Slight cleanup, do some TODOs

2025-06-22 10:42:25 +02:00
parent e305cfaef6
commit 2533512eda
114 changed files with 218 additions and 168 deletions
--- a/Plugins/PkmnLib.Plugin.Gen7/Libraries/Battling/Gen7MiscLibrary.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Libraries/Battling/Gen7MiscLibrary.cs
@@ -1,7 +1,6 @@
 using PkmnLib.Dynamic;
 using PkmnLib.Dynamic.Libraries;
 using PkmnLib.Static.Moves;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Libraries.Battling;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Abilities/Teravolt.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Abilities/Teravolt.cs
@@ -1,4 +1,3 @@
-using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 using PkmnLib.Plugin.Gen7.Scripts.Side;

 namespace PkmnLib.Plugin.Gen7.Scripts.Abilities;
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/Gravity.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/Gravity.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Battle;

 [Script(ScriptCategory.Battle, "gravity")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/MudSportEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/MudSportEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Battle;

 [Script(ScriptCategory.Battle, "mud_sport")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/UproarEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/UproarEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Battle;

 [Script(ScriptCategory.Battle, "uproar_effect")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/HealingItem.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/HealingItem.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Items;

 [ItemScript("healing_item")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/StaticPokeball.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/StaticPokeball.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Items;

 /// <summary>
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/MoveVolatile/BypassSleepVolatile.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/MoveVolatile/BypassSleepVolatile.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.MoveVolatile;

 [Script(ScriptCategory.MoveVolatile, "bypass_sleep")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/MoveVolatile/MeFirstPowerBoost.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/MoveVolatile/MeFirstPowerBoost.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.MoveVolatile;

 [Script(ScriptCategory.MoveVolatile, "me_first")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/MoveVolatile/RoundPowerBoost.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/MoveVolatile/RoundPowerBoost.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.MoveVolatile;

 [Script(ScriptCategory.MoveVolatile, "round")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Acrobatics.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Acrobatics.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 /// <summary>
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Assist.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Assist.cs
@@ -1,6 +1,5 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
 using PkmnLib.Static.Moves;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/AuroraVeil.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/AuroraVeil.cs
@@ -1,6 +1,5 @@
 using PkmnLib.Plugin.Gen7.Scripts.Side;
 using PkmnLib.Plugin.Gen7.Scripts.Weather;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/BatonPass.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/BatonPass.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/BeatUp.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/BeatUp.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "beat_up")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Bind.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Bind.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Brine.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Brine.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "brine")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Camouflage.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Camouflage.cs
@@ -1,7 +1,44 @@
+using PkmnLib.Plugin.Gen7.Scripts.Utils;
+
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "camouflage")]
 public class Camouflage : Script
 {
-    // FIXME: Implement this. How to get the terrain in a sane manner? See also SecretPower.cs
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var type = GetTypeIdentifier(move.Battle);
+        if (type == null)
+            return;
+        move.User.SetTypes([type.Value]);
+    }
+
+    private static TypeIdentifier? GetTypeIdentifier(IBattle battle)
+    {
+        var typesLibrary = battle.Library.StaticLibrary.Types;
+        var environmentCategory = battle.GetEnvironmentCategory();
+        return environmentCategory switch
+        {
+            EnvironmentHelper.EnvironmentCategory.Electric when typesLibrary.TryGetTypeIdentifier("electric",
+                out var electricType) => electricType,
+            EnvironmentHelper.EnvironmentCategory.Fairy when typesLibrary.TryGetTypeIdentifier("fairy",
+                out var fairyType) => fairyType,
+            EnvironmentHelper.EnvironmentCategory.Grass when typesLibrary.TryGetTypeIdentifier("grass",
+                out var grassType) => grassType,
+            EnvironmentHelper.EnvironmentCategory.Psychic when typesLibrary.TryGetTypeIdentifier("psychic",
+                out var psychicType) => psychicType,
+            EnvironmentHelper.EnvironmentCategory.Rock when typesLibrary.TryGetTypeIdentifier("rock", out var rockType)
+                => rockType,
+            EnvironmentHelper.EnvironmentCategory.Ground when typesLibrary.TryGetTypeIdentifier("ground",
+                out var groundType) => groundType,
+            EnvironmentHelper.EnvironmentCategory.Ice when typesLibrary.TryGetTypeIdentifier("ice", out var iceType) =>
+                iceType,
+            EnvironmentHelper.EnvironmentCategory.Water when typesLibrary.TryGetTypeIdentifier("water",
+                out var waterType) => waterType,
+            EnvironmentHelper.EnvironmentCategory.Normal when typesLibrary.TryGetTypeIdentifier("normal",
+                out var normalType) => normalType,
+            _ => null,
+        };
+    }
 }
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeAllTargetStats.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeAllTargetStats.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "change_all_target_stats")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleTargetStatBoosts.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleTargetStatBoosts.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "change_multiple_target_stat_boosts")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleUserStatBoosts.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleUserStatBoosts.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "change_multiple_user_stat_boosts")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeTargetStats.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeTargetStats.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 public abstract class ChangeTargetStats : Script
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeUserStats.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeUserStats.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 public abstract class ChangeUserStats : Script
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Conversion.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Conversion.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "conversion")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Conversion2.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Conversion2.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "conversion_2")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Copycat.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Copycat.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/CoreEnforcer.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/CoreEnforcer.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "core_enforcer")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Counter.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Counter.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/CurePartyStatus.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/CurePartyStatus.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "cure_party_status")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Defog.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Defog.cs
@@ -1,6 +1,5 @@
 using JetBrains.Annotations;
 using PkmnLib.Plugin.Gen7.Scripts.Side;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Facade.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Facade.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "facade")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/FlameBurst.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/FlameBurst.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "flame_burst")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/FlameWheel.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/FlameWheel.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "flame_wheel")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/FuryCutter.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/FuryCutter.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GearUp.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GearUp.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "gear_up")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Gravity.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Gravity.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Grudge.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Grudge.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "grudge")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/HealBell.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/HealBell.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/HealEachEndOfTurn.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/HealEachEndOfTurn.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/HealPercent.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/HealPercent.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "heal_percent")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Hex.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Hex.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "hex")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/IceBall.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/IceBall.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LastResort.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LastResort.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "last_resort")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LightScreen.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LightScreen.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Side;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MagneticFlux.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MagneticFlux.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "magnetic_flux")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MeFirst.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MeFirst.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.MoveVolatile;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MetalBurst.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MetalBurst.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Static.Moves;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Metronome.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Metronome.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MirrorCoat.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MirrorCoat.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Static.Moves;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MirrorMove.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/MirrorMove.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Moonlight.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Moonlight.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Weather;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/NaturalGift.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/NaturalGift.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "natural_gift")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/NaturePower.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/NaturePower.cs
