Merge pull request #110 from WoD5E-Developers/dev

Dev -> Main Merge for 5.0.2 Release
WoD5E-Developers · Nov 5, 2024 · cf77ec9 · cf77ec9
2 parents 85133c4 + e4e85bd
commit cf77ec9
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 52 deletions.
diff --git a/display/vtm/actors/parts/disciplines.hbs b/display/vtm/actors/parts/disciplines.hbs
@@ -142,9 +142,9 @@
                                 </div>
                             {{/ifgr}}
                         </div>
-                        {{#if selectedDisciplinePower.system.enrichedDescription}}
+                        {{#if selectedDisciplinePowerDescription}}
                             <div class="power-description">
-                                {{{selectedDisciplinePower.system.enrichedDescription}}}
+                                {{{selectedDisciplinePowerDescription}}}
                             </div>
                         {{/if}}
                     </div>

diff --git a/lang/de/core-de.json b/lang/de/core-de.json
@@ -10,32 +10,32 @@
       "werewolf": "Werwolf"
     },
     "Item": {
-      "_armor": "",
+      "armor": "Rüstung",
       "_auspice": "",
       "boon": "Gefallen",
-      "_clan": "",
-      "_condition": "",
-      "_creed": "",
+      "clan": "Clan",
+      "condition": "Zustand",
+      "creed": "Überzeugung",
       "customRoll": "Benutzerdefinierter Wurf",
-      "_drive": "",
+      "drive": "Antrieb",
       "_edgepool": "",
       "feature": "Merkmal",
-      "_gear": "",
+      "gear": "Ausrüstung",
       "gift": "Gabe",
       "perk": "Verstärkung",
       "power": "Disziplin",
-      "_predatorType": "",
-      "_resonance": "",
-      "_talisman": "",
+      "predatorType": "Jagdverhalten",
+      "resonance": "Resonanz",
+      "talisman": "Talisman",
       "_trait": "",
-      "_tribe": "",
-      "_weapon": ""
+      "tribe": "Stamm",
+      "weapon": "Waffe"
     }
   },
   "WOD5E": {
     "_Active": "",
     "Add": "Hinzufügen",
-    "_Amount": "",
+    "Amount": "Menge",
     "Cancel": "Abbrechen",
     "_Changelog": "",
     "Close": "Schließen",
@@ -92,20 +92,20 @@
       "Wits": "Geistesschärfe"
     },
     "BiographyList": {
-      "_Age": "",
+      "Age": "Alter",
       "Ambition": "Ambition",
-      "_ApparentAge": "",
+      "ApparentAge": "Echtes Alter",
       "Appearance": "Aussehen",
       "Chronicle": "Chronik",
       "ChronicleTenets": "Grundsätze der Chronik",
       "Concept": "Konzept",
-      "_DateOfBirth": "",
-      "_DateOfDeath": "",
+      "DateOfBirth": "Geburtsdatum",
+      "DateOfDeath": "Todesdatum",
       "Desire": "Verlangen",
       "History": "Geschichte",
       "Label": "Geschichte",
-      "_PersonalInformation": "",
-      "_Touchstones": "",
+      "PersonalInformation": "Persönliche Informationen",
+      "Touchstones": "Anker",
       "TouchstonesAndConvictions": "Anker & Überzeugungen"
     },
     "Chat": {
@@ -132,30 +132,30 @@
       "SkillShortLabel": "F"
     },
     "EquipmentList": {
-      "_ArmorValue": "",
-      "_EquipmentNotes": "",
-      "_Melee": "",
+      "ArmorValue": "Rüstungswert",
+      "EquipmentNotes": "Ausrüstungsnotizen",
+      "Melee": "Nahkampf",
       "_NewStringWeapon": "",
-      "_Quantity": "",
-      "_Ranged": "",
+      "Quantity": "Anzahl",
+      "Ranged": "Fernkampf",
       "_SelectWeaponType": "",
-      "_Supernatural": "",
-      "_WeaponType": "",
-      "_WeaponValue": ""
+      "Supernatural": "Übernatürlich",
+      "WeaponType": "Typ",
+      "WeaponValue": "Wert"
     },
     "Experience": {
-      "_AddExperience": "",
-      "_Calculated": "",
-      "_EditExperience": "",
-      "_History": "",
-      "_Label": "",
+      "AddExperience": "XP hinzufügen",
+      "Calculated": "Berechnet",
+      "EditExperience": "XP bearbeiten",
+      "History": "Verlauf",
+      "Label": "Erfahrungspunkte",
       "_Legacy": "",
       "_NewExperience": "",
-      "_Remaining": "",
-      "_SpendExperience": "",
-      "_Total": "",
-      "_XPGained": "",
-      "_XPSpent": ""
+      "Remaining": "Verbleibend",
+      "SpendExperience": "XP ausgeben",
+      "Total": "Gesamt",
+      "XPGained": "XP erhalten",
+      "XPSpent": "XP ausgegeben"
     },
     "ItemsList": {
       "_Add": "",
@@ -408,8 +408,8 @@
       "Members": "Mitglieder",
       "Notes": "Notizen",
       "Other": "Sonstige",
-      "_PrivateNotes": "",
-      "_PublicNotes": "",
+      "PrivateNotes": "Private Notizen",
+      "PublicNotes": "Öffentliche Notizen",
       "_Settings": "",
       "Stats": "Werte",
       "_StorytellerNotes": "",

diff --git a/lang/de/vampire-de.json b/lang/de/vampire-de.json
@@ -35,7 +35,7 @@
       "DisciplineType": "Disziplins-Typ",
       "Dominate": "Beherrschung",
       "Domitor": "Domitor",
-      "_EndFrenzy": "",
+      "EndFrenzy": "Raserei beenden",
       "FeedingPenalty": "Beuteausschluss",
       "FeedingPenalty1": "Tierblut und Blutkonserven stillen die Hälfte des Hungers.",
       "FeedingPenalty2": "Tierblut und Blutkonserven stillen keinen Hunger.",
@@ -47,10 +47,10 @@
       "Fortitude": "Seelenstärke",
       "Frenzy": "Raserei",
       "_FrenzyChoiceResistOrGiveIn": "",
-      "_FrenzyStatus": "",
+      "FrenzyStatus": "Rasereizustand",
       "Generation": "Generation",
       "Ghoul": "Ghoul",
-      "_GiveIn": "",
+      "GiveIn": "Nachgeben",
       "Humanity": "Menschlichkeit",
       "_HumanityStains": "",
       "Hunger": "Hunger",
@@ -86,13 +86,13 @@
       "Remorse": "Reue",
       "_RemorseFailed": "",
       "_RemorseFailedDescription": "",
-      "_ResistFrenzy": "",
+      "ResistFrenzy": "Rasereiwurf",
       "ResistingFrenzy": "Raserei widerstehen",
       "_ResistingFrenzyFailed": "",
       "_ResistingFrenzyFailedDescription": "",
       "_ResistingFrenzySuccess": "",
       "_ResistingFrenzySuccessDescription": "",
-      "_RidingTheWave": "",
+      "_RidingTheWave": "Die Welle reiten",
       "_RidingTheWaveDescription": "",
       "Rituals": "Rituale",
       "RollFrenzy": "Würfle Raserei",

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
   "id": "vtm5e",
   "title": "World of Darkness 5e",
   "description": "World of Darkness 5e system for Foundry VTT",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "compatibility": {
     "minimum": "12",
     "verified": "12.331",
@@ -267,8 +267,8 @@
   "url": "https://github.com/WoD5E-Developers/wod5e",
   "bugs": "https://github.com/WoD5E-Developers/wod5e/issues",
   "background": "systems/vtm5e/assets/images/wodcity.jpg",
-  "manifest": "https://github.com/WoD5E-Developers/wod5e/releases/download/5.0.1/system.json",
-  "download": "https://github.com/WoD5E-Developers/wod5e/releases/download/5.0.1/vtm5e.zip",
+  "manifest": "https://github.com/WoD5E-Developers/wod5e/releases/download/5.0.2/system.json",
+  "download": "https://github.com/WoD5E-Developers/wod5e/releases/download/5.0.2/vtm5e.zip",
   "flags": {
     "hotReload": {
       "extensions": [

diff --git a/system/actor/scripts/item-roll.js b/system/actor/scripts/item-roll.js
@@ -41,16 +41,21 @@ export const _rollItem = async function (actor, item) {
   const flavor = itemData?.description || ''
   const flatMod = itemData?.modifier || 0
   const macro = itemData.macroid
-  const selectors = []
+  let selectors = []
 
   // Variables yet to be defined
   let basicDice, advancedDice
 
   // Iterate through the dicepool and add to valuePaths and selectors as needed
   for (const dice in dicepool) {
+    const splitPath = dicepool[dice]?.path?.split('.')
+    // Push each of the individual sub-selectors
+    selectors = selectors.concat(splitPath)
+
+    // Push the full selector
     selectors.push(dicepool[dice]?.path)
-    selectors.push(dicepool[dice]?.path?.split('.'))
 
+    // Push the value path
     valuePaths.push(`${dicepool[dice].path}.value`)
   }
 

diff --git a/system/actor/vtm/scripts/prepare-partials.js b/system/actor/vtm/scripts/prepare-partials.js
@@ -21,6 +21,8 @@ export const prepareDisciplinesContext = async function (context, actor) {
   // Get power data if any power is currently selected
   if (actorData?.selectedDisciplinePower) {
     context.selectedDisciplinePower = await actor.items.get(actorData.selectedDisciplinePower)
+
+    context.selectedDisciplinePowerDescription = await TextEditor.enrichHTML(context.selectedDisciplinePower.system.description)
   }
 
   return context

diff --git a/system/api/dicepool-list.js b/system/api/dicepool-list.js
@@ -7,7 +7,7 @@
 export const getDicepoolList = async (document) => {
   const masterList = []
   const gamesystem = document.system?.gamesystem || 'mortal'
-  const isNotEmbedded = !game.items.get('ScZcmxk1WGC0GAQu').isEmbedded
+  const isNotEmbedded = !game.items.get('ScZcmxk1WGC0GAQu')?.isEmbedded
 
   // Attributes
   const attributes = WOD5E.Attributes.getList({})

diff --git a/system/scripts/rolls/situational-modifiers.js b/system/scripts/rolls/situational-modifiers.js
@@ -99,7 +99,9 @@ export async function getSituationalModifiers ({
       if (check === 'isEqual') {
         const pathValue = path.split('.').reduce((obj, key) => obj[key], data)
         modifier.isActive = true
-        showModifier = String(pathValue) === value
+
+        // Check both number and string values
+        showModifier = String(pathValue) === String(value) || Number(pathValue) === Number(value)
       }
 
       // If the qualifier is the path, the modifier will be active