@gamepark/mythologies 1.0.14 → 1.0.16

package/dist/material/Pantheon.js

@@ -95,9 +95,10 @@ export class Pantheon extends MaterialRulesPart {
             moves.push(this.spendGems(4));
         }
         const grid = this.indexGrid;
-        const crush = grid[move.location.y][move.location.x] !== null;
+        const crushedIndex = grid[move.location.y][move.location.x];
+        const crushed = crushedIndex !== null ? this.material(MaterialType.EntityCard).getItem(crushedIndex).id.front : undefined;
         grid[move.location.y][move.location.x] = move.itemIndex;
-        new TriggerEffectsRule(this.game).triggerCardEffect(move.itemIndex, location, { type: TriggerEventType.SelfPlaced, crush }, entity);
+        new TriggerEffectsRule(this.game).triggerCardEffect(move.itemIndex, location, { type: TriggerEventType.SelfPlaced, crushed }, entity);
         const summoned = this.isSummon;
         if (summoned) {
             moves.push(...this.onSummon(move));

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

@@ -40,7 +40,7 @@ export declare enum TriggerEventType {
 }
 export type SelfPlaced = {
     type: TriggerEventType.SelfPlaced;
-    crush: boolean;
+    crushed?: Entity;
 };
 export type EndOfGameEvent = {
     type: TriggerEventType.EndOfGame;

package/dist/material/entity/Effect.js

@@ -14,7 +14,7 @@ export var TriggerEventType;
 })(TriggerEventType || (TriggerEventType = {}));
 export const isEndOfGame = (event) => event.type === TriggerEventType.EndOfGame;
 export const isPlaced = (event) => event.type === TriggerEventType.SelfPlaced;
-export const isPlacedCrush = (event) => isPlaced(event) && event.crush;
+export const isPlacedCrush = (event) => isPlaced(event) && !!event.crushed;
 export var LineEventType;
 (function (LineEventType) {
     LineEventType[LineEventType["BonusGain"] = 1] = "BonusGain";

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

@@ -9,7 +9,7 @@ export declare class GarudaEffectRule extends PlayerEffectRule {
 }
 export declare class GarudaSacrificeRule extends SacrificeEffectRule {
     ruleId: RuleId;
-    onRuleStart(): MaterialMove[];
+    onRuleStart(): CustomMove[] | MoveItem<number, number, number>[];
     getCardsToSacrifice(): import("@gamepark/rules-api").Material<number, number, number>;
     onSacrifice(move: MoveItem): CustomMove[];
     onRuleEnd(): never[];

package/dist/rules/effects/GarudaEffectRule.js

@@ -13,8 +13,22 @@ export class GarudaEffectRule extends PlayerEffectRule {
     }
     onCustomMove(move) {
         if (move.type === CustomMoveType.ChoosePlan) {
-            this.memorize(Memory.TargetPlane, move.data);
-            return [this.startRule(RuleId.GarudaSacrifice)];
+            const plan = move.data;
+            this.memorize(Memory.TargetPlane, plan);
+            const pantheon = new Pantheon(this.game, this.player);
+            const gemCount = pantheon.visibleEntities.location((l) => l.y === plan).length;
+            const creatureCount = pantheon.visibleEntities.id((id) => isCreature(id.front)).location((l) => l.y === plan).length;
+            const moves = [];
+            if (gemCount) {
+                moves.push(pantheon.gainGems(gemCount));
+            }
+            if (creatureCount) {
+                moves.push(this.startRule(RuleId.GarudaSacrifice));
+            }
+            else {
+                moves.push(this.customMove(CustomMoveType.EndEffect));
+            }
+            return moves;
         }
         return super.onCustomMove(move);
     }
@@ -26,12 +40,11 @@ export class GarudaSacrificeRule extends SacrificeEffectRule {
         if (!count)
             return [this.customMove(CustomMoveType.EndEffect)];
         this.memorize(Memory.EffectCount, count);
-        const moves = [new Pantheon(this.game, this.player).gainGems(count)];
         const playerMoves = this.getPlayerMoves();
         if (playerMoves.length === count) {
-            moves.push(...playerMoves);
+            return playerMoves;
         }
-        return moves;
+        return [];
     }
     getCardsToSacrifice() {
         const pantheon = new Pantheon(this.game, this.player);

package/dist/rules/effects/ImpunduluEffectRule.js

@@ -3,7 +3,6 @@ import { entityMythology } from '../../material/Entity';
 import { SummonEffectRule } from '../../material/entity/PlaceCardEffectRule';
 import { LocationType } from '../../material/LocationType';
 import { MaterialType } from '../../material/MaterialType';
-import { Pantheon } from '../../material/Pantheon';
 import { RuleId } from '../RuleId';
 export class ImpunduluEffectRule extends SummonEffectRule {
     ruleId = RuleId.ImpunduluEffect;
@@ -31,9 +30,7 @@ export class ImpunduluEffectRule extends SummonEffectRule {
         return deck.maxBy((item) => item.location.x);
     }
     get mythology() {
-        const pantheon = new Pantheon(this.game, this.player);
-        const { x, y } = this.card.location;
-        const crushed = pantheon.coveredEntities.location((l) => l.x === x && l.y === y).maxBy((item) => item.location.z);
-        return entityMythology(crushed.getItem().id.front);
+        const { triggerEvent } = this.getEffect();
+        return entityMythology(triggerEvent.crushed);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/mythologies",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "The rules of Mythologies adapted for Game Park",
   "sideEffects": false,
   "type": "module",
@@ -25,8 +25,8 @@
     "es-toolkit": "^1.44.0"
   },
   "devDependencies": {
-    "@gamepark/rules-api": "~7.4.0",
+    "@gamepark/rules-api": "~7.5.0",
     "es-toolkit": "^1.44.0"
   },
-  "gitHead": "864b4ad85fab38fa2494bfbbe6307ed5b16ae051"
+  "gitHead": "e2c4b4d214b3672755fe8340d5393d1c75fae46f"
 }