@@ -1,7 +1,52 @@
+using PkmnLib.Plugin.Gen7.Scripts.Utils;
+using PkmnLib.Static.Moves;
+
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "nature_power")]
 public class NaturePower : Script
 {
-    // FIXME: Implement this. How to get the terrain in a sane manner?
+    /// <inheritdoc />
+    public override void ChangeMove(IMoveChoice choice, ref StringKey moveName)
+    {
+        var battleData = choice.User.BattleData;
+        if (battleData is null)
+            return;
+        var newMoveName = GetMoveName(battleData.Battle);
+        if (newMoveName is null)
+        {
+            choice.Fail();
+            return;
+        }
+        moveName = newMoveName.Value;
+    }
+
+    private static StringKey? GetMoveName(IBattle battle)
+    {
+        var movesLibrary = battle.Library.StaticLibrary.Moves;
+        var environmentCategory = battle.GetEnvironmentCategory();
+        var moveName = environmentCategory switch
+        {
+            EnvironmentHelper.EnvironmentCategory.Electric when movesLibrary.TryGet("thunderbolt",
+                out var thunderboltMove) => (StringKey?)thunderboltMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Fairy when movesLibrary.TryGet("moonblast", out var moonblastMove) =>
+                moonblastMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Grass when movesLibrary.TryGet("energy_ball", out var energyballMove)
+                => energyballMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Psychic when movesLibrary.TryGet("psychic", out var psychicMove) =>
+                psychicMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Rock when movesLibrary.TryGet("power_gem", out var rockMove) =>
+                rockMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Ground when movesLibrary.TryGet("earth_power", out var groundMove) =>
+                groundMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Ice when movesLibrary.TryGet("ice_beam", out var iceMove) => iceMove
+                .Name,
+            EnvironmentHelper.EnvironmentCategory.Water when movesLibrary.TryGet("hydro_pump", out var waterMove) =>
+                waterMove.Name,
+            EnvironmentHelper.EnvironmentCategory.Normal when movesLibrary.TryGet("tri_attack", out var normalMove) =>
+                normalMove.Name,
+            _ => null,
+        };
+        return moveName;
+    }
 }
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/OneHitKo.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/OneHitKo.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "one_hit_ko")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Payback.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Payback.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 /// <summary>
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/PerishSong.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/PerishSong.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/PowerTrip.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/PowerTrip.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "power_trip")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Psywave.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Psywave.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "psywave")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/RapidSpin.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/RapidSpin.cs
@@ -13,16 +13,15 @@ public class RapidSpin : Script
        move.User.Volatile.Remove<BindEffect>();
        move.User.Volatile.Remove<FireSpinEffect>();
        move.User.Volatile.Remove<MagmaStormEffect>();
