Skip to content

Commit

Permalink
Merge pull request #235 from oskarrough/feature/card-descriptions
Browse files Browse the repository at this point in the history
Unify card names and descriptions
  • Loading branch information
oskarrough authored Feb 26, 2024
2 parents c071551 + 00f7026 commit 9d8af1d
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/content/cards.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const cardIndex = [
'summer-of-sam',
'terror',
'thunderclap',
'voodoo-education',
'voodoo-gift',
]

/**
Expand Down
2 changes: 1 addition & 1 deletion src/content/cards/adrenaline.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ export const upgrade = (card) => {
a.parameter.amount = 2
return {
...card,
description: 'Gain 2 Energy. Draw 2 Cards. Exhaust.',
description: 'Gain 2 Energy. Draw 2 cards. Exhaust.',
}
}
4 changes: 2 additions & 2 deletions src/content/cards/bludgeon.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ export default {
energy: 3,
target: 'enemy',
damage: 24,
description: 'Deal 24 Damage.',
description: 'Deal 24 damage.',
image: 'alice-holds-the-white-king.jpg',
}

export const upgrade = (card) => {
return {
...card,
damage: 36,
description: 'Deal 36 Damage.',
description: 'Deal 36 damage.',
}
}
2 changes: 1 addition & 1 deletion src/content/cards/body-slam.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export default {
energy: 1,
type: 'attack',
target: 'enemy',
description: 'Deal Damage equal to your Block.',
description: 'Deal damage equal to your Block.',
image: 'fallback.jpg',
actions: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/content/cards/cleave.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export default {
export const upgrade = (card) => ({
...card,
damage: 11,
description: 'Deal 11 Damage to all enemies.',
description: 'Deal 11 damage to all enemies.',
})
2 changes: 1 addition & 1 deletion src/content/cards/intimidate.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ export const upgrade = (card) => {
card.powers.weak = 2
return {
...card,
description: 'Apply 2 Weak to all enemies. Exhaust.',
description: 'Apply 2 Weak to ALL enemies. Exhaust.',
}
}
2 changes: 1 addition & 1 deletion src/content/cards/iron-wave.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ export const upgrade = (card) => ({
...card,
damage: 7,
block: 7,
description: 'Deal 7 Damage. Gain 7 Block.',
description: 'Deal 7 damage. Gain 7 Block.',
})
4 changes: 2 additions & 2 deletions src/content/cards/mask-of-the-faceless.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export default {
type: 'skill',
energy: 0,
target: 'player',
description: 'Gain 1 energy point',
description: 'Gain 1 Energy',
image: 'mask-of-the-faceless.png',
damage: 0,
actions: [
Expand All @@ -20,6 +20,6 @@ export const upgrade = (card) => {
return {
...card,
block: 5,
description: 'Gain 1 energy point and 5 block.',
description: 'Gain 1 Energy and 5 Block.',
}
}
5 changes: 2 additions & 3 deletions src/content/cards/ritual-rain.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export default {
type: 'skill',
energy: 2,
target: 'player',
description: 'Remove your Weaknesses and Vulnerabilities.',
description: 'Dispel your Weaknesses and Vulnerabilities.',
image: 'ritual-rain.png',
damage: 0,
actions: [
Expand All @@ -16,8 +16,7 @@ export default {
export const upgrade = (card) => {
return {
...card,
name: 'Eventual Rain',
description: 'Remove your weaknesses and vulnerabilities. Gain 10 Block.',
description: 'Dispel your Weaknesses and Vulnerabilities. Gain 10 Block.',
block: 10,
}
}
5 changes: 2 additions & 3 deletions src/content/cards/soul-drain.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default {
type: 'attack',
energy: 1,
target: 'allEnemies',
description: 'Drain 3 Health into Weakness and Vulnerability.',
description: 'Apply 3 Weak and Vulnerability to ALL enemies. Drains 3 Health from you.',
image: 'soul-drain.png',
damage: 0,
powers: {
Expand All @@ -27,11 +27,10 @@ export const upgrade = (card) => {
a.parameter.amount = 4
return {
...card,
name: 'Lower Soul Drain',
powers: {
weak: 4,
vulnerable: 4,
},
description: 'Drain 4 Health into Weakness and Vulnerability.',
description: 'Apply 4 Weak and Vulnerability to ALL enemies. Drains 3 Health from you.',
}
}
4 changes: 2 additions & 2 deletions src/content/cards/strike.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ export default {
energy: 1,
target: 'enemy',
damage: 6,
description: 'Deal 6 Damage.',
description: 'Deal 6 damage.',
image: 'the-angel-of-death.jpg',
}

export const upgrade = (card) => {
return {
...card,
damage: 9,
description: 'Deal 9 Damage.',
description: 'Deal 9 damage.',
}
}
6 changes: 3 additions & 3 deletions src/content/cards/succube.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default {
type: 'attack',
energy: 3,
target: 'allEnemies',
description: 'Deal 2 Damage to all enemies and suck it into life.',
description: 'Deal 2 damage to ALL enemies and suck it into life.',
image: 'succube.png',
damage: 2,
actions: [
Expand All @@ -16,7 +16,7 @@ export default {

export const upgrade = (card) => ({
...card,
name: 'High Succube',
name: 'High Succube+',
damage: 3,
description: 'Deal 3 damage to all enemies and suck it into life.',
description: 'Deal 3 damage to ALL enemies and suck it into life.',
})
4 changes: 2 additions & 2 deletions src/content/cards/sucker-punch.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default {
powers: {
weak: 1,
},
description: 'Deal 7 Damage. Apply 1 Weak.',
description: 'Deal 7 damage. Apply 1 Weak.',
image: 'manicule.jpg',
}

Expand All @@ -18,5 +18,5 @@ export const upgrade = (card) => ({
powers: {
weak: 2,
},
description: 'Deal 8 Damage. Apply 2 Weak',
description: 'Deal 8 damage. Apply 2 Weak.',
})
4 changes: 2 additions & 2 deletions src/content/cards/summer-of-sam.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export default {
type: 'skill',
energy: 1,
target: 'player',
description: 'Gain 1 Health. Draw 2 Cards if your health is below 50%.',
description: 'Gain 1 Health. If your health is below 50% draw 2 cards.',
image: 'bare-feet-of-god.jpg',
actions: [
{
Expand Down Expand Up @@ -33,6 +33,6 @@ export const upgrade = (card) => {
a.parameter.amount = 2
return {
...card,
description: 'Gain 2 Health. Draw 2 Cards if your health is below 50%.',
description: 'Gain 2 Health. If your health is below 50% draw 2 cards.',
}
}
2 changes: 1 addition & 1 deletion src/content/cards/terror.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default {
powers: {
vulnerable: 99,
},
description: 'Apply 99 vulnerable. Exhaust.',
description: 'Apply 99 Vulnerable. Exhaust.',
image: '2.jpg',
exhaust: true,
}
Expand Down
4 changes: 2 additions & 2 deletions src/content/cards/thunderclap.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ export default {
powers: {
vulnerable: 1,
},
description: 'Deal 4 Damage. Apply 1 Vulnerable to all enemies.',
description: 'Deal 4 damage. Apply 1 Vulnerable to ALL enemies.',
image: '4.jpg',
}

export const upgrade = (card) => {
return {
...card,
damage: 6,
description: 'Deal 6 Damage. Apply 1 Vulnerable to all enemies.',
description: 'Deal 6 damage. Apply 1 Vulnerable to ALL enemies.',
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default {
name: 'Voodoo Education',
name: 'Voodoo Gift',
energy: 0,
type: 'attack',
target: 'enemy',
description: "Deal Damage equal to target's Vulnerable and Weak and remove the debuffs.",
description: "Deal damage equal to target's Vulnerable and Weak and remove the debuffs.",
image: 'voodoo-education.png',
actions: [
{
Expand Down Expand Up @@ -42,7 +42,6 @@ export const upgrade = (card) => {
return {
...card,
damage: 9,
name: 'Voodoo Gift',
description: card.description + ' but without resets.',
}
}
6 changes: 3 additions & 3 deletions src/ui/pages/stats/[id].astro
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ if (state.dungeon.graph) {
<h1>Slay the Web run no. {run.id}</h1>
<div class="Box Box--text Box--full">
<p>
<em>{run.player}</em> made it to floor {state.dungeon.y} and {state.won ? 'won' : 'lost'} in {
duration
} on {date} with {state.player.currentHealth}/{state.player.maxHealth} health.
<em>{run.player}</em> made it to floor {state.dungeon.y} and <strong
>{state.won ? 'won' : 'lost'}</strong
> in {duration} on {date} with {state.player.currentHealth}/{state.player.maxHealth} health.
</p>
{
extraStats && (
Expand Down

0 comments on commit 9d8af1d

Please sign in to comment.