@gamepark/skyrift 0.2.8 → 0.3.0

package/dist/Deck.d.ts

@@ -1,4 +1,5 @@
 export declare enum Deck {
     HearthBlade = 1,
+    WinSands = 2,
     HighWave = 6
 }

package/dist/Deck.js

@@ -1,5 +1,6 @@
 export var Deck;
 (function (Deck) {
     Deck[Deck["HearthBlade"] = 1] = "HearthBlade";
+    Deck[Deck["WinSands"] = 2] = "WinSands";
     Deck[Deck["HighWave"] = 6] = "HighWave";
 })(Deck || (Deck = {}));

package/dist/Memory.d.ts

@@ -7,5 +7,6 @@ export declare enum Memory {
     CurrentPlayer = 6,
     NextRoundStartPlayer = 7,
     EffectCount = 8,
-    ChallengeConceded = 9
+    ChallengeConceded = 9,
+    OngoingEffects = 10
 }

package/dist/Memory.js

@@ -9,4 +9,5 @@ export var Memory;
     Memory[Memory["NextRoundStartPlayer"] = 7] = "NextRoundStartPlayer";
     Memory[Memory["EffectCount"] = 8] = "EffectCount";
     Memory[Memory["ChallengeConceded"] = 9] = "ChallengeConceded";
+    Memory[Memory["OngoingEffects"] = 10] = "OngoingEffects";
 })(Memory || (Memory = {}));

package/dist/SkyriftRules.d.ts

@@ -11,15 +11,24 @@ import { SacrificeEffectRule } from './material/decks/heathblade/SacrificeEffect
 import { SoulBladeEffectRule } from './material/decks/heathblade/SoulBladeEffectRule';
 import { WatchTowerEffectRule } from './material/decks/heathblade/WatchTowerEffectRule';
 import { BoardingPartyEffectRule } from './material/decks/highwave/BoardingPartyEffectRule';
-import { DarkBlazerEffectRule } from './material/decks/highwave/DarkBlazerEffectRule';
+import { DarkArmageddonEffectRule } from './material/decks/highwave/DarkArmageddonEffectRule';
 import { DawnsDoomEffectRule } from './material/decks/highwave/DawnsDoomEffectRule';
-import { OttoPouchyEffectRule } from './material/decks/highwave/OttoPouchyEffectRule';
-import { PowderMonkeyEffectRule } from './material/decks/highwave/PowderMonkeyEffectRule';
-import { RicoSkeyeEffectRule } from './material/decks/highwave/RicoSkeyeEffectRule';
-import { SaltyDogEffectRule } from './material/decks/highwave/SaltyDogEffectRule';
-import { ScallywagEffectRule } from './material/decks/highwave/ScallywagEffectRule';
-import { SkupperEffectRule } from './material/decks/highwave/SkupperEffectRule';
+import { OttoFactotumEffectRule } from './material/decks/highwave/OttoFactotumEffectRule';
+import { SeaScorcherEffectRule } from './material/decks/highwave/SeaScorcherEffectRule';
+import { EyeOfSkyEffectRule } from './material/decks/highwave/EyeOfSkyEffectRule';
+import { TideRoverEffectRule } from './material/decks/highwave/TideRoverEffectRule';
+import { RiggingRaidersEffectRule } from './material/decks/highwave/RiggingRaidersEffectRule';
+import { OscarScullionEffectRule } from './material/decks/highwave/OscarScullionEffectRule';
 import { SurpriseLootEffectRule } from './material/decks/highwave/SurpriseLootEffectRule';
+import { AbiSnakeCharmerEffectRule } from './material/decks/winsands/AbiSnakeCharmerEffectRule';
+import { DeathTrapEffectRule } from './material/decks/winsands/DeathTrapEffectRule';
+import { DesertRaiderEffectRule } from './material/decks/winsands/DesertRaiderEffectRule';
+import { OasisShamanEffectRule } from './material/decks/winsands/OasisShamanEffectRule';
+import { SandWalkersEffectRule } from './material/decks/winsands/SandWalkersEffectRule';
+import { StarlightBazaarEffectRule } from './material/decks/winsands/StarlightBazaarEffectRule';
+import { VandalsEffectRule } from './material/decks/winsands/VandalsEffectRule';
+import { WindWrathEffectRule } from './material/decks/winsands/WindWrathEffectRule';
+import { WishLampEffectRule } from './material/decks/winsands/WishLampEffectRule';
 import { LocationType } from './material/LocationType';
 import { MaterialType } from './material/MaterialType';
 import { ChallengeRule } from './rules/ChallengeRule';
