@gamepark/skyrift 0.4.2 → 0.5.0

package/dist/material/decks/highwave/BoardingPartyEffectRule.d.ts

@@ -7,5 +7,4 @@ export declare class BoardingPartyEffectRule extends DestroyEffectRule {
     getTargets(): import("@gamepark/rules-api").Material<number, number, number>;
     onCardDestroyed(): import("@gamepark/rules-api").MaterialMove[];
     onCustomMove(move: CustomMove): import("@gamepark/rules-api").MaterialMove[];
-    onRuleEnd(): never[];
 }

package/dist/material/decks/highwave/BoardingPartyEffectRule.js

@@ -45,10 +45,4 @@ export class BoardingPartyEffectRule extends DestroyEffectRule {
         }
         return super.onCustomMove(move);
     }
-    onRuleEnd() {
-        if (!this.isBoardingPlayer) {
-            this.forget(Memory.EffectCount);
-        }
-        return [];
-    }
 }

package/dist/material/decks/highwave/EyeOfSky.d.ts

@@ -3,7 +3,7 @@ import { CardSuit } from '../../CardSuit';
 import { CardType } from '../../CardType';
 declare class EyeOfSkyRule extends CardRule {
     onFoeTurnStart(): void;
-    getEffectPlayer(): number;
+    getEffectPlayers(): number[];
 }
 export declare const EyeOfSky: {
     power: number;

package/dist/material/decks/highwave/EyeOfSky.js

@@ -6,8 +6,8 @@ class EyeOfSkyRule extends CardRule {
     onFoeTurnStart() {
         this.addPendingEffect(RuleId.EyeOfSkyEffect);
     }
-    getEffectPlayer() {
-        return this.foe;
+    getEffectPlayers() {
+        return [this.foe];
     }
 }
 export const EyeOfSky = {

package/dist/rules/DestroyEffectRule.d.ts

@@ -7,5 +7,5 @@ export declare class DestroyEffectRule extends EffectRule<DestroyEffect> {
     getTargets(): Material;
     afterItemMove(move: ItemMove): MaterialMove[];
     onCardDestroyed(): MaterialMove[];
-    onRuleEnd(): never[];
+    onEndEffect(): MaterialMove[];
 }

package/dist/rules/DestroyEffectRule.js

@@ -35,10 +35,15 @@ export class DestroyEffectRule extends EffectRule {
     }
     onCardDestroyed() {
         const remaining = this.memorize(Memory.EffectCount, (c) => c - 1);
-        return remaining <= 0 || !this.getTargets().length ? this.endEffect() : [];
+        if (remaining <= 0 || !this.getTargets().length) {
+            return this.endEffect();
+        }
+        else {
+            return [];
+        }
     }
-    onRuleEnd() {
+    onEndEffect() {
         this.forget(Memory.EffectCount);
-        return [];
+        return super.onEndEffect();
     }
 }

package/dist/rules/EffectRule.js

@@ -39,7 +39,7 @@ export class EffectRule extends PlayerTurnRule {
         }
         const currentPlayer = this.remind(Memory.CurrentPlayer);
         const playerHelper = new PlayerHelper(this.game, currentPlayer);
-        if (this.remind(Memory.CardsPlayed, currentPlayer).length && playerHelper.hasMorePower()) {
+        if (playerHelper.mustPassTurn()) {
             return [this.startPlayerTurn(RuleId.EndPlayerTurn, currentPlayer)];
         }
         else {

package/dist/rules/EndPlayerTurnRule.js

@@ -1,5 +1,7 @@
 import { PlayerTurnRule } from '@gamepark/rules-api';
 import { CustomMoveType } from '../CustomMoveType';
+import { OngoingEffectType } from '../material/OngoingEffect';
+import { Memory } from '../Memory';
 import { RuleId } from './RuleId';
 export class EndPlayerTurnRule extends PlayerTurnRule {
     getPlayerMoves() {
@@ -7,6 +9,7 @@ export class EndPlayerTurnRule extends PlayerTurnRule {
     }
     onCustomMove(move) {
         if (move.type === CustomMoveType.Pass) {
+            this.memorize(Memory.OngoingEffects, (effects) => effects.filter((e) => e.type !== OngoingEffectType.PassTurn));
             return [this.startPlayerTurn(RuleId.StartPlayerTurn, this.nextPlayer)];
         }
         return [];

package/dist/rules/MulliganEffectRule.d.ts

@@ -1,7 +1,8 @@
 import { CustomMove } from '@gamepark/rules-api';
 import { DiscardEffectRule } from './DiscardEffectRule';
 export declare class MulliganEffectRule extends DiscardEffectRule {
-    get discardCount(): number;
     getPlayerMoves(): import("@gamepark/rules-api").MaterialMove[];
+    onRuleStart(): never[];
+    onDiscard(): never[];
     onCustomMove(move: CustomMove): import("@gamepark/rules-api").MaterialMove[];
 }

package/dist/rules/MulliganEffectRule.js

@@ -2,17 +2,28 @@ import { CustomMoveType } from '../CustomMoveType';
 import { Memory } from '../Memory';
 import { DiscardEffectRule } from './DiscardEffectRule';
 export class MulliganEffectRule extends DiscardEffectRule {
-    get discardCount() {
-        return Infinity;
-    }
     getPlayerMoves() {
         const moves = super.getPlayerMoves();
         moves.push(this.customMove(CustomMoveType.Pass));
         return moves;
     }
+    onRuleStart() {
+        this.memorize(Memory.EffectCount, 0);
+        return [];
+    }
+    onDiscard() {
+        this.memorize(Memory.EffectCount, (count) => count + 1);
+        return [];
+    }
     onCustomMove(move) {
         if (move.type === CustomMoveType.Pass) {
-            return [this.customMove(CustomMoveType.Draw, { player: this.player, quantity: this.remind(Memory.EffectCount) }), ...this.endEffect()];
+            const discarded = this.remind(Memory.EffectCount);
+            if (discarded > 0) {
+                return [this.customMove(CustomMoveType.Draw, { player: this.player, quantity: discarded }), ...this.endEffect()];
+            }
+            else {
+                return this.endEffect();
+            }
         }
         return super.onCustomMove(move);
     }

package/dist/rules/PlayCardRule.d.ts

@@ -5,5 +5,4 @@ export declare class PlayCardRule extends PlayerTurnRule {
     get cardsICanPlay(): import("@gamepark/rules-api").Material<number, number, number>;
     afterItemMove(move: ItemMove): MaterialMove[];
     onCustomMove(move: CustomMove): MaterialMove[];
-    private hasMorePower;
 }

package/dist/rules/PlayCardRule.js

@@ -49,7 +49,7 @@ export class PlayCardRule extends PlayerTurnRule {
             }
         }
         if (isMoveItemType(MaterialType.Card)(move) || isMoveItemType(MaterialType.PowerToken)(move)) {
-            if (this.remind(Memory.CardsPlayed, this.player).length > 0 && this.hasMorePower()) {
+            if (new PlayerHelper(this.game, this.player).mustPassTurn()) {
                 return [this.startRule(RuleId.EndPlayerTurn)];
             }
         }
@@ -70,7 +70,4 @@ export class PlayCardRule extends PlayerTurnRule {
         }
         return [];
     }
-    hasMorePower() {
-        return new PlayerHelper(this.game, this.player).getPower() > new PlayerHelper(this.game, this.nextPlayer).getPower();
-    }
 }

package/dist/rules/PlayerHelper.d.ts

@@ -14,5 +14,6 @@ export declare class PlayerHelper extends MaterialRulesPart {
     getPower(): number;
     get foe(): number;
     hasMorePower(): boolean;
+    mustPassTurn(): boolean;
     onCardPlayed(cardIndex: number): void;
 }

package/dist/rules/PlayerHelper.js

@@ -30,7 +30,8 @@ export class PlayerHelper extends MaterialRulesPart {
         return this.cardsInPlay.id((id) => id.front === card).length > 0;
     }
     getPower() {
-        return sumBy(this.cardRules, (rule) => rule.getPower());
+        const foeHelper = new PlayerHelper(this.game, this.foe);
+        return sumBy(this.cardRules, (rule) => rule.getPower()) + sumBy(foeHelper.cardRules, (rule) => rule.getFoePowerModifier());
     }
     get foe() {
         return this.game.players.find((p) => p !== this.player);
@@ -38,6 +39,10 @@ export class PlayerHelper extends MaterialRulesPart {
     hasMorePower() {
         return this.getPower() > new PlayerHelper(this.game, this.foe).getPower();
     }
+    mustPassTurn() {
+        const passTurn = this.remind(Memory.OngoingEffects).some(e => e.type === OngoingEffectType.PassTurn);
+        return passTurn || (this.remind(Memory.CardsPlayed, this.player).length > 0 && this.hasMorePower());
+    }
     onCardPlayed(cardIndex) {
         this.memorize(Memory.CardsPlayed, (cards) => [...cards, cardIndex], this.player);
         const cardRule = createCardRule(this.game, cardIndex);

package/dist/rules/RuleId.d.ts

@@ -17,12 +17,14 @@ export declare enum RuleId {
     GainCrystalEffect = 29,
     StealCrystalEffect = 30,
     PlayCardEffect = 31,
+    MulliganEffect = 32,
     PrincessLithaEffect = 103,
-    ArmadaEffect = 110,
     AbiSnakeCharmerEffect = 204,
     WindWrathEffect = 215,
     CavernSkulkerEffect = 302,
     DoomEffect = 315,
+    CycleKeeperEffect = 409,
+    CaveInEffect = 413,
     EyeOfSkyEffect = 603,
     BoardingPartyEffect = 614
 }

package/dist/rules/RuleId.js

@@ -19,12 +19,14 @@ export var RuleId;
     RuleId[RuleId["GainCrystalEffect"] = 29] = "GainCrystalEffect";
     RuleId[RuleId["StealCrystalEffect"] = 30] = "StealCrystalEffect";
     RuleId[RuleId["PlayCardEffect"] = 31] = "PlayCardEffect";
+    RuleId[RuleId["MulliganEffect"] = 32] = "MulliganEffect";
     RuleId[RuleId["PrincessLithaEffect"] = 103] = "PrincessLithaEffect";
-    RuleId[RuleId["ArmadaEffect"] = 110] = "ArmadaEffect";
     RuleId[RuleId["AbiSnakeCharmerEffect"] = 204] = "AbiSnakeCharmerEffect";
     RuleId[RuleId["WindWrathEffect"] = 215] = "WindWrathEffect";
     RuleId[RuleId["CavernSkulkerEffect"] = 302] = "CavernSkulkerEffect";
     RuleId[RuleId["DoomEffect"] = 315] = "DoomEffect";
+    RuleId[RuleId["CycleKeeperEffect"] = 409] = "CycleKeeperEffect";
+    RuleId[RuleId["CaveInEffect"] = 413] = "CaveInEffect";
     RuleId[RuleId["EyeOfSkyEffect"] = 603] = "EyeOfSkyEffect";
     RuleId[RuleId["BoardingPartyEffect"] = 614] = "BoardingPartyEffect";
 })(RuleId || (RuleId = {}));

package/dist/rules/SimultaneousEffectRule.d.ts

@@ -0,0 +1,5 @@
+import { CustomMove, MaterialMove, SimultaneousRule } from '@gamepark/rules-api';
+export declare abstract class SimultaneousEffectRule extends SimultaneousRule {
+    getMovesAfterPlayersDone(): MaterialMove[];
+    onCustomMove(move: CustomMove): MaterialMove[];
+}

package/dist/rules/SimultaneousEffectRule.js

@@ -0,0 +1,14 @@
+import { SimultaneousRule } from '@gamepark/rules-api';
+import { CustomMoveType } from '../CustomMoveType';
+import { EffectRule } from './EffectRule';
+export class SimultaneousEffectRule extends SimultaneousRule {
+    getMovesAfterPlayersDone() {
+        return [this.customMove(CustomMoveType.EndEffect)];
+    }
+    onCustomMove(move) {
+        if (move.type === CustomMoveType.EndEffect) {
+            return new EffectRule(this.game).onEndEffect();
+        }
+        return [];
+    }
+}

package/dist/rules/StartPlayerTurnRule.js

@@ -3,6 +3,7 @@ import { cardProperties } from '../material/CardProperties';
 import { CardType } from '../material/CardType';
 import { LocationType } from '../material/LocationType';
 import { MaterialType } from '../material/MaterialType';
+import { OngoingEffectType } from '../material/OngoingEffect';
 import { Memory } from '../Memory';
 import { PlayerHelper } from './PlayerHelper';
 import { RuleId } from './RuleId';
@@ -12,7 +13,9 @@ export class StartPlayerTurnRule extends PlayerTurnRule {
         this.memorize(Memory.CurrentPlayer, this.player);
         this.memorize(Memory.CardsPlayed, [], this.player);
         this.memorize(Memory.ActivatedCards, []);
-        this.forget(Memory.Suit);
+        if (!this.remind(Memory.OngoingEffects).some(e => e.type === OngoingEffectType.LockSuit)) {
+            this.forget(Memory.Suit);
+        }
         const actionCards = this.material(MaterialType.Card)
             .location(LocationType.PlayArea)
             .player(this.player)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/skyrift",
-  "version": "0.4.2",
+  "version": "0.5.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": "0db12bff770ff3816b402b8eb7151a34c32947f7"
+  "gitHead": "78e16066c5404fd72217e96816b3d8e9396e9993"
 }