@gamepark/mythologies 0.8.3 → 0.8.4

package/dist/MythologiesRules.d.ts

@@ -1,4 +1,4 @@
-import { CompetitiveScore, CustomMove, FillGapStrategy, ItemMove, MaterialGame, MaterialItem, MaterialMove, MoveItem, PositiveSequenceStrategy, SecretMaterialRules, StackingStrategy, TimeLimit } from '@gamepark/rules-api';
+import { CompetitiveScore, FillGapStrategy, ItemMove, MaterialGame, MaterialItem, MaterialMove, MoveItem, PositiveSequenceStrategy, SecretMaterialRules, StackingStrategy, TimeLimit } from '@gamepark/rules-api';
 import { LocationType } from './material/LocationType';
 import { MaterialType } from './material/MaterialType';
 import { PlayerColor } from './PlayerColor';
@@ -52,6 +52,7 @@ import { YanluoWangEffectRule } from './rules/effects/YanluoWangEffectRule';
 import { EndGameRule } from './rules/EndGameRule';
 import { PlaceCardsRule } from './rules/PlaceCardsRule';
 import { PlaceTokenRule } from './rules/PlaceTokenRule';
+import { RuleId } from './rules/RuleId';
 import { UpkeepRule } from './rules/UpkeepRule';
 export declare class MythologiesRules extends SecretMaterialRules<PlayerColor, MaterialType, LocationType> implements TimeLimit<MaterialGame<PlayerColor, MaterialType, LocationType>, MaterialMove<PlayerColor, MaterialType, LocationType>, PlayerColor>, CompetitiveScore {
     rules: {
@@ -148,9 +149,7 @@ export declare class MythologiesRules extends SecretMaterialRules<PlayerColor, M
     keepMoveSecret(move: MaterialMove): boolean;
     isPlayerDestiny(move: MoveItem): boolean;
     beforeItemMove(move: ItemMove): MaterialMove<PlayerColor, MaterialType, LocationType, number>[];
-    protected onCustomMove(move: CustomMove): MaterialMove<PlayerColor, MaterialType, LocationType, number>[];
-    getAutomaticMoves(): MaterialMove<number, number, number, number>[];
-    startEffectsResolution(): MaterialMove<number, number, number, number>[];
+    getAutomaticMoves(): import("@gamepark/rules-api").StartPlayerTurn<number, RuleId.ResolveEffects>[] | import("@gamepark/rules-api").StartRule<RuleId.ResolveEffects>[];
     giveTime(): number;
     getScore(player: PlayerColor): number;
     getTieBreaker(tieBreaker: number, player: PlayerColor): number | undefined;

package/dist/MythologiesRules.js

@@ -14,35 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MythologiesRules = void 0;
 var rules_api_1 = require("@gamepark/rules-api");
-var CustomMoveType_1 = require("./CustomMoveType");
 var Destiny_1 = require("./material/Destiny");
 var Entity_1 = require("./material/Entity");
 var Effect_1 = require("./material/entity/Effect");
@@ -230,51 +204,21 @@ var MythologiesRules = (function (_super) {
                 new TriggerEffectsRule_1.TriggerEffectsRule(this.game).triggerEffects({ type: Effect_1.TriggerEventType.ColumnEvent, eventType: Effect_1.LineEventType.BonusGain, player: player, x: favor.x });
             }
         }
-        return _super.prototype.beforeItemMove.call(this, move);
-    };
-    MythologiesRules.prototype.onCustomMove = function (move) {
-        var moves = _super.prototype.onCustomMove.call(this, move);
-        if (move.type === CustomMoveType_1.CustomMoveType.EndEffect) {
-            this.forget(Memory_1.Memory.OngoingEffect);
-            if (this.remind(Memory_1.Memory.PendingEffects).length) {
-                moves.push.apply(moves, __spreadArray([], __read(this.startEffectsResolution()), false));
-            }
-            else {
-                var pendingRule = this.remind(Memory_1.Memory.PendingRule);
-                if (pendingRule) {
-                    this.forget(Memory_1.Memory.PendingRule);
-                    if (pendingRule.id === RuleId_1.RuleId.EndGame) {
-                        moves.push.apply(moves, __spreadArray(__spreadArray([], __read(new EndGameRule_1.EndGameRule(this.game).convertGems()), false), [this.endGame()], false));
-                    }
-                    else {
-                        moves.push(this.startPlayerTurn(RuleId_1.RuleId.PlaceCards, pendingRule.player));
-                    }
-                }
+        if ((0, rules_api_1.isMoveItemType)(MaterialType_1.MaterialType.EntityCard)(move) && move.location.type === LocationType_1.LocationType.PlayerDiscard) {
+            var card = this.material(MaterialType_1.MaterialType.EntityCard).getItem(move.itemIndex);
+            if (card.location.type === LocationType_1.LocationType.Pantheon) {
+                new Pantheon_1.Pantheon(this.game, card.location.player).onEntitySacrificed(move.itemIndex);
             }
         }
-        return moves;
+        return _super.prototype.beforeItemMove.call(this, move);
     };
     MythologiesRules.prototype.getAutomaticMoves = function () {
         var _a;
         if (!this.remind(Memory_1.Memory.OngoingEffect) && ((_a = this.game.rule) === null || _a === void 0 ? void 0 : _a.id) !== RuleId_1.RuleId.ResolveEffects && this.remind(Memory_1.Memory.PendingEffects).length) {
-            return this.startEffectsResolution();
+            return new ResolveEffectsRule_1.ResolveEffectsRule(this.game).startEffectsResolution();
         }
         return [];
     };
-    MythologiesRules.prototype.startEffectsResolution = function () {
-        var pendingEffects = this.remind(Memory_1.Memory.PendingEffects)[0];
-        var autoEffectIndex = pendingEffects.findIndex(function (effect) { return effect.auto; });
-        if (autoEffectIndex !== -1) {
-            var autoEffect = pendingEffects.splice(autoEffectIndex, 1)[0];
-            if (pendingEffects.length === 0) {
-                this.remind(Memory_1.Memory.PendingEffects).shift();
-            }
-            return new ResolveEffectsRule_1.ResolveEffectsRule(this.game).playEffect(autoEffect);
-        }
-        var cardIndex = pendingEffects[0].cardIndex;
-        var player = this.material(MaterialType_1.MaterialType.EntityCard).getItem(cardIndex).location.player;
-        return [this.startPlayerTurn(RuleId_1.RuleId.ResolveEffects, player)];
-    };
     MythologiesRules.prototype.giveTime = function () {
         return 60;
     };

package/dist/MythologiesSetup.js

@@ -66,7 +66,7 @@ var MythologiesSetup = (function (_super) {
     };
     MythologiesSetup.prototype.setupMythologies = function (mythologies) {
         var e_1, _a;
-        this.material(MaterialType_1.MaterialType.MythologyBoard).createItems(mythologies.map(function (mythology, index) { return ({
+        this.material(MaterialType_1.MaterialType.MythologyBoard).createItems((0, lodash_1.shuffle)(mythologies).map(function (mythology, index) { return ({
             id: { mythology: mythology, side: index % 2 },
             location: {
                 type: LocationType_1.LocationType.Sanctuary,

package/dist/material/Pantheon.d.ts

@@ -43,7 +43,7 @@ export declare class Pantheon extends MaterialRulesPart {
     isVisible(entity: EntityItem): boolean;
     get mythologies(): import("./Mythology").Mythology[];
     get missingMythologies(): import("./Mythology").Mythology[];
-    onEntitySacrificed(card: Material): void;
+    onEntitySacrificed(cardIndex: number): void;
     hasCrushed(card: MaterialItem): boolean;
     isOpponentOngoingEffect(): boolean;
     replaceSacrifice(cards: EntityItem[]): Material<number, number, number>;

package/dist/material/Pantheon.js

@@ -450,14 +450,16 @@ var Pantheon = (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Pantheon.prototype.onEntitySacrificed = function (card) {
-        var item = card.getItem();
-        var _a = item.location, x = _a.x, y = _a.y, z = _a.z;
+    Pantheon.prototype.onEntitySacrificed = function (cardIndex) {
+        var card = this.material(MaterialType_1.MaterialType.EntityCard).getItem(cardIndex);
+        var _a = card.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;
-        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() });
+        if (grid[y][x] === cardIndex) {
+            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;
+            this.memorize(Memory_1.Memory.PlayerGrid, grid, this.player);
+            new TriggerEffectsRule_1.TriggerEffectsRule(this.game).triggerEffects({ type: Effect_1.TriggerEventType.EntitySacrificed, card: card, cardIndex: cardIndex });
+        }
     };
     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/Trial.js

@@ -172,7 +172,6 @@ var Trial = (function (_super) {
     Trial.prototype.getTrialRightReward = function (mythology) {
         switch (mythology) {
             case Mythology_1.Mythology.Chinese:
-            case Mythology_1.Mythology.Zulu:
             case Mythology_1.Mythology.Celtic:
                 return 1;
             default:

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

@@ -0,0 +1,11 @@
+import { MaterialMove, MaterialRulesPart } from '@gamepark/rules-api';
+import { PlayerColor } from '../../PlayerColor';
+import { EntityId } from '../Entity';
+import { EffectRule, PendingEffect, TriggerEvent } from './Effect';
+export declare abstract class AutoEffectRule extends MaterialRulesPart implements EffectRule {
+    canPlayEffect: () => boolean;
+    abstract playEffect(): MaterialMove[];
+    getEffect<Event extends TriggerEvent>(): PendingEffect<Event>;
+    get card(): import("@gamepark/rules-api").MaterialItem<number, number, EntityId>;
+    get player(): PlayerColor;
+}

package/dist/material/entity/AutoEffectRule.js

@@ -0,0 +1,49 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AutoEffectRule = void 0;
+var rules_api_1 = require("@gamepark/rules-api");
+var Memory_1 = require("../../Memory");
+var MaterialType_1 = require("../MaterialType");
+var AutoEffectRule = (function (_super) {
+    __extends(AutoEffectRule, _super);
+    function AutoEffectRule() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.canPlayEffect = function () { return true; };
+        return _this;
+    }
+    AutoEffectRule.prototype.getEffect = function () {
+        return this.remind(Memory_1.Memory.OngoingEffect);
+    };
+    Object.defineProperty(AutoEffectRule.prototype, "card", {
+        get: function () {
+            var index = this.getEffect().cardIndex;
+            return this.material(MaterialType_1.MaterialType.EntityCard).getItem(index);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AutoEffectRule.prototype, "player", {
+        get: function () {
+            return this.card.location.player;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return AutoEffectRule;
+}(rules_api_1.MaterialRulesPart));
+exports.AutoEffectRule = AutoEffectRule;

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

@@ -1,7 +1,6 @@
-import { Location, MaterialGame, MaterialMove, MaterialRulesPart, PlayerTurnRule, SimultaneousRule, XYCoordinates } from '@gamepark/rules-api';
+import { Location, MaterialGame, MaterialMove, XYCoordinates } from '@gamepark/rules-api';
 import { PlayerColor } from '../../PlayerColor';
-import { RuleId } from '../../rules/RuleId';
-import { Entity, EntityId, EntityItem } from '../Entity';
+import { Entity, EntityItem } from '../Entity';
 export type TriggerEventContext = {
     cardIndex: number;
     cardLocation: Location;
@@ -23,36 +22,10 @@ export type PermanentEffect = {
     sacrificeInsteadOfMove?: boolean;
 };
 export type Effect = TriggeredEffect | PermanentEffect;
-interface EffectRule {
+export interface EffectRule {
     canPlayEffect(cardIndex: number): boolean;
     playEffect(): MaterialMove[];
 }
-export declare abstract class PlayerEffectRule extends PlayerTurnRule implements EffectRule {
-    canPlayEffect(_cardIndex: number): boolean;
-    ruleId?: RuleId;
-    playEffect(): MaterialMove[];
-    onRuleStart(): MaterialMove[];
-    get card(): import("@gamepark/rules-api").MaterialItem<number, number, EntityId>;
-    getEffect<Event extends TriggerEvent>(): PendingEffect<Event>;
-}
-export declare abstract class SimultaneousEffectRule extends SimultaneousRule implements EffectRule {
-    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>;
-    getEffect<Event extends TriggerEvent>(): PendingEffect<Event>;
-    getMovesAfterPlayersDone(): MaterialMove[];
-}
-export declare abstract class AutoEffectRule extends MaterialRulesPart implements EffectRule {
-    canPlayEffect: () => boolean;
-    abstract playEffect(): MaterialMove[];
-    getEffect<Event extends TriggerEvent>(): PendingEffect<Event>;
-    get card(): import("@gamepark/rules-api").MaterialItem<number, number, EntityId>;
-    get player(): PlayerColor;
-}
 export declare enum TriggerEventType {
     EndOfGame = 1,
     SelfPlaced = 2,
@@ -129,4 +102,3 @@ export type PendingEffect<Event extends TriggerEvent = TriggerEvent> = {
     triggerEvent: Event;
     auto: boolean;
 };
-export {};

package/dist/material/entity/Effect.js

@@ -1,177 +1,8 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEndOfMyTurn = exports.isSacrificed = exports.isCrushed = exports.oncePerTurn = exports.LineEventType = exports.isPlaced = exports.isEndOfGame = exports.TriggerEventType = exports.AutoEffectRule = exports.SimultaneousEffectRule = exports.PlayerEffectRule = exports.isTriggeredEffect = void 0;
-var rules_api_1 = require("@gamepark/rules-api");
-var CustomMoveType_1 = require("../../CustomMoveType");
-var Memory_1 = require("../../Memory");
-var MaterialType_1 = require("../MaterialType");
+exports.isEndOfMyTurn = exports.isSacrificed = exports.isCrushed = exports.oncePerTurn = exports.LineEventType = exports.isPlaced = exports.isEndOfGame = exports.TriggerEventType = exports.isTriggeredEffect = void 0;
 var isTriggeredEffect = function (effect) { return typeof effect.trigger === 'function'; };
 exports.isTriggeredEffect = isTriggeredEffect;
-var PlayerEffectRule = (function (_super) {
-    __extends(PlayerEffectRule, _super);
-    function PlayerEffectRule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    PlayerEffectRule.prototype.canPlayEffect = function (_cardIndex) {
-        return true;
-    };
-    PlayerEffectRule.prototype.playEffect = function () {
-        return this.ruleId ? [this.startRule(this.ruleId)] : [];
-    };
-    PlayerEffectRule.prototype.onRuleStart = function () {
-        if (!this.getPlayerMoves().length) {
-            return [this.customMove(CustomMoveType_1.CustomMoveType.EndEffect)];
-        }
-        return [];
-    };
-    Object.defineProperty(PlayerEffectRule.prototype, "card", {
-        get: function () {
-            var index = this.getEffect().cardIndex;
-            return this.material(MaterialType_1.MaterialType.EntityCard).getItem(index);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    PlayerEffectRule.prototype.getEffect = function () {
-        return this.remind(Memory_1.Memory.OngoingEffect);
-    };
-    return PlayerEffectRule;
-}(rules_api_1.PlayerTurnRule));
-exports.PlayerEffectRule = PlayerEffectRule;
-var SimultaneousEffectRule = (function (_super) {
-    __extends(SimultaneousEffectRule, _super);
-    function SimultaneousEffectRule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    SimultaneousEffectRule.prototype.canPlayEffect = function (_cardIndex) {
-        return true;
-    };
-    SimultaneousEffectRule.prototype.playEffect = function () {
-        var e_1, _a;
-        var moves = [];
-        var playersToActivate = [];
-        try {
-            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 && !(0, rules_api_1.isMoveItemType)(MaterialType_1.MaterialType.EntityCard)(legalMoves[0])) {
-                    moves.push(legalMoves[0]);
-                }
-                else if (legalMoves.length > 0) {
-                    playersToActivate.push(player);
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        if (playersToActivate.length > 0 && this.ruleId) {
-            moves.push(this.startSimultaneousRule(this.ruleId, playersToActivate));
-        }
-        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;
-    };
-    SimultaneousEffectRule.prototype.isOpponent = function (player) {
-        return player !== this.card.location.player;
-    };
-    Object.defineProperty(SimultaneousEffectRule.prototype, "card", {
-        get: function () {
-            var index = this.getEffect().cardIndex;
-            return this.material(MaterialType_1.MaterialType.EntityCard).getItem(index);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    SimultaneousEffectRule.prototype.getEffect = function () {
-        return this.remind(Memory_1.Memory.OngoingEffect);
-    };
-    SimultaneousEffectRule.prototype.getMovesAfterPlayersDone = function () {
-        return [this.customMove(CustomMoveType_1.CustomMoveType.EndEffect)];
-    };
-    return SimultaneousEffectRule;
-}(rules_api_1.SimultaneousRule));
-exports.SimultaneousEffectRule = SimultaneousEffectRule;
-var AutoEffectRule = (function (_super) {
-    __extends(AutoEffectRule, _super);
-    function AutoEffectRule() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.canPlayEffect = function () { return true; };
-        return _this;
-    }
-    AutoEffectRule.prototype.getEffect = function () {
-        return this.remind(Memory_1.Memory.OngoingEffect);
-    };
-    Object.defineProperty(AutoEffectRule.prototype, "card", {
-        get: function () {
-            var index = this.getEffect().cardIndex;
-            return this.material(MaterialType_1.MaterialType.EntityCard).getItem(index);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(AutoEffectRule.prototype, "player", {
-        get: function () {
-            return this.card.location.player;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return AutoEffectRule;
-}(rules_api_1.MaterialRulesPart));
-exports.AutoEffectRule = AutoEffectRule;
 var TriggerEventType;
 (function (TriggerEventType) {
     TriggerEventType[TriggerEventType["EndOfGame"] = 1] = "EndOfGame";

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

@@ -1,5 +1,5 @@
-import { CustomMove, ItemMove, Location, Material, MaterialItem, MaterialMove, MoveItem, XYCoordinates } from '@gamepark/rules-api';
-import { PlayerEffectRule } from './Effect';
+import { ItemMove, Location, Material, MaterialItem, MaterialMove, MoveItem, XYCoordinates } from '@gamepark/rules-api';
+import { PlayerEffectRule } from './PlayerEffectRule';
 export declare abstract class MoveEffectRule extends PlayerEffectRule {
     canPlayEffect(cardIndex: number): boolean;
     playEffect(): MaterialMove[];
@@ -13,7 +13,6 @@ export declare abstract class MoveEffectRule extends PlayerEffectRule {
     beforeItemMove(move: ItemMove): MaterialMove<number, number, number, number>[];
     onCardMoved(_move: MoveItem): MaterialMove[];
     onCardSacrificed(move: MoveItem): MaterialMove[];
-    onCustomMove(move: CustomMove): MaterialMove<number, number, number, number>[];
-    onEndEffect(): MaterialMove[];
-    onRuleEnd(): never[];
+    onEndEffect(): MaterialMove<number, number, number, number>[];
+    updateGridAfterMoves(): MaterialMove<number, number, number, number>[];
 }

package/dist/material/entity/MoveEffectRule.js

@@ -42,13 +42,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoveEffectRule = void 0;
 var rules_api_1 = require("@gamepark/rules-api");
+var lodash_1 = require("lodash");
 var CustomMoveType_1 = require("../../CustomMoveType");
-var Memory_1 = require("../../Memory");
 var TriggerEffectsRule_1 = require("../../rules/effects/TriggerEffectsRule");
 var LocationType_1 = require("../LocationType");
 var MaterialType_1 = require("../MaterialType");
 var Pantheon_1 = require("../Pantheon");
-var Effect_1 = require("./Effect");
+var PlayerEffectRule_1 = require("./PlayerEffectRule");
 var MoveEffectRule = (function (_super) {
     __extends(MoveEffectRule, _super);
     function MoveEffectRule() {
@@ -66,7 +66,7 @@ var MoveEffectRule = (function (_super) {
         return this.getMoveCardsMoves().concat(this.getSacrificeToPreventMove());
     };
     MoveEffectRule.prototype.getSacrificeToPreventMove = function () {
-        return this.remind(Memory_1.Memory.EntityMoved, this.player) ? [] : new Pantheon_1.Pantheon(this.game, this.player).sacrificeToPreventMove();
+        return new Pantheon_1.Pantheon(this.game, this.player).sacrificeToPreventMove();
     };
     MoveEffectRule.prototype.getMoveCardsMoves = function (effectCardIndex) {
         var _this = this;
@@ -98,7 +98,6 @@ var MoveEffectRule = (function (_super) {
     MoveEffectRule.prototype.beforeItemMove = function (move) {
         if ((0, rules_api_1.isMoveItemType)(MaterialType_1.MaterialType.EntityCard)(move)) {
             if (move.location.type === LocationType_1.LocationType.Pantheon) {
-                this.memorize(Memory_1.Memory.EntityMoved, true, this.player);
                 return this.onCardMoved(move);
             }
             else if (move.location.type === LocationType_1.LocationType.PlayerDiscard) {
@@ -111,26 +110,20 @@ var MoveEffectRule = (function (_super) {
         return [this.customMove(CustomMoveType_1.CustomMoveType.EndEffect)];
     };
     MoveEffectRule.prototype.onCardSacrificed = function (move) {
-        var card = this.material(MaterialType_1.MaterialType.EntityCard).index(move.itemIndex);
-        new TriggerEffectsRule_1.TriggerEffectsRule(this.game).triggerEffects({ type: Effect_1.TriggerEventType.EntitySacrificed, card: card.getItem(), cardIndex: card.getIndex() });
-        return [this.customMove(CustomMoveType_1.CustomMoveType.EndEffect)];
-    };
-    MoveEffectRule.prototype.onCustomMove = function (move) {
-        if (move.type === CustomMoveType_1.CustomMoveType.EndEffect) {
-            return this.onEndEffect();
+        if (this.getSacrificeToPreventMove().some(function (sacrificeMove) { return (0, lodash_1.isEqual)(move, sacrificeMove); })) {
+            return [this.customMove(CustomMoveType_1.CustomMoveType.EndEffect)];
         }
         return [];
     };
     MoveEffectRule.prototype.onEndEffect = function () {
+        return this.updateGridAfterMoves().concat(_super.prototype.onEndEffect.call(this));
+    };
+    MoveEffectRule.prototype.updateGridAfterMoves = function () {
         var _a;
         var pantheon = new Pantheon_1.Pantheon(this.game, this.player);
         (_a = new TriggerEffectsRule_1.TriggerEffectsRule(this.game)).triggerEffects.apply(_a, __spreadArray([], __read(pantheon.updateGrid()), false));
         return pantheon.gainBonus();
     };
-    MoveEffectRule.prototype.onRuleEnd = function () {
-        this.forget(Memory_1.Memory.EntityMoved);
-        return [];
-    };
     return MoveEffectRule;
-}(Effect_1.PlayerEffectRule));
+}(PlayerEffectRule_1.PlayerEffectRule));
 exports.MoveEffectRule = MoveEffectRule;

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

@@ -1,5 +1,5 @@
 import { ItemMove, Material, MaterialMove, MoveItem, XYCoordinates } from '@gamepark/rules-api';
-import { PlayerEffectRule } from './Effect';
+import { PlayerEffectRule } from './PlayerEffectRule';
 export declare abstract class PlaceCardEffectRule extends PlayerEffectRule {
     canPlayEffect(cardIndex: number): boolean;
     playEffect(): MaterialMove[];

package/dist/material/entity/PlaceCardEffectRule.js

@@ -22,7 +22,7 @@ var Entity_1 = require("../Entity");
 var LocationType_1 = require("../LocationType");
 var MaterialType_1 = require("../MaterialType");
 var Pantheon_1 = require("../Pantheon");
-var Effect_1 = require("./Effect");
+var PlayerEffectRule_1 = require("./PlayerEffectRule");
 var PlaceCardEffectRule = (function (_super) {
     __extends(PlaceCardEffectRule, _super);
     function PlaceCardEffectRule() {
@@ -61,7 +61,7 @@ var PlaceCardEffectRule = (function (_super) {
         return moves;
     };
     return PlaceCardEffectRule;
-}(Effect_1.PlayerEffectRule));
+}(PlayerEffectRule_1.PlayerEffectRule));
 exports.PlaceCardEffectRule = PlaceCardEffectRule;
 var InvokeEffectRule = (function (_super) {
     __extends(InvokeEffectRule, _super);

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

@@ -0,0 +1,14 @@
+import { CustomMove, MaterialMove, PlayerTurnRule } from '@gamepark/rules-api';
+import { RuleId } from '../../rules/RuleId';
+import { EntityId } from '../Entity';
+import { EffectRule, PendingEffect, TriggerEvent } from './Effect';
+export declare abstract class PlayerEffectRule extends PlayerTurnRule implements EffectRule {
+    canPlayEffect(_cardIndex: number): boolean;
+    ruleId?: RuleId;
+    playEffect(): MaterialMove[];
+    onRuleStart(): MaterialMove[];
+    get card(): import("@gamepark/rules-api").MaterialItem<number, number, EntityId>;
+    getEffect<Event extends TriggerEvent>(): PendingEffect<Event>;
+    onCustomMove(move: CustomMove): MaterialMove<number, number, number, number>[];
+    onEndEffect(): MaterialMove<number, number, number, number>[];
+}