@@ -55,17 +64,29 @@ export declare class SkyriftRules extends SecretMaterialRules<Deck, MaterialType
         114: typeof WatchTowerEffectRule;
         115: typeof DrawEffectRule;
         116: typeof HarvestEffectRule;
-        601: typeof PowderMonkeyEffectRule;
+        201: typeof DesertRaiderEffectRule;
+        202: typeof DrawEffectRule;
+        204: typeof AbiSnakeCharmerEffectRule;
+        206: typeof VandalsEffectRule;
+        207: typeof DrawEffectRule;
+        208: typeof OasisShamanEffectRule;
+        211: typeof SandWalkersEffectRule;
+        212: typeof WishLampEffectRule;
+        213: typeof StarlightBazaarEffectRule;
+        214: typeof DrawEffectRule;
+        215: typeof WindWrathEffectRule;
+        216: typeof DeathTrapEffectRule;
+        601: typeof SeaScorcherEffectRule;
         602: typeof DrawEffectRule;
-        603: typeof RicoSkeyeEffectRule;
+        603: typeof EyeOfSkyEffectRule;
         605: typeof DiscardEffectRule;
-        606: typeof ScallywagEffectRule;
-        607: typeof OttoPouchyEffectRule;
-        608: typeof SkupperEffectRule;
-        609: typeof SaltyDogEffectRule;
+        606: typeof RiggingRaidersEffectRule;
+        607: typeof OttoFactotumEffectRule;
+        608: typeof OscarScullionEffectRule;
+        609: typeof TideRoverEffectRule;
         610: typeof StealCrystalEffectRule;
         612: typeof GainCrystalEffectRule;
-        613: typeof DarkBlazerEffectRule;
+        613: typeof DarkArmageddonEffectRule;
         614: typeof BoardingPartyEffectRule;
         615: typeof DawnsDoomEffectRule;
         616: typeof SurpriseLootEffectRule;

package/dist/SkyriftRules.js

@@ -11,15 +11,24 @@ import { SacrificeEffectRule } from './material/decks/heathblade/SacrificeEffect
 import { SoulBladeEffectRule } from './material/decks/heathblade/SoulBladeEffectRule';
 import { WatchTowerEffectRule } from './material/decks/heathblade/WatchTowerEffectRule';
 import { BoardingPartyEffectRule } from './material/decks/highwave/BoardingPartyEffectRule';
-import { DarkBlazerEffectRule } from './material/decks/highwave/DarkBlazerEffectRule';
+import { DarkArmageddonEffectRule } from './material/decks/highwave/DarkArmageddonEffectRule';
 import { DawnsDoomEffectRule } from './material/decks/highwave/DawnsDoomEffectRule';
-import { OttoPouchyEffectRule } from './material/decks/highwave/OttoPouchyEffectRule';
-import { PowderMonkeyEffectRule } from './material/decks/highwave/PowderMonkeyEffectRule';
-import { RicoSkeyeEffectRule } from './material/decks/highwave/RicoSkeyeEffectRule';
-import { SaltyDogEffectRule } from './material/decks/highwave/SaltyDogEffectRule';
-import { ScallywagEffectRule } from './material/decks/highwave/ScallywagEffectRule';
-import { SkupperEffectRule } from './material/decks/highwave/SkupperEffectRule';
+import { OttoFactotumEffectRule } from './material/decks/highwave/OttoFactotumEffectRule';
+import { SeaScorcherEffectRule } from './material/decks/highwave/SeaScorcherEffectRule';
+import { EyeOfSkyEffectRule } from './material/decks/highwave/EyeOfSkyEffectRule';
+import { TideRoverEffectRule } from './material/decks/highwave/TideRoverEffectRule';
+import { RiggingRaidersEffectRule } from './material/decks/highwave/RiggingRaidersEffectRule';
+import { OscarScullionEffectRule } from './material/decks/highwave/OscarScullionEffectRule';
 import { SurpriseLootEffectRule } from './material/decks/highwave/SurpriseLootEffectRule';
