@gamepark/mythologies 0.7.1 → 0.7.2

package/dist/rules/effects/TriggerEffectsRule.js

@@ -103,16 +103,22 @@ var TriggerEffectsRule = (function (_super) {
         var pendingEffects = [];
         var pantheon = new Pantheon_1.Pantheon(this.game, player);
         var material = this.material(MaterialType_1.MaterialType.EntityCard);
-        var cards = pantheon.visibleEntities.getIndexes();
+        var cards = pantheon.visibleEntities.getIndexes().map(function (index) { return ({ index: index, location: material.getItem(index).location }); });
+        var _loop_1 = function (event) {
+            if (event.type === Effect_1.TriggerEventType.EntityCrushed) {
+                var location = material.getItem(event.cardIndex).location;
+                if (location.player === player && !cards.some(function (card) { return card.index === event.cardIndex; })) {
+                    cards.push({ index: event.cardIndex, location: location });
+                }
+            }
+            if (event.type === Effect_1.TriggerEventType.EntityPlaced && event.location.player === player && !cards.some(function (card) { return card.index === event.cardIndex; })) {
+                cards.push({ index: event.cardIndex, location: event.location });
+            }
+        };
         try {
             for (var triggerEvents_1 = __values(triggerEvents), triggerEvents_1_1 = triggerEvents_1.next(); !triggerEvents_1_1.done; triggerEvents_1_1 = triggerEvents_1.next()) {
                 var event = triggerEvents_1_1.value;
-                if (event.type === Effect_1.TriggerEventType.EntityCrushed && material.getItem(event.cardIndex).location.player === player && !cards.includes(event.cardIndex)) {
-                    cards.push(event.cardIndex);
-                }
-                if (event.type === Effect_1.TriggerEventType.EntityPlaced && event.location.player === player && !cards.includes(event.cardIndex)) {
-                    cards.push(event.cardIndex);
-                }
+                _loop_1(event);
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -127,9 +133,8 @@ var TriggerEffectsRule = (function (_super) {
                 var triggerEvent = triggerEvents_2_1.value;
                 try {
                     for (var cards_1 = (e_4 = void 0, __values(cards)), cards_1_1 = cards_1.next(); !cards_1_1.done; cards_1_1 = cards_1.next()) {
-                        var cardIndex = cards_1_1.value;
-                        var card = material.index(cardIndex);
-                        pendingEffects.push.apply(pendingEffects, __spreadArray([], __read(this.getCardEffects(card, triggerEvent)), false));
+                        var _d = cards_1_1.value, index = _d.index, location = _d.location;
+                        pendingEffects.push.apply(pendingEffects, __spreadArray([], __read(this.getCardEffects(index, location, triggerEvent)), false));
                     }
                 }
                 catch (e_4_1) { e_4 = { error: e_4_1 }; }
@@ -150,19 +155,18 @@ var TriggerEffectsRule = (function (_super) {
         }
         return pendingEffects;
     };
-    TriggerEffectsRule.prototype.triggerCardEffect = function (card, triggerEvent) {
-        var pendingEffects = this.getCardEffects(card, triggerEvent);
+    TriggerEffectsRule.prototype.triggerCardEffect = function (cardIndex, cardLocation, triggerEvent) {
+        var pendingEffects = this.getCardEffects(cardIndex, cardLocation, triggerEvent);
         if (pendingEffects.length) {
             this.remind(Memory_1.Memory.PendingEffects).unshift(pendingEffects);
         }
     };
-    TriggerEffectsRule.prototype.getCardEffects = function (card, triggerEvent) {
+    TriggerEffectsRule.prototype.getCardEffects = function (cardIndex, cardLocation, triggerEvent) {
         var pendingEffects = [];
-        var cardIndex = card.getIndex();
-        var cardItem = card.getItem();
-        for (var effectIndex = 0; effectIndex < (0, EntityDescription_1.getEffects)(cardItem.id.front).length; effectIndex++) {
-            var effect = (0, EntityDescription_1.getEffects)(cardItem.id.front)[effectIndex];
-            if ((0, Effect_1.isTriggeredEffect)(effect) && effect.trigger(triggerEvent, card, this.game)) {
+        var card = this.material(MaterialType_1.MaterialType.EntityCard).getItem(cardIndex);
+        for (var effectIndex = 0; effectIndex < (0, EntityDescription_1.getEffects)(card.id.front).length; effectIndex++) {
+            var effect = (0, EntityDescription_1.getEffects)(card.id.front)[effectIndex];
+            if ((0, Effect_1.isTriggeredEffect)(effect) && effect.trigger(triggerEvent, { cardIndex: cardIndex, cardLocation: cardLocation, game: this.game })) {
                 pendingEffects.push({ cardIndex: cardIndex, effectIndex: effectIndex, triggerEvent: triggerEvent, auto: !!effect.auto });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/mythologies",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "The rules of Mythologies adapted for Game Park",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -20,14 +20,14 @@
     "lint": "eslint --fix"
   },
   "peerDependencies": {
-    "@gamepark/rules-api": ">=6.38",
+    "@gamepark/rules-api": ">=6.38.5",
     "lodash": ">=4.17"
   },
   "devDependencies": {
-    "@gamepark/rules-api": "~6.38.0",
+    "@gamepark/rules-api": "~6.38.5",
     "@types/lodash": "^4.17.7",
     "i18next": "^22.0.3",
     "lodash": "^4.17.21"
   },
-  "gitHead": "c14d682186f3955885026c16a9446734b4002eb0"
+  "gitHead": "b10370b9280251102d7b219e849cd8d8cc07ab88"
 }