fix currencies

AngryBeaver · Oct 9, 2022 · 95ea113 · 95ea113
1 parent fb073d4
commit 95ea113
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
     "title": "Beaver's Crafting System",
     "description": "A Crafting Module for DnD",
     "id": "beavers-crafting",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "authors": [
       {
         "name": "angryBeaver",

diff --git a/src/Crafting.ts b/src/Crafting.ts
@@ -24,7 +24,7 @@ export class Crafting {
         return new Crafting(actor, item);
     }
 
-    async craft() {
+    async craft():Promise<Result> {
         const result = await this.checkSkill();
         RecipeCompendium.validateRecipeToItemList(this.recipe,this.actor.items,result);
         this.checkCurrency(result);
@@ -127,7 +127,7 @@ export class Crafting {
         }
         await this.actor.createEmbeddedDocuments("Item", createItems)
         await this.actor.update({
-            "system.currency": result.currencies
+            "system.currency": result.changes.currencies
         });
         return result;
     }

diff --git a/src/Exchange.ts b/src/Exchange.ts
@@ -7,6 +7,7 @@ export const CONVERSION = "conversion";
 export class Exchange {
 
     static pay(priceCurrency, actorCurrencies) {
+        this.fixCurrencies(actorCurrencies);
         let lowestActorCurrency = this.toLowestCurrency(actorCurrencies);
         const lowestPriceCurrency = this.toLowestCurrency(this.toCurrencies(priceCurrency));
         const result = new DefaultCurrency();
@@ -19,6 +20,14 @@ export class Exchange {
         return this.toHighestCurrencies(exchangeCurrencies);
     }
 
+    static fixCurrencies(currencies){
+        getCurrencies().forEach(c => {
+            if (Number.isNaN(currencies[ABBREVIATION])) {
+                currencies[ABBREVIATION] = 0;
+            }
+        })
+    }
+
     static toCurrencies(currency:Currency) {
         let currencies = {};
         getCurrencies().forEach(c => {

diff --git a/templates/crafting-chat.hbs b/templates/crafting-chat.hbs
@@ -29,9 +29,9 @@
                         </div>
                         <div class="action" style="flex:0 0 20px;">
                             {{#if result.currencies}}
-                                <i class="fas fa-times"></i>
-                            {{else}}
                                 <i class="fas fa-check"></i>
+                            {{else}}
+                                <i class="fas fa-times"></i>
                             {{/if}}
                         </div>
                     </div>