Compare commits

..

No commits in common. "7e81b5021442543903e45b952b02b7b41b0d9877" and "dba2adf44ea6ee74948d2fb3bc03c9e08813cbd0" have entirely different histories.

14 changed files with 75 additions and 75 deletions

View File

@ -2765,7 +2765,7 @@ export const speciesStarters = {
[Species.SENTRET]: 1, [Species.SENTRET]: 1,
[Species.HOOTHOOT]: 2, [Species.HOOTHOOT]: 2,
[Species.LEDYBA]: 1, [Species.LEDYBA]: 1,
[Species.SPINARAK]: 1, [Species.SPINARAK]: 2,
[Species.CHINCHOU]: 2, [Species.CHINCHOU]: 2,
[Species.PICHU]: 2, [Species.PICHU]: 2,
[Species.CLEFFA]: 2, [Species.CLEFFA]: 2,
@ -2819,7 +2819,7 @@ export const speciesStarters = {
[Species.CELEBI]: 6, [Species.CELEBI]: 6,
[Species.TREECKO]: 3, [Species.TREECKO]: 3,
[Species.TORCHIC]: 4, [Species.TORCHIC]: 3,
[Species.MUDKIP]: 3, [Species.MUDKIP]: 3,
[Species.POOCHYENA]: 2, [Species.POOCHYENA]: 2,
[Species.ZIGZAGOON]: 2, [Species.ZIGZAGOON]: 2,
@ -2986,7 +2986,7 @@ export const speciesStarters = {
[Species.ZORUA]: 3, [Species.ZORUA]: 3,
[Species.MINCCINO]: 3, [Species.MINCCINO]: 3,
[Species.GOTHITA]: 3, [Species.GOTHITA]: 3,
[Species.SOLOSIS]: 3, [Species.SOLOSIS]: 4,
[Species.DUCKLETT]: 2, [Species.DUCKLETT]: 2,
[Species.VANILLITE]: 3, [Species.VANILLITE]: 3,
[Species.DEERLING]: 2, [Species.DEERLING]: 2,
@ -3205,7 +3205,7 @@ export const speciesStarters = {
[Species.LECHONK]: 2, [Species.LECHONK]: 2,
[Species.TAROUNTULA]: 1, [Species.TAROUNTULA]: 1,
[Species.NYMBLE]: 3, [Species.NYMBLE]: 3,
[Species.PAWMI]: 3, [Species.PAWMI]: 4,
[Species.TANDEMAUS]: 4, [Species.TANDEMAUS]: 4,
[Species.FIDOUGH]: 2, [Species.FIDOUGH]: 2,
[Species.SMOLIV]: 3, [Species.SMOLIV]: 3,
@ -3319,14 +3319,14 @@ export const starterPassiveAbilities = {
[Species.SQUIRTLE]: Abilities.STURDY, [Species.SQUIRTLE]: Abilities.STURDY,
[Species.CATERPIE]: Abilities.MAGICIAN, [Species.CATERPIE]: Abilities.MAGICIAN,
[Species.WEEDLE]: Abilities.TINTED_LENS, [Species.WEEDLE]: Abilities.TINTED_LENS,
[Species.PIDGEY]: Abilities.FLARE_BOOST, [Species.PIDGEY]: Abilities.GALE_WINGS,
[Species.RATTATA]: Abilities.STRONG_JAW, [Species.RATTATA]: Abilities.STRONG_JAW,
[Species.SPEAROW]: Abilities.MOXIE, [Species.SPEAROW]: Abilities.MOXIE,
[Species.EKANS]: Abilities.REGENERATOR, [Species.EKANS]: Abilities.REGENERATOR,
[Species.SANDSHREW]: Abilities.TOUGH_CLAWS, [Species.SANDSHREW]: Abilities.TOUGH_CLAWS,
[Species.NIDORAN_F]: Abilities.FLARE_BOOST, [Species.NIDORAN_F]: Abilities.FLARE_BOOST,
[Species.NIDORAN_M]: Abilities.GUTS, [Species.NIDORAN_M]: Abilities.GUTS,
[Species.VULPIX]: Abilities.FUR_COAT, [Species.VULPIX]: Abilities.SOLAR_POWER,
[Species.ZUBAT]: Abilities.INTIMIDATE, [Species.ZUBAT]: Abilities.INTIMIDATE,
[Species.ODDISH]: Abilities.TRIAGE, [Species.ODDISH]: Abilities.TRIAGE,
[Species.PARAS]: Abilities.TRIAGE, [Species.PARAS]: Abilities.TRIAGE,
@ -3345,16 +3345,16 @@ export const starterPassiveAbilities = {
[Species.PONYTA]: Abilities.MAGIC_GUARD, [Species.PONYTA]: Abilities.MAGIC_GUARD,
[Species.SLOWPOKE]: Abilities.UNAWARE, [Species.SLOWPOKE]: Abilities.UNAWARE,
[Species.MAGNEMITE]: Abilities.LEVITATE, [Species.MAGNEMITE]: Abilities.LEVITATE,
[Species.FARFETCHD]: Abilities.SNIPER, [Species.FARFETCHD]: Abilities.HUGE_POWER,
[Species.DODUO]: Abilities.PARENTAL_BOND, [Species.DODUO]: Abilities.PARENTAL_BOND,
[Species.SEEL]: Abilities.WATER_BUBBLE, [Species.SEEL]: Abilities.WATER_BUBBLE,
[Species.GRIMER]: Abilities.WATER_ABSORB, [Species.GRIMER]: Abilities.WATER_ABSORB,
[Species.SHELLDER]: Abilities.ICE_SCALES, [Species.SHELLDER]: Abilities.ICE_SCALES,
[Species.GASTLY]: Abilities.SHADOW_SHIELD, [Species.GASTLY]: Abilities.SHADOW_SHIELD,
[Species.ONIX]: Abilities.ROCKY_PAYLOAD, [Species.ONIX]: Abilities.ROCKY_PAYLOAD,
[Species.DROWZEE]: Abilities.MAGICIAN, [Species.DROWZEE]: Abilities.BAD_DREAMS,
[Species.KRABBY]: Abilities.UNBURDEN, [Species.KRABBY]: Abilities.UNBURDEN,
[Species.VOLTORB]: Abilities.TRANSISTOR, [Species.VOLTORB]: Abilities.ELECTRIC_SURGE,
[Species.EXEGGCUTE]: Abilities.RIPEN, [Species.EXEGGCUTE]: Abilities.RIPEN,
[Species.CUBONE]: Abilities.PARENTAL_BOND, [Species.CUBONE]: Abilities.PARENTAL_BOND,
[Species.LICKITUNG]: Abilities.THICK_FAT, [Species.LICKITUNG]: Abilities.THICK_FAT,
@ -3374,7 +3374,7 @@ export const starterPassiveAbilities = {
[Species.EEVEE]: Abilities.SIMPLE, [Species.EEVEE]: Abilities.SIMPLE,
[Species.PORYGON]: Abilities.PROTEAN, [Species.PORYGON]: Abilities.PROTEAN,
[Species.OMANYTE]: Abilities.STURDY, [Species.OMANYTE]: Abilities.STURDY,
[Species.KABUTO]: Abilities.TOUGH_CLAWS, [Species.KABUTO]: Abilities.SHARPNESS,
[Species.AERODACTYL]: Abilities.ORICHALCUM_PULSE, [Species.AERODACTYL]: Abilities.ORICHALCUM_PULSE,
[Species.ARTICUNO]: Abilities.SNOW_WARNING, [Species.ARTICUNO]: Abilities.SNOW_WARNING,
[Species.ZAPDOS]: Abilities.DRIZZLE, [Species.ZAPDOS]: Abilities.DRIZZLE,
@ -3476,7 +3476,7 @@ export const starterPassiveAbilities = {
[Species.CACNEA]: Abilities.SAND_RUSH, [Species.CACNEA]: Abilities.SAND_RUSH,
[Species.SWABLU]: Abilities.ADAPTABILITY, [Species.SWABLU]: Abilities.ADAPTABILITY,
[Species.ZANGOOSE]: Abilities.POISON_HEAL, [Species.ZANGOOSE]: Abilities.POISON_HEAL,
[Species.SEVIPER]: Abilities.MULTISCALE, [Species.SEVIPER]: Abilities.INTIMIDATE,
[Species.LUNATONE]: Abilities.SHADOW_SHIELD, [Species.LUNATONE]: Abilities.SHADOW_SHIELD,
[Species.SOLROCK]: Abilities.DROUGHT, [Species.SOLROCK]: Abilities.DROUGHT,
[Species.BARBOACH]: Abilities.SIMPLE, [Species.BARBOACH]: Abilities.SIMPLE,
@ -3495,16 +3495,16 @@ export const starterPassiveAbilities = {
[Species.SNORUNT]: Abilities.SNOW_WARNING, [Species.SNORUNT]: Abilities.SNOW_WARNING,
[Species.SPHEAL]: Abilities.UNAWARE, [Species.SPHEAL]: Abilities.UNAWARE,
[Species.CLAMPERL]: Abilities.DRIZZLE, [Species.CLAMPERL]: Abilities.DRIZZLE,
[Species.RELICANTH]: Abilities.PRIMORDIAL_SEA, [Species.RELICANTH]: Abilities.SOLID_ROCK,
[Species.LUVDISC]: Abilities.MULTISCALE, [Species.LUVDISC]: Abilities.MULTISCALE,
[Species.BAGON]: Abilities.DRAGONS_MAW, [Species.BAGON]: Abilities.ADAPTABILITY,
[Species.BELDUM]: Abilities.LEVITATE, [Species.BELDUM]: Abilities.LEVITATE,
[Species.REGIROCK]: Abilities.SAND_STREAM, [Species.REGIROCK]: Abilities.SAND_STREAM,
[Species.REGICE]: Abilities.SNOW_WARNING, [Species.REGICE]: Abilities.SNOW_WARNING,
[Species.REGISTEEL]: Abilities.FILTER, [Species.REGISTEEL]: Abilities.FILTER,
[Species.LATIAS]: Abilities.PRISM_ARMOR, [Species.LATIAS]: Abilities.SOUL_HEART,
[Species.LATIOS]: Abilities.TINTED_LENS, [Species.LATIOS]: Abilities.TINTED_LENS,
[Species.KYOGRE]: Abilities.MOLD_BREAKER, [Species.KYOGRE]: Abilities.RAIN_DISH,
[Species.GROUDON]: Abilities.TURBOBLAZE, [Species.GROUDON]: Abilities.TURBOBLAZE,
[Species.RAYQUAZA]: Abilities.UNNERVE, [Species.RAYQUAZA]: Abilities.UNNERVE,
[Species.JIRACHI]: Abilities.COMATOSE, [Species.JIRACHI]: Abilities.COMATOSE,
@ -3523,7 +3523,7 @@ export const starterPassiveAbilities = {
[Species.COMBEE]: Abilities.INTIMIDATE, [Species.COMBEE]: Abilities.INTIMIDATE,
[Species.PACHIRISU]: Abilities.HONEY_GATHER, [Species.PACHIRISU]: Abilities.HONEY_GATHER,
[Species.BUIZEL]: Abilities.MOXIE, [Species.BUIZEL]: Abilities.MOXIE,
[Species.CHERUBI]: Abilities.ORICHALCUM_PULSE, [Species.CHERUBI]: Abilities.DROUGHT,
[Species.SHELLOS]: Abilities.REGENERATOR, [Species.SHELLOS]: Abilities.REGENERATOR,
[Species.DRIFLOON]: Abilities.MAGIC_GUARD, [Species.DRIFLOON]: Abilities.MAGIC_GUARD,
[Species.BUNEARY]: Abilities.ADAPTABILITY, [Species.BUNEARY]: Abilities.ADAPTABILITY,
@ -3537,13 +3537,13 @@ export const starterPassiveAbilities = {
[Species.CHATOT]: Abilities.PUNK_ROCK, [Species.CHATOT]: Abilities.PUNK_ROCK,
[Species.SPIRITOMB]: Abilities.VESSEL_OF_RUIN, [Species.SPIRITOMB]: Abilities.VESSEL_OF_RUIN,
[Species.GIBLE]: Abilities.SAND_STREAM, [Species.GIBLE]: Abilities.SAND_STREAM,
[Species.MUNCHLAX]: Abilities.HARVEST, [Species.MUNCHLAX]: Abilities.RIPEN,
[Species.RIOLU]: Abilities.MINDS_EYE, [Species.RIOLU]: Abilities.MINDS_EYE,
[Species.HIPPOPOTAS]: Abilities.UNAWARE, [Species.HIPPOPOTAS]: Abilities.UNAWARE,
[Species.SKORUPI]: Abilities.SUPER_LUCK, [Species.SKORUPI]: Abilities.SUPER_LUCK,
[Species.CROAGUNK]: Abilities.MOXIE, [Species.CROAGUNK]: Abilities.MOXIE,
[Species.CARNIVINE]: Abilities.ARENA_TRAP, [Species.CARNIVINE]: Abilities.ARENA_TRAP,
[Species.FINNEON]: Abilities.WATER_BUBBLE, [Species.FINNEON]: Abilities.DRIZZLE,
[Species.MANTYKE]: Abilities.UNAWARE, [Species.MANTYKE]: Abilities.UNAWARE,
[Species.SNOVER]: Abilities.THICK_FAT, [Species.SNOVER]: Abilities.THICK_FAT,
[Species.ROTOM]: Abilities.HADRON_ENGINE, [Species.ROTOM]: Abilities.HADRON_ENGINE,
@ -3557,7 +3557,7 @@ export const starterPassiveAbilities = {
[Species.GIRATINA]: Abilities.SHADOW_SHIELD, [Species.GIRATINA]: Abilities.SHADOW_SHIELD,
[Species.CRESSELIA]: Abilities.MAGIC_BOUNCE, [Species.CRESSELIA]: Abilities.MAGIC_BOUNCE,
[Species.PHIONE]: Abilities.SIMPLE, [Species.PHIONE]: Abilities.SIMPLE,
[Species.MANAPHY]: Abilities.PRIMORDIAL_SEA, [Species.MANAPHY]: Abilities.SIMPLE,
[Species.DARKRAI]: Abilities.UNNERVE, [Species.DARKRAI]: Abilities.UNNERVE,
[Species.SHAYMIN]: Abilities.WIND_RIDER, [Species.SHAYMIN]: Abilities.WIND_RIDER,
[Species.ARCEUS]: Abilities.ADAPTABILITY, [Species.ARCEUS]: Abilities.ADAPTABILITY,
@ -3590,13 +3590,13 @@ export const starterPassiveAbilities = {
[Species.SANDILE]: Abilities.TOUGH_CLAWS, [Species.SANDILE]: Abilities.TOUGH_CLAWS,
[Species.DARUMAKA]: Abilities.GORILLA_TACTICS, [Species.DARUMAKA]: Abilities.GORILLA_TACTICS,
[Species.MARACTUS]: Abilities.WELL_BAKED_BODY, [Species.MARACTUS]: Abilities.WELL_BAKED_BODY,
[Species.DWEBBLE]: Abilities.ROCKY_PAYLOAD, [Species.DWEBBLE]: Abilities.ANGER_SHELL,
[Species.SCRAGGY]: Abilities.PROTEAN, [Species.SCRAGGY]: Abilities.PROTEAN,
[Species.SIGILYPH]: Abilities.FLARE_BOOST, [Species.SIGILYPH]: Abilities.MAGICIAN,
[Species.YAMASK]: Abilities.PURIFYING_SALT, [Species.YAMASK]: Abilities.PURIFYING_SALT,
[Species.TIRTOUGA]: Abilities.WATER_ABSORB, [Species.TIRTOUGA]: Abilities.ANGER_SHELL,
[Species.ARCHEN]: Abilities.MULTISCALE, [Species.ARCHEN]: Abilities.MULTISCALE,
[Species.TRUBBISH]: Abilities.NEUTRALIZING_GAS, [Species.TRUBBISH]: Abilities.TOXIC_DEBRIS,
[Species.ZORUA]: Abilities.DARK_AURA, [Species.ZORUA]: Abilities.DARK_AURA,
[Species.MINCCINO]: Abilities.FUR_COAT, [Species.MINCCINO]: Abilities.FUR_COAT,
[Species.GOTHITA]: Abilities.UNNERVE, [Species.GOTHITA]: Abilities.UNNERVE,
@ -3611,7 +3611,7 @@ export const starterPassiveAbilities = {
[Species.ALOMOMOLA]: Abilities.MULTISCALE, [Species.ALOMOMOLA]: Abilities.MULTISCALE,
[Species.JOLTIK]: Abilities.TRANSISTOR, [Species.JOLTIK]: Abilities.TRANSISTOR,
[Species.FERROSEED]: Abilities.ROUGH_SKIN, [Species.FERROSEED]: Abilities.ROUGH_SKIN,
[Species.KLINK]: Abilities.STEELY_SPIRIT, [Species.KLINK]: Abilities.STEELWORKER,
[Species.TYNAMO]: Abilities.POISON_HEAL, [Species.TYNAMO]: Abilities.POISON_HEAL,
[Species.ELGYEM]: Abilities.PRISM_ARMOR, [Species.ELGYEM]: Abilities.PRISM_ARMOR,
[Species.LITWICK]: Abilities.SOUL_HEART, [Species.LITWICK]: Abilities.SOUL_HEART,
@ -3625,7 +3625,7 @@ export const starterPassiveAbilities = {
[Species.GOLETT]: Abilities.SHADOW_SHIELD, [Species.GOLETT]: Abilities.SHADOW_SHIELD,
[Species.PAWNIARD]: Abilities.SWORD_OF_RUIN, [Species.PAWNIARD]: Abilities.SWORD_OF_RUIN,
[Species.BOUFFALANT]: Abilities.ROCK_HEAD, [Species.BOUFFALANT]: Abilities.ROCK_HEAD,
[Species.RUFFLET]: Abilities.SPEED_BOOST, [Species.RUFFLET]: Abilities.GALE_WINGS,
[Species.VULLABY]: Abilities.THICK_FAT, [Species.VULLABY]: Abilities.THICK_FAT,
[Species.HEATMOR]: Abilities.CONTRARY, [Species.HEATMOR]: Abilities.CONTRARY,
[Species.DURANT]: Abilities.COMPOUND_EYES, [Species.DURANT]: Abilities.COMPOUND_EYES,
@ -3651,12 +3651,12 @@ export const starterPassiveAbilities = {
[Species.SCATTERBUG]: Abilities.PRANKSTER, [Species.SCATTERBUG]: Abilities.PRANKSTER,
[Species.LITLEO]: Abilities.BEAST_BOOST, [Species.LITLEO]: Abilities.BEAST_BOOST,
[Species.FLABEBE]: Abilities.GRASSY_SURGE, [Species.FLABEBE]: Abilities.GRASSY_SURGE,
[Species.SKIDDO]: Abilities.SEED_SOWER, [Species.SKIDDO]: Abilities.GRASSY_SURGE,
[Species.PANCHAM]: Abilities.FUR_COAT, [Species.PANCHAM]: Abilities.FUR_COAT,
[Species.FURFROU]: Abilities.FLUFFY, [Species.FURFROU]: Abilities.FLUFFY,
[Species.ESPURR]: Abilities.FUR_COAT, [Species.ESPURR]: Abilities.FUR_COAT,
[Species.HONEDGE]: Abilities.SHARPNESS, [Species.HONEDGE]: Abilities.SHARPNESS,
[Species.SPRITZEE]: Abilities.FUR_COAT, [Species.SPRITZEE]: Abilities.MISTY_SURGE,
[Species.SWIRLIX]: Abilities.WELL_BAKED_BODY, [Species.SWIRLIX]: Abilities.WELL_BAKED_BODY,
[Species.INKAY]: Abilities.UNNERVE, [Species.INKAY]: Abilities.UNNERVE,
[Species.BINACLE]: Abilities.SAP_SIPPER, [Species.BINACLE]: Abilities.SAP_SIPPER,
@ -3670,17 +3670,17 @@ export const starterPassiveAbilities = {
[Species.CARBINK]: Abilities.SOLID_ROCK, [Species.CARBINK]: Abilities.SOLID_ROCK,
[Species.GOOMY]: Abilities.REGENERATOR, [Species.GOOMY]: Abilities.REGENERATOR,
[Species.KLEFKI]: Abilities.LEVITATE, [Species.KLEFKI]: Abilities.LEVITATE,
[Species.PHANTUMP]: Abilities.SHADOW_TAG, [Species.PHANTUMP]: Abilities.RIPEN,
[Species.PUMPKABOO]: Abilities.WELL_BAKED_BODY, [Species.PUMPKABOO]: Abilities.WELL_BAKED_BODY,
[Species.BERGMITE]: Abilities.ICE_SCALES, [Species.BERGMITE]: Abilities.ICE_SCALES,
[Species.NOIBAT]: Abilities.PUNK_ROCK, [Species.NOIBAT]: Abilities.PUNK_ROCK,
[Species.XERNEAS]: Abilities.HARVEST, [Species.XERNEAS]: Abilities.MISTY_SURGE,
[Species.YVELTAL]: Abilities.SOUL_HEART, [Species.YVELTAL]: Abilities.SOUL_HEART,
[Species.ZYGARDE]: Abilities.HUGE_POWER, [Species.ZYGARDE]: Abilities.HUGE_POWER,
[Species.DIANCIE]: Abilities.LEVITATE, [Species.DIANCIE]: Abilities.LEVITATE,
[Species.HOOPA]: Abilities.OPPORTUNIST, [Species.HOOPA]: Abilities.OPPORTUNIST,
[Species.VOLCANION]: Abilities.FILTER, [Species.VOLCANION]: Abilities.FILTER,
[Species.ROWLET]: Abilities.SNIPER, [Species.ROWLET]: Abilities.UNBURDEN,
[Species.LITTEN]: Abilities.FUR_COAT, [Species.LITTEN]: Abilities.FUR_COAT,
[Species.POPPLIO]: Abilities.PUNK_ROCK, [Species.POPPLIO]: Abilities.PUNK_ROCK,
[Species.PIKIPEK]: Abilities.TECHNICIAN, [Species.PIKIPEK]: Abilities.TECHNICIAN,
@ -3714,7 +3714,7 @@ export const starterPassiveAbilities = {
[Species.BRUXISH]: Abilities.MULTISCALE, [Species.BRUXISH]: Abilities.MULTISCALE,
[Species.DRAMPA]: Abilities.THICK_FAT, [Species.DRAMPA]: Abilities.THICK_FAT,
[Species.DHELMISE]: Abilities.WATER_BUBBLE, [Species.DHELMISE]: Abilities.WATER_BUBBLE,
[Species.JANGMO_O]: Abilities.DAUNTLESS_SHIELD, [Species.JANGMO_O]: Abilities.PUNK_ROCK,
[Species.TAPU_KOKO]: Abilities.TRANSISTOR, [Species.TAPU_KOKO]: Abilities.TRANSISTOR,
[Species.TAPU_LELE]: Abilities.SHEER_FORCE, [Species.TAPU_LELE]: Abilities.SHEER_FORCE,
[Species.TAPU_BULU]: Abilities.TRIAGE, [Species.TAPU_BULU]: Abilities.TRIAGE,
@ -3726,7 +3726,7 @@ export const starterPassiveAbilities = {
[Species.XURKITREE]: Abilities.TRANSISTOR, [Species.XURKITREE]: Abilities.TRANSISTOR,
[Species.CELESTEELA]: Abilities.HEATPROOF, [Species.CELESTEELA]: Abilities.HEATPROOF,
[Species.KARTANA]: Abilities.SHARPNESS, [Species.KARTANA]: Abilities.SHARPNESS,
[Species.GUZZLORD]: Abilities.POISON_HEAL, [Species.GUZZLORD]: Abilities.INNARDS_OUT,
[Species.NECROZMA]: Abilities.BEAST_BOOST, [Species.NECROZMA]: Abilities.BEAST_BOOST,
[Species.MAGEARNA]: Abilities.STEELY_SPIRIT, [Species.MAGEARNA]: Abilities.STEELY_SPIRIT,
[Species.MARSHADOW]: Abilities.IRON_FIST, [Species.MARSHADOW]: Abilities.IRON_FIST,
@ -3738,13 +3738,13 @@ export const starterPassiveAbilities = {
[Species.GROOKEY]: Abilities.GRASS_PELT, [Species.GROOKEY]: Abilities.GRASS_PELT,
[Species.SCORBUNNY]: Abilities.NO_GUARD, [Species.SCORBUNNY]: Abilities.NO_GUARD,
[Species.SOBBLE]: Abilities.SUPER_LUCK, [Species.SOBBLE]: Abilities.SUPER_LUCK,
[Species.SKWOVET]: Abilities.HARVEST, [Species.SKWOVET]: Abilities.RIPEN,
[Species.ROOKIDEE]: Abilities.IRON_BARBS, [Species.ROOKIDEE]: Abilities.IRON_BARBS,
[Species.BLIPBUG]: Abilities.PSYCHIC_SURGE, [Species.BLIPBUG]: Abilities.PSYCHIC_SURGE,
[Species.NICKIT]: Abilities.MAGICIAN, [Species.NICKIT]: Abilities.MAGICIAN,
[Species.GOSSIFLEUR]: Abilities.GRASSY_SURGE, [Species.GOSSIFLEUR]: Abilities.GRASSY_SURGE,
[Species.WOOLOO]: Abilities.SIMPLE, [Species.WOOLOO]: Abilities.SIMPLE,
[Species.CHEWTLE]: Abilities.ROCKY_PAYLOAD, [Species.CHEWTLE]: Abilities.ROCK_HEAD,
[Species.YAMPER]: Abilities.SHEER_FORCE, [Species.YAMPER]: Abilities.SHEER_FORCE,
[Species.ROLYCOLY]: Abilities.SOLID_ROCK, [Species.ROLYCOLY]: Abilities.SOLID_ROCK,
[Species.APPLIN]: Abilities.DRAGONS_MAW, [Species.APPLIN]: Abilities.DRAGONS_MAW,
@ -3757,7 +3757,7 @@ export const starterPassiveAbilities = {
[Species.SINISTEA]: Abilities.SHADOW_SHIELD, [Species.SINISTEA]: Abilities.SHADOW_SHIELD,
[Species.HATENNA]: Abilities.FAIRY_AURA, [Species.HATENNA]: Abilities.FAIRY_AURA,
[Species.IMPIDIMP]: Abilities.FUR_COAT, [Species.IMPIDIMP]: Abilities.FUR_COAT,
[Species.MILCERY]: Abilities.REGENERATOR, [Species.MILCERY]: Abilities.MISTY_SURGE,
[Species.FALINKS]: Abilities.PARENTAL_BOND, [Species.FALINKS]: Abilities.PARENTAL_BOND,
[Species.PINCURCHIN]: Abilities.ELECTROMORPHOSIS, [Species.PINCURCHIN]: Abilities.ELECTROMORPHOSIS,
[Species.SNOM]: Abilities.SNOW_WARNING, [Species.SNOM]: Abilities.SNOW_WARNING,
@ -3776,7 +3776,7 @@ export const starterPassiveAbilities = {
[Species.ZAMAZENTA]: Abilities.STAMINA, [Species.ZAMAZENTA]: Abilities.STAMINA,
[Species.ETERNATUS]: Abilities.SUPREME_OVERLORD, [Species.ETERNATUS]: Abilities.SUPREME_OVERLORD,
[Species.KUBFU]: Abilities.IRON_FIST, [Species.KUBFU]: Abilities.IRON_FIST,
[Species.ZARUDE]: Abilities.TOUGH_CLAWS, [Species.ZARUDE]: Abilities.GRASSY_SURGE,
[Species.REGIELEKI]: Abilities.ELECTRIC_SURGE, [Species.REGIELEKI]: Abilities.ELECTRIC_SURGE,
[Species.REGIDRAGO]: Abilities.MULTISCALE, [Species.REGIDRAGO]: Abilities.MULTISCALE,
[Species.GLASTRIER]: Abilities.FILTER, [Species.GLASTRIER]: Abilities.FILTER,
@ -3785,7 +3785,7 @@ export const starterPassiveAbilities = {
[Species.ENAMORUS]: Abilities.FAIRY_AURA, [Species.ENAMORUS]: Abilities.FAIRY_AURA,
[Species.SPRIGATITO]: Abilities.MAGICIAN, [Species.SPRIGATITO]: Abilities.MAGICIAN,
[Species.FUECOCO]: Abilities.PUNK_ROCK, [Species.FUECOCO]: Abilities.PUNK_ROCK,
[Species.QUAXLY]: Abilities.OPPORTUNIST, [Species.QUAXLY]: Abilities.DEFIANT,
[Species.LECHONK]: Abilities.SIMPLE, [Species.LECHONK]: Abilities.SIMPLE,
[Species.TAROUNTULA]: Abilities.HONEY_GATHER, [Species.TAROUNTULA]: Abilities.HONEY_GATHER,
[Species.NYMBLE]: Abilities.GUTS, [Species.NYMBLE]: Abilities.GUTS,
@ -3833,7 +3833,7 @@ export const starterPassiveAbilities = {
[Species.IRON_MOTH]: Abilities.LEVITATE, [Species.IRON_MOTH]: Abilities.LEVITATE,
[Species.IRON_THORNS]: Abilities.SAND_STREAM, [Species.IRON_THORNS]: Abilities.SAND_STREAM,
[Species.FRIGIBAX]: Abilities.SNOW_WARNING, [Species.FRIGIBAX]: Abilities.SNOW_WARNING,
[Species.GIMMIGHOUL]: Abilities.HONEY_GATHER, [Species.GIMMIGHOUL]: Abilities.CONTRARY,
[Species.WO_CHIEN]: Abilities.VESSEL_OF_RUIN, [Species.WO_CHIEN]: Abilities.VESSEL_OF_RUIN,
[Species.CHIEN_PAO]: Abilities.INTREPID_SWORD, [Species.CHIEN_PAO]: Abilities.INTREPID_SWORD,
[Species.TING_LU]: Abilities.STAMINA, [Species.TING_LU]: Abilities.STAMINA,
@ -3864,7 +3864,7 @@ export const starterPassiveAbilities = {
[Species.ALOLA_GRIMER]: Abilities.TOXIC_DEBRIS, [Species.ALOLA_GRIMER]: Abilities.TOXIC_DEBRIS,
[Species.ETERNAL_FLOETTE]: Abilities.MAGIC_GUARD, [Species.ETERNAL_FLOETTE]: Abilities.MAGIC_GUARD,
[Species.GALAR_MEOWTH]: Abilities.STEELWORKER, [Species.GALAR_MEOWTH]: Abilities.STEELWORKER,
[Species.GALAR_PONYTA]: Abilities.MOXIE, [Species.GALAR_PONYTA]: Abilities.PIXILATE,
[Species.GALAR_SLOWPOKE]: Abilities.UNAWARE, [Species.GALAR_SLOWPOKE]: Abilities.UNAWARE,
[Species.GALAR_FARFETCHD]: Abilities.INTREPID_SWORD, [Species.GALAR_FARFETCHD]: Abilities.INTREPID_SWORD,
[Species.GALAR_ARTICUNO]: Abilities.SERENE_GRACE, [Species.GALAR_ARTICUNO]: Abilities.SERENE_GRACE,
@ -3876,7 +3876,7 @@ export const starterPassiveAbilities = {
[Species.GALAR_YAMASK]: Abilities.TABLETS_OF_RUIN, [Species.GALAR_YAMASK]: Abilities.TABLETS_OF_RUIN,
[Species.GALAR_STUNFISK]: Abilities.ARENA_TRAP, [Species.GALAR_STUNFISK]: Abilities.ARENA_TRAP,
[Species.HISUI_GROWLITHE]: Abilities.RECKLESS, [Species.HISUI_GROWLITHE]: Abilities.RECKLESS,
[Species.HISUI_VOLTORB]: Abilities.TRANSISTOR, [Species.HISUI_VOLTORB]: Abilities.ELECTRIC_SURGE,
[Species.HISUI_QWILFISH]: Abilities.MERCILESS, [Species.HISUI_QWILFISH]: Abilities.MERCILESS,
[Species.HISUI_SNEASEL]: Abilities.SCRAPPY, [Species.HISUI_SNEASEL]: Abilities.SCRAPPY,
[Species.HISUI_ZORUA]: Abilities.ADAPTABILITY, [Species.HISUI_ZORUA]: Abilities.ADAPTABILITY,

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen.", "genFilter": "Gen.",
"typeFilter": "Typ", "typeFilter": "Typ",
"caughtFilter": "Gefangen", "dexFilter": "Dex.",
"unlocksFilter": "Freisch.", "unlocksFilter": "Freisch.",
"miscFilter": "Sonst.", "miscFilter": "Sonst.",
"sortFilter": "Sort.", "sortFilter": "Sort.",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen", "genFilter": "Gen",
"typeFilter": "Type", "typeFilter": "Type",
"caughtFilter": "Caught", "dexFilter": "Dex",
"unlocksFilter": "Unlocks", "unlocksFilter": "Unlocks",
"miscFilter": "Misc", "miscFilter": "Misc",
"sortFilter": "Sort", "sortFilter": "Sort",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen.", "genFilter": "Gen.",
"typeFilter": "Tipo", "typeFilter": "Tipo",
"caughtFilter": "Caught", "dexFilter": "Dex",
"unlocksFilter": "Otros", "unlocksFilter": "Otros",
"miscFilter": "Misc", "miscFilter": "Misc",
"sortFilter": "Orden", "sortFilter": "Orden",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen", "genFilter": "Gen",
"typeFilter": "Type", "typeFilter": "Type",
"caughtFilter": "Capturés", "dexFilter": "Dex",
"unlocksFilter": "Débloq.", "unlocksFilter": "Débloq.",
"miscFilter": "Divers", "miscFilter": "Divers",
"sortFilter": "Tri", "sortFilter": "Tri",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen", "genFilter": "Gen",
"typeFilter": "Tipo", "typeFilter": "Tipo",
"caughtFilter": "Caught", "dexFilter": "Dex",
"unlocksFilter": "Altro", "unlocksFilter": "Altro",
"miscFilter": "Misc", "miscFilter": "Misc",
"sortFilter": "Ordina", "sortFilter": "Ordina",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "세대", "genFilter": "세대",
"typeFilter": "타입", "typeFilter": "타입",
"caughtFilter": "포획", "dexFilter": "도감",
"unlocksFilter": "해금", "unlocksFilter": "해금",
"miscFilter": "기타", "miscFilter": "기타",
"sortFilter": "정렬", "sortFilter": "정렬",
@ -13,18 +13,18 @@ export const filterBar: SimpleTranslationEntries = {
"passive": "패시브", "passive": "패시브",
"passiveUnlocked": "패시브 해금", "passiveUnlocked": "패시브 해금",
"passiveLocked": "패시브 잠김", "passiveLocked": "패시브 잠김",
"costReduction": "코스트 줄이기", "costReduction": "Cost Reduction",
"costReductionUnlocked": "코스트 절감됨", "costReductionUnlocked": "Cost Reduction Unlocked",
"costReductionLocked": "코스트 절감 없음", "costReductionLocked": "Cost Reduction Locked",
"ribbon": "클리어 여부", "ribbon": "클리어 여부",
"hasWon": "클리어 완료", "hasWon": "클리어 ",
"hasNotWon": "클리어 안함", "hasNotwon": "클리어 안함",
"hiddenAbility": "숨겨진 특성", "hiddenAbility": "Hidden Ability",
"hasHiddenAbility": "숨겨진 특성 보유", "hasHiddenAbility": "Hidden Ability - Yes",
"noHiddenAbility": "숨겨진 특성 없음", "noHiddenAbility": "Hidden Ability - No",
"pokerus": "포켓러스", "pokerus": "Pokerus",
"hasPokerus": "포켓러스 감염", "hasPokerus": "Pokerus - Yes",
"noPokerus": "포켓러스 없음", "noPokerus": "Pokerus - No",
"sortByNumber": "도감번호", "sortByNumber": "도감번호",
"sortByCost": "코스트", "sortByCost": "코스트",
"sortByCandies": "사탕 수", "sortByCandies": "사탕 수",

View File

@ -7,7 +7,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
*/ */
export const starterSelectUiHandler: SimpleTranslationEntries = { export const starterSelectUiHandler: SimpleTranslationEntries = {
"confirmStartTeam": "이 포켓몬들로 시작하시겠습니까?", "confirmStartTeam": "이 포켓몬들로 시작하시겠습니까?",
"confirmExit": "나가시겠습니까?", "confirmExit": "Do you want to exit?",
"invalidParty": "스타팅 포켓몬 파티에 적합하지 않습니다!", "invalidParty": "스타팅 포켓몬 파티에 적합하지 않습니다!",
"gen1": "1세대", "gen1": "1세대",
"gen2": "2세대", "gen2": "2세대",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Ger.", "genFilter": "Ger.",
"typeFilter": "Tipo", "typeFilter": "Tipo",
"caughtFilter": "Capturado", "dexFilter": "Dex",
"unlocksFilter": "Desbloqueios", "unlocksFilter": "Desbloqueios",
"miscFilter": "Outros", "miscFilter": "Outros",
"sortFilter": "Ordem", "sortFilter": "Ordem",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "世代", "genFilter": "世代",
"typeFilter": "属性", "typeFilter": "属性",
"caughtFilter": "捕获", "dexFilter": "Dex",
"unlocksFilter": "解锁", "unlocksFilter": "解锁",
"miscFilter": "混合", "miscFilter": "混合",
"sortFilter": "排序", "sortFilter": "排序",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "世代", "genFilter": "世代",
"typeFilter": "屬性", "typeFilter": "屬性",
"caughtFilter": "捕獲", "dexFilter": "Dex",
"unlocksFilter": "解鎖", "unlocksFilter": "解鎖",
"miscFilter": "混合", "miscFilter": "混合",
"sortFilter": "排序", "sortFilter": "排序",

View File

@ -1569,7 +1569,7 @@ const modifierPool: ModifierPool = {
p => !p.getHeldItems().some(i => i instanceof Modifiers.PokemonResetNegativeStatStageModifier && i.stackCount >= i.getMaxHeldItemCount(p)) && p => !p.getHeldItems().some(i => i instanceof Modifiers.PokemonResetNegativeStatStageModifier && i.stackCount >= i.getMaxHeldItemCount(p)) &&
(checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => selfStatLowerMoves.includes(m.moveId)))).length; (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => selfStatLowerMoves.includes(m.moveId)))).length;
// If a party member has one of the above moves or abilities and doesn't have max herbs, the herb will appear more frequently // If a party member has one of the above moves or abilities and doesn't have max herbs, the herb will appear more frequently
return 0 * (weightMultiplier ? 2 : 1) + (weightMultiplier ? weightMultiplier * 0 : 0); return 2 * (weightMultiplier ? 2 : 1) + (weightMultiplier ? weightMultiplier : 0);
}, 10), }, 10),
new WeightedModifierType(modifierTypes.REVIVER_SEED, 4), new WeightedModifierType(modifierTypes.REVIVER_SEED, 4),
new WeightedModifierType(modifierTypes.CANDY_JAR, 5), new WeightedModifierType(modifierTypes.CANDY_JAR, 5),
@ -1637,7 +1637,7 @@ const wildModifierPool: ModifierPool = {
}), }),
[ModifierTier.ULTRA]: [ [ModifierTier.ULTRA]: [
new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10), new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
new WeightedModifierType(modifierTypes.WHITE_HERB, 0) new WeightedModifierType(modifierTypes.WHITE_HERB, 1)
].map(m => { ].map(m => {
m.setTier(ModifierTier.ULTRA); return m; m.setTier(ModifierTier.ULTRA); return m;
}), }),
@ -1667,7 +1667,7 @@ const trainerModifierPool: ModifierPool = {
}), }),
[ModifierTier.ULTRA]: [ [ModifierTier.ULTRA]: [
new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10), new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
new WeightedModifierType(modifierTypes.WHITE_HERB, 0), new WeightedModifierType(modifierTypes.WHITE_HERB, 1),
].map(m => { ].map(m => {
m.setTier(ModifierTier.ULTRA); return m; m.setTier(ModifierTier.ULTRA); return m;
}), }),

View File

@ -8,7 +8,7 @@ import { addWindow, WindowVariant } from "./ui-theme";
export enum DropDownColumn { export enum DropDownColumn {
GEN, GEN,
TYPES, TYPES,
CAUGHT, DEX,
UNLOCKS, UNLOCKS,
MISC, MISC,
SORT SORT

View File

@ -398,7 +398,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
}); });
this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(this.scene, 0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5)); this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(this.scene, 0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5));
// caught filter // shiny filter
const shiny1Sprite = this.scene.add.sprite(0, 0, "shiny_icons"); const shiny1Sprite = this.scene.add.sprite(0, 0, "shiny_icons");
shiny1Sprite.setOrigin(0.15, 0.2); shiny1Sprite.setOrigin(0.15, 0.2);
shiny1Sprite.setScale(0.6); shiny1Sprite.setScale(0.6);
@ -415,7 +415,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
shiny3Sprite.setFrame(getVariantIcon(2)); shiny3Sprite.setFrame(getVariantIcon(2));
shiny3Sprite.setTint(getVariantTint(2)); shiny3Sprite.setTint(getVariantTint(2));
const caughtOptions = [ const shinyOptions = [
new DropDownOption(this.scene, "SHINY3", new DropDownLabel("", shiny3Sprite)), new DropDownOption(this.scene, "SHINY3", new DropDownLabel("", shiny3Sprite)),
new DropDownOption(this.scene, "SHINY2", new DropDownLabel("", shiny2Sprite)), new DropDownOption(this.scene, "SHINY2", new DropDownLabel("", shiny2Sprite)),
new DropDownOption(this.scene, "SHINY", new DropDownLabel("", shiny1Sprite)), new DropDownOption(this.scene, "SHINY", new DropDownLabel("", shiny1Sprite)),
@ -423,7 +423,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
new DropDownOption(this.scene, "UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))) new DropDownOption(this.scene, "UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught")))
]; ];
this.filterBar.addFilter(DropDownColumn.CAUGHT, i18next.t("filterBar:caughtFilter"), new DropDown(this.scene, 0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID)); this.filterBar.addFilter(DropDownColumn.DEX, i18next.t("filterBar:dexFilter"), new DropDown(this.scene, 0, 0, shinyOptions, this.updateStarters, DropDownType.HYBRID));
// unlocks filter // unlocks filter
const passiveLabels = [ const passiveLabels = [
@ -2130,16 +2130,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
const fitsType = this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1)); const fitsType = this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1));
const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => { const fitsShiny = this.filterBar.getVals(DropDownColumn.DEX).some(variant => {
if (caught === "SHINY3") { if (variant === "SHINY3") {
return isVariant3Caught; return isVariant3Caught;
} else if (caught === "SHINY2") { } else if (variant === "SHINY2") {
return isVariant2Caught && !isVariant3Caught; return isVariant2Caught && !isVariant3Caught;
} else if (caught === "SHINY") { } else if (variant === "SHINY") {
return isVariantCaught && !isVariant2Caught && !isVariant3Caught; return isVariantCaught && !isVariant2Caught && !isVariant3Caught;
} else if (caught === "NORMAL") { } else if (variant === "NORMAL") {
return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught; return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught;
} else if (caught === "UNCAUGHT") { } else if (variant === "UNCAUGHT") {
return isUncaught; return isUncaught;
} }
}); });
@ -2196,7 +2196,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
} }
}); });
if (fitsGen && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsWin && fitsHA && fitsPokerus) { if (fitsGen && fitsType && fitsShiny && fitsPassive && fitsCostReduction && fitsWin && fitsHA && fitsPokerus) {
this.filteredStarterContainers.push(container); this.filteredStarterContainers.push(container);
} }
}); });