From a6c73a9c046bc2ae7a5202e25c5c9668e120987b Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Fri, 7 Mar 2025 16:16:22 +0100
Subject: [PATCH] Implements more move effects

---
 PkmnLib.Dynamic/Models/LearnedMove.cs         | 12 +++++
 PkmnLib.Dynamic/Models/Pokemon.cs             |  1 +
 PkmnLib.Dynamic/ScriptHandling/ScriptSet.cs   |  2 +-
 PkmnLib.NET.sln.DotSettings                   |  2 +
 PkmnLib.Tests/Data/Moves.json                 | 48 +++++++++++++++----
 .../Scripts/Battle/Gravity.cs                 | 35 ++++++++++++++
 .../Moves/ChangeMultipleUserStatBoosts.cs     |  2 +-
 .../Scripts/Moves/Frustration.cs              |  2 +-
 .../Scripts/Moves/Gravity.cs                  | 36 ++++++++++++++
 .../Scripts/Moves/Grudge.cs                   | 19 ++++++++
 .../Scripts/Moves/GuardSplit.cs               | 27 +++++++++++
 .../Scripts/Moves/GuardSwap.cs                | 29 +++++++++++
 .../Scripts/Moves/GuardianOfAlola.cs          | 12 +++++
 .../Scripts/Moves/GyroBall.cs                 | 13 +++++
 .../Scripts/Pokemon/GrudgeEffect.cs           | 22 +++++++++
 15 files changed, 251 insertions(+), 11 deletions(-)
 create mode 100644 PkmnLib.NET.sln.DotSettings
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/Gravity.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Gravity.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Grudge.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSplit.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSwap.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardianOfAlola.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GyroBall.cs
 create mode 100644 Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/GrudgeEffect.cs

diff --git a/PkmnLib.Dynamic/Models/LearnedMove.cs b/PkmnLib.Dynamic/Models/LearnedMove.cs
index 0bc7269..74637cb 100644
--- a/PkmnLib.Dynamic/Models/LearnedMove.cs
+++ b/PkmnLib.Dynamic/Models/LearnedMove.cs
@@ -80,6 +80,12 @@ public interface ILearnedMove : IDeepCloneable
     /// Restore the remaining PP by a certain amount. Will prevent it from going above max PP.
     /// </summary>
     void RestoreUses(byte amount);
+
+    /// <summary>
+    /// Forcibly set the remaining PP to a certain amount.
+    /// </summary>
+    /// <param name="uses"></param>
+    void SetCurrentPP(byte uses);
 }
 
 /// <inheritdoc />
@@ -136,4 +142,10 @@ public class LearnedMoveImpl : ILearnedMove
     /// Restore the PP by a certain amount. This will prevent the PP from going above the maximum PP.
     /// </summary>
     public void RestoreUses(byte amount) => CurrentPp = (byte)Math.Min(CurrentPp + amount, MaxPp);
+
+    /// <inheritdoc />
+    public void SetCurrentPP(byte uses)
+    {
+        CurrentPp = Math.Min(uses, MaxPp);
+    }
 }
\ No newline at end of file
diff --git a/PkmnLib.Dynamic/Models/Pokemon.cs b/PkmnLib.Dynamic/Models/Pokemon.cs
index 575643d..320082e 100644
--- a/PkmnLib.Dynamic/Models/Pokemon.cs
+++ b/PkmnLib.Dynamic/Models/Pokemon.cs
@@ -1091,6 +1091,7 @@ public class PokemonImpl : ScriptSource, IPokemon
                 Types = Form.Types;
                 OverrideAbility = null;
                 AbilitySuppressed = false;
+                RecalculateFlatStats();
             }
         }
     }
diff --git a/PkmnLib.Dynamic/ScriptHandling/ScriptSet.cs b/PkmnLib.Dynamic/ScriptHandling/ScriptSet.cs
index 8b6952d..bf1207b 100644
--- a/PkmnLib.Dynamic/ScriptHandling/ScriptSet.cs
+++ b/PkmnLib.Dynamic/ScriptHandling/ScriptSet.cs
@@ -21,7 +21,7 @@ public interface IScriptSet : IEnumerable<ScriptContainer>
     /// Adds a script with a name to the set. If the script with that name already exists in this
     /// set, this makes that script stack instead. The return value here is that script.
     /// </summary>
-    ScriptContainer? StackOrAdd(StringKey scriptKey, Func<Script> instantiation);
+    ScriptContainer? StackOrAdd(StringKey scriptKey, Func<Script?> instantiation);
 
     /// <summary>
     /// Gets a script from the set using its unique name.
