Merge 3c920e1 into 0a267d6

gryffon · Jan 24, 2020 · 5fab0c8 · 5fab0c8
2 parents 0a267d6 + 3c920e1
commit 5fab0c8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/server/game/cards/01-Core/SeekerOfAir.js b/server/game/cards/01-Core/SeekerOfAir.js
@@ -8,7 +8,7 @@ class SeekerOfAir extends RoleCard {
             when: {
                 onCardRevealed: (event, context) =>
                     event.card.controller === context.player && event.card.isProvince &&
-                    context.source.hasTrait(event.card.getElement())
+                    event.card.getElement().some(element => context.source.hasTrait(element))
             },
             gameAction: ability.actions.gainFate()
         });

diff --git a/server/game/cards/01-Core/SeekerOfEarth.js b/server/game/cards/01-Core/SeekerOfEarth.js
@@ -8,7 +8,7 @@ class SeekerOfEarth extends RoleCard {
             when: {
                 onCardRevealed: (event, context) =>
                     event.card.controller === context.player && event.card.isProvince &&
-                    context.source.hasTrait(event.card.getElement())
+                    event.card.getElement().some(element => context.source.hasTrait(element))
             },
             gameAction: ability.actions.gainFate()
         });

diff --git a/server/game/cards/01-Core/SeekerOfFire.js b/server/game/cards/01-Core/SeekerOfFire.js
@@ -8,7 +8,7 @@ class SeekerOfFire extends RoleCard {
             when: {
                 onCardRevealed: (event, context) =>
                     event.card.controller === context.player && event.card.isProvince &&
-                    context.source.hasTrait(event.card.getElement())
+                    event.card.getElement().some(element => context.source.hasTrait(element))
             },
             gameAction: ability.actions.gainFate()
         });

diff --git a/server/game/cards/01-Core/SeekerOfVoid.js b/server/game/cards/01-Core/SeekerOfVoid.js
@@ -8,7 +8,7 @@ class SeekerOfVoid extends RoleCard {
             when: {
                 onCardRevealed: (event, context) =>
                     event.card.controller === context.player && event.card.isProvince &&
-                    context.source.hasTrait(event.card.getElement())
+                    event.card.getElement().some(element => context.source.hasTrait(element))
             },
             gameAction: ability.actions.gainFate()
         });

diff --git a/server/game/cards/01-Core/SeekerOfWater.js b/server/game/cards/01-Core/SeekerOfWater.js
@@ -8,7 +8,7 @@ class SeekerOfWater extends RoleCard {
             when: {
                 onCardRevealed: (event, context) =>
                     event.card.controller === context.player && event.card.isProvince &&
-                context.source.hasTrait(event.card.getElement())
+                    event.card.getElement().some(element => context.source.hasTrait(element))
             },
             gameAction: ability.actions.gainFate()
         });

diff --git a/server/game/cards/04.6-EU/SpecializedDefenses.js b/server/game/cards/04.6-EU/SpecializedDefenses.js
@@ -9,12 +9,13 @@ class SpecializedDefenses extends DrawCard {
                 if(!this.game.isDuringConflict()) {
                     return false;
                 }
-                let element = this.game.currentConflict.conflictProvince.element;
-                if(element === 'all') {
-                    return true;
-                }
-                return this.game.rings[element].isConsideredClaimed(context.player) ||
-                       this.game.currentConflict.ring.getElements().includes(element);
+                return this.game.currentConflict.conflictProvince.element.some(element => {
+                    if(element === 'all') {
+                        return true;
+                    }
+                    return this.game.rings[element].isConsideredClaimed(context.player) ||
+                           this.game.currentConflict.ring.getElements().includes(element);
+                });
             },
             effect: 'double {1}\'s province strength',
             effectArgs: context => context.game.currentConflict.conflictProvince,

diff --git a/server/game/provincecard.js b/server/game/provincecard.js
@@ -52,7 +52,7 @@ class ProvinceCard extends BaseCard {
     }
 
     isElement(element) {
-        return this.element === 'all' || this.element === element;
+        return this.element === 'all' || this.element.includes(element);
     }
 
     flipFaceup() {