Update WeatherChange logic

Author: andrebastosdias

data/abilities.ts

@@ -3438,10 +3438,13 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 			// Protosynthesis is not affected by Utility Umbrella
 			if (this.field.isWeather('sunnyday')) {
 				pokemon.addVolatile('protosynthesis');
-			} else if (!pokemon.volatiles['protosynthesis'] && pokemon.hasItem('boosterenergy')) {
-				pokemon.useItem();
-			} else if (!pokemon.volatiles['protosynthesis']?.fromBooster) {
-				pokemon.removeVolatile('protosynthesis');
+			} else {
+				if (!pokemon.volatiles['protosynthesis']?.fromBooster) {
+					pokemon.removeVolatile('protosynthesis');
+				}
+				if (!pokemon.volatiles['protosynthesis'] && pokemon.hasItem('boosterenergy')) {
+					pokemon.useItem();
+				}
 			}
 		},
 		onUpdate(pokemon) {
@@ -3584,10 +3587,13 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 		onTerrainChange(pokemon) {
 			if (this.field.isTerrain('electricterrain')) {
 				pokemon.addVolatile('quarkdrive');
-			} else if (!pokemon.volatiles['quarkdrive'] && pokemon.hasItem('boosterenergy')) {
-				pokemon.useItem();
-			} else if (!pokemon.volatiles['quarkdrive']?.fromBooster) {
-				pokemon.removeVolatile('quarkdrive');
+			} else {
+				if (!pokemon.volatiles['quarkdrive']?.fromBooster) {
+					pokemon.removeVolatile('quarkdrive');
+				}
+				if (!pokemon.volatiles['quarkdrive'] && pokemon.hasItem('boosterenergy')) {
+					pokemon.useItem();
+				}
 			}
 		},
 		onUpdate(pokemon) {

data/items.ts

@@ -614,7 +614,7 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
 			basePower: 30,
 		},
 		onUseItem(item, pokemon) {
-			return ['protosynthesis', 'quarkdrive'].includes(pokemon.ability);
+			return item.id === 'boosterenergy' && (pokemon.hasAbility('protosynthesis') || pokemon.hasAbility('quarkdrive'));
 		},
 		onUse(pokemon) {
 			pokemon.addVolatile(pokemon.ability);

data/mods/gen9dlc1/abilities.ts

@@ -13,11 +13,13 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa
 			// Protosynthesis is not affected by Utility Umbrella
 			if (this.field.isWeather('sunnyday')) {
 				pokemon.addVolatile('protosynthesis');
-			} else if (!pokemon.volatiles['protosynthesis'] && pokemon.hasItem('boosterenergy')) {
-				pokemon.useItem();
-			} else if (!pokemon.volatiles['protosynthesis']?.fromBooster && this.field.weather !== 'sunnyday') {
-				// Protosynthesis will not deactivite if Sun is suppressed, hence the direct ID check (isWeather respects supression)
-				pokemon.removeVolatile('protosynthesis');
+			} else {
+				if (!pokemon.volatiles['protosynthesis']?.fromBooster && this.field.weather !== 'sunnyday') {
+					pokemon.removeVolatile('protosynthesis');
+				}
+				if (!pokemon.volatiles['protosynthesis'] && pokemon.hasItem('boosterenergy')) {
+					pokemon.useItem();
+				}
 			}
 		},
 		condition: {