Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-11 11:11:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Pokedex: Update formes"

Browse Source 
This reverts commit 302f391381.

Fixes a bug in 77cca394bd
This commit is contained in:
Guangcong Luo 2019-12-02 13:56:18 +09:00
parent b47cd83a7b
commit 4b324e536e
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/abilities.js
View File

@ -762,7 +762,7 @@ let BattleAbilities = {
},
onUpdate(pokemon) {
if (['mimikyu', 'mimikyutotem'].includes(pokemon.template.speciesid) && this.effectData.busted) {
let templateid = pokemon.template.speciesid + 'busted';
let templateid = pokemon.template.speciesid === 'mimikyutotem' ? 'Mimikyu-Busted-Totem' : 'Mimikyu-Busted';
pokemon.formeChange(templateid, this.effect, true);
this.damage(pokemon.maxhp / 8, pokemon, pokemon);
}

4
data/formats-data.js
View File

@ -5392,7 +5392,7 @@ let BattleFormatsData = {
tier: "OU",
doublesTier: "New",
},
darmanitangalarzen: {
darmanitanzengalar: {
requiredAbility: "Zen Mode",
battleOnly: true,
},
@ -7124,7 +7124,7 @@ let BattleFormatsData = {
isNonstandard: "Past",
tier: "Illegal",
},
mimikyutotembusted: {
mimikyubustedtotem: {
requiredAbility: 'Disguise',
battleOnly: true,
isNonstandard: "Past",

2
data/mods/gen7/formats-data.js
View File

@ -5499,7 +5499,7 @@ let BattleFormatsData = {
tier: "UU",
doublesTier: "DUU",
},
mimikyutotembusted: {
mimikyubustedtotem: {
requiredAbility: 'Disguise',
battleOnly: true,
},

26
data/pokedex.js
View File

@ -7044,6 +7044,7 @@ let BattlePokedex = {
heightm: 0.5,
weightkg: 9.3,
color: "Pink",
prevo: "cherubi",
evoLevel: 25,
eggGroups: ["Fairy", "Grass"],
},
@ -9262,7 +9263,7 @@ let BattlePokedex = {
prevo: "darumaka",
evoLevel: 35,
eggGroups: ["Field"],
otherFormes: ["darmanitanzen", "darmanitangalar"],
otherFormes: ["darmanitanzen", "darmanitangalar", "darmanitanzengalar"],
},
darmanitanzen: {
num: 555,
@ -9275,6 +9276,7 @@ let BattlePokedex = {
heightm: 1.3,
weightkg: 92.9,
color: "Blue",
prevo: "darumaka",
evoLevel: 35,
eggGroups: ["Field"],
},
@ -9293,19 +9295,19 @@ let BattlePokedex = {
evoType: "useItem",
evoItem: "Ice Stone",
eggGroups: ["Field"],
otherFormes: ["darmanitangalarzen"],
},
darmanitangalarzen: {
darmanitanzengalar: {
num: 555,
species: "Darmanitan-Galar-Zen",
baseSpecies: "Darmanitan-Galar",
forme: "Zen",
species: "Darmanitan-Zen-Galar",
baseSpecies: "Darmanitan",
forme: "Zen-Galar",
types: ["Ice", "Fire"],
baseStats: {hp: 105, atk: 160, def: 55, spa: 30, spd: 55, spe: 135},
abilities: {0: "Zen Mode"},
heightm: 1.7,
weightkg: 120,
color: "White",
prevo: "darumakagalar",
evoType: "useItem",
evoItem: "Ice Stone",
eggGroups: ["Field"],
@ -11236,6 +11238,7 @@ let BattlePokedex = {
heightm: 1.7,
weightkg: 53,
color: "Brown",
prevo: "doublade",
evoType: "useItem",
evoItem: "Dusk Stone",
eggGroups: ["Mineral"],
@ -13100,7 +13103,7 @@ let BattlePokedex = {
weightkg: 0.7,
color: "Yellow",
eggGroups: ["Amorphous"],
otherFormes: ["mimikyubusted", "mimikyutotem"],
otherFormes: ["mimikyubusted", "mimikyutotem", "mimikyubustedtotem"],
},
mimikyubusted: {
num: 778,
@ -13127,13 +13130,12 @@ let BattlePokedex = {
weightkg: 2.8,
color: "Yellow",
eggGroups: ["Amorphous"],
otherFormes: ["mimikyutotembusted"],
},
mimikyutotembusted: {
mimikyubustedtotem: {
num: 778,
species: "Mimikyu-Totem-Busted",
baseSpecies: "Mimikyu-Totem",
forme: "Busted",
species: "Mimikyu-Busted-Totem",
baseSpecies: "Mimikyu",
forme: "Busted-Totem",
types: ["Ghost", "Fairy"],
baseStats: {hp: 55, atk: 90, def: 80, spa: 50, spd: 105, spe: 96},
abilities: {0: "Disguise"},