@gamepark/mythologies 1.0.5 → 1.0.7

package/dist/material/Pantheon.d.ts

@@ -10,7 +10,6 @@ export declare class Pantheon extends MaterialRulesPart {
     get coveredEntities(): Material<number, number, number>;
     get grid(): (Entity | undefined)[][];
     private get indexGrid();
-    getLegalSpacesToSummon(entity: Entity): XYCoordinates[];
     isLegalSpaceToSummon(space: XYCoordinates, entity?: Entity): boolean;
     getFavorTax(space: XYCoordinates): number;
     getGemTax(space: XYCoordinates): number;
@@ -29,7 +28,7 @@ export declare class Pantheon extends MaterialRulesPart {
     updateGrid(gridAfter?: (number | null)[][]): TriggerEvent[];
     private getEntitiesMoved;
     private getEntitiesCrushed;
-    triggerBonusGains(grid?: (number | null)[][]): void;
+    triggerBonusGains(grid?: (number | null)[][], gridBefore?: (number | null)[][] | null): void;
     gainLineBonus(y: number): MoveItem<number, number, number>[];
     gainColumnBonus(x: number): MoveItem<number, number, number>[];
     getBonusGem(y: number): Material<number, number, number>;

package/dist/material/Pantheon.js

@@ -38,9 +38,6 @@ export class Pantheon extends MaterialRulesPart {
             return entity.length > 0 ? entity.getIndex() : null;
         }));
     }
-    getLegalSpacesToSummon(entity) {
-        return this.legalSpaces.filter((space) => this.isLegalSpaceToSummon(space, entity));
-    }
     isLegalSpaceToSummon(space, entity) {
         const opponents = this.game.players.filter((player) => player !== this.player);
         const favorTax = sumBy(opponents, (opponent) => new Pantheon(this.game, opponent).getFavorTax(space));
@@ -106,18 +103,19 @@ export class Pantheon extends MaterialRulesPart {
         if (summoned) {
             moves.push(...this.onSummon(move));
         }
+        const gridBefore = this.remind(Memory.PlayerGrid, this.player);
         const triggerEvents = this.updateGrid(grid);
         triggerEvents.push({ type: TriggerEventType.EntityPlaced, cardIndex: move.itemIndex, entity, location, summoned: summoned });
         if (triggerEvents.length) {
             triggerEffectsRule.triggerEffects(...triggerEvents);
         }
+        this.triggerBonusGains(grid, gridBefore);
         return moves;
     }
     get isSummon() {
         return new MythologiesRules(this.game).delegate().isSummon;
     }
     updateGrid(gridAfter = this.indexGrid) {
-        this.triggerBonusGains(gridAfter);
         const gridBefore = this.remind(Memory.PlayerGrid, this.player) ?? this.indexGrid;
         this.memorize(Memory.PlayerGrid, gridAfter, this.player);
         const triggerEvents = [];
@@ -166,16 +164,20 @@ export class Pantheon extends MaterialRulesPart {
         }
         return entities;
     }
-    triggerBonusGains(grid = this.indexGrid) {
+    triggerBonusGains(grid = this.indexGrid, gridBefore) {
         const effect = { type: PendingEffectsType.BonusGains, player: this.player, lines: [], columns: [] };
         const fullLines = range(0, 3).filter((y) => !grid[y].includes(null));
         for (const y of fullLines) {
+            if (gridBefore && gridBefore[y].every((item) => item !== null))
+                continue;
             if (this.getBonusGem(y).length) {
                 effect.lines.push(y);
             }
         }
         const fullColumns = range(0, 3).filter((x) => grid.every((line) => line[x] !== null));
         for (const x of fullColumns) {
+            if (gridBefore && gridBefore.every((line) => line[x] !== null))
+                continue;
             if (this.getBonusFavor(x).length) {
                 effect.columns.push(x);
             }

package/dist/material/entity/egyptian/Osiris.js

@@ -1,4 +1,4 @@
-import { range, uniq } from 'es-toolkit';
+import { uniq } from 'es-toolkit';
 import { entityMythology } from '../../Entity';
 import { Mythology } from '../../Mythology';
 import { Pantheon } from '../../Pantheon';
@@ -13,10 +13,8 @@ export const Osiris = {
                 const pantheon = new Pantheon(this.game, this.player);
                 const grid = pantheon.grid;
                 const mythologiesPerLine = grid.map((line) => line.filter((space) => space !== undefined).map(entityMythology));
-                const otherMythologies = Math.max(...range(0, 3).map((skipY) => {
-                    const mythologies = uniq(mythologiesPerLine.flatMap((mythologies, y) => (y !== skipY ? mythologies : [])));
-                    return mythologies.filter((mythology) => mythology !== Mythology.Egyptian).length;
-                }));
+                const allMythologies = uniq(mythologiesPerLine.flat()).filter((m) => m !== Mythology.Egyptian);
+                const otherMythologies = allMythologies.filter((m) => mythologiesPerLine.filter((line) => line.includes(m)).length >= 2).length;
                 return otherMythologies > 0 ? [pantheon.gainFavor(otherMythologies * 2)] : [];
             }
         }

package/dist/rules/effects/ResolveEffectsRule.js

@@ -47,6 +47,7 @@ export class ResolveEffectsRule extends PlayerTurnRule {
             return moves;
         }
         else if (moves.length === 0) {
+            this.memorize(Memory.PendingEffects, (effects) => effects.slice(1));
             return [this.customMove(CustomMoveType.EndEffect)];
         }
         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/mythologies",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "The rules of Mythologies adapted for Game Park",
   "sideEffects": false,
   "type": "module",
@@ -28,5 +28,5 @@
     "@gamepark/rules-api": "~7.2.0",
     "es-toolkit": "^1.44.0"
   },
-  "gitHead": "806e4b2d4bb686c0216d8629056df3dbb6008d08"
+  "gitHead": "206c518eab1522346aa611cf57e3333f42aae2a7"
 }