@gamepark/mythologies 0.7.2 → 0.7.3

package/dist/material/Pantheon.js

@@ -437,15 +437,13 @@ var Pantheon = (function (_super) {
         configurable: true
     });
     Pantheon.prototype.onEntitySacrificed = function (card) {
-        var _a;
         var item = card.getItem();
-        var _b = item.location, x = _b.x, y = _b.y, z = _b.z;
+        var _a = item.location, x = _a.x, y = _a.y, z = _a.z;
         var grid = this.indexGrid;
         var cardUnder = this.allCards.location(function (l) { return l.x === x && l.y === y && l.z !== z; }).maxBy(function (item) { return item.location.z; });
         grid[y][x] = cardUnder.length ? cardUnder.getIndex() : null;
-        var effects = this.updateGrid(grid);
-        effects.push({ type: Effect_1.TriggerEventType.EntitySacrificed, card: item, cardIndex: card.getIndex() });
-        (_a = new TriggerEffectsRule_1.TriggerEffectsRule(this.game)).triggerEffects.apply(_a, __spreadArray([], __read(effects), false));
+        this.memorize(Memory_1.Memory.PlayerGrid, grid, this.player);
+        new TriggerEffectsRule_1.TriggerEffectsRule(this.game).triggerEffects({ type: Effect_1.TriggerEventType.EntitySacrificed, card: item, cardIndex: card.getIndex() });
     };
     Pantheon.prototype.hasCrushed = function (card) {
         return this.allCards.location(function (l) { return l.x === card.location.x && l.y === card.location.y && l.z < card.location.z; }).length > 0;

package/dist/material/entity/Effect.d.ts

@@ -38,6 +38,7 @@ export declare abstract class SimultaneousEffectRule extends SimultaneousRule im
     canPlayEffect(_cardIndex: number): boolean;
     ruleId?: RuleId;
     playEffect(): MaterialMove[];
+    onRuleStart(): MaterialMove<number, number, number, number>[];
     getAffectedPlayers(): PlayerColor[];
     isOpponent(player: PlayerColor): boolean;
     get card(): import("@gamepark/rules-api").MaterialItem<number, number, EntityId>;

package/dist/material/entity/Effect.js

@@ -80,10 +80,10 @@ var SimultaneousEffectRule = (function (_super) {
             for (var _b = __values(this.getAffectedPlayers()), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var player = _c.value;
                 var legalMoves = this.getActivePlayerLegalMoves(player);
-                if (legalMoves.length === 1) {
+                if (legalMoves.length === 1 && !(0, rules_api_1.isMoveItemType)(MaterialType_1.MaterialType.EntityCard)(legalMoves[0])) {
                     moves.push(legalMoves[0]);
                 }
-                else if (legalMoves.length > 1) {
+                else if (legalMoves.length > 0) {
                     playersToActivate.push(player);
                 }
             }
@@ -100,6 +100,27 @@ var SimultaneousEffectRule = (function (_super) {
         }
         return moves;
     };
+    SimultaneousEffectRule.prototype.onRuleStart = function () {
+        var e_2, _a;
+        var moves = [];
+        try {
+            for (var _b = __values(this.game.rule.players), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var player = _c.value;
+                var legalMoves = this.getActivePlayerLegalMoves(player);
+                if (legalMoves.length === 1) {
+                    moves.push(legalMoves[0]);
+                }
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return moves;
+    };
     SimultaneousEffectRule.prototype.getAffectedPlayers = function () {
         return this.game.players;
     };

package/dist/rules/PlaceCardsRule.js

@@ -174,8 +174,26 @@ var PlaceCardsRule = (function (_super) {
         return [];
     };
     PlaceCardsRule.prototype.onPass = function () {
-        new TriggerEffectsRule_1.TriggerEffectsRule(this.game).triggerEffects({ type: Effect_1.TriggerEventType.EndOfTurn, player: this.player });
-        return __spreadArray(__spreadArray([], __read(new Trial_1.Trial(this.game).passTrials(this.player)), false), [this.nextRule], false);
+        var e_2, _a;
+        var moves = [];
+        var effects = new TriggerEffectsRule_1.TriggerEffectsRule(this.game).getPlayerEffects(this.player, { type: Effect_1.TriggerEventType.EndOfTurn, player: this.player });
+        var resolveEffectsRule = new ResolveEffectsRule_1.ResolveEffectsRule(this.game);
+        try {
+            for (var effects_1 = __values(effects), effects_1_1 = effects_1.next(); !effects_1_1.done; effects_1_1 = effects_1.next()) {
+                var effect = effects_1_1.value;
+                moves.push.apply(moves, __spreadArray([], __read(resolveEffectsRule.playEffect(effect)), false));
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (effects_1_1 && !effects_1_1.done && (_a = effects_1.return)) _a.call(effects_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        moves.push.apply(moves, __spreadArray([], __read(new Trial_1.Trial(this.game).passTrials(this.player)), false));
+        moves.push(this.nextRule);
+        return moves;
     };
     Object.defineProperty(PlaceCardsRule.prototype, "nextRule", {
         get: function () {

package/dist/rules/effects/MinotaurEffectRule.d.ts

@@ -4,7 +4,7 @@ import { PlayerColor } from '../../PlayerColor';
 import { RuleId } from '../RuleId';
 export declare class MinotaurEffectRule extends SimultaneousMoveEffectRule {
     ruleId: RuleId;
-    onRuleStart(): never[];
+    onRuleStart(): import("@gamepark/rules-api").MaterialMove<number, number, number, number>[];
     getMovingCards(player: PlayerColor): import("@gamepark/rules-api").Material<number, number, number>;
     isLegalDestination(space: XYCoordinates, cardLocation: Location): boolean;
     onRuleEnd(): never[];

package/dist/rules/effects/MinotaurEffectRule.js

@@ -30,7 +30,7 @@ var MinotaurEffectRule = (function (_super) {
     }
     MinotaurEffectRule.prototype.onRuleStart = function () {
         this.memorize(Memory_1.Memory.TargetLine, this.card.location.x);
-        return [];
+        return _super.prototype.onRuleStart.call(this);
     };
     MinotaurEffectRule.prototype.getMovingCards = function (player) {
         var column = this.remind(Memory_1.Memory.TargetLine);

package/dist/rules/effects/NuwaEffectRule.d.ts

@@ -5,7 +5,7 @@ import { RuleId } from '../RuleId';
 export declare class NuwaEffectRule extends SimultaneousSacrificeEffectRule {
     ruleId: RuleId;
     getAffectedPlayers(): number[];
-    onRuleStart(): never[];
+    onRuleStart(): import("@gamepark/rules-api").MaterialMove<number, number, number, number>[];
     getActivePlayerLegalMoves(player: PlayerColor): import("@gamepark/rules-api").MaterialMove<number, number, number, number>[];
     getCardsToSacrifice(player: PlayerColor): Material;
     onSacrifice(move: MoveItem): import("@gamepark/rules-api").EndPlayerTurn<number>[];

package/dist/rules/effects/NuwaEffectRule.js

@@ -61,7 +61,7 @@ var NuwaEffectRule = (function (_super) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        return [];
+        return _super.prototype.onRuleStart.call(this);
     };
     NuwaEffectRule.prototype.getActivePlayerLegalMoves = function (player) {
         var moves = _super.prototype.getActivePlayerLegalMoves.call(this, player);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/mythologies",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "The rules of Mythologies adapted for Game Park",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -29,5 +29,5 @@
     "i18next": "^22.0.3",
     "lodash": "^4.17.21"
   },
-  "gitHead": "b10370b9280251102d7b219e849cd8d8cc07ab88"
+  "gitHead": "dea6a9053b6c44493df694a064d2b1288ae86a3b"
 }