leavanny + sprites update

app/core/abilities/abilities.ts

@@ -7669,6 +7669,46 @@ export class MoongeistBeamStrategy extends AbilityStrategy {
   }
 }
 
+export class MantisBladesStrategy extends AbilityStrategy {
+  process(
+    pokemon: PokemonEntity,
+    state: PokemonState,
+    board: Board,
+    target: PokemonEntity,
+    crit: boolean
+  ) {
+    super.process(pokemon, state, board, target, crit)
+    const damage = pokemon.stars === 1 ? 30 : pokemon.stars === 2 ? 60 : 120
+
+    target.handleSpecialDamage(
+      damage,
+      board,
+      AttackType.PHYSICAL,
+      pokemon,
+      crit,
+      true
+    )
+
+    target.handleSpecialDamage(
+      damage,
+      board,
+      AttackType.SPECIAL,
+      pokemon,
+      crit,
+      true
+    )
+
+    target.handleSpecialDamage(
+      damage,
+      board,
+      AttackType.TRUE,
+      pokemon,
+      crit,
+      true
+    )
+  }
+}
+
 export * from "./hidden-power"
 
 export const AbilityStrategies: { [key in Ability]: AbilityStrategy } = {
@@ -7963,5 +8003,6 @@ export const AbilityStrategies: { [key in Ability]: AbilityStrategy } = {
   [Ability.ACCELEROCK]: new AccelerockStrategy(),
   [Ability.PETAL_BLIZZARD]: new PetalBlizzardStrategy(),
   [Ability.SUNSTEEL_STRIKE]: new SunsteelStrikeStrategy(),
-  [Ability.MOONGEIST_BEAM]: new MoongeistBeamStrategy()
+  [Ability.MOONGEIST_BEAM]: new MoongeistBeamStrategy(),
+  [Ability.MANTIS_BLADES]: new MantisBladesStrategy()
 }

app/models/colyseus-models/player.ts

@@ -14,20 +14,20 @@ import { Pkm, PkmDuos, PkmProposition } from "../../types/enum/Pokemon"
 import { SpecialGameRule } from "../../types/enum/SpecialGameRule"
 import { Synergy } from "../../types/enum/Synergy"
 import { Weather } from "../../types/enum/Weather"
+import { removeInArray } from "../../utils/array"
 import { getFirstAvailablePositionInBench } from "../../utils/board"
 import { pickNRandomIn, pickRandomIn } from "../../utils/random"
 import { values } from "../../utils/schemas"
 import { Effects } from "../effects"
 import { IPokemonConfig } from "../mongo-models/user-metadata"
 import PokemonFactory from "../pokemon-factory"
+import { getPokemonData } from "../precomputed"
 import ExperienceManager from "./experience-manager"
 import HistoryItem from "./history-item"
-import { isOnBench, Pokemon } from "./pokemon"
+import { Pokemon, isOnBench } from "./pokemon"
 import PokemonCollection from "./pokemon-collection"
 import PokemonConfig from "./pokemon-config"
 import Synergies, { computeSynergies } from "./synergies"
-import { getPokemonData } from "../precomputed"
-import { removeInArray } from "../../utils/array"
 
 export default class Player extends Schema implements IPlayer {
   @type("string") id: string
@@ -254,7 +254,7 @@ export default class Player extends Schema implements IPlayer {
         previousNbArtifItems
       )
       lostArtificialItems.forEach((item) => {
-        removeInArray(this.items, item)
+        removeInArray<Item>(this.items, item)
       })
       this.board.forEach((pokemon) => {
         lostArtificialItems.forEach((item) => {

app/models/colyseus-models/pokemon.ts

@@ -378,25 +378,26 @@ export class MegaAltaria extends Pokemon {
 
 export class Scyther extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.BUG, Synergy.FLYING])
-  rarity = Rarity.ULTRA
-  stars = 1
+  rarity = Rarity.UNIQUE
+  stars = 2
   evolution = Pkm.SCIZOR
-  hp = 130
+  evolutionRule = new ItemEvolutionRule([Item.METAL_COAT])
+  hp = 180
   atk = 18
   def = 5
   speDef = 5
   maxPP = 80
   range = 1
   skill = Ability.X_SCISSOR
   attackSprite = AttackSprite.NORMAL_MELEE
+  passive = Passive.SCYTHER
 }
 
 export class Scizor extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.BUG, Synergy.FLYING, Synergy.STEEL])
-  rarity = Rarity.ULTRA
-  stars = 2
-  evolution = Pkm.MEGA_SCIZOR
-  hp = 180
+  rarity = Rarity.UNIQUE
+  stars = 3
+  hp = 230
   atk = 28
   def = 6
   speDef = 6
@@ -408,15 +409,15 @@ export class Scizor extends Pokemon {
 
 export class MegaScizor extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.BUG, Synergy.FLYING, Synergy.STEEL])
-  rarity = Rarity.ULTRA
+  rarity = Rarity.UNIQUE
   stars = 3
   hp = 250
   atk = 48
   def = 7
   speDef = 7
   maxPP = 80
   range = 1
-  skill = Ability.X_SCISSOR
+  skill = Ability.DEFAULT
   attackSprite = AttackSprite.NORMAL_MELEE
 }
 
