Implement correctly for all gens

Author: andrebastosdias

Diff for: data/abilities.ts

@@ -837,11 +837,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 			const dancersTarget = !targetOf1stDance.isAlly(dancer) && source.isAlly(dancer) ?
 				targetOf1stDance : source;
 			const dancersTargetLoc = dancer.getLocOf(dancersTarget);
-			// Dancer activates in order of lowest speed stat to highest
-			// Note that the speed stat used is after any volatile replacements like Speed Swap,
-			// but before any multipliers like Agility or Choice Scarf
-			// Ties go to whichever Pokemon has had the ability for the least amount of time
-			this.queue.insertChoice({
+			const action = this.queue.resolveAction({
 				choice: 'move',
 				order: 198,
 				effectOrder: dancer.abilityState.effectOrder,
@@ -850,7 +846,13 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 				targetLoc: dancersTargetLoc,
 				sourceEffect: this.dex.abilities.get('dancer'),
 				externalMove: true,
-			});
+			})[0];
+			// Gen 7: Dancer activates in order of lowest speed stat to highest
+			// Note that the speed stat used is after any volatile replacements like Speed Swap,
+			// but before any multipliers like Agility or Choice Scarf
+			// Ties go to whichever Pokemon has had the ability for the least amount of time
+			action.speed = -dancer.getStat('spe', true, true);
+			this.queue.insertAction(action);
 		},
 		condition: {
 			noCopy: true, // doesn't get copied by Baton Pass

Diff for: sim/battle-queue.ts

@@ -376,6 +376,14 @@ export class BattleQueue {
 		}
 		const actions = this.resolveAction(choice, midTurn);
 
+		this.insertAction(actions);
+	}
+
+	insertAction(actions: Action | Action[]) {
+		if (!Array.isArray(actions)) {
+			actions = [actions];
+		}
+
 		let firstIndex = null;
 		let lastIndex = null;
 		for (const [i, curAction] of this.list.entries()) {

Diff for: sim/battle.ts

@@ -2599,8 +2599,6 @@ export class Battle {
 
 		if (!action.pokemon) {
 			action.speed = 1;
-		} else if (action.sourceEffect?.id === 'dancer') {
-			action.speed = -action.pokemon.getStat('spe', true, true);
 		} else {
 			action.speed = action.pokemon.getActionSpeed();
 		}

Diff for: test/sim/abilities/dancer.js

@@ -21,34 +21,17 @@ describe('Dancer', () => {
 		assert.statStage(battle.p2.active[0], 'atk', 3);
 	});
 
-	it('should activate in order of lowest to highest raw speed', () => {
+	it('should activate in order of fastest to slowest', () => {
 		battle = common.createBattle({ gameType: 'doubles' }, [[
-			{ species: 'Shedinja', level: 98, ability: 'dancer', item: 'focussash', moves: ['sleeptalk'] },
+			{ species: 'Shedinja', ability: 'dancer', item: 'focussash', moves: ['sleeptalk'] },
 			{ species: 'Shedinja', level: 99, ability: 'dancer', moves: ['sleeptalk'] },
 		], [
 			{ species: 'Shedinja', ability: 'wonderguard', moves: ['fierydance'] },
-			{ species: 'Shedinja', ability: 'dancer', moves: ['sleeptalk'] },
-		]]);
-		const [, fastDancer] = battle.p1.active;
-		const [wwDanceSource, foeDancer] = battle.p2.active;
-		fastDancer.boostBy({ spe: 6 });
-		battle.makeChoices('move sleeptalk, move sleeptalk', 'move fierydance 1, move sleeptalk');
-		assert.fainted(wwDanceSource);
-		assert.fainted(foeDancer);
-	});
-
-	it('should activate in order of lowest to highest raw speed inside Trick Room', () => {
-		battle = common.createBattle({ gameType: 'doubles' }, [[
-			{ species: 'Shedinja', level: 98, ability: 'dancer', item: 'focussash', moves: ['sleeptalk'] },
-			{ species: 'Shedinja', level: 99, ability: 'dancer', moves: ['sleeptalk'] },
-		], [
-			{ species: 'Shedinja', ability: 'wonderguard', moves: ['fierydance', 'trickroom'] },
-			{ species: 'Shedinja', ability: 'dancer', moves: ['sleeptalk'] },
+			{ species: 'Shedinja', level: 98, ability: 'dancer', moves: ['sleeptalk'] },
 		]]);
 		const [, fastDancer] = battle.p1.active;
 		const [wwDanceSource, foeDancer] = battle.p2.active;
 		fastDancer.boostBy({ spe: 6 });
-		battle.makeChoices('move sleeptalk, move sleeptalk', 'move trickroom, move sleeptalk');
 		battle.makeChoices('move sleeptalk, move sleeptalk', 'move fierydance 1, move sleeptalk');
 		assert.fainted(wwDanceSource);
 		assert.fainted(foeDancer);
@@ -199,3 +182,42 @@ describe('Dancer', () => {
 		assert.notEqual(suicune.hp, suicune.fullHP);
 	});
 });
+
+describe('[Gen 7] Dancer', () => {
+	afterEach(() => {
+		battle.destroy();
+	});
+
+	it('should activate in order of lowest to highest raw speed', () => {
+		battle = common.gen(7).createBattle({ gameType: 'doubles' }, [[
+			{ species: 'Shedinja', level: 98, ability: 'dancer', item: 'focussash', moves: ['sleeptalk'] },
+			{ species: 'Shedinja', level: 99, ability: 'dancer', moves: ['sleeptalk'] },
+		], [
+			{ species: 'Shedinja', ability: 'wonderguard', moves: ['fierydance'] },
+			{ species: 'Shedinja', ability: 'dancer', moves: ['sleeptalk'] },
+		]]);
+		const [, fastDancer] = battle.p1.active;
+		const [wwDanceSource, foeDancer] = battle.p2.active;
+		fastDancer.boostBy({ spe: 6 });
+		battle.makeChoices('move sleeptalk, move sleeptalk', 'move fierydance 1, move sleeptalk');
+		assert.fainted(wwDanceSource);
+		assert.fainted(foeDancer);
+	});
+
+	it('should activate in order of lowest to highest raw speed inside Trick Room', () => {
+		battle = common.gen(7).createBattle({ gameType: 'doubles' }, [[
+			{ species: 'Shedinja', level: 98, ability: 'dancer', item: 'focussash', moves: ['sleeptalk'] },
+			{ species: 'Shedinja', level: 99, ability: 'dancer', moves: ['sleeptalk'] },
+		], [
+			{ species: 'Shedinja', ability: 'wonderguard', moves: ['fierydance', 'trickroom'] },
+			{ species: 'Shedinja', ability: 'dancer', moves: ['sleeptalk'] },
+		]]);
+		const [, fastDancer] = battle.p1.active;
+		const [wwDanceSource, foeDancer] = battle.p2.active;
+		fastDancer.boostBy({ spe: 6 });
+		battle.makeChoices('move sleeptalk, move sleeptalk', 'move trickroom, move sleeptalk');
+		battle.makeChoices('move sleeptalk, move sleeptalk', 'move fierydance 1, move sleeptalk');
+		assert.fainted(wwDanceSource);
+		assert.fainted(foeDancer);
+	});
+});