5.2.2

Plushtoast · Nov 18, 2023 · b3ff38c · b3ff38c
1 parent b223c7d
commit b3ff38c
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 37 deletions.
diff --git a/bundle/dsa5.bundle.js b/bundle/dsa5.bundle.js
diff --git a/lang/de.json b/lang/de.json
@@ -354,6 +354,7 @@
     "halfDefenseShort": "Halbe Verteidigung",
     "Hair_color": "Haarfarbe",
     "Height": "Größe",
+    "extensionModifier": "Erweiterungsmodifikator",
     "Home": "Heimatort",
     "Initial": "Startwert",
     "initDie": "Initiativewürfel",
@@ -404,7 +405,7 @@
     "maintainedSpells": "Aufrechterhaltene Zauber/Liturgien (je -1)",
     "manual": "Händisch",
     "mageLevel": "Magieart",
-    "minorghostsappear": "Lästige Mindergeister werden durch den Zauber angelockt",
+    "minorghostsappear": "{creature} werden durch den Zauber angelockt",
     "stunnedByCounterAttack": "Gegenhalten versursacht 1 Stufe Betäubung",
     "maxSpellMods": "Maximale Modifikatorenanzahl",
     "misc": "Sonstiges",
@@ -1410,7 +1411,8 @@
         "servantCloud": "Diener der Wolken", 
         "servantOre": "Diener des Erzes",
         "immuneTo": "Immunität gegen",
-        "enemySense": "Feindgespür"
+        "enemySense": "Feindgespür",
+        "winhallStyle": "Winhall-Stil"
     },
     "LocalizedCTs": {
         "Blasrohre": "Blowpipes",

diff --git a/lang/en.json b/lang/en.json
@@ -262,6 +262,7 @@
     "Advances": "Advances",
     "attributes": "Attributes",
     "botchCritEffect": "Botch/Crit",
+    "extensionModifier": "Extension modifier",
     "astralenergy": "Arcane energy",
     "fallingHeight": "Falling height",
     "fallingFloor": "Ground condition",
@@ -465,7 +466,7 @@
     "maintainedSpells": "Maintained Spells/Chants (each -1)",
     "manual": "Manual",
     "mageLevel": "Magic type",
-    "minorghostsappear": "Annoying Minor spirits are attracted by the spell",
+    "minorghostsappear": "{creature} are attracted by the spell",
     "stunnedByCounterAttack": "Counterattack causes 1 level of stunned",
     "maxSpellMods": "Max modifier count",
     "misc": "Misc",

diff --git a/modules/dialog/dialog-combat-dsa5.js b/modules/dialog/dialog-combat-dsa5.js
@@ -518,13 +518,24 @@ export default class DSA5CombatDialog extends DialogShared {
                 value,
             });
             const enemySense = game.i18n.localize("LocalizedIDs.enemySense")
+            const winhallStyle = game.i18n.localize("LocalizedIDs.winhallStyle")
             game.user.targets.forEach((target) => {
-                if (target.actor?.items.find((x) => x.type == "specialability" && x.name == enemySense)) {
-                    situationalModifiers.push({
-                        name: enemySense,
-                        value,
-                    });
-                    return;
+                for(const item of target.actor?.items || []){
+                    if(item.type == "specialability"){
+                        if(item.name == enemySense){
+                            situationalModifiers.push({
+                                name: enemySense,
+                                value: -4,
+                            });
+                        }
+                        else if(item.name == winhallStyle){
+                            situationalModifiers.push({
+                                name: winhallStyle,
+                                value: -2,
+                            });
+                        }
+
+                    }
                 }
             });
         }

