Add support for class-specific attack modifiers for Jaws of the Lion …

…classes
abrindam · Dec 27, 2020 · 3bff083 · 3bff083
1 parent 0ef16f6
commit 3bff083
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Logic/GloomhavenDataService.ts b/src/Logic/GloomhavenDataService.ts
@@ -59,7 +59,14 @@ export class GloomhavenDataService {
     })
     this.characterAbilityCards = baseCharacterAbilityCards.concat(jotlCharacterAbilityCards)
       .concat()
-    this.attackModifiers = require("json-loader!gloomhaven/data/attack-modifiers.js")
+
+    const baseAttackModifiers = require("json-loader!gloomhaven/data/attack-modifiers.js")
+    const jotlAttackModifiers = require("json-loader!jotl/data/attack-modifiers.js").filter((rawCard: any) => {
+      return !rawCard.image.includes(`/base/player`) &&  // exclude duplicative base player cards, only want the per-character ones
+        !rawCard.image.endsWith("-back.png") // per-character backs are included, unlike main game
+    })
+    this.attackModifiers = baseAttackModifiers.concat(jotlAttackModifiers)
+
     this.attackModifierAdditionals = require("../Data/attack-modifiers-additional.json")
   }
 

diff --git a/src/UI/AttackModifierImages.ts b/src/UI/AttackModifierImages.ts
@@ -3,6 +3,11 @@ import { AttackModifier } from "../Logic/AttackModifier";
 
 export class AttackModifierImages {
   static get(attackModifier: AttackModifier) : string {
-    return require(`gloomhaven/images/attack-modifiers/${attackModifier.imageBasename}.png`).default
+    try {
+      return require(`gloomhaven/images/attack-modifiers/${attackModifier.imageBasename}.png`).default
+    } catch(e) {
+      return require(`jotl/images/attack-modifiers/${attackModifier.imageBasename}.png`).default
+    }
+
   }
 }