diff --git a/PkmnLib.NET.sln.DotSettings b/PkmnLib.NET.sln.DotSettings
new file mode 100644
index 0000000..c32bf07
--- /dev/null
+++ b/PkmnLib.NET.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/PkmnLib.Tests/Data/Moves.json b/PkmnLib.Tests/Data/Moves.json
index 1d67481..89ddf51 100755
--- a/PkmnLib.Tests/Data/Moves.json
+++ b/PkmnLib.Tests/Data/Moves.json
@@ -4572,7 +4572,10 @@
       "category": "status",
       "flags": [
         "nonskybattle"
-      ]
+      ],
+      "effect": {
+        "name": "gravity"
+      }
     },
     {
       "name": "growl",
@@ -4609,7 +4612,14 @@
       "category": "status",
       "flags": [
         "snatch"
-      ]
+      ],
+      "effect": {
+        "name": "change_multiple_user_stat_boosts",
+        "parameters": {
+          "attack": 1,
+          "specialAttack": 1
+        }
+      }
     },
     {
       "name": "grudge",
@@ -4622,7 +4632,10 @@
       "category": "status",
       "flags": [
         "ignore-substitute"
-      ]
+      ],
+      "effect": {
+        "name": "grudge"
+      }
     },
     {
       "name": "guard_split",
@@ -4650,7 +4663,10 @@
         "protect",
         "mirror",
         "ignore-substitute"
-      ]
+      ],
+      "effect": {
+        "name": "guard_swap"
+      }
     },
     {
       "name": "guardian_of_alola",
@@ -4661,7 +4677,10 @@
       "priority": 0,
       "target": "Any",
       "category": "special",
-      "flags": []
+      "flags": [],
+      "effect": {
+        "name": "guardian_of_alola"
+      }
     },
     {
       "name": "guillotine",
@@ -4676,7 +4695,10 @@
         "contact",
         "protect",
         "mirror"
-      ]
+      ],
+      "effect": {
+        "name": "one_hit_ko"
+      }
     },
     {
       "name": "gunk_shot",
@@ -4690,7 +4712,14 @@
       "flags": [
         "protect",
         "mirror"
-      ]
+      ],
+      "effect": {
+        "name": "set_status",
+        "chance": 30,
+        "parameters": {
+          "status": "poisoned"
+        }
+      }
     },
     {
       "name": "gust",
@@ -4723,7 +4752,10 @@
         "protect",
         "mirror",
         "ballistics"
-      ]
+      ],
+      "effect": {
+        "name": "gyro_ball"
+      }
     },
     {
       "name": "hail",
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/Gravity.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/Gravity.cs
new file mode 100644
index 0000000..9e01a20
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/Gravity.cs
@@ -0,0 +1,35 @@
+using System.Linq;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Battle;
+
+[Script(ScriptCategory.Battle, "gravity")]
+public class Gravity : Script
+{
+    /// <inheritdoc />
+    public override void ChangeEffectiveness(IExecutingMove move, IPokemon target, byte hit, ref float effectiveness)
+    {
+        var battleData = target.BattleData;
+        if (battleData == null)
+            return;
+
+        if (move.UseMove.MoveType.Name == "ground")
+        {
+            var targetTypes = target.Types;
+            var typeLibrary = battleData.Battle.Library.StaticLibrary.Types;
+            effectiveness =
+                // Get the effectiveness of the move against each target type
+                targetTypes.Select(x => typeLibrary.GetSingleEffectiveness(move.UseMove.MoveType, x))
+                    // Ignore all types that are immune to ground moves
+                    .Where(x => x > 0)
+                    // Multiply all effectiveness values together
+                    .Aggregate(1.0f, (current, x) => current * x);
+        }
+    }
+
+    /// <inheritdoc />
+    public override void FailIncomingMove(IExecutingMove move, IPokemon target, ref bool fail)
+    {
+        if (move.UseMove.HasFlag("gravity"))
+            fail = true;
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleUserStatBoosts.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleUserStatBoosts.cs
index b831beb..f5dbf87 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleUserStatBoosts.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/ChangeMultipleUserStatBoosts.cs
@@ -22,7 +22,7 @@ public class ChangeMultipleUserStatBoosts : Script
         foreach (var par in parameters)
         {
             if (!Enum.TryParse<Statistic>(par.Key, true, out var stat))
-                continue;
+                throw new ArgumentException($"Invalid stat name: {par.Key}");
             if (par.Value is sbyte value)
             {
                 _statBoosts[stat] = value;
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Frustration.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Frustration.cs
index 733f98d..d9c80ed 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Frustration.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Frustration.cs
@@ -9,6 +9,6 @@ public class Frustration : Script
     public override void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref byte basePower)
     {
         var friendship = move.User.Happiness;
-        basePower = Math.Min((byte)1, (byte)((255 - friendship) * 2 / 5));
+        basePower = Math.Max((byte)1, (byte)((255 - friendship) * 2 / 5));
     }
 }
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Gravity.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Gravity.cs
new file mode 100644
index 0000000..7019ae6
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Gravity.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Linq;
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+using PkmnLib.Static.Utils;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "gravity")]
+public class Gravity : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var battleData = target.BattleData;
+        if (battleData == null)
+            return;
+
+        battleData.Battle.Volatile.StackOrAdd("gravity", () =>
+        {
+            battleData.Battle.Library.ScriptResolver.TryResolve(ScriptCategory.Battle, "gravity",
+                new Dictionary<StringKey, object?>(), out var script);
+            return script;
+        });
+
+        foreach (var pokemon in battleData.Battle.Sides.SelectMany(x => x.Pokemon).WhereNotNull())
+        {
+            var chargeBounceEffect = ScriptUtils.ResolveName<ChargeBounceEffect>();
+            if (pokemon.Volatile.Contains(chargeBounceEffect))
+                pokemon.Volatile.Remove(chargeBounceEffect);
+            var flyEffect = ScriptUtils.ResolveName<ChargeFlyEffect>();
+            if (pokemon.Volatile.Contains(flyEffect))
+                pokemon.Volatile.Remove(flyEffect);
+            // TODO: Sky Drop
+        }
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Grudge.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Grudge.cs
new file mode 100644
index 0000000..ee718b0
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Grudge.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using PkmnLib.Static.Utils;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "grudge")]
+public class Grudge : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        move.User.Volatile.StackOrAdd("grudge", () =>
+        {
+            move.User.Library.ScriptResolver.TryResolve(ScriptCategory.Pokemon, "grudge",
+                new Dictionary<StringKey, object?>(), out var script);
+            return script;
+        });
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSplit.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSplit.cs
new file mode 100644
index 0000000..c5f652b
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSplit.cs
@@ -0,0 +1,27 @@
+using PkmnLib.Static;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "guard_split")]
+public class GuardSplit : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var user = move.User;
+        var userStats = user.FlatStats;
+        var targetStats = target.FlatStats;
+
+        var userDefense = userStats.GetStatistic(Statistic.Defense);
+        var targetDefense = targetStats.GetStatistic(Statistic.Defense);
+        var userSpecialDefense = userStats.GetStatistic(Statistic.SpecialDefense);
+        var targetSpecialDefense = targetStats.GetStatistic(Statistic.SpecialDefense);
+
+        var newDefense = (userDefense + targetDefense) / 2;
+        var newSpecialDefense = (userSpecialDefense + targetSpecialDefense) / 2;
+
+        userStats.SetStatistic(Statistic.Defense, newDefense);
+        userStats.SetStatistic(Statistic.SpecialDefense, newSpecialDefense);
+        user.RecalculateFlatStats();
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSwap.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSwap.cs
new file mode 100644
index 0000000..74c2388
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardSwap.cs
@@ -0,0 +1,29 @@
+using PkmnLib.Static;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "guard_swap")]
+public class GuardSwap : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        EventBatchId eventBatchId = new();
+
+        var user = move.User;
+        var userStats = user.StatBoost;
+        var targetStats = target.StatBoost;
+
+        var userDefense = userStats.GetStatistic(Statistic.Defense);
+        var targetDefense = targetStats.GetStatistic(Statistic.Defense);
+        var userSpecialDefense = userStats.GetStatistic(Statistic.SpecialDefense);
+        var targetSpecialDefense = targetStats.GetStatistic(Statistic.SpecialDefense);
+
+        user.ChangeStatBoost(Statistic.Defense, (sbyte)(targetDefense - userDefense), true, eventBatchId);
+        user.ChangeStatBoost(Statistic.SpecialDefense, (sbyte)(targetSpecialDefense - userSpecialDefense), true,
+            eventBatchId);
+        target.ChangeStatBoost(Statistic.Defense, (sbyte)(userDefense - targetDefense), false, eventBatchId);
+        target.ChangeStatBoost(Statistic.SpecialDefense, (sbyte)(userSpecialDefense - targetSpecialDefense), false,
+            eventBatchId);
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardianOfAlola.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardianOfAlola.cs
new file mode 100644
index 0000000..4e1ab42
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GuardianOfAlola.cs
@@ -0,0 +1,12 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "guardian_of_alola")]
+public class GuardianOfAlola : Script
+{
+    /// <inheritdoc />
+    public override void ChangeMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    {
+        var maxHp = target.BoostedStats.Hp;
+        damage = (uint)(maxHp * (3f / 4f));
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GyroBall.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GyroBall.cs
new file mode 100644
index 0000000..0cf24d1
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/GyroBall.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "gyro_ball")]
+public class GyroBall : Script
+{
+    /// <inheritdoc />
+    public override void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref byte basePower)
+    {
+        basePower = Math.Min((byte)150, (byte)(25 * target.BoostedStats.Speed / move.User.BoostedStats.Speed + 1));
+    }
+}
\ No newline at end of file
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/GrudgeEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/GrudgeEffect.cs
new file mode 100644
index 0000000..b263d8e
--- /dev/null
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/GrudgeEffect.cs
@@ -0,0 +1,22 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+[Script(ScriptCategory.Pokemon, "grudge")]
+public class GrudgeEffect : Script
+{
+    private ILearnedMove? _lastMove;
+
+    /// <inheritdoc />
+    public override void OnIncomingHit(IExecutingMove move, IPokemon target, byte hit)
+    {
+        _lastMove = move.ChosenMove;
+    }
+
+    /// <inheritdoc />
+    public override void OnFaint(IPokemon pokemon, DamageSource source)
+    {
+        if (_lastMove != null && source == DamageSource.MoveDamage)
+        {
+            _lastMove.SetCurrentPP(0);
+        }
+    }
+}
\ No newline at end of file