Skip to content

Commit

Permalink
Merge pull request #345 from mrkwnzl/develop
Browse files Browse the repository at this point in the history
Update 2.11.0
  • Loading branch information
mrkwnzl committed Nov 2, 2023
2 parents 2980309 + b051e60 commit a2d909d
Show file tree
Hide file tree
Showing 55 changed files with 645 additions and 260 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.11.0] - 2023-11-02
### Added
- It’s now possible to change stats with normal tags.
- Tags can now be sorted into four categories.

### Changed
- The propose Intrusion dialog now also shows the players who own the actors in question. Selecting a companion token now targets the owner of the companion (not the owner of the actor!) with the GMI. If the selected token doesn’t have a viable target, the dialog with all viable targets opens up instead of just throwing an error.
- The icon for exclusive tags in the character portrait now has a tooltip for the currently active exclusive tag.

### Fixed
- The Simplified Stat Roll macro now works as expected again.
- TinyMCE now changes its size dynamically when resizing the window. (Thanks for @farling)
- Items in compendia aren’t throwing an error anymore.
- Active exclusive tags can be deleted.

## [2.10.3] - 2023-10-03
### Changed
- Updated translations.
Expand Down
16 changes: 14 additions & 2 deletions css/cyphersystem.css
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,14 @@ li.folder.collapsed>.folder-header h3 {

/* until here */

.sheet.actor .editor.tinymce div[role="application"] {
height: 100%;
}

.sheet.item .editor.tinymce div[role="application"] {
height: 100%;
}

.cyphersystem.sheet.pc,
.cyphersystem.sheet.npc,
.cyphersystem.sheet.companion,
Expand Down Expand Up @@ -576,7 +584,7 @@ li.folder.collapsed>.folder-header h3 {
margin-right: 5px;
border: 1px solid rgb(0, 0, 0, 0);
border-radius: 3px;
object-fit: scale-down;
object-fit: contain;
}

.cyphersystem .profile-img-gmi {
Expand Down Expand Up @@ -1230,6 +1238,10 @@ select.settings-input {
color: white;
}

.cyphersystem .profile-img-overlay-exclusive-tag:hover {
text-shadow: 0px 0px 2px #000;
}

.cyphersystem .profile-img-overlay-lock {
position: absolute;
top: 102px;
Expand Down Expand Up @@ -1379,7 +1391,7 @@ select.settings-input {
vertical-align: middle;
margin-right: 0px !important;
opacity: 1;
object-fit: scale-down;
object-fit: contain;
}

.cyphersystem .sheet-header img.pc-logo {
Expand Down
2 changes: 1 addition & 1 deletion lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@
"CYPHERSYSTEM.SettingSheetCustomizationLabel": "Charakterbogenanpassungsstandards",
"CYPHERSYSTEM.SettingSheetCustomizationHint": "Stelle die Standards für alle Charakterbögen fest.",
"CYPHERSYSTEM.AppliesToNextRoll": "Wird auf den nächsten Wurf angewandt!",
"CYPHERSYSTEM.SheetEditorHint": "Wähle aus, welcher Editor für Charakter- und Itembögen benutzt wird. Beachte, dass TinyMCE zu ungewolltem Verhalten führen kann, wenn man die Größe eines Fensters ändert während man gerade im Bearbeiten-Modus ist.",
"CYPHERSYSTEM.SheetEditorHint": "Wähle aus, welcher Editor für Charakter- und Itembögen benutzt wird.",
"CYPHERSYSTEM.SheetEditor": "Bogeneditor",
"CYPHERSYSTEM.EquipmentCategoryTwo": "Ausrüstung 2",
"CYPHERSYSTEM.EquipmentCategoryThree": "Ausrüstung 3",
Expand Down
6 changes: 5 additions & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@
"CYPHERSYSTEM.SkillCategoryTwo": "Skills 2",
"CYPHERSYSTEM.SkillCategoryThree": "Skills 3",
"CYPHERSYSTEM.SkillCategoryFour": "Skills 4",
"CYPHERSYSTEM.TagCategoryTwo": "Tags 2",
"CYPHERSYSTEM.TagCategoryThree": "Tags 3",
"CYPHERSYSTEM.TagCategoryFour": "Tags 4",
"CYPHERSYSTEM.EquipmentCategories": "Equipment Categories",
"CYPHERSYSTEM.EquipmentCategoryTwo": "Equipment 2",
"CYPHERSYSTEM.EquipmentCategoryThree": "Equipment 3",
Expand Down Expand Up @@ -460,6 +463,7 @@
"CYPHERSYSTEM.Tags": "Tags",
"CYPHERSYSTEM.ShowTagsTab": "Tags Tab",
"CYPHERSYSTEM.ShowTagsInRecursionTab": "Tags in Recursion Tab",
"CYPHERSYSTEM.TagCategories": "Tag Categories",
"CYPHERSYSTEM.Delete": "Delete",
"CYPHERSYSTEM.Keep": "Keep",
"CYPHERSYSTEM.Duplicate": "Duplicate",
Expand Down Expand Up @@ -634,7 +638,7 @@
"CYPHERSYSTEM.MultiRollValueChanged": "Value changed due to multi roll action in progress.",
"CYPHERSYSTEM.MultiRollInProgress": "Multi roll action in progress. Click to cancel.",
"CYPHERSYSTEM.SheetEditor": "Sheet Editor",
"CYPHERSYSTEM.SheetEditorHint": "Select which editor is used on actor and item sheets. Note that using TinyMCE might result in undesired behavior when resizing a window while in editing mode.",
"CYPHERSYSTEM.SheetEditorHint": "Select which editor is used on actor and item sheets.",
"CYPHERSYSTEM.CopyAs": "Copy as…",
"CYPHERSYSTEM.ItemCreatedAsSkill": "{item} has been copied as a skill.",
"CYPHERSYSTEM.ItemCreatedAsAttack": "{item} has been copied as an attack.",
Expand Down
26 changes: 19 additions & 7 deletions lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@
"CYPHERSYSTEM.SettingMacroAllInOne": "Usar el Diálogo \"Todo en Uno\" por Defecto",
"CYPHERSYSTEM.SettingMacroAllInOneHint": "Con esta opción, las macros de objetos creadas al arrastrar a la barra de macro usan la macro \"Todo en Uno\" en lugar de la de \"Tirada Rápida\". Con Alt-click puedes hacer la tirada rápida.",
"CYPHERSYSTEM.SettingShowWelcome": "Mostrar Mensaje de Bienvenida",
"CYPHERSYSTEM.SettingShowWelcomeHint": "Muestra el mensaje de bienvenida cada vez que se lance el mundo.",
"CYPHERSYSTEM.SettingShowWelcomeHint": "Muestra el mensaje de bienvenida la próxima vez que se lance el mundo.",
"CYPHERSYSTEM.WelcomeMessage": "¡Bienvenido a Cypher System!",
"CYPHERSYSTEM.GettingStarted": "Introducción",
"CYPHERSYSTEM.UserManual": "Manual del Usuario",
"CYPHERSYSTEM.GMIntrusion": "¡Intromisión del DJ!",
"CYPHERSYSTEM.OneDamage": "+1 Daño",
"CYPHERSYSTEM.TwoDamage": "+2 Daño",
"CYPHERSYSTEM.OneDamage": "+1 Punto de Daño",
"CYPHERSYSTEM.TwoDamage": "+2 Puntos de Daño",
"CYPHERSYSTEM.MinorEffectRoll": "Efecto Menor",
"CYPHERSYSTEM.MajorEffectRoll": "Efecto Mayor",
"CYPHERSYSTEM.Difficulty": "Dificultad",
Expand Down Expand Up @@ -551,17 +551,17 @@
"CYPHERSYSTEM.BGIconHolySymbol": "Símbolo Sagrado",
"CYPHERSYSTEM.CancelButtonTooltip": "Cancelar (alt-click para continuar la acción multi-tirada)",
"CYPHERSYSTEM.TeensCantMultiRoll": "Las formas de adolescente no pueden usar tiradas de multi-acción.",
"CYPHERSYSTEM.DamageOrMinorEffectRoll": "Efecto Menor o +3 Daño",
"CYPHERSYSTEM.DamageOrMinorEffectRoll": "Efecto Menor o +3 Puntos de Daño",
"CYPHERSYSTEM.DamageInfo": "Daño: {totalDamage}",
"CYPHERSYSTEM.DamageWithEffectInfo": "Daño: {totalDamage} o {damageWithEffect}",
"CYPHERSYSTEM.DamageWithEffectInfo": "Daño infligido: {totalDamage} o {damageWithEffect} puntos",
"CYPHERSYSTEM.MigrationInProgress": "Aplicando la Migración del Sistema Cypher para la versión {version}. Por favor sea paciente y no cierre la partida ni apague el servidor.",
"CYPHERSYSTEM.IndividualGMIRange": "Individual",
"CYPHERSYSTEM.RollButtonTooltip": "Tirada de dados (alt-click para comenzar o continuar una acción multi-tirada)",
"CYPHERSYSTEM.PayButtonTooltip": "Pagar el coste sin tirar (alt-click para empezar o continuar una tirada multi-acción)",
"TYPES.Actor.marker": "Marcador",
"TYPES.Item.lasting-damage": "Daño Persistente",
"TYPES.Item.power-shift": "Mejora de Poder",
"CYPHERSYSTEM.DamageOrMajorEffectRoll": "Efecto Mayor o +4 Daño",
"CYPHERSYSTEM.DamageOrMajorEffectRoll": "Efecto Mayor o +4 Puntos de Daño",
"CYPHERSYSTEM.IntrusionAcceptedAndGaveXP": "{actor} ha aceptado la intromisión (+1 XP) y entrega los PE adicionales a {selectedActor}.",
"CYPHERSYSTEM.MigrationDone": "¡Migración del Sistema Cypher a la versión {version} completada!",
"CYPHERSYSTEM.ReloadFoundry": "¡Recargando Foundry!",
Expand Down Expand Up @@ -635,5 +635,17 @@
"CYPHERSYSTEM.AppliesToNextRoll": "¡Se aplica a la siguiente tirada!",
"CYPHERSYSTEM.SubtractDifficulty": "Resta 1 de la dificultad.",
"CYPHERSYSTEM.AddDifficulty": "Añade 1 a la dificultad.",
"CYPHERSYSTEM.ResetDifficulty": "Restaura la dificultad."
"CYPHERSYSTEM.ResetDifficulty": "Restaura la dificultad.",
"CYPHERSYSTEM.SettingShowRollDetails": "Mostrar Detalles de la Tirada",
"CYPHERSYSTEM.SettingShowRollDetailsHint": "Activa esta opción para mostrar los detalles de la tirada por defecto.",
"CYPHERSYSTEM.BaseCost": "Coste base",
"CYPHERSYSTEM.BaseDamagePoints": "Daño base: {baseDamage} puntos",
"CYPHERSYSTEM.EffectDamagePoint": "Tirada especial: {baseDamage} punto",
"CYPHERSYSTEM.EffectDamagePoints": "Tirada especial: {baseDamage} puntos",
"CYPHERSYSTEM.DamageInflictedPoints": "Daño infligido: {totalDamage} puntos",
"CYPHERSYSTEM.RollItemPayPoints": "Tirada de Objeto (alt-click para pagar puntos de Reserva)",
"CYPHERSYSTEM.ToggleTemporaryPowerShift": "Conmutar Mejora de Poder Temporal",
"CYPHERSYSTEM.BaseDamagePoint": "Daño base: {baseDamage} punto",
"CYPHERSYSTEM.DamageInflictedPoint": "Daño infligido: {totalDamage} punto",
"CYPHERSYSTEM.RollItemSkip": "Tirada de Objeto (alt-click para evitar el diálogo Todo-en-Uno)"
}
2 changes: 1 addition & 1 deletion lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
"CYPHERSYSTEM.SettingSheetCustomizationHint": "Définir les valeurs par défaut pour toutes les feuilles d'acteur.",
"CYPHERSYSTEM.AppliesToNextRoll": "S'applique au jet de dès suivant !",
"CYPHERSYSTEM.SheetEditor": "Éditeur de feuilles",
"CYPHERSYSTEM.SheetEditorHint": "Sélectionnez l'éditeur utilisé pour les fiches d'acteur et d'objet. Notez que l'utilisation de TinyMCE peut entraîner un comportement indésirable lors du redimensionnement d'une fenêtre en mode édition.",
"CYPHERSYSTEM.SheetEditorHint": "Sélectionnez l'éditeur utilisé pour les fiches d'acteur et d'objet.",
"CYPHERSYSTEM.ItemCreatedAsAttack": "{item} a été copié en tant qu'attaque.",
"CYPHERSYSTEM.ItemCreatedAsEquipment": "{item} a été copié en tant qu'équipement.",
"CYPHERSYSTEM.EquipmentCategories": "Catégories d'équipement",
Expand Down
2 changes: 1 addition & 1 deletion lang/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@
"CYPHERSYSTEM.EquipmentCategoryThree": "Equipamento 3",
"CYPHERSYSTEM.EquipmentCategoryFour": "Equipamento 4",
"CYPHERSYSTEM.SheetEditor": "Editor de Ficha",
"CYPHERSYSTEM.SheetEditorHint": "Selecionar qual editor é usado nas fichas de ator e item. Note que usando o TinyMCE pode causar comportalmento indesejado quando ajustar tamanho da janela enquanto estiver no modo de edição.",
"CYPHERSYSTEM.SheetEditorHint": "Selecionar qual editor é usado nas fichas de ator e item.",
"CYPHERSYSTEM.RollItemSkip": "Rolar Item (alt-click para pular a janela Tudo-em-Um)",
"CYPHERSYSTEM.RollItemPayPoints": "Rolar Item (alt-click para pagar pontos de Reserva)",
"CYPHERSYSTEM.ToggleTemporaryPowerShift": "Alternar Power Shift Temporário",
Expand Down
Loading

0 comments on commit a2d909d

Please sign in to comment.