Slight cleanup, do some TODOs

PkmnLib.Dynamic/AI/PokemonAI.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.Models;
 using PkmnLib.Dynamic.Models.Choices;
 using PkmnLib.Static.Moves;

PkmnLib.Dynamic/BattleFlow/MoveTurnExecutor.cs

@@ -132,7 +132,7 @@ public static class MoveTurnExecutor
         target.RunScriptHook(x => x.IsInvulnerableToMove(executingMove, target, ref isInvulnerable));
         if (isInvulnerable)
         {
-            // TODO: event?
+            battle.EventHook.Invoke(new MoveInvulnerableEvent(executingMove, target));
             return;
         }
 

PkmnLib.Dynamic/Events/Handling/EventData.cs

@@ -1,5 +1,3 @@
-using JetBrains.Annotations;
-
 namespace PkmnLib.Dynamic.Events;
 
 /// <summary>

PkmnLib.Dynamic/Events/MoveInvulnerableEvent.cs

@@ -0,0 +1,18 @@
+using PkmnLib.Dynamic.Models;
+
+namespace PkmnLib.Dynamic.Events;
+
+public class MoveInvulnerableEvent : IEventData
+{
+    public IExecutingMove ExecutingMove { get; }
+    public IPokemon Target { get; }
+
+    public MoveInvulnerableEvent(IExecutingMove executingMove, IPokemon target)
+    {
+        ExecutingMove = executingMove;
+        Target = target;
+    }
+
+    /// <inheritdoc />
+    public EventBatchId BatchId { get; init; }
+}

PkmnLib.Dynamic/GlobalUsings.cs

@@ -1,4 +1,5 @@
 global using LevelInt = byte;
+global using JetBrains.Annotations;
 
 namespace PkmnLib.Dynamic;
 

PkmnLib.Dynamic/Libraries/DataLoaders/ItemDataLoader.cs

@@ -1,6 +1,5 @@
 using System.Collections.Immutable;
 using System.Text.Json;
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.Libraries.DataLoaders.Models;
 using PkmnLib.Static;
 using PkmnLib.Static.Libraries;

PkmnLib.Dynamic/Libraries/DataLoaders/MoveDataLoader.cs

@@ -1,6 +1,5 @@
 using System.Collections.Immutable;
 using System.Text.Json;
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.Libraries.DataLoaders.Models;
 using PkmnLib.Static;
 using PkmnLib.Static.Libraries;

PkmnLib.Dynamic/Libraries/DataLoaders/SpeciesDataLoader.cs

@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.Libraries.DataLoaders.Models;
 using PkmnLib.Static;
 using PkmnLib.Static.Libraries;

PkmnLib.Dynamic/Models/Battle.cs

@@ -40,6 +40,13 @@ public interface IBattle : IScriptSource, IDeepCloneable, IDisposable
     /// </summary>
     byte PositionsPerSide { get; }
 
+    /// <summary>
+    /// The name of the environment the battle is taking place in, such as "grass", "cave", etc.
+    /// This is sometimes referred to as the "terrain" in the games, but is not the same as the
+    /// <see cref="TerrainName"/> which is a battle condition that can be set by scripts.
+    /// </summary>
+    StringKey EnvironmentName { get; }
+
     /// <summary>
     /// Whether this battle is a wild battle. In a wild battle, the player can catch the opposing Pokemon,
     /// and moves like roar will end the battle instead of switching out the Pokemon.
@@ -173,9 +180,12 @@ public class BattleImpl : ScriptSource, IBattle
     /// <param name="canFlee">Whether Pokémon are allowed to flee from the battle.</param>
     /// <param name="numberOfSides">The number of sides in the battle. Generally 2.</param>
     /// <param name="positionsPerSide">The number of spots there are on each side for Pokémon. 1 for singles, 2 for doubles, etc.</param>
