Fix unintended changes to speed ties in other events

sim/battle.ts

@@ -94,6 +94,7 @@ interface EventListener extends EventListenerWithoutPriority {
 	order: number | false;
 	priority: number;
 	subOrder: number;
+	effectOrder?: number;
 	speed?: number;
 }
 
@@ -407,7 +408,7 @@ export class Battle {
 			((b.priority || 0) - (a.priority || 0)) ||
 			((b.speed || 0) - (a.speed || 0)) ||
 			-((b.subOrder || 0) - (a.subOrder || 0)) ||
-			-((b.state?.effectOrder || 0) - (a.state?.effectOrder || 0)) ||
+			-((b.effectOrder || 0) - (a.effectOrder || 0)) ||
 			0;
 	}
 
@@ -953,6 +954,13 @@ export class Battle {
 				}
 			}
 		}
+		if (callbackName.endsWith('SwitchIn') || callbackName.endsWith('RedirectTarget')) {
+			// If multiple hazards are present on one side, their event handlers all perfectly tie in speed, priority,
+			// and subOrder. They should activate in the order they were created, which is where effectOrder comes in.
+			// This also applies to speed ties for which ability like Lightning Rod redirects moves.
+			// TODO: In-game, other events are also sorted this way, but that's an implementation for another refactor
+			handler.effectOrder = handler.state?.effectOrder;
+		}
 		if (handler.effectHolder && (handler.effectHolder as Pokemon).getStat) {
 			const pokemon = (handler.effectHolder as Pokemon);
 			handler.speed = pokemon.speed;

sim/pokemon.ts

@@ -36,10 +36,12 @@ export class EffectState {
 	duration?: number;
 	[k: string]: any;
 
-	constructor(data: AnyObject, battle: Battle) {
+	constructor(data: AnyObject, battle: Battle, effectOrder?: number) {
 		this.id = data.id || '';
 		Object.assign(this, data);
-		if (this.id && this.target && (!(this.target instanceof Pokemon) || this.target.isActive)) {
+		if (effectOrder !== undefined) {
+			this.effectOrder = effectOrder;
+		} else if (this.id && this.target && (!(this.target instanceof Pokemon) || this.target.isActive)) {
 			this.effectOrder = battle.effectOrder++;
 		} else {
 			this.effectOrder = 0;