Rename event to AfterDamage

smogon · Feb 17, 2025 · dd3cc89 · dd3cc89
1 parent 7c87d8b
commit dd3cc89
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/data/abilities.ts b/data/abilities.ts
@@ -167,7 +167,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 			if (target.hp <= target.maxhp / 2 && target.hp + damage > target.maxhp / 2) {
 				this.boost({atk: 1, spa: 1, spe: 1, def: -1, spd: -1}, target, target);
 				const item = target.getItem();
-				if (item.isBerry || item.id === 'berryjuice') this.runEvent('TakeDamage', target, null, null, damage);
+				if (item.isBerry || item.id === 'berryjuice') this.runEvent('AfterDamage', target, null, null, damage);
 			}
 		},
 		flags: {},
@@ -426,7 +426,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 			if (target.hp <= target.maxhp / 2 && target.hp + damage > target.maxhp / 2) {
 				this.boost({spa: 1}, target, target);
 				const item = target.getItem();
-				if (item.isBerry || item.id === 'berryjuice') this.runEvent('TakeDamage', target, null, null, damage);
+				if (item.isBerry || item.id === 'berryjuice') this.runEvent('AfterDamage', target, null, null, damage);
 			}
 		},
 		flags: {},

diff --git a/data/items.ts b/data/items.ts
@@ -166,7 +166,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -281,7 +281,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -453,7 +453,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				}
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 2) {
 				if (this.runEvent('TryHeal', pokemon, null, this.effect, 20) && pokemon.useItem()) {
 					this.heal(20);
@@ -1864,7 +1864,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -2188,7 +2188,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -2650,7 +2650,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -2998,7 +2998,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -3139,7 +3139,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -3441,7 +3441,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -4103,7 +4103,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 2) {
 				pokemon.eatItem();
 			}
@@ -4249,7 +4249,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -5165,7 +5165,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -5396,7 +5396,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 2) {
 				pokemon.eatItem();
 			}
@@ -5625,7 +5625,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();
@@ -7328,7 +7328,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 				pokemon.eatItem();
 			}
 		},
-		onTakeDamage(damage, pokemon) {
+		onAfterDamage(damage, pokemon) {
 			if (pokemon.hp <= pokemon.maxhp / 4 || (pokemon.hp <= pokemon.maxhp / 2 &&
 				pokemon.hasAbility('gluttony') && pokemon.abilityState.gluttony)) {
 				pokemon.eatItem();

diff --git a/data/mods/gen3/items.ts b/data/mods/gen3/items.ts
@@ -2,7 +2,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	aguavberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -14,7 +14,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	apicotberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -26,7 +26,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	berryjuice: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -93,7 +93,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	figyberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -105,7 +105,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	ganlonberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -131,7 +131,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	iapapaberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -158,7 +158,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	lansatberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -182,7 +182,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	liechiberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -221,7 +221,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	magoberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -277,7 +277,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	oranberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -289,7 +289,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	petayaberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -316,7 +316,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	salacberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -368,7 +368,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	sitrusberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -407,7 +407,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	starfberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {
@@ -429,7 +429,7 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 	wikiberry: {
 		inherit: true,
 		onStart() {},
-		onTakeDamage() {},
+		onAfterDamage() {},
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 		onResidual(pokemon) {

diff --git a/sim/battle-actions.ts b/sim/battle-actions.ts
@@ -1140,7 +1140,7 @@ export class BattleActions {
 					this.battle.singleEvent('AfterHit', moveData, {}, t, pokemon, move);
 				}
 			}
-			this.battle.runEvent('TakeDamage', damagedTargets, pokemon, move, damagedDamage);
+			this.battle.runEvent('AfterDamage', damagedTargets, pokemon, move, damagedDamage);
 			if (pokemon.hp && pokemon.hp <= pokemon.maxhp / 2 && pokemonOriginalHP > pokemon.maxhp / 2) {
 				this.battle.runEvent('EmergencyExit', pokemon);
 			}

diff --git a/sim/battle.ts b/sim/battle.ts
@@ -2086,7 +2086,7 @@ export class Battle {
 				}
 			}
 			// for moves, it needs to run after the 'AfterHit' event
-			if (effect.effectType !== 'Move') this.runEvent('TakeDamage', target, source, effect, targetDamage);
+			if (effect.effectType !== 'Move') this.runEvent('AfterDamage', target, source, effect, targetDamage);
 		}
 
 		if (instafaint) {
@@ -2179,7 +2179,7 @@ export class Battle {
 			this.add('-damage', target, target.getHealth);
 			break;
 		}
-		this.runEvent('TakeDamage', target, source, effect, damage);
+		this.runEvent('AfterDamage', target, source, effect, damage);
 		if (target.fainted) this.faint(target);
 		return damage;
 	}

diff --git a/sim/dex-conditions.ts b/sim/dex-conditions.ts
@@ -23,6 +23,7 @@ export interface EventMethods {
 	onAfterUseItem?: (this: Battle, item: Item, pokemon: Pokemon) => void;
 	onAfterTakeItem?: (this: Battle, item: Item, pokemon: Pokemon) => void;
 	onAfterBoost?: (this: Battle, boost: SparseBoostsTable, target: Pokemon, source: Pokemon, effect: Effect) => void;
+	onAfterDamage?: (this: Battle, damage: number, target: Pokemon, source: Pokemon, effect: Effect) => void;
 	onAfterFaint?: (this: Battle, length: number, target: Pokemon, source: Pokemon, effect: Effect) => void;
 	onAfterMoveSecondarySelf?: MoveEventMethods['onAfterMoveSecondarySelf'];
 	onAfterMoveSecondary?: MoveEventMethods['onAfterMoveSecondary'];
@@ -45,7 +46,6 @@ export interface EventMethods {
 	onDamage?: (
 		this: Battle, damage: number, target: Pokemon, source: Pokemon, effect: Effect
 	) => number | boolean | null | void;
-	onTakeDamage?: (this: Battle, damage: number, target: Pokemon, source: Pokemon, effect: Effect) => void;
 	onDeductPP?: (this: Battle, target: Pokemon, source: Pokemon) => number | void;
 	onDisableMove?: (this: Battle, pokemon: Pokemon) => void;
 	onDragOut?: (this: Battle, pokemon: Pokemon, source?: Pokemon, move?: ActiveMove) => void;