+    /// <param name="isWildBattle">Whether this battle is a wild battle. In a wild battle, the player can catch the opposing Pokémon,
+    /// and moves like roar will end the battle instead of switching out the Pokémon.</param>
+    /// <param name="environmentName">The name of the environment the battle is taking place in, such as "grass", "cave", etc.</param>
     /// <param name="randomSeed">The seed for the RNG. If null, this uses a time-dependent seed.</param>
     public BattleImpl(IDynamicLibrary library, IReadOnlyList<IBattleParty> parties, bool canFlee, byte numberOfSides,
-        byte positionsPerSide, bool isWildBattle, int? randomSeed = null)
+        byte positionsPerSide, bool isWildBattle, StringKey environmentName, int? randomSeed = null)
     {
         Library = library;
         Parties = parties;
@@ -183,6 +193,7 @@ public class BattleImpl : ScriptSource, IBattle
         NumberOfSides = numberOfSides;
         PositionsPerSide = positionsPerSide;
         IsWildBattle = isWildBattle;
+        EnvironmentName = environmentName;
         Volatile = new ScriptSet(this);
         var sides = new IBattleSide[numberOfSides];
         for (byte i = 0; i < numberOfSides; i++)
@@ -207,6 +218,9 @@ public class BattleImpl : ScriptSource, IBattle
     /// <inheritdoc />
     public byte PositionsPerSide { get; }
 
+    /// <inheritdoc />
+    public StringKey EnvironmentName { get; }
+
     /// <inheritdoc />
     public bool IsWildBattle { get; }
 

PkmnLib.Dynamic/Models/Choices/MoveChoice.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.ScriptHandling;
 using PkmnLib.Static.Utils;
 

PkmnLib.Dynamic/Models/Pokemon.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.Events;
 using PkmnLib.Dynamic.Libraries;
 using PkmnLib.Dynamic.Models.Serialized;

PkmnLib.Dynamic/ScriptHandling/Registry/ItemScriptAttribute.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using PkmnLib.Static.Utils;
 
 namespace PkmnLib.Dynamic.ScriptHandling.Registry;

PkmnLib.Dynamic/ScriptHandling/Registry/Plugin.cs

@@ -1,5 +1,3 @@
-using JetBrains.Annotations;
-
 namespace PkmnLib.Dynamic.ScriptHandling.Registry;
 
 /// <summary>

PkmnLib.Dynamic/ScriptHandling/Registry/ScriptAttribute.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using PkmnLib.Static.Utils;
 
 namespace PkmnLib.Dynamic.ScriptHandling.Registry;

PkmnLib.Dynamic/ScriptHandling/Registry/ScriptRegistry.cs

@@ -1,6 +1,5 @@
 using System.Linq.Expressions;
 using System.Reflection;
-using JetBrains.Annotations;
 using PkmnLib.Dynamic.Libraries;
 using PkmnLib.Static;
 using PkmnLib.Static.Utils;

PkmnLib.Dynamic/StaticHelpers.cs

@@ -5,11 +5,17 @@ namespace PkmnLib.Dynamic;
 /// </summary>
 public static class StaticHelpers
 {
+    /// <summary>
+    /// A delegate that provides the current date and time.
+    /// </summary>
+    public delegate DateTimeOffset DateTimeProviderDelegate();
+
     /// <summary>
     /// A function to get the current date and time. This can be replaced in cases where the date and time
     /// may not be the same as the system time.
     /// </summary>
-    public static Func<DateTimeOffset> DateTimeProvider { get; set; } = () => DateTimeOffset.Now;
+    [PublicAPI]
+    public static DateTimeProviderDelegate DateTimeProvider { get; set; } = () => DateTimeOffset.Now;
 
     /// <summary>
     /// Get the current date and time.

PkmnLib.Static/Utils/StringKey.cs

@@ -71,4 +71,6 @@ public readonly record struct StringKey
 
     /// <inheritdoc cref="Equals(StringKey)"/>
     public static bool operator !=(StringKey? left, StringKey right) => !(left == right);
+
+    public bool Contains(StringKey other) => _key.IndexOf(other._key, StringComparison.InvariantCultureIgnoreCase) >= 0;
 }

PkmnLib.Tests/Integration/IntegrationTestRunner.cs

@@ -87,7 +87,8 @@ public class IntegrationTestRunner
             return new BattlePartyImpl(party, x.Indices.Select(y => new ResponsibleIndex(y[0], y[1])).ToArray());
         }).ProcessOneAtATime().GetResultsAsync();
         using var battle = new BattleImpl(library, parties, test.BattleSetup.CanFlee, test.BattleSetup.NumberOfSides,
-            test.BattleSetup.PositionsPerSide, false, test.BattleSetup.Seed);
+            test.BattleSetup.PositionsPerSide, false, test.BattleSetup.EnvironmentName ?? "grass",
+            test.BattleSetup.Seed);
 
         foreach (var action in test.Actions)
         {

PkmnLib.Tests/Integration/Models/IntegrationTestModel.cs

@@ -19,6 +19,7 @@ public class IntegrationTestBattleSetup
     public byte NumberOfSides { get; set; }
     public byte PositionsPerSide { get; set; }
     public bool HasDamageRandomness { get; set; }
+    public string? EnvironmentName { get; set; }
     public IntegrationTestParty[] Parties { get; set; } = null!;
 }
 

PkmnLib.Tests/Static/DeepCloneTests.cs

@@ -108,7 +108,7 @@ public class DeepCloneTests
             new BattlePartyImpl(party1, [new ResponsibleIndex(0, 0)]),
             new BattlePartyImpl(party2, [new ResponsibleIndex(1, 0)]),
         };
-        using var battle = new BattleImpl(library, parties, false, 2, 3, false, 0);
+        using var battle = new BattleImpl(library, parties, false, 2, 3, false, "grass", 0);
         battle.Sides[0].SwapPokemon(0, party1[0]);
         battle.Sides[1].SwapPokemon(0, party2[0]);
         party1[0]!.ChangeStatBoost(Statistic.Defense, 2, true, false);

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;
 

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;

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")]

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")]

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")]

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")]

Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/StaticPokeball.cs

@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Items;
 
 /// <summary>

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")]

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")]

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")]

Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Acrobatics.cs

@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 
 /// <summary>

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;
 

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;
 

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;
 

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")]

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;
 

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")]

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,
+        };
+    }
 }

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")]

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")]

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")]

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

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

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")]

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")]

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;
 

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")]

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;
 

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")]

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;
 

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")]

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")]

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")]

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;
 

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")]

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;
 

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")]

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;
 

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;
 

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")]

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")]

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;
 

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")]

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;
 

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")]

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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")]

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;
+    }
 }

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")]

Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Payback.cs

@@ -1,5 +1,3 @@
-using PkmnLib.Static.Utils;
-
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 
 /// <summary>

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;
 

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")]

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")]

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>();
         }
     }
 }

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")]

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")]

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")]

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;
+        }
+    }
 }

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")]

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")]

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")]

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;
 

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;
 

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")]

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")]

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")]

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;
 

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")]

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")]

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;
 

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;
 

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;
 

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")]

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;
 

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;