fix chargen error, uia script update

moo-man · Jan 31, 2025 · 05fb541 · 05fb541
1 parent 57e78a9
commit 05fb541
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/modules/model/item/skill.js b/modules/model/item/skill.js
@@ -165,17 +165,17 @@ export class SkillModel extends BaseItemModel {
         }
     }
 
-    _handleSkillMerging()
+    _handleSkillMerging(data, options, user)
     {
-        if (this.parent.isEmbedded)
+        if (this.parent.isEmbedded && this.parent.actor.inCollection) // prevent error during chargen
         {
             let actor = this.parent.actor;
 
             let existing = actor.itemTags.skill.find(i => i.name == this.parent.name);
 
             if (existing)
             {
-                existing.update({"system.advances.value" : existing.advances.value + this.advances.value});
+                existing.update({"system.advances.value" : existing.advances.value + this.advances.value}, options);
             }
         }
     }

diff --git a/scripts/R32U01LBjBrK1pns.js b/scripts/R32U01LBjBrK1pns.js
@@ -1,11 +1,11 @@
         const templateMap = {
             'P2e7Yx98bK3u110a' : "",
-            'iuMp3KLaMT2WCmie' : "Xp4r2KUhqfjak8zq", 
-            'RBuYcT5tppwcmnC5' : "wYN19h3WVF1yOVq2", 
-            'vcGpNwNbhvfzVveQ' : "ac5ClOuaYtzOYyWp", 
-            'jmhKZy0w9TzkEK9c' : "IS3LTdTuay6uRHUq", 
-            '9Byj6k7SmdTYis2V' : "LjMlx99gBGeRJUQu", 
-            'laJwc2l9tzJPgaaJ' : "x5wpMprsObuqMCYg",
+            'iuMp3KLaMT2WCmie' : "4s01nHFKVKTEZd3B", 
+            'RBuYcT5tppwcmnC5' : "h3yuJDWnixliXeBG", 
+            'vcGpNwNbhvfzVveQ' : "7QrsbofccMOE1YsF", 
+            'jmhKZy0w9TzkEK9c' : "scVTPVyDDbli4WZL", 
+            '9Byj6k7SmdTYis2V' : "4Cd7Dknee2WjReOo", 
+            'laJwc2l9tzJPgaaJ' : "2hJ2a5YjbwZWWYrd",
         }
         let template = (await game.wfrp4e.tables.rollTable("hireling-templates", {hideDSN: true})).object;
         let physicalQuirk = (await game.wfrp4e.tables.rollTable("physical-quirks", {hideDSN: true})).text;

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
   "id": "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": "8.4.0",
+  "version": "8.4.1",
   "authors" : [
     {
       "name": "Moo Man",
@@ -72,6 +72,6 @@
   },
   "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/8.4.0/wfrp4e.zip",
+  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/8.4.1/wfrp4e.zip",
   "url" : "https://github.com/moo-man/WFRP4e-FoundryVTT"
 }