From d9c092f928b2a7fdea8fd3b822fbd02eb0b9ca6e Mon Sep 17 00:00:00 2001 From: Dan Rosart Date: Tue, 31 Dec 2024 21:40:25 +0000 Subject: [PATCH 1/3] [Fix] delete some New Age spells duplicated in P&F --- src/aer-data/src/ENG/pastAndFuture/cards.ts | 109 -------------------- 1 file changed, 109 deletions(-) diff --git a/src/aer-data/src/ENG/pastAndFuture/cards.ts b/src/aer-data/src/ENG/pastAndFuture/cards.ts index bc9adcfd..f52e1dfa 100644 --- a/src/aer-data/src/ENG/pastAndFuture/cards.ts +++ b/src/aer-data/src/ENG/pastAndFuture/cards.ts @@ -261,113 +261,4 @@ export const cards: ICard[] = [ `, keywords: ['develop'], }, - { - type: 'Spell', - expansion: 'NA', - name: 'Fatal Harmony', - id: 'FatalHarmony', - cost: 5, - effect: ` -

- Cast: Deal 4 damage.
- 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: [], - }, - { - 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: [], - }, ] From 30e73efd5e515ffd2f1f34b090efd43bdeeb9d6b Mon Sep 17 00:00:00 2001 From: Dan Rosart Date: Tue, 31 Dec 2024 21:48:27 +0000 Subject: [PATCH 2/3] Update snapshot --- .../selected/__test__/__snapshots__/reducer.test.ts.snap | 7 ------- 1 file changed, 7 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 ca36b900..0736759b 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 @@ -178,13 +178,6 @@ Array [ "ImbuedPocketwatch", "MicaShard", "ThistleSpear", - "FatalHarmony", - "BouncingBoom", - "SpiritLift", - "Tethered Darts", - "ForceAmplifier", - "ImbuedSmash", - "PatternStrike", "Olivinite", "CacheGlass", "ReflectiveConduit", From 22c496b272de20ca02d1a80adb1d1d3e6370a103 Mon Sep 17 00:00:00 2001 From: Dan Rosart Date: Tue, 31 Dec 2024 22:23:54 +0000 Subject: [PATCH 3/3] Fix cypress --- .../Expeditions/creationAndRunThrough.cy.ts | 20 +++++++++++-------- cypress/e2e/Expeditions/seeds.cy.ts | 8 ++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/cypress/e2e/Expeditions/creationAndRunThrough.cy.ts b/cypress/e2e/Expeditions/creationAndRunThrough.cy.ts index 8b75ae2f..bed760c4 100644 --- a/cypress/e2e/Expeditions/creationAndRunThrough.cy.ts +++ b/cypress/e2e/Expeditions/creationAndRunThrough.cy.ts @@ -61,7 +61,7 @@ describe('Expedition creation and run through', () => { .contains('Reflective Conduit') .click() .get('p') - .contains('Combustion') + .contains('Psychic Eruption') .click() .get('[data-test="btn-continue"]') .click() @@ -74,7 +74,7 @@ describe('Expedition creation and run through', () => { cy.get('[data-test="btn-battle-won"]').click() cy.get('p').contains('Energized Rubidium').click() cy.get('p').contains('Primordial Fetish').click() - cy.get('p').contains('Catalyst').click() + cy.get('p').contains('Char').click() cy.get('[data-test="btn-continue"]').click() }) @@ -85,7 +85,7 @@ describe('Expedition creation and run through', () => { cy.get('[data-test="btn-battle-won"]').click() cy.get('p').contains('Searing Ruby').click() cy.get('p').contains('Scholars Opus').click() - cy.get('p').contains('Reduce To Ash').click() + cy.get('p').contains('Carbonize').click() cy.get('[data-test="btn-continue"]').click() }) @@ -130,11 +130,12 @@ describe('Expedition creation and run through', () => { cy.get('p').contains('Oblivium Resin').should('be.visible') cy.get('p').contains('Transmogrifier').should('be.visible') cy.get('p').contains('Breach Extractor').should('be.visible') + cy.get('p').contains('Feral Lightning').scrollIntoView() cy.get('p').contains('Feral Lightning').should('be.visible') - cy.get('p').contains('Wildfire Whip').scrollIntoView() - cy.get('p').contains('Wildfire Whip').should('be.visible') + cy.get('p').contains('Amplify Vision').scrollIntoView() + cy.get('p').contains('Amplify Vision').should('be.visible') cy.get('p').contains('Celestial Spire').should('be.visible') - cy.get('p').contains('Pyromancy').should('be.visible') + cy.get('p').contains('Scrying Bolt').should('be.visible') // Treasures cy.get('[data-test="treasure"]').click({ force: true }) @@ -182,13 +183,16 @@ describe('Expedition creation and run through', () => { cy.get('p').contains('Vriswood Amber').should('be.visible') cy.get('p').contains('Dread Diamond').should('be.visible') cy.get('p').contains('Reflective Conduit').should('be.visible') - cy.get('p').contains('Combustion').scrollIntoView().should('be.visible') + cy.get('p') + .contains('Psychic Eruption') + .scrollIntoView() + .should('be.visible') cy.get('p').contains('Energized Rubidium').should('be.visible') cy.get('p') .contains('Primordial Fetish') .scrollIntoView() .should('be.visible') - cy.get('p').contains('Catalyst').should('be.visible') + cy.get('p').contains('Char').should('be.visible') cy.get('p').contains('Searing Ruby').should('be.visible') cy.get('p').contains('Scholars Opus').should('be.visible') }) diff --git a/cypress/e2e/Expeditions/seeds.cy.ts b/cypress/e2e/Expeditions/seeds.cy.ts index 4f369c77..1517e158 100644 --- a/cypress/e2e/Expeditions/seeds.cy.ts +++ b/cypress/e2e/Expeditions/seeds.cy.ts @@ -48,7 +48,7 @@ describe('seeds', () => { cy.get('[data-test="btn-battle-won"]').click() cy.get('p').contains('Dread Diamond').click() cy.get('p').contains('Reflective Conduit').click() - cy.get('p').contains('Combustion').click() + cy.get('p').contains('Psychic Eruption').click() cy.get('[data-test="btn-continue"]').click() cy.get('[data-test=btn-battle]').eq(1).click() @@ -83,7 +83,7 @@ describe('seeds', () => { cy.get('[data-test="btn-battle-won"]').click() cy.get('p').contains('Dread Diamond').click() cy.get('p').contains('Reflective Conduit').click() - cy.get('p').contains('Combustion').click() + cy.get('p').contains('Psychic Eruption').click() cy.get('[data-test="btn-continue"]').click() cy.get('[data-test=btn-battle]').eq(1).click() @@ -116,7 +116,7 @@ describe('seeds', () => { cy.get('[data-test="btn-battle-won"]').click() cy.get('p').contains('Summonite').click() cy.get('p').contains('Conclave Scroll').click() - cy.get('p').contains('Storm Vapor').click() + cy.get('p').contains('Embody Flame').click() cy.get('[data-test="btn-continue"]').click() @@ -151,7 +151,7 @@ describe('seeds', () => { cy.get('[data-test="btn-battle-won"]').click() cy.get('p').contains('Voidium Spike').click() cy.get('p').contains('Caged Fire').scrollIntoView().click() - cy.get('p').contains('Convection Field').click() + cy.get('p').contains('Jagged Lightning').click() cy.get('[data-test="btn-continue"]').click()