Pokebilities: fix special abilities as well as Gastro Acid (#5140)

smogon · Feb 6, 2019 · 205a753 · 205a753
1 parent 0a864e8
commit 205a753
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/config/formats.js b/config/formats.js
@@ -574,7 +574,7 @@ let Formats = [
 		onBegin: function () {
 			let allPokemon = this.p1.pokemon.concat(this.p2.pokemon);
 			for (let pokemon of allPokemon) {
-				if (pokemon.ability === pokemon.template.abilities['S']) {
+				if (pokemon.ability === toId(pokemon.template.abilities['S'])) {
 					continue;
 				}
 				// @ts-ignore

diff --git a/data/mods/pokebilities/moves.js b/data/mods/pokebilities/moves.js
@@ -0,0 +1,16 @@
+'use strict';
+
+/**@type {{[k: string]: ModdedMoveData}} */
+exports.BattleMovedex = {
+	"gastroacid": {
+		inherit: true,
+		effect: {
+			// Ability suppression implemented in Pokemon.ignoringAbility() within sim/pokemon.js
+			onStart: function (pokemon) {
+				this.add('-endability', pokemon);
+				this.singleEvent('End', this.getAbility(pokemon.ability), pokemon.abilityData, pokemon, pokemon, 'gastroacid');
+				if (pokemon.innates) pokemon.innates.forEach(innate => pokemon.removeVolatile("ability" + innate));
+			},
+		},
+	},
+};
diff --git a/data/pokedex.js b/data/pokedex.js
@@ -11472,7 +11472,7 @@ let BattlePokedex = {
 		types: ["Dragon", "Ground"],
 		gender: "N",
 		baseStats: {hp: 108, atk: 100, def: 121, spa: 81, spd: 95, spe: 95},
-		abilities: {0: "Aura Break", H: "Power Construct"},
+		abilities: {0: "Aura Break", S: "Power Construct"},
 		heightm: 5,
 		weightkg: 305,
 		color: "Green",
@@ -11488,7 +11488,7 @@ let BattlePokedex = {
 		types: ["Dragon", "Ground"],
 		gender: "N",
 		baseStats: {hp: 54, atk: 100, def: 71, spa: 61, spd: 85, spe: 115},
-		abilities: {0: "Aura Break", H: "Power Construct"},
+		abilities: {0: "Aura Break", S: "Power Construct"},
 		heightm: 1.2,
 		weightkg: 33.5,
 		color: "Green",