Automatically activate Booster Energy during weather/terrain changes

data/abilities.ts

@@ -3422,16 +3422,31 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 	protosynthesis: {
 		onStart(pokemon) {
 			this.singleEvent('WeatherChange', this.effect, this.effectState, pokemon);
+			this.effectState.started = true;
 		},
 		onWeatherChange(pokemon) {
 			// Protosynthesis is not affected by Utility Umbrella
 			if (this.field.isWeather('sunnyday')) {
 				pokemon.addVolatile('protosynthesis');
-			} else if (!pokemon.volatiles['protosynthesis']?.fromBooster && !this.field.isWeather('sunnyday')) {
+			} else if (!pokemon.transformed && !pokemon.volatiles['protosynthesis'] && pokemon.hasItem('boosterenergy') &&
+				this.effectState.started) {
+				pokemon.useItem();
+			} else if (!pokemon.volatiles['protosynthesis']?.fromBooster) {
 				pokemon.removeVolatile('protosynthesis');
 			}
 		},
+		onUpdate(pokemon) {
+			// don't trigger before hazards
+			if (pokemon.transformed) return;
+			if (this.queue.peek(true)?.choice === 'runSwitch') return;
+
+			if (!pokemon.volatiles['protosynthesis'] && !this.field.isWeather('sunnyday') && pokemon.hasItem('boosterenergy') &&
+				pokemon.itemState.started) {
+				pokemon.useItem();
+			}
+		},
 		onEnd(pokemon) {
+			delete this.effectState.started;
 			delete pokemon.volatiles['protosynthesis'];
 			this.add('-end', pokemon, 'Protosynthesis', '[silent]');
 		},
@@ -3558,15 +3573,30 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 	quarkdrive: {
 		onStart(pokemon) {
 			this.singleEvent('TerrainChange', this.effect, this.effectState, pokemon);
+			this.effectState.started = true;
 		},
 		onTerrainChange(pokemon) {
 			if (this.field.isTerrain('electricterrain')) {
 				pokemon.addVolatile('quarkdrive');
+			} else if (!pokemon.transformed && !pokemon.volatiles['quarkdrive'] && pokemon.hasItem('boosterenergy') &&
+			this.effectState.started) {
+				pokemon.useItem();
 			} else if (!pokemon.volatiles['quarkdrive']?.fromBooster) {
 				pokemon.removeVolatile('quarkdrive');
 			}
 		},
+		onUpdate(pokemon) {
+			// don't trigger before hazards
+			if (pokemon.transformed) return;
+			if (this.queue.peek(true)?.choice === 'runSwitch') return;
+
+			if (!pokemon.volatiles['quarkdrive'] && !this.field.isTerrain('electricterrain') && pokemon.hasItem('boosterenergy') &&
+				pokemon.itemState.started) {
+				pokemon.useItem();
+			}
+		},
 		onEnd(pokemon) {
+			delete this.effectState.started;
 			delete pokemon.volatiles['quarkdrive'];
 			this.add('-end', pokemon, 'Quark Drive', '[silent]');
 		},

data/items.ts

@@ -617,16 +617,8 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 		onStart() {
 			this.effectState.started = true;
 		},
-		onUpdate(pokemon) {
-			if (!this.effectState.started || pokemon.transformed) return;
-			if (this.queue.peek(true)?.choice === 'runSwitch') return;
-
-			if (pokemon.hasAbility('protosynthesis') && !this.field.isWeather('sunnyday') && pokemon.useItem()) {
-				pokemon.addVolatile('protosynthesis');
-			}
-			if (pokemon.hasAbility('quarkdrive') && !this.field.isTerrain('electricterrain') && pokemon.useItem()) {
-				pokemon.addVolatile('quarkdrive');
-			}
+		onUse(pokemon) {
+			pokemon.addVolatile(pokemon.ability);
 		},
 		onTakeItem(item, source) {
 			if (source.baseSpecies.tags.includes("Paradox")) return false;

sim/dex-items.ts

@@ -102,6 +102,7 @@ export class Item extends BasicEffect implements Readonly<BasicEffect> {
 
 	declare readonly onEat?: ((this: Battle, pokemon: Pokemon) => void) | false;
 	declare readonly onPrimal?: (this: Battle, pokemon: Pokemon) => void;
+	declare readonly onUse?: ((this: Battle, pokemon: Pokemon) => void) | false;
 	declare readonly onStart?: (this: Battle, target: Pokemon) => void;
 	declare readonly onEnd?: (this: Battle, target: Pokemon) => void;
 

test/sim/items/boosterenergy.js

@@ -24,4 +24,19 @@ describe('Booster Energy', function () {
 		assert.equal(bundle.volatiles['quarkdrive'].bestStat, 'spa',
 			`Iron Bundle's Speed should have been lowered before Booster Energy activated, boosting its SpA instead.`);
 	});
+
+	it(`should activate right after weather changes`, function () {
+		battle = common.createBattle({gameType: 'doubles'}, [[
+			{species: 'Ninetales-Alola', ability: 'snowwarning', moves: ['sleeptalk']},
+			{species: 'Roaring Moon', item: 'boosterenergy', ability: 'protosynthesis', moves: ['sleeptalk']},
+		], [
+			{species: 'Incineroar', ability: 'intimidate', moves: ['sleeptalk']},
+			{species: 'Torkoal', ability: 'drought', moves: ['sleeptalk']},
+		]]);
+
+		const roaringMoon = battle.p1.active[1];
+		assert(roaringMoon.volatiles['protosynthesis'].fromBooster);
+		assert.equal(roaringMoon.volatiles['protosynthesis'].bestStat, 'atk');
+		assert.equal(battle.field.weather, 'sunnyday');
+	});
 });