Skip to content

Commit

Permalink
Leavanny scyther (#1586)
Browse files Browse the repository at this point in the history
* leavanny nerf
scyther buff

* rebase
  • Loading branch information
keldaan-ag authored Mar 19, 2024
1 parent f973b31 commit cadad7b
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 23 deletions.
18 changes: 9 additions & 9 deletions app/models/colyseus-models/pokemon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ export class Scyther extends Pokemon {
stars = 2
evolution = Pkm.SCIZOR
evolutionRule = new ItemEvolutionRule([Item.METAL_COAT])
hp = 180
atk = 18
hp = 190
atk = 19
def = 5
speDef = 5
maxPP = 80
Expand All @@ -397,10 +397,10 @@ export class Scizor extends Pokemon {
types = new SetSchema<Synergy>([Synergy.BUG, Synergy.FLYING, Synergy.STEEL])
rarity = Rarity.UNIQUE
stars = 3
hp = 230
atk = 28
def = 6
speDef = 6
hp = 240
atk = 29
def = 7
speDef = 7
maxPP = 80
range = 1
skill = Ability.X_SCISSOR
Expand Down Expand Up @@ -1488,7 +1488,7 @@ export class PorygonZ extends Pokemon {
}

export class Sewaddle extends Pokemon {
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG, Synergy.SOUND])
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG])
rarity = Rarity.ULTRA
stars = 1
evolution = Pkm.SWADLOON
Expand All @@ -1503,7 +1503,7 @@ export class Sewaddle extends Pokemon {
}

export class Swadloon extends Pokemon {
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG, Synergy.SOUND])
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG])
rarity = Rarity.ULTRA
stars = 2
evolution = Pkm.LEAVANNY
Expand All @@ -1518,7 +1518,7 @@ export class Swadloon extends Pokemon {
}

export class Leavanny extends Pokemon {
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG, Synergy.SOUND])
types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG])
rarity = Rarity.ULTRA
stars = 3
hp = 250
Expand Down
2 changes: 1 addition & 1 deletion app/models/precomputed/credits.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/emotions-per-pokemon-index.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions app/models/precomputed/pokemons-data.csv
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
0120,STARYU,RARE,1,true,WATER,PSYCHIC,,,80,7,2,3,2,90,PSYBEAM,STARYU,WATER,PSYCHIC,,,false
0121,STARMIE,RARE,2,true,WATER,PSYCHIC,,,180,20,4,6,2,90,PSYBEAM,STARYU,WATER,PSYCHIC,,,false
0122,MR_MIME,RARE,2,true,FAIRY,PSYCHIC,HUMAN,,200,15,2,4,2,80,MIMIC,MIME_JR,FAIRY,PSYCHIC,BABY,HUMAN,false
0123,SCYTHER,UNIQUE,2,false,BUG,FLYING,,,180,18,5,5,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
0123,SCYTHER,UNIQUE,2,false,BUG,FLYING,,,190,19,5,5,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
0124,JYNX,UNCOMMON,2,true,ICE,PSYCHIC,HUMAN,,130,12,3,3,2,80,LOVELY_KISS,SMOOCHUM,ICE,PSYCHIC,BABY,HUMAN,false
0125,ELECTABUZZ,EPIC,2,false,ELECTRIC,ARTIFICIAL,LIGHT,,180,16,5,5,1,90,DISCHARGE,ELEKID,ELECTRIC,ARTIFICIAL,BABY,LIGHT,false
0126,MAGMAR,RARE,2,false,FIRE,HUMAN,,,140,14,2,2,2,80,HEAT_WAVE,MAGBY,FIRE,HUMAN,BABY,,false
Expand Down Expand Up @@ -233,7 +233,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
0209,SNUBULL,EPIC,1,true,FAIRY,FIELD,,,115,10,3,2,1,70,BITE,SNUBULL,FAIRY,FIELD,,,false
0210,GRANBULL,EPIC,2,true,FAIRY,FIELD,,,265,24,6,3,1,70,BITE,SNUBULL,FAIRY,FIELD,,,false
0211-0001,HISUIAN_QWILFISH,EPIC,1,true,DARK,POISON,AQUATIC,,95,8,4,2,1,100,BARB_BARRAGE,HISUIAN_QWILFISH,DARK,POISON,AQUATIC,,false
0212,SCIZOR,UNIQUE,3,false,BUG,FLYING,STEEL,,230,28,6,6,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
0212,SCIZOR,UNIQUE,3,false,BUG,FLYING,STEEL,,240,29,7,7,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
0213,SHUCKLE,UNIQUE,3,false,BUG,ROCK,,,150,4,15,15,1,100,SHELL_TRAP,SHUCKLE,BUG,ROCK,,,false
0214,HERACROSS,UNIQUE,3,false,BUG,FIGHTING,,,190,22,3,3,1,100,CLOSE_COMBAT,HERACROSS,BUG,FIGHTING,,,false
0215,SNEASEL,EPIC,1,true,ICE,DARK,MONSTER,,85,9,1,3,1,40,SLASHING_CLAW,SNEASEL,ICE,DARK,MONSTER,,false
Expand Down Expand Up @@ -522,9 +522,9 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
0535,TYMPOLE,HATCH,1,false,AQUATIC,GROUND,SOUND,,80,7,3,3,1,90,SLUDGE_WAVE,TYMPOLE,AQUATIC,GROUND,SOUND,,false
0536,PALPITOAD,HATCH,2,false,AQUATIC,GROUND,SOUND,,130,17,4,4,1,90,SLUDGE_WAVE,TYMPOLE,AQUATIC,GROUND,SOUND,,false
0537,SEISMITOAD,HATCH,3,false,AQUATIC,GROUND,SOUND,,210,22,6,6,1,90,SLUDGE_WAVE,TYMPOLE,AQUATIC,GROUND,SOUND,,false
0540,SEWADDLE,ULTRA,1,false,GRASS,BUG,SOUND,,130,14,3,3,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,SOUND,,false
0541,SWADLOON,ULTRA,2,false,GRASS,BUG,SOUND,,180,24,4,4,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,SOUND,,false
0542,LEAVANNY,ULTRA,3,false,GRASS,BUG,SOUND,,250,34,5,5,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,SOUND,,false
0540,SEWADDLE,ULTRA,1,false,GRASS,BUG,,,130,14,3,3,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,,,false
0541,SWADLOON,ULTRA,2,false,GRASS,BUG,,,180,24,4,4,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,,,false
0542,LEAVANNY,ULTRA,3,false,GRASS,BUG,,,250,34,5,5,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,,,false
0556,MARACTUS,UNIQUE,3,false,GRASS,GROUND,FLORA,,200,16,6,4,1,85,SPIKE_ARMOR,MARACTUS,GRASS,GROUND,FLORA,,false
0559,SCRAGGY,UNCOMMON,1,true,DARK,FIGHTING,,,70,8,2,2,1,85,ASSURANCE,SCRAGGY,DARK,FIGHTING,,,false
0560,SCRAFTY,UNCOMMON,2,true,DARK,FIGHTING,,,140,18,4,4,1,85,ASSURANCE,SCRAGGY,DARK,FIGHTING,,,false
Expand Down
3 changes: 1 addition & 2 deletions app/models/precomputed/pokemons-data.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-per-type-and-category.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-per-type.json

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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 v4.9.0.85"
const CACHE_NAME = "CACHE v4.9.0.87"

// Cache-first strategy
const cacheFirst = (event) => {
Expand Down
2 changes: 1 addition & 1 deletion app/public/src/assets/atlas.json

Large diffs are not rendered by default.

0 comments on commit cadad7b

Please sign in to comment.