@@ -1488,46 +1489,46 @@ export class PorygonZ extends Pokemon {
 
 export class Sewaddle extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG, Synergy.SOUND])
-  rarity = Rarity.EPIC
+  rarity = Rarity.ULTRA
   stars = 1
   evolution = Pkm.SWADLOON
-  hp = 80
-  atk = 5
-  def = 3
-  speDef = 3
-  maxPP = 80
+  hp = 160
+  atk = 14
+  def = 5
+  speDef = 5
+  maxPP = 100
   range = 1
-  skill = Ability.DEFAULT
-  attackSprite = AttackSprite.GRASS_MELEE
+  skill = Ability.MANTIS_BLADES
+  attackSprite = AttackSprite.BUG_MELEE
 }
 
 export class Swadloon extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG, Synergy.SOUND])
-  rarity = Rarity.EPIC
+  rarity = Rarity.ULTRA
   stars = 2
   evolution = Pkm.LEAVANNY
-  hp = 120
-  atk = 9
-  def = 4
-  speDef = 4
-  maxPP = 80
+  hp = 200
+  atk = 24
+  def = 6
+  speDef = 6
+  maxPP = 100
   range = 1
-  skill = Ability.DEFAULT
-  attackSprite = AttackSprite.GRASS_MELEE
+  skill = Ability.MANTIS_BLADES
+  attackSprite = AttackSprite.BUG_MELEE
 }
 
 export class Leavanny extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.GRASS, Synergy.BUG, Synergy.SOUND])
-  rarity = Rarity.EPIC
+  rarity = Rarity.ULTRA
   stars = 3
-  hp = 220
-  atk = 20
-  def = 4
-  speDef = 4
-  maxPP = 80
+  hp = 300
+  atk = 34
+  def = 7
+  speDef = 7
+  maxPP = 100
   range = 1
-  skill = Ability.DEFAULT
-  attackSprite = AttackSprite.GRASS_MELEE
+  skill = Ability.MANTIS_BLADES
+  attackSprite = AttackSprite.BUG_MELEE
 }
 
 export class Turtwig extends Pokemon {

app/models/precomputed/pokemons-data.csv

@@ -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,ULTRA,1,false,BUG,FLYING,,,130,18,5,5,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
+0123,SCYTHER,UNIQUE,2,false,BUG,FLYING,,,130,18,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
@@ -233,8 +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,ULTRA,2,false,BUG,FLYING,STEEL,,180,28,6,6,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
-0212-0001,MEGA_SCIZOR,ULTRA,3,false,BUG,FLYING,STEEL,,250,48,7,7,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
+0212,SCIZOR,UNIQUE,3,false,BUG,FLYING,STEEL,,180,28,6,6,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
@@ -523,6 +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,,160,14,5,5,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,SOUND,,false
+0541,SWADLOON,ULTRA,2,false,GRASS,BUG,SOUND,,200,24,6,6,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,SOUND,,false
+0542,LEAVANNY,ULTRA,3,false,GRASS,BUG,SOUND,,300,34,7,7,1,100,MANTIS_BLADES,SEWADDLE,GRASS,BUG,SOUND,,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