Merge pull request #105 from WoD5E-Developers/dev

Dev -> Main Merge for 5.0.1 Release
WoD5E-Developers · Nov 4, 2024 · 85133c4 · 85133c4
2 parents a1d31c2 + b63cdf2
commit 85133c4
Show file tree

Hide file tree

Showing 50 changed files with 155 additions and 79 deletions.
diff --git a/display/shared/styling/parts/actor-sheets.less b/display/shared/styling/parts/actor-sheets.less
@@ -393,6 +393,7 @@
 
       prose-mirror {
         height: 400px;
+        min-width: 100%;
       }
     }
   }

diff --git a/display/shared/styling/themes/base-theme.less b/display/shared/styling/themes/base-theme.less
@@ -117,7 +117,8 @@
 
 prose-mirror {
   button.icon.toggle {
-    background-color: var(--system-color-6);
+    background-color: var(--system-color-1);
+    color: var(--system-color-2)
   }
 
   .editor-menu {

diff --git a/display/shared/styling/themes/dark-theme.less b/display/shared/styling/themes/dark-theme.less
@@ -295,7 +295,7 @@
       }
 
       .navicon .wod5e-symbol,
-      .item[data-tab="wolf"] {
+      [data-tab="wolf"] .navicon {
         color: var(--werewolf-color-3);
       }
     }

diff --git a/display/ui/chat/roll-message.hbs b/display/ui/chat/roll-message.hbs
@@ -58,8 +58,7 @@
             </div>
         </div>
     {{else}}
-        <div class="message-content">
-                <div class="dice-roll">
+        <div class="dice-roll">
             <div class="dice-result">
                 <div class="dice-formula">???</div>
                 <h4 class="dice-total">?</h4>

diff --git a/display/ui/splat-colors-menu.hbs b/display/ui/splat-colors-menu.hbs
@@ -8,6 +8,9 @@
             {{#each record.settings as |setting|}}
                 <div class="flexrow">
                     <div>
+                        <a class="reset-color" data-input-id="{{setting.id}}" data-setting-id="{{setting.settingId}}" data-css-variable="{{setting.cssVariable}}" title="{{localize 'WOD5E.Reset'}}">
+                            <i class="fa-solid fa-rotate-left"></i>
+                        </a>
                         <b>{{localize setting.settingName}}</b>
                     </div>
                     <input id="{{setting.id}}" class="color-input" data-setting-id="{{setting.settingId}}" data-css-variable="{{setting.cssVariable}}" value="{{lookup ../.. @key}}" data-jscolor="">

diff --git a/display/vtm/styling/vampire-styling.less b/display/vtm/styling/vampire-styling.less
@@ -7,7 +7,7 @@
 
 /* Define splat-specific colours for the WOD5E Symbols */
 .wod5e .wod5e-symbol.vampire {
-  color: var(--vampire-color-1);
+  color: var(--vampire-color-3);
 }
 
 /* Vampire Actor Sheet */
@@ -71,8 +71,8 @@
     background-color: var(--vampire-color-2);
 
     .navicon .wod5e-symbol,
-    .item[data-tab="blood"] {
-      color: var(--vampire-color-1);
+    [data-tab="blood"] .navicon {
+      color: var(--vampire-color-2);
     }
 
     .active .navicon {

diff --git a/display/wod5e-styling.css b/display/wod5e-styling.css
@@ -774,7 +774,7 @@ h3.item-name {
 }
 /* Define splat-specific colours for the WOD5E Symbols */
 .wod5e .wod5e-symbol.vampire {
-  color: var(--vampire-color-1);
+  color: var(--vampire-color-3);
 }
 /* Vampire Actor Sheet */
 .actor.sheet.vampire .actor-header {
@@ -820,8 +820,8 @@ h3.item-name {
   background-color: var(--vampire-color-2);
 }
 .actor.sheet.vampire .tabs-container .navicon .wod5e-symbol,
-.actor.sheet.vampire .tabs-container .item[data-tab="blood"] {
-  color: var(--vampire-color-1);
+.actor.sheet.vampire .tabs-container [data-tab="blood"] .navicon {
+  color: var(--vampire-color-2);
 }
 .actor.sheet.vampire .tabs-container .active .navicon {
   background-color: var(--vampire-color-1);
@@ -1564,6 +1564,7 @@ body.uk .actor.sheet {
 }
 .actor.sheet .tab[data-tab="notepad"] .note-container prose-mirror {
   height: 400px;
+  min-width: 100%;
 }
 .actor.sheet .toggle-limited {
   font-size: 13pt;
@@ -2406,7 +2407,8 @@ body.uk .actor.sheet {
   color: #e4e4e4a9;
 }
 prose-mirror button.icon.toggle {
-  background-color: var(--system-color-6);
+  background-color: var(--system-color-1);
+  color: var(--system-color-2);
 }
 prose-mirror .editor-menu {
   background: var(--system-color-7);
@@ -2981,7 +2983,7 @@ prose-mirror .editor-menu button {
   color: var(--system-dark-color-4);
 }
 .wod-dark-theme .actor.sheet.werewolf .tabs-container .navicon .wod5e-symbol,
-.wod-dark-theme .actor.sheet.werewolf .tabs-container .item[data-tab="wolf"] {
+.wod-dark-theme .actor.sheet.werewolf .tabs-container [data-tab="wolf"] .navicon {
   color: var(--werewolf-color-3);
 }
 .wod-dark-theme .actor.sheet.werewolf .tab[data-tab="wolf"] .resource input,

diff --git a/lang/de/core-de.json b/lang/de/core-de.json
@@ -53,13 +53,15 @@
     "Level": "Stufe",
     "_LicensedUnderDarkPack": "",
     "_LicensedUnderDarkPackFulltext": "",
+    "_MaxString": "",
     "Mortal": "Sterblicher",
     "Name": "Name",
     "_NewString": "",
     "NoGroupMembers": "Keine Gruppenmitglieder. Zum Hinzufügen aus der Akteur-Liste hierher ziehen.",
     "None": "Kein",
     "OpenSheet": "Bogen öffnen",
     "RemoveFromGroup": "Aus Gruppe entfernen",
+    "_Reset": "",
     "Save": "Speichern",
     "Submit": "Absenden",
     "System": "System",

diff --git a/lang/de/vampire-de.json b/lang/de/vampire-de.json
@@ -52,6 +52,7 @@
       "Ghoul": "Ghoul",
       "_GiveIn": "",
       "Humanity": "Menschlichkeit",
+      "_HumanityStains": "",
       "Hunger": "Hunger",
       "HungerDice": "Hunger-Würfel",
       "HungerFull1": "Hunger maximal",
@@ -64,7 +65,6 @@
       "Level4": "Stufe 4 und darunter",
       "Level5": "Stufe 5 und darunter",
       "Lien": "Einbindung",
-      "_MaxHunger": "",
       "MendAmount": "Schaden heilen (pro Wallungs-Check)",
       "MessyCritical": "Schmutziger Triumph",
       "_NewStringPower": "",

diff --git a/lang/de/werewolf-de.json b/lang/de/werewolf-de.json
@@ -72,7 +72,6 @@
       "LupusName": "Lupus",
       "_LupusSocialTests": "",
       "LupusTitle": "Der Wolf",
-      "_MaxRage": "",
       "Native": "Native",
       "NewGift": "Neue Gabe",
       "NewRite": "Neuer Ritus",

diff --git a/lang/en/core-en.json b/lang/en/core-en.json
@@ -53,13 +53,15 @@
     "Level": "Level",
     "LicensedUnderDarkPack": "Licensed Under The Dark Pack",
     "LicensedUnderDarkPackFulltext": "Portions of the materials are the copyrights and trademarks of Paradox Interactive AB, and are used with permission. All rights reserved. For more information please visit <a href='https://worldofdarkness.com'>worldofdarkness.com</a>.",
+    "MaxString": "Max {string}",
     "Mortal": "Mortal",
     "Name": "Name",
     "NewString": "New {string}",
     "NoGroupMembers": "No group members added. Drag and drop from the actors sidebar to add some!",
     "None": "None",
     "OpenSheet": "Open sheet",
     "RemoveFromGroup": "Remove from group",
+    "Reset": "Reset",
     "Save": "Save",
     "Submit": "Submit",
     "System": "System",
@@ -333,7 +335,7 @@
       "SkillType": "Skill Type",
       "SortDefAlphabetically": "Alphabetical Sorting",
       "SortDefAlphabeticallyHint": "Determine which aspects of the system are sorted. By default, everything except attributes will be sorted alphabetically.",
-      "SpendXpIconOverride": "SPent XP Icon",
+      "SpendXpIconOverride": "Spent XP Icon",
       "SpendXpIconOverrideHint": "Replaces the default icon for spent XP.",
       "SplatColorsHint": "Allows for the storyteller to edit the colours associated with each individual splat in the system.",
       "SplatColorsMenu": "Splat Colors Menu",

diff --git a/lang/en/vampire-en.json b/lang/en/vampire-en.json
@@ -52,6 +52,7 @@
       "Ghoul": "Ghoul",
       "GiveIn": "Give In",
       "Humanity": "Humanity",
+      "HumanityStains": "Humanity Stains",
       "Hunger": "Hunger",
       "HungerDice": "Hunger Dice",
       "HungerFull1": "Hunger Full",
@@ -64,7 +65,6 @@
       "Level4": "Level 4 and below",
       "Level5": "Level 5 and below",
       "Lien": "Lien",
-      "MaxHunger": "Max Hunger",
       "MendAmount": "Mend Amount",
       "MessyCritical": "Messy Critical",
       "NewStringPower": "New {string} Power",

diff --git a/lang/en/werewolf-en.json b/lang/en/werewolf-en.json
@@ -72,7 +72,6 @@
       "LupusName": "Lupus",
       "LupusSocialTests": "Social Tests: Limited to wolves and Garou",
       "LupusTitle": "The Wolf",
-      "MaxRage": "Max Rage",
       "Native": "Native",
       "NewGift": "New Gift",
       "NewRite": "New Rite",

diff --git a/lang/es/core-es.json b/lang/es/core-es.json
@@ -53,13 +53,15 @@
     "Level": "Nivel",
     "_LicensedUnderDarkPack": "",
     "_LicensedUnderDarkPackFulltext": "",
+    "_MaxString": "",
     "Mortal": "Mortal",
     "Name": "Nombre",
     "_NewString": "",
     "_NoGroupMembers": "",
     "None": "Ninguno",
     "_OpenSheet": "",
     "_RemoveFromGroup": "",
+    "_Reset": "",
     "Save": "Guardar",
     "Submit": "Enviar",
     "System": "Sistema",

diff --git a/lang/es/vampire-es.json b/lang/es/vampire-es.json
@@ -52,6 +52,7 @@
       "Ghoul": "Ghoul",
       "_GiveIn": "",
       "Humanity": "Humanidad",
+      "_HumanityStains": "",
       "Hunger": "Ansia",
       "HungerDice": "Dados de Ansia",
       "HungerFull1": "Ansia llena",
@@ -64,7 +65,6 @@
       "Level4": "Nivel 4 y superior",
       "Level5": "Nivel 5 y superior",
       "_Lien": "",
-      "_MaxHunger": "",
       "MendAmount": "Cantidad de Reparación",
       "MessyCritical": "Crítico conflictivo",
       "_NewStringPower": "",

diff --git a/lang/es/werewolf-es.json b/lang/es/werewolf-es.json
@@ -72,7 +72,6 @@
       "LupusName": "Lupus",
       "_LupusSocialTests": "",
       "_LupusTitle": "",
-      "_MaxRage": "",
       "_Native": "",
       "_NewGift": "",
       "_NewRite": "",

diff --git a/lang/fr/core-fr.json b/lang/fr/core-fr.json
@@ -53,13 +53,15 @@
     "Level": "Niveau",
     "_LicensedUnderDarkPack": "",
     "_LicensedUnderDarkPackFulltext": "",
+    "_MaxString": "",
     "Mortal": "Mortel",
     "Name": "Nom",
     "_NewString": "",
     "_NoGroupMembers": "",
     "None": "Aucun",
     "_OpenSheet": "",
     "_RemoveFromGroup": "",
+    "_Reset": "",
     "Save": "Enregistrer",
     "Submit": "Valider",
     "System": "Système",

diff --git a/lang/fr/vampire-fr.json b/lang/fr/vampire-fr.json
@@ -52,6 +52,7 @@
       "Ghoul": "Goule",
       "_GiveIn": "",
       "Humanity": "Humanité",
+      "_HumanityStains": "",
       "Hunger": "Soif",
       "HungerDice": "Dé de Soif",
       "HungerFull1": "Soif au max",
@@ -64,7 +65,6 @@
       "Level4": "Niveau 4 et inférieur",
       "Level5": "Niveau 5 et inférieur",
       "Lien": "Servage",
-      "_MaxHunger": "",
       "MendAmount": "Dégâts régénérés",
       "MessyCritical": "Triomphe Brutal",
       "_NewStringPower": "",

diff --git a/lang/fr/werewolf-fr.json b/lang/fr/werewolf-fr.json
@@ -72,7 +72,6 @@
       "_LupusName": "",
       "_LupusSocialTests": "",
       "_LupusTitle": "",
-      "_MaxRage": "",
       "_Native": "",
       "_NewGift": "",
       "_NewRite": "",

diff --git a/lang/it/core-it.json b/lang/it/core-it.json
@@ -53,13 +53,15 @@
     "Level": "Livello",
     "_LicensedUnderDarkPack": "",
     "_LicensedUnderDarkPackFulltext": "",
+    "_MaxString": "",
     "Mortal": "Mortale",
     "Name": "Nome",
     "NewString": "Nuovo {string}",
     "NoGroupMembers": "Non ci sono membri in questo gruppo. Trascina una scheda per aggiungerla al gruppo!",
     "None": "Nessuno",
     "OpenSheet": "Apri scheda",
     "RemoveFromGroup": "Rimuovi dal gruppo",
+    "_Reset": "",
     "Save": "Salva",
     "Submit": "Invia",
     "System": "Sistema",

diff --git a/lang/it/vampire-it.json b/lang/it/vampire-it.json
@@ -52,6 +52,7 @@
       "Ghoul": "Ghoul",
       "_GiveIn": "",
       "Humanity": "Umanità",
+      "_HumanityStains": "",
       "Hunger": "Fame",
       "HungerDice": "Dadi fame",
       "HungerFull1": "Fame massima",
@@ -64,7 +65,6 @@
       "Level4": "Livello 4 o meno",
       "Level5": "Livello 5 o meno",
       "Lien": "Lien",
-      "_MaxHunger": "",
       "MendAmount": "Danni risanati",
       "MessyCritical": "Critico Caotico",
       "NewStringPower": "Nuovo potere {string}",

diff --git a/lang/it/werewolf-it.json b/lang/it/werewolf-it.json
@@ -72,7 +72,6 @@
       "LupusName": "Lupus",
       "LupusSocialTests": "Prove sociali:  limitate a lupi e Garou",
       "LupusTitle": "Il Lupo",
-      "_MaxRage": "",
       "Native": "Nativo",
       "NewGift": "Nuovo Dono",
       "NewRite": "Nuovo rito",

diff --git a/lang/pl/core-pl.json b/lang/pl/core-pl.json
@@ -53,13 +53,15 @@
     "Level": "Poziom",
     "_LicensedUnderDarkPack": "",
     "_LicensedUnderDarkPackFulltext": "",
+    "_MaxString": "",
     "Mortal": "Śmiertelnik",
     "Name": "Nazwa",
     "_NewString": "",
     "_NoGroupMembers": "",
     "None": "Brak",
     "_OpenSheet": "",
     "_RemoveFromGroup": "",
+    "_Reset": "",
     "_Save": "",
     "_Submit": "",
     "_System": "",

diff --git a/lang/pl/vampire-pl.json b/lang/pl/vampire-pl.json
@@ -52,6 +52,7 @@
       "Ghoul": "Ghul",
       "_GiveIn": "",
       "Humanity": "Człowieczeństwo",
+      "_HumanityStains": "",
       "Hunger": "Głód",
       "_HungerDice": "",
       "_HungerFull1": "",
@@ -64,7 +65,6 @@
       "Level4": "Poziom 4 i niższy",
       "Level5": "Poziom 5 i niższy",
       "_Lien": "",
-      "_MaxHunger": "",
       "MendAmount": "Wartość leczenia",
       "MessyCritical": "Krwawa wygrana",
       "_NewStringPower": "",

diff --git a/lang/pl/werewolf-pl.json b/lang/pl/werewolf-pl.json
@@ -72,7 +72,6 @@
       "LupusName": "Lupus",
       "_LupusSocialTests": "",
       "LupusTitle": "Wilk",
-      "_MaxRage": "",
       "Native": "Ogólne",
       "NewGift": "Nowy Dar",
       "NewRite": "Nowy Rytuał",

diff --git a/lang/pt-BR/core-pt-BR.json b/lang/pt-BR/core-pt-BR.json
@@ -53,13 +53,15 @@
     "Level": "Nível",
     "_LicensedUnderDarkPack": "",
     "_LicensedUnderDarkPackFulltext": "",
+    "_MaxString": "",
     "Mortal": "Mortal",
     "Name": "Nome",
     "_NewString": "",
     "_NoGroupMembers": "",
     "None": "Nenhum",
     "_OpenSheet": "",
     "_RemoveFromGroup": "",
+    "_Reset": "",
     "Save": "Salvar",
     "Submit": "Enviar",
     "System": "Sistema",

diff --git a/lang/pt-BR/vampire-pt-BR.json b/lang/pt-BR/vampire-pt-BR.json
@@ -52,6 +52,7 @@
       "Ghoul": "Carniçal",
       "_GiveIn": "",
       "Humanity": "Humanidade",
+      "_HumanityStains": "",
       "Hunger": "Fome",
       "HungerDice": "Dados de Fome",
       "HungerFull1": "Fome máxima",
@@ -64,7 +65,6 @@
       "Level4": "Nível 4 e abaixo",
       "Level5": "Nível 5 e abaixo",
       "_Lien": "",
-      "_MaxHunger": "",
       "MendAmount": "Quantidade Recuperada",
       "MessyCritical": "Crítico Bestial",
       "_NewStringPower": "",