Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] delete some New Age spells duplicated in P&F #539

Merged
merged 4 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions cypress/e2e/Expeditions/creationAndRunThrough.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
})

Expand All @@ -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()
})

Expand Down Expand Up @@ -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 })
Expand Down Expand Up @@ -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')
})
Expand Down
8 changes: 4 additions & 4 deletions cypress/e2e/Expeditions/seeds.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,6 @@ Array [
"ImbuedPocketwatch",
"MicaShard",
"ThistleSpear",
"FatalHarmony",
"BouncingBoom",
"SpiritLift",
"Tethered Darts",
"ForceAmplifier",
"ImbuedSmash",
"PatternStrike",
"Olivinite",
"CacheGlass",
"ReflectiveConduit",
Expand Down
109 changes: 0 additions & 109 deletions src/aer-data/src/ENG/pastAndFuture/cards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,113 +262,4 @@ export const cards: ICard[] = [
`,
keywords: ['develop'],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Fatal Harmony',
id: 'FatalHarmony',
cost: 5,
effect: `
<p>
<b>Cast:</b> Deal 4 damage.<br/>
Any ally may discard a Fatal Harmony in hand and draw a card.<br/>
If they do, deal 3 damage.<br/>
<span class="hint">(Effects that
modify damage affect both instances of damage.)</span>
</p>
`,
keywords: [],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Bouncing Boom',
id: 'BouncingBoom',
cost: 6,
effect: `
<p>
<b>Echo</b>
</p>
<p>
<b>Cast:</b> Deal 2 damage.
</p>
`,
keywords: ['echo'],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Spirit Lift',
id: 'SpiritLift',
cost: 8,
effect: `
<p>
While prepped once during your turn when you gain a charge, any ally
gains 2 charges.<br/>
<b>Cast:</b> Deal 5 damage.
</p>
`,
keywords: [],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Tethered Darts',
id: 'Tethered Darts',
cost: 3,
effect: `
<p>
<b>Cast:</b> Deal 2 damage.<br/>
If this was cast from an opened III or IV breach, you may place this
into any ally's hand.
</p>
`,
keywords: [],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Force Amplifier',
id: 'ForceAmplifier',
cost: 4,
effect: `
<p>
<b>Cast:</b> Deal 3 damage.<br/>
If this was cast from an opened III or IV breach, deal 1 additional
damage.
</p>
`,
keywords: [],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Imbued Smash',
id: 'ImbuedSmash',
cost: 5,
effect: `
<p>
<b>Cast:</b> Deal 4 damage.<br/>
You may discard a card in hand. If you do, deal 2 damage to the nemesis.<br/>
<span class="hint">(Effects that modify damage affect both
instances of damage.)</span>
</p>
`,
keywords: [],
},
{
type: 'Spell',
expansion: 'NA',
name: 'Pattern Strike',
id: 'PatternStrike',
cost: 7,
effect: `
<p>
<b>Cast:</b> Deal 4 damage.<br/>
You may return to your hand up to two cards in your discard pile
that cost 0 <span class="aether">&AElig;</span>.
</p>
`,
keywords: [],
},
]
Loading