+import { AbiSnakeCharmerEffectRule } from './material/decks/winsands/AbiSnakeCharmerEffectRule';
+import { DeathTrapEffectRule } from './material/decks/winsands/DeathTrapEffectRule';
+import { DesertRaiderEffectRule } from './material/decks/winsands/DesertRaiderEffectRule';
+import { OasisShamanEffectRule } from './material/decks/winsands/OasisShamanEffectRule';
+import { SandWalkersEffectRule } from './material/decks/winsands/SandWalkersEffectRule';
+import { StarlightBazaarEffectRule } from './material/decks/winsands/StarlightBazaarEffectRule';
+import { VandalsEffectRule } from './material/decks/winsands/VandalsEffectRule';
+import { WindWrathEffectRule } from './material/decks/winsands/WindWrathEffectRule';
+import { WishLampEffectRule } from './material/decks/winsands/WishLampEffectRule';
 import { LocationType } from './material/LocationType';
 import { MaterialType } from './material/MaterialType';
 import { Memory } from './Memory';
@@ -58,17 +67,29 @@ export class SkyriftRules extends SecretMaterialRules {
         [RuleId.WatchTowerEffect]: WatchTowerEffectRule,
         [RuleId.ConfluenceEffect]: DrawEffectRule,
         [RuleId.HarvestEffect]: HarvestEffectRule,
-        [RuleId.PowderMonkeyEffect]: PowderMonkeyEffectRule,
+        [RuleId.DesertRaiderEffect]: DesertRaiderEffectRule,
+        [RuleId.MetamorphEffect]: DrawEffectRule,
+        [RuleId.AbiSnakeCharmerEffect]: AbiSnakeCharmerEffectRule,
+        [RuleId.VandalsEffect]: VandalsEffectRule,
+        [RuleId.MushaFakirEffect]: DrawEffectRule,
+        [RuleId.OasisShamanEffect]: OasisShamanEffectRule,
+        [RuleId.SandWalkersEffect]: SandWalkersEffectRule,
+        [RuleId.WishLampEffect]: WishLampEffectRule,
+        [RuleId.StarlightBazaarEffect]: StarlightBazaarEffectRule,
+        [RuleId.AncientCurseEffect]: DrawEffectRule,
+        [RuleId.WindWrathEffect]: WindWrathEffectRule,
+        [RuleId.DeathTrapEffect]: DeathTrapEffectRule,
+        [RuleId.SeaScorcherEffect]: SeaScorcherEffectRule,
         [RuleId.AeliaSteadyHandEffect]: DrawEffectRule,
-        [RuleId.RicoSkeyeEffect]: RicoSkeyeEffectRule,
+        [RuleId.EyeOfSkyEffect]: EyeOfSkyEffectRule,
         [RuleId.TropicalRuffianEffect]: DiscardEffectRule,
-        [RuleId.ScallywagEffect]: ScallywagEffectRule,
-        [RuleId.OttoPouchyEffect]: OttoPouchyEffectRule,
-        [RuleId.SkupperEffect]: SkupperEffectRule,
-        [RuleId.SaltyDogEffect]: SaltyDogEffectRule,
+        [RuleId.RiggingRaidersEffect]: RiggingRaidersEffectRule,
+        [RuleId.OttoFactotumEffect]: OttoFactotumEffectRule,
+        [RuleId.OscarScullionEffect]: OscarScullionEffectRule,
+        [RuleId.TideRoverEffect]: TideRoverEffectRule,
         [RuleId.LongJawsSilverEffect]: StealCrystalEffectRule,
-        [RuleId.TreasureMapEffect]: GainCrystalEffectRule,
-        [RuleId.DarkBlazerEffect]: DarkBlazerEffectRule,
+        [RuleId.FortunesCourseEffect]: GainCrystalEffectRule,
+        [RuleId.DarkArmageddonEffect]: DarkArmageddonEffectRule,
         [RuleId.BoardingPartyEffect]: BoardingPartyEffectRule,
         [RuleId.DawnsDoomEffect]: DawnsDoomEffectRule,
         [RuleId.SurpriseLootEffect]: SurpriseLootEffectRule
@@ -100,16 +121,22 @@ export class SkyriftRules extends SecretMaterialRules {
             if (origin.type === LocationType.PlayArea && move.location.type !== LocationType.PlayArea) {
                 const cardRule = new PlayerHelper(this.game).getCardRule(move.itemIndex);
                 moves.push(...cardRule.onLeave());
+                this.memorize(Memory.OngoingEffects, (effects) => effects.filter((e) => e.cardIndex !== move.itemIndex));
             }
         }
         else if (isMoveItemTypeAtOnce(MaterialType.Card)(move)) {
+            const leavingIndexes = [];
             for (const itemIndex of move.indexes) {
                 const origin = this.material(MaterialType.Card).getItem(itemIndex).location;
                 if (origin.type === LocationType.PlayArea && move.location.type !== LocationType.PlayArea) {
                     const cardRule = new PlayerHelper(this.game).getCardRule(itemIndex);
                     moves.push(...cardRule.onLeave());
+                    leavingIndexes.push(itemIndex);
                 }
             }
+            if (leavingIndexes.length > 0) {
+                this.memorize(Memory.OngoingEffects, (effects) => effects.filter((e) => !leavingIndexes.includes(e.cardIndex)));
+            }
         }
         return moves;
     }

