Skip to content

Commit

Permalink
add fuecoco line
Browse files Browse the repository at this point in the history
  • Loading branch information
keldaan-ag committed Apr 24, 2024
1 parent a9a9ba7 commit 76ceacd
Show file tree
Hide file tree
Showing 34 changed files with 194 additions and 21 deletions.
67 changes: 66 additions & 1 deletion app/core/abilities/abilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8387,6 +8387,70 @@ export class PsyshieldBashStrategy extends AbilityStrategy {
}
}

export class TorchSongStrategy extends AbilityStrategy {
process(
pokemon: PokemonEntity,
state: PokemonState,
board: Board,
target: PokemonEntity,
crit: boolean
) {
super.process(pokemon, state, board, target, crit, true)
const damage = pokemon.stars === 3 ? 30 : pokemon.stars === 2 ? 20 : 10
const count = pokemon.stars
const apBoost = 10

const scorchedEnnemiesId = new Set<string>()

const enemies = board.cells.filter(
(p) => p && p.team !== pokemon.team
) as PokemonEntity[]
const enemiesHit = enemies
.sort((a, b) => b.items.size - a.items.size)
.slice(0, count) as PokemonEntity[]

enemiesHit.forEach((enemy) => {
pokemon.simulation.room.broadcast(Transfer.ABILITY, {
id: pokemon.simulation.id,
skill: "TORCH_SONG_CAST",
positionX: pokemon.positionX,
positionY: pokemon.positionY,
targetX: enemy.positionX,
targetY: enemy.positionY
})
const cells = board
.getAdjacentCells(enemy.positionX, enemy.positionY, true)
.concat({ x: enemy.positionX, y: enemy.positionY, value: enemy })
cells.forEach((cell) => {
if (cell.value && cell.value.team !== pokemon.team) {
pokemon.simulation.room.broadcast(Transfer.ABILITY, {
id: pokemon.simulation.id,
skill: Ability.TORCH_SONG,
positionX: cell.value.positionX,
positionY: cell.value.positionY
})
cell.value.handleSpecialDamage(
damage,
board,
AttackType.SPECIAL,
pokemon,
crit
)
if (
cell.value.status.burn ||
cell.value.status.curse ||
cell.value.status.silence
) {
scorchedEnnemiesId.add(cell.value.id)
}
}
})
})

pokemon.addAbilityPower(scorchedEnnemiesId.size * apBoost, false)
}
}

export * from "./hidden-power"

