Hotfix /pay, /credit, and wounds/damage

fix #139
fix #138

Author: moo-man

modules/actor/actor-wfrp4e.js

@@ -187,10 +187,7 @@ export default class ActorWfrp4e extends Actor {
       if (data.flags.autoCalcWounds) {
         let wounds = this._calculateWounds()
         if (data.data.status.wounds.max != wounds) // If change detected, reassign max and current wounds
-        {
-          data.data.status.wounds.max = wounds;
-          data.data.status.wounds.value = wounds;
-        }
+          this.update({"data.status.wounds.max" : wounds, "data.status.wounds.value" : wounds});
       }
 
       if (data.flags.autoCalcSize) {

modules/hooks/actor.js

@@ -30,10 +30,20 @@ export default function() {
 
   // Treat the custom default token as a true default token
   // If you change the actor image from the default token, it will automatically set the same image to be the token image
-  Hooks.on("preUpdateActor", (data, updatedData) => {
-    if (data.data.token.img == "systems/wfrp4e/tokens/unknown.png" && updatedData.img) {
+  Hooks.on("preUpdateActor", (actor, updatedData) => {
+    if (actor.data.token.img == "systems/wfrp4e/tokens/unknown.png" && updatedData.img) {
       updatedData["token.img"] = updatedData.img;
-      data.data.token.img = updatedData.img;
+      actor.data.token.img = updatedData.img;
     }
   })
+
+
+  Hooks.on("updateActor", (actor, updateData) => {
+      if (actor.data.flags.autoCalcWounds) 
+      {
+        let wounds = actor._calculateWounds()
+        if (actor.data.data.status.wounds.max != wounds) // If change detected, reassign max and current wounds
+          actor.update({"data.status.wounds.max" : wounds, "data.status.wounds.value" : wounds});
+      }
+  })
 }

modules/system/dice-wfrp4e.js

@@ -1114,7 +1114,7 @@ export default class DiceWFRP {
           if (!game.user.isGM) {
             let actor = game.user.character;
             if ( actor ) { 
-              money = MarketWfrp4e.payCommand($(event.currentTarget).attr("data-pay"), actor);
+              let money = MarketWfrp4e.payCommand($(event.currentTarget).attr("data-pay"), actor);
               if (money) {
                 WFRP_Audio.PlayContextAudio({ item: { "type": "money" }, action: "lose" })
                 actor.updateEmbeddedEntity("OwnedItem", money);
@@ -1131,7 +1131,7 @@ export default class DiceWFRP {
             let actor = game.user.character;
             if ( actor ) {
               let dataExchange = $(event.currentTarget).attr("data-amount");
-              money = MarketWfrp4e.creditCommand(dataExchange, actor);
+              let money = MarketWfrp4e.creditCommand(dataExchange, actor);
               if (money) {
                 WFRP_Audio.PlayContextAudio({ item: { type: "money" }, action: "gain" })
                 actor.updateEmbeddedEntity("OwnedItem", money);

system.json

@@ -2,7 +2,7 @@
   "name": "wfrp4e",
   "title": "Warhammer Fantasy Roleplay 4th Edition",
   "description": "A comprehensive system for running grim and perilious games of Warhammer Fantasy Role-play in the Foundry VTT environment.",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "author": "Moo Man, CatoThe1stElder",
   "esmodules" : ["wfrp4e.js"],
   "scripts": ["./libs/pixi-filters.js"],
@@ -38,6 +38,6 @@
   "templateVersion":2,
   "socket": true,
   "manifest" :  "https://raw.githubusercontent.com/moo-man/WFRP4e-FoundryVTT/master/system.json",
-  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/3.0.1/wfrp4e.zip",
+  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/3.0.2/wfrp4e.zip",
   "url" : "https://github.com/moo-man/WFRP4e-FoundryVTT"
 }