From 0279a0b3a373fe5d1c0ec2e645ff70869f680030 Mon Sep 17 00:00:00 2001 From: Theo Salzmann Date: Sun, 13 Oct 2024 15:29:12 +0200 Subject: [PATCH 1/4] Revert "fix: Broken snapshot tests" This reverts commit c795146b4c0dedd4cbbaa13756d7b3d7d9b8e8f6. --- .../__test__/__snapshots__/reducer.test.ts.snap | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Redux/Store/Settings/Expansions/Cards/selected/__test__/__snapshots__/reducer.test.ts.snap b/src/Redux/Store/Settings/Expansions/Cards/selected/__test__/__snapshots__/reducer.test.ts.snap index 61a28412..66392a12 100644 --- a/src/Redux/Store/Settings/Expansions/Cards/selected/__test__/__snapshots__/reducer.test.ts.snap +++ b/src/Redux/Store/Settings/Expansions/Cards/selected/__test__/__snapshots__/reducer.test.ts.snap @@ -145,12 +145,12 @@ Array [ "TomeOfTheAncients", "ConsumeMagic", "PrismaticFlare", - "InscrutableArtifact", + "Inscrutable Artifact", "CavernousMaw", "Glowstone", - "EncasedFossil", + "Encased Fossil", "FoolsGold", - "HarbingerDescent", + "ResonantPearl", "SplinteredGarnet", "SeersWrath", "TetheredSmite", @@ -160,6 +160,13 @@ Array [ "ImbuedPocketwatch", "MicaShard", "ThistleSpear", + "FatalHarmony", + "BouncingBoom", + "SpiritLift", + "Tethered Darts", + "ForceAmplifier", + "ImbuedSmash", + "PatternStrike", "Olivinite", "CacheGlass", "ReflectiveConduit", From e2e6e676491206602847fb62c39f5b314e5fd0db Mon Sep 17 00:00:00 2001 From: Theo Salzmann Date: Sun, 13 Oct 2024 15:29:12 +0200 Subject: [PATCH 2/4] Revert "Inscrutable Artifact ID" This reverts commit 92a00fd546a11f613b1c3b48abfca685ca0f0198. --- src/aer-data/src/ENG/pastAndFuture/cards.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aer-data/src/ENG/pastAndFuture/cards.ts b/src/aer-data/src/ENG/pastAndFuture/cards.ts index 9c911091..bcf7fbbc 100644 --- a/src/aer-data/src/ENG/pastAndFuture/cards.ts +++ b/src/aer-data/src/ENG/pastAndFuture/cards.ts @@ -48,7 +48,7 @@ export const cards: ICard[] = [ type: 'Relic', expansion: 'PAF', name: 'Inscrutable Artifact', - id: 'InscrutableArtifact', + id: 'Inscrutable Artifact', cost: 6, effect: `

Cast any player's prepped spell that costs 5 Æ or less without discarding it. From eb7be541d68136576308bcecef51b5e6664f4f78 Mon Sep 17 00:00:00 2001 From: Theo Salzmann Date: Sun, 13 Oct 2024 15:29:12 +0200 Subject: [PATCH 3/4] Revert "removing Propel because it's in Origins actually lol" This reverts commit 1d605d3dc73060f3fd8399123eec6a8e7a2bfe59. --- src/aer-data/src/ENG/pastAndFuture/cards.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/aer-data/src/ENG/pastAndFuture/cards.ts b/src/aer-data/src/ENG/pastAndFuture/cards.ts index bcf7fbbc..992aedab 100644 --- a/src/aer-data/src/ENG/pastAndFuture/cards.ts +++ b/src/aer-data/src/ENG/pastAndFuture/cards.ts @@ -261,4 +261,18 @@ export const cards: ICard[] = [ `, keywords: ['develop'], }, + { + type: 'Spell', + expansion: 'PAF', + name: 'Propel', + id: 'Propel', + cost: 5, + effect: ` +

+ Cast: Deal 4 damage.
+ If you placed this into your discard pile, swap this card for Gather Force.
+

+ `, + keywords: ['swap'], + }, ] From 8809d7dba50ffa0529c81318befa88d356a81bdb Mon Sep 17 00:00:00 2001 From: Theo Salzmann Date: Sun, 13 Oct 2024 15:29:12 +0200 Subject: [PATCH 4/4] Revert "Fix Harbinger Descent's ID, add missing Propel spell, remove redundant New Age spells." This reverts commit b1389c76d2dd85cc26888db6f9d5d2b3ae855193. --- src/aer-data/src/ENG/pastAndFuture/cards.ts | 109 ++++++++++++++++++-- 1 file changed, 102 insertions(+), 7 deletions(-) diff --git a/src/aer-data/src/ENG/pastAndFuture/cards.ts b/src/aer-data/src/ENG/pastAndFuture/cards.ts index 992aedab..55e2c31e 100644 --- a/src/aer-data/src/ENG/pastAndFuture/cards.ts +++ b/src/aer-data/src/ENG/pastAndFuture/cards.ts @@ -90,7 +90,7 @@ export const cards: ICard[] = [ type: 'Gem', expansion: 'PAF', name: 'Encased Fossil', - id: 'EncasedFossil', + id: 'Encased Fossil', cost: 4, effect: `

@@ -118,7 +118,7 @@ export const cards: ICard[] = [ type: 'Spell', expansion: 'PAF', name: 'Harbinger Descent', - id: 'HarbingerDescent', + id: 'ResonantPearl', cost: 8, effect: `

@@ -263,16 +263,111 @@ export const cards: ICard[] = [ }, { type: 'Spell', - expansion: 'PAF', - name: 'Propel', - id: 'Propel', + expansion: 'NA', + name: 'Fatal Harmony', + id: 'FatalHarmony', cost: 5, effect: `

Cast: Deal 4 damage.
- If you placed this into your discard pile, swap this card for Gather Force.
+ Any ally may discard a Fatal Harmony in hand and draw a card.
+ If they do, deal 3 damage.
+ (Effects that + modify damage affect both instances of damage.) +

+ `, + keywords: [], + }, + { + type: 'Spell', + expansion: 'NA', + name: 'Bouncing Boom', + id: 'BouncingBoom', + cost: 6, + effect: ` +

+ Echo

+

+ Cast: Deal 2 damage. +

+ `, + keywords: ['echo'], + }, + { + type: 'Spell', + expansion: 'NA', + name: 'Spirit Lift', + id: 'SpiritLift', + cost: 8, + effect: ` +

+ While prepped once during your turn when you gain a charge, any ally + gains 2 charges.
+ Cast: Deal 5 damage. +

+ `, + keywords: [], + }, + { + type: 'Spell', + expansion: 'NA', + name: 'Tethered Darts', + id: 'Tethered Darts', + cost: 3, + effect: ` +

+ Cast: Deal 2 damage.
+ If this was cast from an opened III or IV breach, you may place this + into any ally's hand. +

`, - keywords: ['swap'], + keywords: [], + }, + { + type: 'Spell', + expansion: 'NA', + name: 'Force Amplifier', + id: 'ForceAmplifier', + cost: 4, + effect: ` +

+ Cast: Deal 3 damage.
+ If this was cast from an opened III or IV breach, deal 1 additional + damage. +

+ `, + keywords: [], + }, + { + type: 'Spell', + expansion: 'NA', + name: 'Imbued Smash', + id: 'ImbuedSmash', + cost: 5, + effect: ` +

+ Cast: Deal 4 damage.
+ You may discard a card in hand. If you do, deal 2 damage to the nemesis.
+ (Effects that modify damage affect both + instances of damage.) +

+ `, + keywords: [], + }, + { + type: 'Spell', + expansion: 'NA', + name: 'Pattern Strike', + id: 'PatternStrike', + cost: 7, + effect: ` +

+ Cast: Deal 4 damage.
+ You may return to your hand up to two cards in your discard pile + that cost 0 Æ. +

+ `, + keywords: [], }, ]