-        // TODO: Whirlpool effect removal
-        // TODO: Wrap effect removal
+        move.User.Volatile.Remove<WhirlpoolEffect>();

        var battleData = move.User.BattleData;
        if (battleData != null)
        {
            battleData.BattleSide.VolatileScripts.Remove<SpikesEffect>();
            battleData.BattleSide.VolatileScripts.Remove<StickyWebEffect>();
-            // TODO: Remove Toxic Spikes
-            // TODO: Remove Stealth Rock
+            battleData.BattleSide.VolatileScripts.Remove<ToxicSpikesEffect>();
+            battleData.BattleSide.VolatileScripts.Remove<StealthRockEffect>();
        }
    }
 }
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Reflect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Reflect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "reflect")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Retaliate.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Retaliate.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "retaliate")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Rototiller.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Rototiller.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "rototiller")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SecretPower.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SecretPower.cs
@@ -1,7 +1,46 @@
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+using PkmnLib.Plugin.Gen7.Scripts.Utils;
+
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "secret_power")]
 public class SecretPower : Script
 {
-    // FIXME: Implement this. How to get the terrain in a sane manner? See also Camouflage.cs
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var environmentCategory = move.Battle.GetEnvironmentCategory();
+        switch (environmentCategory)
+        {
+            case EnvironmentHelper.EnvironmentCategory.Electric:
+            case EnvironmentHelper.EnvironmentCategory.Normal:
+                target.SetStatus(ScriptUtils.ResolveName<Status.Paralyzed>(), move.User);
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Rock:
+                target.Volatile.Add(new FlinchEffect());
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Ground:
+                target.ChangeStatBoost(Statistic.Accuracy, -1, false, false);
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Water:
+                target.ChangeStatBoost(Statistic.Attack, -1, false, false);
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Ice:
+                target.SetStatus(ScriptUtils.ResolveName<Status.Frozen>(), move.User);
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Grass:
+                target.SetStatus(ScriptUtils.ResolveName<Status.Sleep>(), move.User);
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Fairy:
+                target.ChangeStatBoost(Statistic.SpecialAttack, -1, false, false);
+                break;
+            case EnvironmentHelper.EnvironmentCategory.Psychic:
+                target.ChangeStatBoost(Statistic.Speed, -1, false, false);
+                break;
+            // ReSharper disable once RedundantEmptySwitchSection
+            default:
+                // No effect for unrecognized environments
+                break;
+        }
+    }
 }
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SetStatus.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SetStatus.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "set_status")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SetWeather.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SetWeather.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "set_weather")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Sketch.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Sketch.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "sketch")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SleepTalk.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SleepTalk.cs
@@ -1,6 +1,5 @@
 using PkmnLib.Plugin.Gen7.Scripts.MoveVolatile;
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SpitUp.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/SpitUp.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/StaticDamage.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/StaticDamage.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "static_damage")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/StompingTantrum.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/StompingTantrum.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "stomping_tantrum")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Synchronoise.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Synchronoise.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "synchronoise")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Uproar.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Uproar.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Battle;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/WakeUpSlap.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/WakeUpSlap.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "wake_up_slap")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/WeatherBall.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/WeatherBall.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

 [Script(ScriptCategory.Move, "weather_ball")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Whirlpool.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Whirlpool.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/BaseChargeEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/BaseChargeEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ChargeMoveEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ChargeMoveEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DisableEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DisableEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 [Script(ScriptCategory.Pokemon, "disable")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/EncoreEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/EncoreEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ForesightEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ForesightEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Static.Libraries;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/FreezeShockEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/FreezeShockEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 public class RequireChargeEffect(IPokemon owner, StringKey moveName) : BaseChargeEffect(owner, moveName);
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/HelpingHandEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/HelpingHandEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 public class HelpingHandEffect : Script
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/IceBallEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/IceBallEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ImprisonEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ImprisonEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 [Script(ScriptCategory.Pokemon, "imprison")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/IngrainEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/IngrainEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 [Script(ScriptCategory.Pokemon, "ingrain")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/OutrageLikeEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/OutrageLikeEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Utils;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/PursuitEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/PursuitEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Dynamic.BattleFlow;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/RoostEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/RoostEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 [Script(ScriptCategory.Pokemon, "roost_effect")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/SmackDownEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/SmackDownEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 [Script(ScriptCategory.Pokemon, "smack_down")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ThousandArrowsEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ThousandArrowsEffect.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;

 [Script(ScriptCategory.Move, "thousand_arrows")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Side/SafeguardEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Side/SafeguardEffect.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Side;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Status/Sleep.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Status/Sleep.cs
@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Status;

 [Script(ScriptCategory.Status, "sleep")]
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Utils/CopyableMoves.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Utils/CopyableMoves.cs
@@ -1,5 +1,4 @@
 using PkmnLib.Static.Moves;
-using PkmnLib.Static.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Utils;

--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Utils/EnvironmentHelper.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Utils/EnvironmentHelper.cs
@@ -0,0 +1,43 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Utils;
+
+public static class EnvironmentHelper
+{
+    public enum EnvironmentCategory
+    {
+        Electric,
+        Fairy,
+        Grass,
+        Psychic,
+        Rock,
+        Ground,
+        Ice,
+        Water,
+        Normal,
+    }
+
+    public static EnvironmentCategory GetEnvironmentCategory(this IBattle battle)
+    {
+        var terrainName = battle.TerrainName;
+        if (terrainName == ScriptUtils.ResolveName<Terrain.ElectricTerrain>())
+            return EnvironmentCategory.Electric;
+        if (terrainName == ScriptUtils.ResolveName<Terrain.MistyTerrain>())
+            return EnvironmentCategory.Fairy;
+        if (terrainName == ScriptUtils.ResolveName<Terrain.GrassyTerrain>())
+            return EnvironmentCategory.Grass;
+        if (terrainName == ScriptUtils.ResolveName<Terrain.PsychicTerrain>())
+            return EnvironmentCategory.Psychic;
+
+        var environment = battle.EnvironmentName;
+        if (environment.Contains("cave"))
+            return EnvironmentCategory.Rock;
+        if (environment.Contains("mountain") || environment.Contains("beach"))
+            return EnvironmentCategory.Ground;
+        if (environment.Contains("snow"))
+            return EnvironmentCategory.Ice;
+        if (environment.Contains("sea") || environment.Contains("lake") || environment.Contains("river"))
+            return EnvironmentCategory.Water;
+        if (environment.Contains("forest") || environment.Contains("field"))
+            return EnvironmentCategory.Normal;
+        return EnvironmentCategory.Normal; // Default case if no specific environment is matched
+    }
+}