add skill safeguards to scirpts

close #1921 close #1929 close #1922
moo-man · Apr 27, 2024 · 58ca210 · 58ca210
1 parent 40223d1
commit 58ca210
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 17 deletions.
diff --git a/docs/pages/effects/effect-refactor.md b/docs/pages/effects/effect-refactor.md
@@ -156,6 +156,7 @@ function keepData(oldItem, newItem)
     let keep = {
         _id : oldItem._id,
         name : oldItem.name,
+        img: oldItem.img,
         "system.description.value" : oldItem.system.description.value,
         "system.gmdescription.value" : oldItem.system.gmdescription.value
     }
@@ -175,6 +176,10 @@ function keepData(oldItem, newItem)
     {
         keep["system.worn"] = oldItem.system.worn
     }
+    if (oldItem.system.equipped)
+    {
+        keep["system.equipped"] = oldItem.system.equipped
+    }
     if (oldItem.system.advances)
     {
         keep["system.advances"] = oldItem.system.advances

diff --git a/scripts/0FNOq4J1AdPd2A0q.js b/scripts/0FNOq4J1AdPd2A0q.js
diff --git a/scripts/2hzDv8ROulOe1elK.js b/scripts/2hzDv8ROulOe1elK.js
@@ -1 +1 @@
-return args.skill.name.includes(game.i18n.localize("NAME.Lore"));
+return args.skill?.name.includes(game.i18n.localize("NAME.Lore"));
diff --git a/scripts/3LLiSgj6KGtgqcmo.js b/scripts/3LLiSgj6KGtgqcmo.js
@@ -1 +1 @@
-return !args.skill.name.includes(game.i18n.localize("NAME.Language"));
+return !args.skill?.name.includes(game.i18n.localize("NAME.Language"));
diff --git a/scripts/5lc1eHIYQNpSRWip.js b/scripts/5lc1eHIYQNpSRWip.js
@@ -0,0 +1,8 @@
+if (["death", "necromancy"].includes(args.spell?.system.lore.value))
+{
+    args.fields.successBonus += 1
+}
+else if(["life", "light", "heavens"].includes(args.spell?.system.lore.value))
+{
+    args.fields.modifier -= 10;
+}
diff --git a/scripts/8tyMXDfHR8AJBdDu.js b/scripts/8tyMXDfHR8AJBdDu.js
@@ -0,0 +1,7 @@
+let weakpointsAP = args.AP.layers.filter(i => !i.ignored && i.weakpoints).reduce((ap, layer) => ap + layer.value, 0);
+
+if (weakpointsAP > 0)
+{
+    args.modifiers.ap.ignored += weakpointsAP;
+    args.modifiers.ap.details.push(`${this.effect.name} - Ignore Weakpoints (${weakpointsAP})`);
+}
diff --git a/scripts/AGD7zCyV4zruvnWu.js b/scripts/AGD7zCyV4zruvnWu.js
diff --git a/scripts/AV2Kj6jgmIc45zKi.js b/scripts/AV2Kj6jgmIc45zKi.js
@@ -1 +1 @@
-return args.skill.name.includes(game.i18n.localize("NAME.Stealth"));
+return args.skill?.name.includes(game.i18n.localize("NAME.Stealth"));
diff --git a/scripts/DxQnamsb2AuW0p2e.js b/scripts/DxQnamsb2AuW0p2e.js
@@ -1 +1 @@
-return !args.skill.name.includes(game.i18n.localize("NAME.Lore"));
+return !args.skill?.name.includes(game.i18n.localize("NAME.Lore"));
diff --git a/scripts/EGWF3LHav3e2zFL4.js b/scripts/EGWF3LHav3e2zFL4.js
diff --git a/scripts/J0IWUhxada2ONowP.js b/scripts/J0IWUhxada2ONowP.js
diff --git a/scripts/KUx0deSF3xNzMucL.js b/scripts/KUx0deSF3xNzMucL.js
@@ -1 +1 @@
-return args.skill.name.includes(game.i18n.localize("NAME.Art"));
+return args.skill?.name.includes(game.i18n.localize("NAME.Art"));
diff --git a/scripts/MDLttXplnNthncGr.js b/scripts/MDLttXplnNthncGr.js
diff --git a/scripts/RNr9CwyvLhlnwD2h.js b/scripts/RNr9CwyvLhlnwD2h.js
@@ -1 +1 @@
-return !args.skill.name.includes(game.i18n.localize("NAME.Sail"));
+return !args.skill?.name.includes(game.i18n.localize("NAME.Sail"));
diff --git a/scripts/VAs1nXvicdQK18Do.js b/scripts/VAs1nXvicdQK18Do.js
@@ -1 +1 @@
-return args.skill.name.includes(game.i18n.localize("NAME.Language"));
+return args.skill?.name.includes(game.i18n.localize("NAME.Language"));
diff --git a/scripts/l8qFKSnMpy4P7XQR.js b/scripts/l8qFKSnMpy4P7XQR.js
@@ -1 +1 @@
-return !args.skill.name.includes(game.i18n.localize("NAME.Stealth"));
+return !args.skill?.name.includes(game.i18n.localize("NAME.Stealth"));
diff --git a/scripts/pHyXdPnWwoFrUA5n.js b/scripts/pHyXdPnWwoFrUA5n.js
@@ -1 +1 @@
-return !args.skill.name.includes(game.i18n.localize("NAME.Entertain"));
+return !args.skill?.name.includes(game.i18n.localize("NAME.Entertain"));
diff --git a/scripts/t56mnblo1kv3gM1M.js b/scripts/t56mnblo1kv3gM1M.js
diff --git a/scripts/yRRzSKlcN3L7rEEe.js b/scripts/yRRzSKlcN3L7rEEe.js
diff --git a/scripts/ziG9H5Kdb7xC3dFE.js b/scripts/ziG9H5Kdb7xC3dFE.js
@@ -1 +1 @@
-return !args.skill.name.includes(game.i18n.localize("NAME.Art"));
+return !args.skill?.name.includes(game.i18n.localize("NAME.Art"));
diff --git a/system.json b/system.json
@@ -3,7 +3,7 @@
   "name": "wfrp4e",
   "title": "Warhammer Fantasy Roleplay 4th Edition",
   "description": "A comprehensive system for running grim and perilous games of Warhammer Fantasy Roleplay in the Foundry VTT environment.",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "author": "Moo Man, CatoThe1stElder",
   "authors" : [
     {
@@ -62,6 +62,6 @@
   "templateVersion":3,
   "socket": true,
   "manifest" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/latest/download/system.json",
-  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/7.1.0/wfrp4e.zip",
+  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/7.1.1/wfrp4e.zip",
   "url" : "https://github.com/moo-man/WFRP4e-FoundryVTT"
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		return args.skill.name.includes(game.i18n.localize("NAME.Lore"));
		return args.skill?.name.includes(game.i18n.localize("NAME.Lore"));
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		return !args.skill.name.includes(game.i18n.localize("NAME.Language"));
		return !args.skill?.name.includes(game.i18n.localize("NAME.Language"));