diff --git a/modules/dsa5.js b/modules/dsa5.js
@@ -95,9 +95,9 @@ Hooks.once("init", () => {
             SpeciesWizard
         },
         view: {
-            tinyNotification: tinyNotification,
-            tabSlider: tabSlider,
-            clickableAbility: clickableAbility
+            tinyNotification,
+            tabSlider,
+            clickableAbility
         },
         dialogs: {
             DialogReactDSA5,

diff --git a/modules/hooks/combat_tracker.js b/modules/hooks/combat_tracker.js
@@ -228,7 +228,7 @@ export class DSA5Combatant extends Combatant {
 
     brawlingChange() {
         const actor = DSA5_Utility.getSpeaker({actor: this.actor.id, scene: this.sceneId, token: this.token.id})
-        const tokenChange = getProperty(actor, "system.config.autoBar") ? actor.getActiveTokens().map(x => {return { _id: x.id, bar1: { attribute: "status.temporaryLeP" } }}) : [{}]
+        const tokenChange = getProperty(actor, "system.config.autoBar") ? actor.getActiveTokens().map(x => {return { _id: x.id, bar1: { attribute: "status.temporaryLeP" } }}) : []
         const actorChange = {
             _id: actor.id,
             system: {
@@ -256,7 +256,7 @@ export class DSA5Combatant extends Combatant {
 
     async undoBrawlingChange() {
         const actor = DSA5_Utility.getSpeaker({actor: this.actor.id, scene: this.sceneId, token: this.token.id})
-        const tokenChange = getProperty(actor, "system.config.autoBar") ? actor.getActiveTokens().map(x => { return { _id: x.id, bar1: { attribute: "status.wounds" } }}) : [{}]
+        const tokenChange = getProperty(actor, "system.config.autoBar") ? actor.getActiveTokens().map(x => { return { _id: x.id, bar1: { attribute: "status.wounds" } }}) : []
         const lostLP = Math.max(0, actor.system.status.temporaryLeP.max - actor.system.status.temporaryLeP.value)
         let brawlDamage = 0
 

diff --git a/modules/status/active_effects.js b/modules/status/active_effects.js
@@ -46,13 +46,13 @@ async function callMacro(packName, name, actor, item, qs, args = {}) {
 
 Hooks.once("i18nInit", () => {
     DSAActiveEffectConfig.effectDurationRegexes = [
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.combatRounds"), "gi"), seconds: 5 },
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.minutes"), "gi"), seconds: 60 },
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.hours"), "gi"), seconds: 3600 },
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.days"), "gi"), seconds: 3600 * 24 },
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.weeks"), "gi"), seconds: 3600 * 24 * 7 },
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.months"), "gi"), seconds: 3600 * 24 * 30 },
-        { regEx: new RegExp(game.i18n.localize("DSAREGEX.years"), "gi"), seconds: 3600 * 24 * 350 }
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.combatRounds"), "i"), seconds: 5 },
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.minutes"), "i"), seconds: 60 },
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.hours"), "i"), seconds: 3600 },
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.days"), "i"), seconds: 3600 * 24 },
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.weeks"), "i"), seconds: 3600 * 24 * 7 },
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.months"), "i"), seconds: 3600 * 24 * 30 },
+        { regEx: new RegExp(game.i18n.localize("DSAREGEX.years"), "i"), seconds: 3600 * 24 * 350 }
     ];
 })
 

diff --git a/modules/system/dice-dsa5.js b/modules/system/dice-dsa5.js
@@ -1068,16 +1068,16 @@ export default class DiceDSA5 {
 
         await this.calculateEnergyCost(isClerical, res, testData)
 
-        if (
-            AdvantageRulesDSA5.hasVantage(testData.extra.actor, game.i18n.localize("CONDITION.minorSpirits")) &&
-            !testData.extra.actor.effects.find((x) => x.name == game.i18n.localize("CONDITION.minorSpirits"))
-        ) {
-            const ghostroll = await new Roll("1d20").evaluate({ async: true })
-            if (ghostroll.total <= res.preData.calculatedSpellModifiers.finalcost) {
-                res.description += ", " + game.i18n.localize("minorghostsappear")
-                DSA5_Utility.getSpeaker(testData.extra.speaker).addCondition("minorSpirits")
+        for(const creature of ["minorFairies", "minorSpirits"]){
+            const name = game.i18n.localize("CONDITION." + creature)
+            if (AdvantageRulesDSA5.hasVantage(testData.extra.actor, name) && !testData.extra.actor.effects.find((x) => x.name == name)) {
+                const ghostroll = await new Roll("1d20").evaluate({ async: true })
+                if (ghostroll.total <= res.preData.calculatedSpellModifiers.finalcost) {
+                    res.description += ", " + game.i18n.format("minorghostsappear", { creature: name})
+                    DSA5_Utility.getSpeaker(testData.extra.speaker).addCondition(creature)
+                }
             }
-        }
+        }    
 
         return res
     }

diff --git a/modules/system/opposed-dsa5.js b/modules/system/opposed-dsa5.js
@@ -404,8 +404,6 @@ export default class OpposedDsa5 {
             attackerTest.successLevel = 1
         }
 
-        console.log(defenderTest, attackerTest)
-
         if (defenderTest.successLevel != undefined) {
             switch (attackerTest.rollType) {
                 case "combatskill":

diff --git a/modules/system/triggers.js b/modules/system/triggers.js
@@ -23,7 +23,8 @@ export default class DSATriggers {
 
     static async callMacro(item, packName, name, args = {}) {
         const onUseEffect = new OnUseEffect(item);
-        return await onUseEffect.callMacro(packName, name, args);
+        const res = await onUseEffect.callMacro(packName, name, args);
+        return res
     }
 
     static async runMacro(actor, testData, type, data) {
@@ -34,7 +35,14 @@ export default class DSATriggers {
                 const source = actor.items.get(key)
                 const ef = source.effects.get(value)
                 const macro = ef.getFlag("dsa5", "args3")
-                await eval(`(async () => {${macro}})()`);
+                const body = `(async () => { ${macro} })()`;
+                const fn = Function("actor", "testData", "type", "data", "source", "ef", body);
+                try {
+                    await Promise.all([fn.call(this, actor, testData, type, data, source, ef)])
+                } catch (err) {
+                    ui.notifications.error(`There was an error in your macro syntax. See the console (F12) for details`);
+                    console.error(err);
+                }
             }            
         }
     }

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
     "id": "dsa5",
     "title": "Das Schwarze Auge/The Dark Eye (5th Edition)",
     "description": "The \"Das Schwarze Auge\" system for Foundry VTT. Includes all relevant mechanisms to play in the wonderous world of Aventuria and Das Schwarze Auge/The Dark Eye.",
-    "version": "5.2.1",
+    "version": "5.2.2",
     "authors": [{
         "name": "Plushtoast"
     },{
@@ -91,7 +91,7 @@
     },
     "url": "https://github.com/Plushtoast/dsa5-foundryVTT",
     "manifest": "https://raw.githubusercontent.com/Plushtoast/dsa5-foundryVTT/foundry11/system.json",
-    "download": "https://github.com/Plushtoast/dsa5-foundryVTT/releases/download/5.2.1/dsa5-foundryVTT-5.2.1.zip",
+    "download": "https://github.com/Plushtoast/dsa5-foundryVTT/releases/download/5.2.2/dsa5-foundryVTT-5.2.2.zip",
     "name": "dsa5",
     "minimumCoreVersion": "11.306",
     "packFolders": [