Merge pull request #194 from anthonyronda/fix/gp-cost-do-not-multiply…

…-when-at-max Fix GP cost multiplying when a max quantity is defined
vttred · Jun 9, 2022 · d25a660 · d25a660
2 parents 3ccdda2 + c66af8f
commit d25a660
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/lang/en.json b/src/lang/en.json
@@ -226,6 +226,8 @@
   "OSE.items.enterTag": "Tags",
   "OSE.items.pattern": "Attack pattern marker",
   "OSE.items.uses": "Uses",
+  "OSE.items.gp.short": "GP",
+  "OSE.items.gp.long": "Gold Pieces",
 
   "OSE.items.Range": "Range",
   "OSE.items.Melee": "Melee",

diff --git a/src/module/dialog/character-creation.js b/src/module/dialog/character-creation.js
@@ -186,7 +186,7 @@ export class OseCharacterCreator extends FormApplication {
     });
     // Generate gold
     const itemData = {
-      name: "GP",
+      name: game.i18n.localize("OSE.items.gp.short"),
       type: "item",
       img: "systems/ose/assets/gold.png",
       data: {

diff --git a/src/module/dialog/character-gp-cost.js b/src/module/dialog/character-gp-cost.js
@@ -54,7 +54,11 @@ export class OseCharacterGpCost extends FormApplication {
     // Generate gold
     const totalCost = await this._getTotalCost(await this.getData());
     const gp = await this.object.items.find((item) => {
-      return item.name === "GP" && item.data.data.treasure;
+      return (
+        (item.name === game.i18n.localize("OSE.items.gp.short") ||
+          item.name === "GP") && // legacy behavior used GP, even for other languages
+        item.data.data.treasure
+      );
     });
     if (!gp) {
       ui.notifications.error(game.i18n.localize("OSE.error.noGP"));
@@ -104,7 +108,8 @@ export class OseCharacterGpCost extends FormApplication {
         physical.some((itemType) => item.type === itemType) &&
         !item.data.treasure
       )
-        total += item.data.cost * item.data.quantity.value;
+        if (item.data.quantity.max) total += item.data.cost;
+        else total += item.data.cost * item.data.quantity.value;
     });
     return total;
   }