package/dist/SkyriftSetup.js

@@ -3,6 +3,7 @@ import { shuffle } from 'es-toolkit';
 import { Deck } from './Deck';
 import { HearthBlade } from './material/decks/HearthBlade';
 import { HighWave } from './material/decks/HighWave';
+import { WinSands } from './material/decks/WinSands';
 import { LocationType } from './material/LocationType';
 import { MaterialType } from './material/MaterialType';
 import { Memory } from './Memory';
@@ -10,6 +11,7 @@ import { RuleId } from './rules/RuleId';
 import { SkyriftRules } from './SkyriftRules';
 const deckConfigurations = {
     [Deck.HearthBlade]: HearthBlade,
+    [Deck.WinSands]: WinSands,
     [Deck.HighWave]: HighWave
 };
 export class SkyriftSetup extends MaterialGameSetup {
@@ -17,6 +19,7 @@ export class SkyriftSetup extends MaterialGameSetup {
     setupMaterial(_options) {
         this.setupDecks();
         this.memorize(Memory.PendingEffects, []);
+        this.memorize(Memory.OngoingEffects, []);
         this.memorize(Memory.CrystalsToWin, 6);
     }
     setupDecks() {

package/dist/material/Card.d.ts

@@ -16,19 +16,35 @@ export declare enum Card {
     WatchTower = 114,
     Confluence = 115,
     Harvest = 116,
-    PowderMonkey = 601,
+    DesertRaider = 201,
+    Metamorph = 202,
+    ErgDeathslayer = 203,
+    AbiSnakeCharmer = 204,
+    Catadjinn = 205,
+    Vandals = 206,
+    MushaFakir = 207,
+    OasisShaman = 208,
+    MalikShadowtracker = 209,
+    DuneWardrums = 210,
+    SandWalkers = 211,
+    WishLamp = 212,
+    StarlightBazaar = 213,
+    AncientCurse = 214,
+    WindWrath = 215,
+    DeathTrap = 216,
+    SeaScorcher = 601,
     AeliaSteadyHand = 602,
-    RicoSkeye = 603,
-    MistyGunner = 604,
+    EyeOfSky = 603,
+    BonnyTheGunner = 604,
     TropicalRuffian = 605,
-    Scallywag = 606,
-    OttoPouchy = 607,
-    Skupper = 608,
-    SaltyDog = 609,
+    RiggingRaiders = 606,
+    OttoFactotum = 607,
+    OscarScullion = 608,
+    TideRover = 609,
     LongJawsSilver = 610,
-    BrassDragon = 611,
-    TreasureMap = 612,
-    DarkBlazer = 613,
+    GoldenApocalypse = 611,
+    FortunesCourse = 612,
+    DarkArmageddon = 613,
     BoardingParty = 614,
     DawnsDoom = 615,
     SurpriseLoot = 616

package/dist/material/Card.js

@@ -16,19 +16,35 @@ export var Card;
     Card[Card["WatchTower"] = 114] = "WatchTower";
     Card[Card["Confluence"] = 115] = "Confluence";
     Card[Card["Harvest"] = 116] = "Harvest";
-    Card[Card["PowderMonkey"] = 601] = "PowderMonkey";
+    Card[Card["DesertRaider"] = 201] = "DesertRaider";
+    Card[Card["Metamorph"] = 202] = "Metamorph";
+    Card[Card["ErgDeathslayer"] = 203] = "ErgDeathslayer";
+    Card[Card["AbiSnakeCharmer"] = 204] = "AbiSnakeCharmer";
+    Card[Card["Catadjinn"] = 205] = "Catadjinn";
+    Card[Card["Vandals"] = 206] = "Vandals";
+    Card[Card["MushaFakir"] = 207] = "MushaFakir";
+    Card[Card["OasisShaman"] = 208] = "OasisShaman";
+    Card[Card["MalikShadowtracker"] = 209] = "MalikShadowtracker";
+    Card[Card["DuneWardrums"] = 210] = "DuneWardrums";
+    Card[Card["SandWalkers"] = 211] = "SandWalkers";
+    Card[Card["WishLamp"] = 212] = "WishLamp";
+    Card[Card["StarlightBazaar"] = 213] = "StarlightBazaar";
+    Card[Card["AncientCurse"] = 214] = "AncientCurse";
+    Card[Card["WindWrath"] = 215] = "WindWrath";
+    Card[Card["DeathTrap"] = 216] = "DeathTrap";
+    Card[Card["SeaScorcher"] = 601] = "SeaScorcher";
     Card[Card["AeliaSteadyHand"] = 602] = "AeliaSteadyHand";
-    Card[Card["RicoSkeye"] = 603] = "RicoSkeye";
-    Card[Card["MistyGunner"] = 604] = "MistyGunner";
+    Card[Card["EyeOfSky"] = 603] = "EyeOfSky";
+    Card[Card["BonnyTheGunner"] = 604] = "BonnyTheGunner";
     Card[Card["TropicalRuffian"] = 605] = "TropicalRuffian";
-    Card[Card["Scallywag"] = 606] = "Scallywag";
-    Card[Card["OttoPouchy"] = 607] = "OttoPouchy";
-    Card[Card["Skupper"] = 608] = "Skupper";
-    Card[Card["SaltyDog"] = 609] = "SaltyDog";
+    Card[Card["RiggingRaiders"] = 606] = "RiggingRaiders";
+    Card[Card["OttoFactotum"] = 607] = "OttoFactotum";
+    Card[Card["OscarScullion"] = 608] = "OscarScullion";
+    Card[Card["TideRover"] = 609] = "TideRover";
     Card[Card["LongJawsSilver"] = 610] = "LongJawsSilver";
-    Card[Card["BrassDragon"] = 611] = "BrassDragon";
-    Card[Card["TreasureMap"] = 612] = "TreasureMap";
-    Card[Card["DarkBlazer"] = 613] = "DarkBlazer";
+    Card[Card["GoldenApocalypse"] = 611] = "GoldenApocalypse";
+    Card[Card["FortunesCourse"] = 612] = "FortunesCourse";
+    Card[Card["DarkArmageddon"] = 613] = "DarkArmageddon";
     Card[Card["BoardingParty"] = 614] = "BoardingParty";
     Card[Card["DawnsDoom"] = 615] = "DawnsDoom";
     Card[Card["SurpriseLoot"] = 616] = "SurpriseLoot";

package/dist/material/CardProperties.js

@@ -1,20 +1,36 @@
 import { Card } from './Card';
 import { AeliaSteadyHand } from './decks/highwave/AeliaSteadyHand';
 import { BoardingParty } from './decks/highwave/BoardingParty';
-import { BrassDragon } from './decks/highwave/BrassDragon';
-import { DarkBlazer } from './decks/highwave/DarkBlazer';
+import { GoldenApocalypse } from './decks/highwave/GoldenApocalypse';
+import { DarkArmageddon } from './decks/highwave/DarkArmageddon';
 import { DawnsDoom } from './decks/highwave/DawnsDoom';
 import { LongJawsSilver } from './decks/highwave/LongJawsSilver';
-import { MistyGunner } from './decks/highwave/MistyGunner';
-import { OttoPouchy } from './decks/highwave/OttoPouchy';
-import { PowderMonkey } from './decks/highwave/PowderMonkey';
-import { RicoSkeye } from './decks/highwave/RicoSkeye';
-import { SaltyDog } from './decks/highwave/SaltyDog';
-import { Scallywag } from './decks/highwave/Scallywag';
-import { Skupper } from './decks/highwave/Skupper';
+import { BonnyTheGunner } from './decks/highwave/BonnyTheGunner';
+import { OttoFactotum } from './decks/highwave/OttoFactotum';
+import { SeaScorcher } from './decks/highwave/SeaScorcher';
+import { EyeOfSky } from './decks/highwave/EyeOfSky';
+import { TideRover } from './decks/highwave/TideRover';
+import { RiggingRaiders } from './decks/highwave/RiggingRaiders';
+import { OscarScullion } from './decks/highwave/OscarScullion';
 import { SurpriseLoot } from './decks/highwave/SurpriseLoot';
-import { TreasureMap } from './decks/highwave/TreasureMap';
+import { FortunesCourse } from './decks/highwave/FortunesCourse';
 import { TropicalRuffian } from './decks/highwave/TropicalRuffian';
+import { AbiSnakeCharmer } from './decks/winsands/AbiSnakeCharmer';
+import { AncientCurse } from './decks/winsands/AncientCurse';
+import { Catadjinn } from './decks/winsands/Catadjinn';
+import { DeathTrap } from './decks/winsands/DeathTrap';
+import { DesertRaider } from './decks/winsands/DesertRaider';
+import { DuneWardrums } from './decks/winsands/DuneWardrums';
+import { ErgDeathslayer } from './decks/winsands/ErgDeathslayer';
+import { MalikShadowtracker } from './decks/winsands/MalikShadowtracker';
+import { Metamorph } from './decks/winsands/Metamorph';
+import { MushaFakir } from './decks/winsands/MushaFakir';
+import { OasisShaman } from './decks/winsands/OasisShaman';
+import { SandWalkers } from './decks/winsands/SandWalkers';
+import { StarlightBazaar } from './decks/winsands/StarlightBazaar';
+import { Vandals } from './decks/winsands/Vandals';
+import { WindWrath } from './decks/winsands/WindWrath';
+import { WishLamp } from './decks/winsands/WishLamp';
 import { Armada } from './decks/heathblade/Armada';
 import { Confluence } from './decks/heathblade/Confluence';
 import { CoverOfNight } from './decks/heathblade/CoverOfNight';
@@ -48,19 +64,35 @@ export const cardProperties = {
     [Card.WatchTower]: WatchTower,
     [Card.Confluence]: Confluence,
     [Card.Harvest]: Harvest,
-    [Card.PowderMonkey]: PowderMonkey,
+    [Card.DesertRaider]: DesertRaider,
+    [Card.Metamorph]: Metamorph,
+    [Card.ErgDeathslayer]: ErgDeathslayer,
+    [Card.AbiSnakeCharmer]: AbiSnakeCharmer,
+    [Card.Catadjinn]: Catadjinn,
+    [Card.Vandals]: Vandals,
+    [Card.MushaFakir]: MushaFakir,
+    [Card.OasisShaman]: OasisShaman,
+    [Card.MalikShadowtracker]: MalikShadowtracker,
+    [Card.DuneWardrums]: DuneWardrums,
+    [Card.SandWalkers]: SandWalkers,
+    [Card.WishLamp]: WishLamp,
+    [Card.StarlightBazaar]: StarlightBazaar,
+    [Card.AncientCurse]: AncientCurse,
+    [Card.WindWrath]: WindWrath,
+    [Card.DeathTrap]: DeathTrap,
+    [Card.SeaScorcher]: SeaScorcher,
     [Card.AeliaSteadyHand]: AeliaSteadyHand,
-    [Card.RicoSkeye]: RicoSkeye,
-    [Card.MistyGunner]: MistyGunner,
+    [Card.EyeOfSky]: EyeOfSky,
+    [Card.BonnyTheGunner]: BonnyTheGunner,
     [Card.TropicalRuffian]: TropicalRuffian,
-    [Card.Scallywag]: Scallywag,
-    [Card.OttoPouchy]: OttoPouchy,
-    [Card.Skupper]: Skupper,
-    [Card.SaltyDog]: SaltyDog,
+    [Card.RiggingRaiders]: RiggingRaiders,
+    [Card.OttoFactotum]: OttoFactotum,
+    [Card.OscarScullion]: OscarScullion,
+    [Card.TideRover]: TideRover,
     [Card.LongJawsSilver]: LongJawsSilver,
-    [Card.BrassDragon]: BrassDragon,
-    [Card.TreasureMap]: TreasureMap,
-    [Card.DarkBlazer]: DarkBlazer,
+    [Card.GoldenApocalypse]: GoldenApocalypse,
+    [Card.FortunesCourse]: FortunesCourse,
+    [Card.DarkArmageddon]: DarkArmageddon,
     [Card.BoardingParty]: BoardingParty,
     [Card.DawnsDoom]: DawnsDoom,
     [Card.SurpriseLoot]: SurpriseLoot

package/dist/material/CardRule.d.ts

@@ -1,8 +1,8 @@
 import { MaterialGame, MaterialMove, MaterialRulesPart } from '@gamepark/rules-api';
 import { Deck } from '../Deck';
-import { RuleId } from '../rules/RuleId';
 import { Card, CardId } from './Card';
 import { CardTag } from './CardTag';
+import { OngoingEffectType } from './OngoingEffect';
 export declare class CardRule extends MaterialRulesPart {
     index: number;
     constructor(game: MaterialGame, index: number);
@@ -16,7 +16,7 @@ export declare class CardRule extends MaterialRulesPart {
     entersEffect: boolean;
     challenge: boolean;
     onChallengeAccepted(): import("@gamepark/rules-api").CustomMove[];
-    onChallengeDeclined(): import("@gamepark/rules-api").StartPlayerTurn<number, RuleId.EndRound>[];
+    onChallengeDeclined(): MaterialMove[];
     onLeave(): MaterialMove[];
     removePowerTokens(): import("@gamepark/rules-api").DeleteItem<number>[];
     removeStunTokens(): import("@gamepark/rules-api").DeleteItem<number>[];
@@ -27,6 +27,7 @@ export declare class CardRule extends MaterialRulesPart {
     getPower(): number;
     getPowerIfNotStunned(): number;
     addPendingEffect(): void;
+    addOngoingEffect(type: OngoingEffectType): void;
     get player(): number;
     get opponent(): number;
     startEffect(): MaterialMove[];

package/dist/material/CardRule.js

@@ -6,6 +6,7 @@ import { cardProperties } from './CardProperties';
 import { CardSuit } from './CardSuit';
 import { LocationType } from './LocationType';
 import { MaterialType } from './MaterialType';
+import { OngoingEffectType } from './OngoingEffect';
 export class CardRule extends MaterialRulesPart {
     index;
     constructor(game, index) {
@@ -83,6 +84,9 @@ export class CardRule extends MaterialRulesPart {
     addPendingEffect() {
         this.memorize(Memory.PendingEffects, (effects) => [...effects, { cardIndex: this.index }]);
     }
+    addOngoingEffect(type) {
+        this.memorize(Memory.OngoingEffects, (effects) => [...effects, { type, cardIndex: this.index }]);
+    }
     get player() {
         return this.item.location.player;
     }
@@ -103,6 +107,16 @@ export class CardRule extends MaterialRulesPart {
         }
     }
     canBePlayed() {
+        const ongoingEffects = this.remind(Memory.OngoingEffects);
+        const forcedSuit = ongoingEffects.find((e) => e.type === OngoingEffectType.ForcedSuit);
+        if (forcedSuit) {
+            const sourceCard = this.material(MaterialType.Card).getItem(forcedSuit.cardIndex);
+            if (sourceCard.location.player !== this.player) {
+                const forcedSuitValue = cardProperties[sourceCard.id.front].suit;
+                if (this.properties.suit !== forcedSuitValue)
+                    return false;
+            }
+        }
         const currentSuit = this.remind(Memory.Suit);
         const cardSuit = this.properties.suit;
         return !(cardSuit === CardSuit.Night && currentSuit === CardSuit.Day) && !(cardSuit === CardSuit.Day && currentSuit === CardSuit.Night);

package/dist/material/OngoingEffect.d.ts

@@ -0,0 +1,8 @@
+export declare enum OngoingEffectType {
+    ForcedSuit = 1,
+    DeathTrap = 2
+}
+export type OngoingEffect = {
+    type: OngoingEffectType;
+    cardIndex: number;
+};

package/dist/material/OngoingEffect.js

@@ -0,0 +1,5 @@
+export var OngoingEffectType;
+(function (OngoingEffectType) {
+    OngoingEffectType[OngoingEffectType["ForcedSuit"] = 1] = "ForcedSuit";
+    OngoingEffectType[OngoingEffectType["DeathTrap"] = 2] = "DeathTrap";
+})(OngoingEffectType || (OngoingEffectType = {}));

package/dist/material/decks/HearthBlade.js

@@ -9,11 +9,11 @@ export const HearthBlade = {
     [Card.ElaraBlazingArrow]: 1,
     [Card.WoodSlinger]: 2,
     [Card.OzmaTheMage]: 1,
-    [Card.Armada]: 2,
-    [Card.SoulBlade]: 1,
-    [Card.CoverOfNight]: 2,
+    [Card.Armada]: 1,
+    [Card.SoulBlade]: 2,
+    [Card.CoverOfNight]: 1,
     [Card.Sacrifice]: 1,
-    [Card.WatchTower]: 1,
+    [Card.WatchTower]: 2,
     [Card.Confluence]: 2,
     [Card.Harvest]: 1
 };

package/dist/material/decks/HighWave.js

@@ -1,18 +1,18 @@
 import { Card } from '../Card';
 export const HighWave = {
-    [Card.PowderMonkey]: 2,
+    [Card.SeaScorcher]: 2,
     [Card.AeliaSteadyHand]: 1,
-    [Card.RicoSkeye]: 1,
-    [Card.MistyGunner]: 2,
+    [Card.EyeOfSky]: 2,
+    [Card.BonnyTheGunner]: 1,
     [Card.TropicalRuffian]: 2,
-    [Card.Scallywag]: 2,
-    [Card.OttoPouchy]: 1,
-    [Card.Skupper]: 1,
-    [Card.SaltyDog]: 2,
+    [Card.RiggingRaiders]: 2,
+    [Card.OttoFactotum]: 1,
+    [Card.OscarScullion]: 1,
+    [Card.TideRover]: 2,
     [Card.LongJawsSilver]: 1,
-    [Card.BrassDragon]: 2,
-    [Card.TreasureMap]: 1,
-    [Card.DarkBlazer]: 2,
+    [Card.GoldenApocalypse]: 2,
+    [Card.FortunesCourse]: 1,
+    [Card.DarkArmageddon]: 2,
     [Card.BoardingParty]: 1,
     [Card.DawnsDoom]: 2,
     [Card.SurpriseLoot]: 1

package/dist/material/decks/WinSands.d.ts

@@ -0,0 +1,18 @@
+export declare const WinSands: {
+    201: number;
+    202: number;
+    203: number;
+    204: number;
+    205: number;
+    206: number;
+    207: number;
+    208: number;
+    209: number;
+    210: number;
+    211: number;
+    212: number;
+    213: number;
+    214: number;
+    215: number;
+    216: number;
+};

package/dist/material/decks/WinSands.js

@@ -0,0 +1,19 @@
+import { Card } from '../Card';
+export const WinSands = {
+    [Card.DesertRaider]: 2,
+    [Card.Metamorph]: 2,
+    [Card.ErgDeathslayer]: 1,
+    [Card.AbiSnakeCharmer]: 1,
+    [Card.Catadjinn]: 2,
+    [Card.Vandals]: 2,
+    [Card.MushaFakir]: 1,
+    [Card.OasisShaman]: 2,
+    [Card.MalikShadowtracker]: 1,
+    [Card.DuneWardrums]: 2,
+    [Card.SandWalkers]: 1,
+    [Card.WishLamp]: 2,
+    [Card.StarlightBazaar]: 1,
+    [Card.AncientCurse]: 1,
+    [Card.WindWrath]: 1,
+    [Card.DeathTrap]: 2
+};

package/dist/material/decks/heathblade/Confluence.js

@@ -12,7 +12,7 @@ class ConfluenceRule extends CardRule {
     }
 }
 export const Confluence = {
-    power: 1,
+    power: 2,
     type: CardType.Action,
     suit: CardSuit.Twilight,
     rule: ConfluenceRule

package/dist/material/decks/heathblade/Harvest.js

@@ -5,7 +5,7 @@ class HarvestRule extends CardRule {
     entersEffect = true;
 }
 export const Harvest = {
-    power: 1,
+    power: 2,
     type: CardType.Action,
     suit: CardSuit.Twilight,
     rule: HarvestRule

package/dist/material/decks/heathblade/OzmaTheMageEffectRule.js

@@ -1,17 +1,15 @@
 import { EffectRule } from '../../../rules/EffectRule';
-import { Memory } from '../../../Memory';
 import { LocationType } from '../../LocationType';
 import { MaterialType } from '../../MaterialType';
 export class OzmaTheMageEffectRule extends EffectRule {
     onRuleStart() {
-        const ozmaIndex = this.remind(Memory.PendingEffects)[0].cardIndex;
         return [
             this.material(MaterialType.PowerToken)
                 .location(LocationType.PowerTokenStock)
                 .createItem({
                 location: {
                     type: LocationType.CardPowerTokens,
-                    parent: ozmaIndex
+                    parent: this.effectCardIndex
                 }
             }),
             ...this.endEffect()

package/dist/material/decks/heathblade/RobbinsMasterOfArmsEffectRule.js

@@ -1,4 +1,3 @@
-import { Memory } from '../../../Memory';
 import { cardProperties } from '../../CardProperties';
 import { CardType } from '../../CardType';
 import { LocationType } from '../../LocationType';
@@ -7,13 +6,12 @@ import { EffectRule } from '../../../rules/EffectRule';
 export class RobbinsMasterOfArmsEffectRule extends EffectRule {
     onRuleStart() {
         const moves = [];
-        const robbinsIndex = this.remind(Memory.PendingEffects)[0].cardIndex;
         const otherCreatures = this.material(MaterialType.Card)
             .location(LocationType.PlayArea)
             .player(this.player)
             .id((id) => cardProperties[id.front].type === CardType.Creature)
             .getIndexes()
-            .filter(index => index !== robbinsIndex);
+            .filter(index => index !== this.effectCardIndex);
         for (const creatureIndex of otherCreatures) {
             moves.push(this.material(MaterialType.PowerToken)
                 .location(LocationType.PowerTokenStock)