export const AbilityStrategies: { [key in Ability]: AbilityStrategy } = {
Expand Down Expand Up @@ -8704,5 +8768,6 @@ export const AbilityStrategies: { [key in Ability]: AbilityStrategy } = {
[Ability.THUNDER_FANG]: new ThunderFangStrategy(),
[Ability.TAIL_WHIP]: new TailWhipStrategy(),
[Ability.PSYSHIELD_BASH]: new PsyshieldBashStrategy(),
[Ability.QUIVER_DANCE]: new QuiverDanceStrategy()
[Ability.QUIVER_DANCE]: new QuiverDanceStrategy(),
[Ability.TORCH_SONG]: new TorchSongStrategy()
}
49 changes: 48 additions & 1 deletion app/models/colyseus-models/pokemon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,50 @@ export class Gardevoir extends Pokemon {
attackSprite = AttackSprite.PSYCHIC_RANGE
}

export class Fuecoco extends Pokemon {
types = new SetSchema<Synergy>([Synergy.FIRE, Synergy.SOUND, Synergy.GHOST])
rarity = Rarity.EPIC
stars = 1
evolution = Pkm.CROCALOR
hp = 110
atk = 5
def = 4
speDef = 4
maxPP = 100
range = 2
skill = Ability.TORCH_SONG
attackSprite = AttackSprite.FIRE_RANGE
}

export class Crocalor extends Pokemon {
types = new SetSchema<Synergy>([Synergy.FIRE, Synergy.SOUND, Synergy.GHOST])
rarity = Rarity.EPIC
stars = 2
evolution = Pkm.SKELEDIRGE
hp = 170
atk = 13
def = 5
speDef = 5
maxPP = 100
range = 2
skill = Ability.TORCH_SONG
attackSprite = AttackSprite.FIRE_RANGE
}

export class Skeledirge extends Pokemon {
types = new SetSchema<Synergy>([Synergy.FIRE, Synergy.SOUND, Synergy.GHOST])
rarity = Rarity.EPIC
stars = 3
hp = 350
atk = 24
def = 6
speDef = 6
maxPP = 100
range = 2
skill = Ability.TORCH_SONG
attackSprite = AttackSprite.FIRE_RANGE
}

export class Budew extends Pokemon {
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.POISON, Synergy.BABY])
rarity = Rarity.EPIC
Expand Down Expand Up @@ -13857,5 +13901,8 @@ export const PokemonClasses: Record<
[Pkm.WORMADAM_TRASH]: WormadamTrash,
[Pkm.MOTHIM]: Mothim,
[Pkm.PALDEA_WOOPER]: PaldeaWooper,
[Pkm.CLODSIRE]: Clodsire
[Pkm.CLODSIRE]: Clodsire,
[Pkm.FUECOCO]: Fuecoco,
[Pkm.CROCALOR]: Crocalor,
[Pkm.SKELEDIRGE]: Skeledirge
}
17 changes: 10 additions & 7 deletions app/models/precomputed/pokemons-data.csv
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,13 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
0409,RAMPARDOS,UNCOMMON,2,true,FOSSIL,MONSTER,,,160,15,3,1,1,100,HEAD_SMASH,CRANIDOS,FOSSIL,MONSTER,,,false,false,2
0410,SHIELDON,RARE,1,true,FOSSIL,STEEL,,,90,6,5,3,1,100,IRON_DEFENSE,SHIELDON,FOSSIL,STEEL,,,false,false,2
0411,BASTIODON,RARE,2,true,FOSSIL,STEEL,,,250,10,8,4,1,100,IRON_DEFENSE,SHIELDON,FOSSIL,STEEL,,,false,false,2
0412,BURMY_PLANT,RARE,1,false,BUG,GRASS,,,70,7,3,5,2,100,QUIVER_DANCE,BURMY_PLANT,BUG,GRASS,FLYING,,false,true,3
0412-0001,BURMY_SANDY,RARE,1,false,BUG,GROUND,,,70,7,3,5,2,100,QUIVER_DANCE,BURMY_SANDY,BUG,GROUND,,,false,true,3
0412-0002,BURMY_TRASH,RARE,1,false,BUG,ARTIFICIAL,,,70,7,3,5,2,100,QUIVER_DANCE,BURMY_TRASH,BUG,ARTIFICIAL,,,false,true,3
0413,WORMADAM_PLANT,RARE,2,false,BUG,GRASS,,,200,20,3,3,2,80,QUIVER_DANCE,BURMY_PLANT,BUG,GRASS,FLYING,,false,true,3
0413-0001,WORMADAM_SANDY,RARE,2,false,BUG,GROUND,,,200,20,3,3,2,80,QUIVER_DANCE,BURMY_SANDY,BUG,GROUND,,,false,true,3
0413-0002,WORMADAM_TRASH,RARE,2,false,BUG,ARTIFICIAL,,,200,20,3,3,2,80,QUIVER_DANCE,BURMY_TRASH,BUG,ARTIFICIAL,,,false,true,3
0414,MOTHIM,RARE,3,false,BUG,FLYING,,,200,20,3,3,2,60,QUIVER_DANCE,BURMY_PLANT,BUG,GRASS,FLYING,,false,true,3
0412,BURMY_PLANT,RARE,1,false,,,,,70,7,3,5,2,100,QUIVER_DANCE,BURMY_PLANT,BUG,GRASS,FLYING,,false,false,3
0412-0001,BURMY_SANDY,RARE,1,false,,,,,70,7,3,5,2,100,QUIVER_DANCE,BURMY_SANDY,BUG,GROUND,,,false,false,3
0412-0002,BURMY_TRASH,RARE,1,false,,,,,70,7,3,5,2,100,QUIVER_DANCE,BURMY_TRASH,BUG,ARTIFICIAL,,,false,false,3
0413,WORMADAM_PLANT,RARE,2,false,,,,,200,20,3,3,2,80,QUIVER_DANCE,BURMY_PLANT,BUG,GRASS,FLYING,,false,false,3
0413-0001,WORMADAM_SANDY,RARE,2,false,,,,,200,20,3,3,2,80,QUIVER_DANCE,BURMY_SANDY,BUG,GROUND,,,false,false,3
0413-0002,WORMADAM_TRASH,RARE,2,false,,,,,200,20,3,3,2,80,QUIVER_DANCE,BURMY_TRASH,BUG,ARTIFICIAL,,,false,false,3
0414,MOTHIM,RARE,3,false,,,,,200,20,3,3,2,60,QUIVER_DANCE,BURMY_PLANT,BUG,GRASS,FLYING,,false,false,3
0415,COMBEE,EPIC,1,true,BUG,FLORA,,,120,9,3,3,1,90,HEAL_ORDER,COMBEE,BUG,FLORA,,,false,false,2
0416,VESPIQUEEN,EPIC,2,true,BUG,FLORA,,,280,20,4,4,1,90,HEAL_ORDER,COMBEE,BUG,FLORA,,,false,false,2
0418,BUIZEL,EPIC,1,true,WATER,AQUATIC,FIELD,,90,9,3,3,1,55,AQUA_JET,BUIZEL,WATER,AQUATIC,FIELD,,false,false,2
Expand Down Expand Up @@ -732,6 +732,9 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
0897,SPECTRIER,LEGENDARY,3,false,GHOST,FIELD,,,280,30,5,10,1,100,ASTRAL_BARRAGE,SPECTRIER,GHOST,FIELD,,,false,false,3
0904,OVERQWIL,EPIC,2,false,DARK,POISON,AQUATIC,,230,19,6,4,1,100,BARB_BARRAGE,HISUIAN_QWILFISH,DARK,POISON,AQUATIC,,false,true,2
0905,ENAMORUS,LEGENDARY,3,false,FLYING,FAIRY,,,250,30,3,3,3,80,SPRINGTIDE_STORM,ENAMORUS,FLYING,FAIRY,,,false,false,3
0909,FUECOCO,EPIC,1,false,,,,,110,5,4,4,2,100,TORCH_SONG,FUECOCO,FIRE,SOUND,GHOST,,false,false,1
0910,CROCALOR,EPIC,2,false,,,,,170,13,5,5,2,100,TORCH_SONG,FUECOCO,FIRE,SOUND,GHOST,,false,false,1
0911,SKELEDIRGE,EPIC,3,false,,,,,350,24,6,6,2,100,TORCH_SONG,FUECOCO,FIRE,SOUND,GHOST,,false,false,1
0924,TANDEMAUS,UNIQUE,2,false,NORMAL,FAIRY,,,160,16,5,5,1,100,POPULATION_BOMB,TANDEMAUS,NORMAL,FAIRY,,,false,false,4
0925,MAUSHOLD_FOUR,UNIQUE,4,false,NORMAL,FAIRY,,,240,24,5,5,1,100,POPULATION_BOMB,TANDEMAUS,NORMAL,FAIRY,,,false,false,4
0925-0001,MAUSHOLD_THREE,UNIQUE,3,false,NORMAL,FAIRY,,,200,20,5,5,1,100,POPULATION_BOMB,TANDEMAUS,NORMAL,FAIRY,,,false,false,4
Expand Down
3 changes: 3 additions & 0 deletions app/public/dist/client/changelog/patch-5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Each player now starts on a different map. Portals now makes you travel to new l
- Mothim
- Paldean Wooper
- Clodsire
- Fuecoco
- Crocalor
- Skeledirge

