Add AfterMoveSecondaryLast event

data/abilities.ts

@@ -3156,7 +3156,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 		num: 253,
 	},
 	pickpocket: {
-		onAfterMoveSecondary(target, source, move) {
+		onAfterMoveSecondaryLast(target, source, move) {
 			if (source && source !== target && move?.flags['contact']) {
 				if (target.item || target.switchFlag || target.forceSwitchFlag || source.switchFlag === true) {
 					return;

data/moves.ts

@@ -9759,12 +9759,7 @@ export const Moves: import('../sim/dex-moves').MoveDataTable = {
 		pp: 15,
 		priority: 0,
 		flags: {contact: 1, protect: 1, mirror: 1, metronome: 1},
-		onAfterHit(target, source) {
-			if (source.hp) {
-				this.field.clearTerrain();
-			}
-		},
-		onAfterSubDamage(damage, target, source) {
+		onAfterMoveSecondaryLast(target, source) {
 			if (source.hp) {
 				this.field.clearTerrain();
 			}

sim/battle-actions.ts

@@ -536,6 +536,10 @@ export class BattleActions {
 					this.battle.runEvent('EmergencyExit', pokemon, pokemon);
 				}
 			}
+			for (const i of targets.keys()) {
+				this.battle.singleEvent('AfterMoveSecondaryLast', move, null, targets[i], pokemon, move);
+				this.battle.runEvent('AfterMoveSecondaryLast', targets[i], pokemon, move);
+			}
 		}
 
 		return true;

sim/dex-conditions.ts

@@ -24,6 +24,7 @@ export interface EventMethods {
 	onAfterTakeItem?: (this: Battle, item: Item, pokemon: Pokemon) => void;
 	onAfterBoost?: (this: Battle, boost: SparseBoostsTable, target: Pokemon, source: Pokemon, effect: Effect) => void;
 	onAfterFaint?: (this: Battle, length: number, target: Pokemon, source: Pokemon, effect: Effect) => void;
+	onAfterMoveSecondaryLast?: MoveEventMethods['onAfterMoveSecondaryLast'];
 	onAfterMoveSecondarySelf?: MoveEventMethods['onAfterMoveSecondarySelf'];
 	onAfterMoveSecondary?: MoveEventMethods['onAfterMoveSecondary'];
 	onAfterMove?: MoveEventMethods['onAfterMove'];

sim/dex-moves.ts

@@ -112,6 +112,7 @@ export interface MoveEventMethods {
 
 	onAfterHit?: CommonHandlers['VoidSourceMove'];
 	onAfterSubDamage?: (this: Battle, damage: number, target: Pokemon, source: Pokemon, move: ActiveMove) => void;
+	onAfterMoveSecondaryLast?: CommonHandlers['VoidMove'];
 	onAfterMoveSecondarySelf?: CommonHandlers['VoidSourceMove'];
 	onAfterMoveSecondary?: CommonHandlers['VoidMove'];
 	onAfterMove?: CommonHandlers['VoidSourceMove'];

test/sim/abilities/pickpocket.js

@@ -46,7 +46,7 @@ describe('Pickpocket', function () {
 		assert.holdsItem(battle.p2.active[0]);
 	});
 
-	it.skip(`should steal items back and forth when hit by a Magician user`, function () {
+	it(`should steal items back and forth when hit by a Magician user`, function () {
 		battle = common.createBattle([[
 			{species: 'Weavile', ability: 'pickpocket', item: 'cheriberry', moves: ['agility']},
 		], [

test/sim/moves/icespinner.js

@@ -21,7 +21,19 @@ describe(`Ice Spinner`, function () {
 		assert.false(battle.field.isTerrain('psychicterrain'));
 	});
 
-	it.skip(`should not remove Terrains if the user faints from Life Orb`, function () {
+	it(`should remove Terrains if behind a substitute`, function () {
+		battle = common.createBattle([[
+			{species: 'wynaut', moves: ['substitute', 'icespinner']},
+		], [
+			{species: 'registeel', ability: 'psychicsurge', moves: ['sleeptalk']},
+		]]);
+
+		battle.makeChoices();
+		battle.makeChoices('move ice spinner', 'auto');
+		assert.false(battle.field.isTerrain('psychicterrain'));
+	});
+
+	it(`should not remove Terrains if the user faints from Life Orb`, function () {
 		battle = common.createBattle([[
 			{species: 'shedinja', item: 'lifeorb', moves: ['icespinner']},
 			{species: 'wynaut', moves: ['sleeptalk']},