@gamepark/skyrift 0.2.9 → 0.3.0

package/dist/rules/PlayCardRule.js

@@ -1,7 +1,6 @@
 import { isMoveItemType, PlayerTurnRule } from '@gamepark/rules-api';
 import { CustomMoveType } from '../CustomMoveType';
 import { cardProperties } from '../material/CardProperties';
-import { CardSuit } from '../material/CardSuit';
 import { LocationType } from '../material/LocationType';
 import { MaterialType } from '../material/MaterialType';
 import { Memory } from '../Memory';
@@ -44,26 +43,11 @@ export class PlayCardRule extends PlayerTurnRule {
     afterItemMove(move) {
         const moves = [];
         if (isMoveItemType(MaterialType.Card)(move) && move.location.type === LocationType.PlayArea) {
-            this.memorize(Memory.CardsPlayed, (cards) => [...cards, move.itemIndex], this.player);
-            const cardRule = new PlayerHelper(this.game, this.player).getCardRule(move.itemIndex);
-            if (!this.remind(Memory.Suit)) {
-                const card = this.material(MaterialType.Card).getItem(move.itemIndex);
-                const suit = cardProperties[card.id.front].suit;
-                if (suit === CardSuit.Day || suit === CardSuit.Night) {
-                    this.memorize(Memory.Suit, suit);
-                }
-            }
-            const cardsInPlay = this.material(MaterialType.Card).location(LocationType.PlayArea);
-            for (const cardIndex of cardsInPlay.getIndexes()) {
-                if (cardIndex !== move.itemIndex) {
-                    const otherCardRule = new PlayerHelper(this.game, this.player).getCardRule(cardIndex);
-                    moves.push(...otherCardRule.onCardEnters(cardRule.card, move.location.player));
-                }
-            }
-            moves.push(...cardRule.onEnters());
+            const playerHelper = new PlayerHelper(this.game, this.player);
+            moves.push(...playerHelper.onCardPlayed(move.itemIndex));
             const pendingEffects = this.remind(Memory.PendingEffects);
             if (pendingEffects.length > 0) {
-                return new PlayerHelper(this.game, this.player).getCardRule(pendingEffects[0].cardIndex).startEffect();
+                return [...moves, ...playerHelper.getCardRule(pendingEffects[0].cardIndex).startEffect()];
             }
         }
         if (isMoveItemType(MaterialType.Card)(move) || isMoveItemType(MaterialType.PowerToken)(move)) {
@@ -75,6 +59,7 @@ export class PlayCardRule extends PlayerTurnRule {
     }
     onCustomMove(move) {
         if (move.type === CustomMoveType.ConcedeRound) {
+            this.memorize(Memory.OngoingEffects, []);
             return [this.startRule(RuleId.EndRound)];
         }
         else if (move.type === CustomMoveType.ActivateCard) {

package/dist/rules/PlayerHelper.d.ts

@@ -1,4 +1,4 @@
-import { MaterialGame, MaterialRulesPart } from '@gamepark/rules-api';
+import { MaterialGame, MaterialMove, MaterialRulesPart } from '@gamepark/rules-api';
 import { Deck } from '../Deck';
 export declare class PlayerHelper extends MaterialRulesPart {
     private player;
@@ -10,4 +10,5 @@ export declare class PlayerHelper extends MaterialRulesPart {
     getPower(): number;
     get foe(): number;
     hasMorePower(): boolean;
+    onCardPlayed(cardIndex: number): MaterialMove[];
 }

package/dist/rules/PlayerHelper.js

@@ -1,8 +1,11 @@
 import { MaterialRulesPart } from '@gamepark/rules-api';
 import { sumBy } from 'es-toolkit';
 import { cardProperties } from '../material/CardProperties';
+import { CardSuit } from '../material/CardSuit';
+import { CardType } from '../material/CardType';
 import { LocationType } from '../material/LocationType';
 import { MaterialType } from '../material/MaterialType';
+import { OngoingEffectType } from '../material/OngoingEffect';
 import { Memory } from '../Memory';
 export class PlayerHelper extends MaterialRulesPart {
     player;
@@ -33,4 +36,33 @@ export class PlayerHelper extends MaterialRulesPart {
     hasMorePower() {
         return this.getPower() > new PlayerHelper(this.game, this.foe).getPower();
     }
+    onCardPlayed(cardIndex) {
+        this.memorize(Memory.CardsPlayed, (cards) => [...cards, cardIndex], this.player);
+        this.memorize(Memory.OngoingEffects, (effects) => effects.filter((e) => !(e.type === OngoingEffectType.ForcedSuit &&
+            this.material(MaterialType.Card).getItem(e.cardIndex).location.player !== this.player)));
+        const cardRule = this.getCardRule(cardIndex);
+        if (!this.remind(Memory.Suit)) {
+            const suit = cardProperties[cardRule.card].suit;
+            if (suit === CardSuit.Day || suit === CardSuit.Night) {
+                this.memorize(Memory.Suit, suit);
+            }
+        }
+        const ongoingEffects = this.remind(Memory.OngoingEffects);
+        const deathTrap = ongoingEffects.find((e) => e.type === OngoingEffectType.DeathTrap);
+        if (deathTrap && cardProperties[cardRule.card].type === CardType.Creature) {
+            this.memorize(Memory.OngoingEffects, (effects) => effects.filter((e) => e.type !== OngoingEffectType.DeathTrap));
+            this.memorize(Memory.PendingEffects, (effects) => [...effects, { cardIndex: deathTrap.cardIndex }]);
+            return [];
+        }
+        const moves = [];
+        const cardsInPlay = this.material(MaterialType.Card).location(LocationType.PlayArea);
+        for (const index of cardsInPlay.getIndexes()) {
+            if (index !== cardIndex) {
+                const otherCardRule = this.getCardRule(index);
+                moves.push(...otherCardRule.onCardEnters(cardRule.card, this.player));
+            }
+        }
+        moves.push(...cardRule.onEnters());
+        return moves;
+    }
 }

package/dist/rules/PrepareNextRoundRule.js

@@ -22,6 +22,7 @@ export class PrepareNextRoundRule extends MaterialRulesPart {
     }
     onRuleEnd() {
         this.forget(Memory.NextRoundStartPlayer);
+        this.memorize(Memory.OngoingEffects, []);
         return [];
     }
 }

package/dist/rules/RuleId.d.ts

@@ -18,6 +18,18 @@ export declare enum RuleId {
     WatchTowerEffect = 114,
     ConfluenceEffect = 115,
     HarvestEffect = 116,
+    DesertRaiderEffect = 201,
+    MetamorphEffect = 202,
+    AbiSnakeCharmerEffect = 204,
+    VandalsEffect = 206,
+    MushaFakirEffect = 207,
+    OasisShamanEffect = 208,
+    SandWalkersEffect = 211,
+    WishLampEffect = 212,
+    StarlightBazaarEffect = 213,
+    AncientCurseEffect = 214,
+    WindWrathEffect = 215,
+    DeathTrapEffect = 216,
     SeaScorcherEffect = 601,
     AeliaSteadyHandEffect = 602,
     EyeOfSkyEffect = 603,

package/dist/rules/RuleId.js

@@ -20,6 +20,18 @@ export var RuleId;
     RuleId[RuleId["WatchTowerEffect"] = 114] = "WatchTowerEffect";
     RuleId[RuleId["ConfluenceEffect"] = 115] = "ConfluenceEffect";
     RuleId[RuleId["HarvestEffect"] = 116] = "HarvestEffect";
+    RuleId[RuleId["DesertRaiderEffect"] = 201] = "DesertRaiderEffect";
+    RuleId[RuleId["MetamorphEffect"] = 202] = "MetamorphEffect";
+    RuleId[RuleId["AbiSnakeCharmerEffect"] = 204] = "AbiSnakeCharmerEffect";
+    RuleId[RuleId["VandalsEffect"] = 206] = "VandalsEffect";
+    RuleId[RuleId["MushaFakirEffect"] = 207] = "MushaFakirEffect";
+    RuleId[RuleId["OasisShamanEffect"] = 208] = "OasisShamanEffect";
+    RuleId[RuleId["SandWalkersEffect"] = 211] = "SandWalkersEffect";
+    RuleId[RuleId["WishLampEffect"] = 212] = "WishLampEffect";
+    RuleId[RuleId["StarlightBazaarEffect"] = 213] = "StarlightBazaarEffect";
+    RuleId[RuleId["AncientCurseEffect"] = 214] = "AncientCurseEffect";
+    RuleId[RuleId["WindWrathEffect"] = 215] = "WindWrathEffect";
+    RuleId[RuleId["DeathTrapEffect"] = 216] = "DeathTrapEffect";
     RuleId[RuleId["SeaScorcherEffect"] = 601] = "SeaScorcherEffect";
     RuleId[RuleId["AeliaSteadyHandEffect"] = 602] = "AeliaSteadyHandEffect";
     RuleId[RuleId["EyeOfSkyEffect"] = 603] = "EyeOfSkyEffect";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/skyrift",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "description": "The rules of SkyRift adapted for Game Park",
   "sideEffects": false,
   "type": "module",
@@ -30,5 +30,5 @@
     "es-toolkit": "^1.43.0",
     "vitest": "^4.0.15"
   },
-  "gitHead": "3eecc32048afbafd221b143f55a2b4e8cfb3a154"
+  "gitHead": "f50ba0de0d312d2424e9bb27f567966975c5e72d"
 }