# Changes to Pokemon & Abilities

Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/esbuild.meta.json

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions app/public/dist/client/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@
"THUNDER_FANG": "Thunder Fang",
"TAIL_WHIP": "Tail Whip",
"PSYSHIELD_BASH": "Psyshield Bash",
"QUIVER_DANCE": "Quiver Dance"
"QUIVER_DANCE": "Quiver Dance",
"TORCH_SONG": "Torch Song"
},
"pkm": {
"DEFAULT": "MissingNo.",
Expand Down Expand Up @@ -1110,7 +1111,10 @@
"WORMADAM_TRASH": "Wormadam (Trash)",
"MOTHIM": "Mothim",
"PALDEA_WOOPER": "Paldean Wooper",
"CLODSIRE": "Clodsire"
"CLODSIRE": "Clodsire",
"FUECOCO": "Fuecoco",
"CROCALOR": "Crocalor",
"SKELEDIRGE": "Skeledirge"
},
"ability_description": {
"SOFT_BOILED": "Cures all status effects and grants [20,40,80,SP] SHIELD to every allied Pokémon",
Expand Down Expand Up @@ -1426,7 +1430,8 @@
"THUNDER_FANG": "Deal [30,60,120,SP] SPECIAL and inflicts PARALYSIS for 3 seconds",
"TAIL_WHIP": "Reduce target's DEF by [30,SP] %",
"PSYSHIELD_BASH": "Dash into the ennemy backlane, dealing [60,SP] special damage and PROTECT the caster for 1s",
"QUIVER_DANCE": "Gain [5,SP] ATK, [5,SP] SPE_DEF, [20,SP]% ATK_SPEED and 20% AP"
"QUIVER_DANCE": "Gain [5,SP] ATK, [5,SP] SPE_DEF, [20,SP]% ATK_SPEED and 20% AP",
"TORCH_SONG": "The caster blows out [1,2,3] raging flames to the [1,2,3] strongest opponents. Each flame scorchs the target and adjacent units for [10,20,30,SP] SPECIAL . Gains 10 AP for each unit BURN, CURSE or SILENCE"
},
"effect": {
"INGRAIN": "Ingrain",
Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/sw.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Change this cache name every time you want to force players
to invalidate their cache and download all assets again */

const CACHE_NAME = "CACHE v5.0.0.149"
const CACHE_NAME = "CACHE v5.0.0.153"

// Cache-first strategy
const cacheFirst = (event) => {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/public/src/assets/atlas.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/public/src/assets/pokemons/0909.json

Large diffs are not rendered by default.

Binary file added app/public/src/assets/pokemons/0909.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/public/src/assets/pokemons/0910.json

Large diffs are not rendered by default.

Binary file added app/public/src/assets/pokemons/0910.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/public/src/assets/pokemons/0911.json

Large diffs are not rendered by default.

Binary file added app/public/src/assets/pokemons/0911.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/public/src/assets/pokemons/durations.json

Large diffs are not rendered by default.

Loading

0 comments on commit 76ceacd

Please sign in to comment.