SSB: Fix some bugs

smogon · May 19, 2024 · 5a8c8f5 · 5a8c8f5
1 parent 2cdef4c
commit 5a8c8f5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/data/mods/gen9ssb/abilities.ts b/data/mods/gen9ssb/abilities.ts
@@ -342,14 +342,15 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 	cascade: {
 		shortDesc: "At 25% HP, transforms into a Mismagius. Sigil's Storm becomes Ghost type and doesn't charge.",
 		name: "Cascade",
-		onDamagingHit(damage, pokemon, source, move) {
+		onUpdate(pokemon) {
 			if (pokemon.baseSpecies.baseSpecies !== 'Hatterene' || pokemon.transformed || !pokemon.hp) return;
 			if (pokemon.species.id === 'mismagius' || pokemon.hp > pokemon.maxhp / 4) return;
 			this.add(`c:|${getName('ausma')}|that's it, yall mfs are about to face the wrath of Big Stall™`);
 			this.add(`c:|${getName('ausma')}|or i guess moreso Big Pult. pick your poison`);
 			this.add('-activate', pokemon, 'ability: Cascade');
 			changeSet(this, pokemon, ssbSets['ausma-Mismagius'], true);
 			pokemon.cureStatus();
+			this.heal(pokemon.maxhp / 3);
 			if (this.field.pseudoWeather['trickroom']) {
 				this.field.removePseudoWeather('trickroom');
 				this.boost({spe: 2}, pokemon, pokemon, this.effect);
@@ -684,7 +685,9 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 		onResidual(pokemon) {
 			for (const ally of pokemon.side.pokemon) {
 				if (!ally.hp || ally === pokemon) continue;
-				this.heal(ally.baseMaxhp * (pokemon.hp > pokemon.maxhp / 4 ? 5 : 10) / 100, ally, pokemon);
+				if (ally.heal(this.modify(ally.baseMaxhp, pokemon.hp > pokemon.maxhp / 4 ? 0.05 : 0.1))) {
+					this.add('-heal', ally, ally.getHealth, '[from] ability: Coalescence', '[of] ' + pokemon);
+				}
 			}
 		},
 		flags: {},

diff --git a/data/mods/gen9ssb/moves.ts b/data/mods/gen9ssb/moves.ts
@@ -3804,7 +3804,9 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 		onTry(pokemon, target, move) {
 			if (move.sourceEffect !== '3' && this.randomChance(1, 10)) {
 				this.add('-message', "The move backfired!");
-				this.actions.useMove('3', target, pokemon);
+				const activeMove = this.dex.getActiveMove(':3');
+				activeMove.hasBounced = true;
+				this.actions.useMove(activeMove, target, pokemon);
 				return null;
 			}
 		},
@@ -4766,8 +4768,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 		accuracy: 100,
 		basePower: 80,
 		category: "Physical",
-		shortDesc: "User: Recycle; Target: Leech Seed.",
-		desc: "If this attack is successful, the user regains its last used held item, unless it was forcibly removed. This move summons Leech Seed on the foe.",
+		shortDesc: "The user recycles their item.",
+		desc: "If this attack is successful, the user regains its last used held item, unless it was forcibly removed.",
 		name: "Like..?",
 		pp: 5,
 		priority: 0,
@@ -4778,11 +4780,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 		onPrepareHit(target, source) {
 			this.add('-anim', source, 'Recycle', target);
 			this.add('-anim', source, 'Seed Bomb', target);
-			this.add('-anim', source, 'Leech Seed', target);
-		},
-		onHit(target, source) {
-			if (target.hasType('Grass')) return null;
-			target.addVolatile('leechseed', source);
 		},
 		self: {
 			onHit(pokemon) {

diff --git a/data/mods/gen9ssb/random-teams.ts b/data/mods/gen9ssb/random-teams.ts
@@ -106,13 +106,13 @@ export const ssbSets: SSBSets = {
 		species: 'Deoxys-Defense', ability: 'Marble Phantasm', item: 'Heavy-Duty Boots', gender: 'N',
 		moves: [['Lunar Blessing', 'Jungle Healing'], 'Body Press', ['Toxic', 'Will-O-Wisp', 'Topsy-Turvy']],
 		signatureMove: 'Funny Vamp',
-		evs: {hp: 248, spa: 8, spe: 252}, nature: 'Naive', shiny: true,
+		evs: {hp: 248, def: 252, spd: 8}, nature: 'Bold', teraType: 'Fairy', shiny: true,
 	},
 	'Arcueid-Attack': {
 		species: 'Deoxys-Attack', ability: 'Marble Phantasm', item: 'Heavy-Duty Boots', gender: 'N',
-		moves: [['Moonblast', 'Draining Kiss'], 'Photon Geyser', 'Flamethrower'],
+		moves: ['Moonblast', 'Photon Geyser', 'Flamethrower'],
 		signatureMove: 'Funny Vamp',
-		evs: {hp: 248, spa: 8, spe: 252}, nature: 'Naive', shiny: true, skip: 'Arcueid',
+		evs: {hp: 4, spa: 252, spe: 252}, nature: 'Timid', teraType: 'Fairy', shiny: true, skip: 'Arcueid',
 	},
 	Arsenal: {
 		species: 'Rabsca', ability: 'Absorb Phys', item: 'Covert Cloak', gender: 'N',
@@ -139,13 +139,13 @@ export const ssbSets: SSBSets = {
 		evs: {def: 8, spa: 244, spe: 252}, nature: 'Timid', teraType: 'Fairy',
 	},
 	ausma: {
-		species: 'Hatterene', ability: 'Cascade', item: 'Iapapa Berry', gender: 'F',
+		species: 'Hatterene', ability: 'Cascade', item: 'Leftovers', gender: 'F',
 		moves: ['Light of Ruin', 'Strength Sap', 'Substitute'],
 		signatureMove: 'Sigil\'s Storm',
 		evs: {hp: 252, def: 4, spa: 252}, ivs: {atk: 0, spe: 0}, nature: 'Modest', teraType: 'Fairy',
 	},
 	'ausma-Mismagius': {
-		species: 'Mismagius', ability: 'Levitate', item: 'Iapapa Berry', gender: 'F',
+		species: 'Mismagius', ability: 'Levitate', item: 'Leftovers', gender: 'F',
 		moves: ['Light of Ruin', 'Strength Sap', 'Substitute'],
 		signatureMove: 'Sigil\'s Storm',
 		evs: {spa: 252, spd: 4, spe: 252}, ivs: {atk: 0}, nature: 'Modest', teraType: 'Fairy', skip: 'ausma',
@@ -399,9 +399,9 @@ export const ssbSets: SSBSets = {
 	},
 	'Haste Inky': {
 		species: 'Falinks', ability: 'Simple', item: 'Sitrus Berry', gender: 'N',
-		moves: ['Superpower', 'Ice Hammer', 'Poison Jab'],
+		moves: ['Superpower', 'Ice Hammer', 'Throat Chop'],
 		signatureMove: 'Hasty Revolution',
-		evs: {atk: 4, def: 252, spe: 252}, nature: 'Jolly', teraType: 'Poison',
+		evs: {atk: 252, def: 4, spe: 252}, nature: 'Jolly', teraType: 'Dark',
 	},
 	havi: {
 		species: 'Gastly', ability: 'Mensis Cage', item: 'Leftovers', gender: 'F',