More moves implemented

Plugins/PkmnLib.Plugin.Gen7/Libraries/Gen7DamageCalculator.cs

@@ -63,9 +63,9 @@ public class Gen7DamageCalculator(bool hasRandomness) : IDamageCalculator
             _ => (uint)floatDamage,
         };
         executingMove.RunScriptHook(script =>
-            script.ChangeDamage(executingMove, target, hitNumber, ref damage));
+            script.ChangeMoveDamage(executingMove, target, hitNumber, ref damage));
         target.RunScriptHook(script =>
-            script.ChangeIncomingDamage(executingMove, target, hitNumber, ref damage));
+            script.ChangeIncomingMoveDamage(executingMove, target, hitNumber, ref damage));
 
         return damage;
     }

Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/FairyLockEffect.cs

@@ -0,0 +1,27 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Battle;
+
+[Script(ScriptCategory.Battle, "fairy_lock")]
+public class FairyLockEffect : Script
+{
+    private int _turns = 1;
+    
+    /// <inheritdoc />
+    public override void PreventSelfRunAway(IFleeChoice choice, ref bool prevent)
+    {
+        prevent = true;
+    }
+
+    /// <inheritdoc />
+    public override void PreventSelfSwitch(ISwitchChoice choice, ref bool prevent)
+    {
+        prevent = true;
+    }
+
+    /// <inheritdoc />
+    public override void OnEndTurn(IBattle battle)
+    {
+        if (_turns <= 0) 
+            RemoveSelf();
+        _turns--;
+    }
+}

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

@@ -6,7 +6,7 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 public class BanefulBunker : ProtectionScript
 {
     /// <inheritdoc />
-    protected override ProtectionEffectScript GetEffectScript()
+    protected override Script GetEffectScript()
     {
         return new BanefulBunkerEffect();
     }

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

@@ -27,7 +27,7 @@ public class Counter : Script
     }
 
     /// <inheritdoc />
-    public override void ChangeDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    public override void ChangeMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
     {
         var counterHelper = move.User.Volatile.Get<CounterHelperEffect>();
         if (counterHelper == null || counterHelper.LastHitBy == null || counterHelper.LastHitBy != target)

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

@@ -4,7 +4,7 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 public class DragonRage : Script
 {
     /// <inheritdoc />
-    public override void ChangeDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    public override void ChangeMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
     {
         damage = 40;
     }

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

@@ -12,7 +12,7 @@ public class Electrify : Script
         if (choiceQueue == null)
             return;
 
-        if (choiceQueue.Where(x => x is IMoveChoice moveChoice && moveChoice.User == target) is not IMoveChoice choice)
+        if (choiceQueue.FirstOrDefault(x => x is IMoveChoice moveChoice && moveChoice.User == target) is not IMoveChoice choice)
         {
             move.GetHitData(target, hit).Fail();
             return;

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

@@ -0,0 +1,13 @@
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "embargo")]
+public class Embargo : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        target.Volatile.Add(new EmbargoEffect());
+    }
+}

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

@@ -0,0 +1,31 @@
+using System.Linq;
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "encore")]
+public class Encore : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var battle = target.BattleData?.Battle;
+        if (battle == null)
+            return;
+
+        var currentTurn = battle.ChoiceQueue!.LastRanChoice;
+        var lastMove = battle.PreviousTurnChoices
+            .SelectMany(x => x)
+            .OfType<IMoveChoice>()
+            .TakeWhile(x => x != currentTurn)
+            .LastOrDefault(x => x.User == target);
+        if (lastMove == null)
+        {
+            move.GetHitData(target, hit).Fail();
+            return;
+        }
+        
+        var effect = new EncoreEffect(target, lastMove.ChosenMove.MoveData.Name, 3);
+        target.Volatile.Add(effect);
+    }
+}

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

@@ -0,0 +1,18 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "endeavor")]
+public class Endeavor : Script
+{
+    /// <inheritdoc />
+    public override void ChangeMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    {
+        var user = move.User;
+        var userHealth = user.CurrentHealth;
+        var targetHealth = target.CurrentHealth;
+        if (userHealth >= targetHealth)
+        {
+            return;
+        }
+        damage = targetHealth - userHealth;
+    }
+}

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

@@ -0,0 +1,10 @@
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "endure")]
+public class Endure : ProtectionScript
+{
+    /// <inheritdoc />
+    protected override Script GetEffectScript() => new EndureEffect();
+}

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

@@ -0,0 +1,25 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "entrainment")]
+public class Entrainment : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var userAbility = move.User.ActiveAbility;
+        var targetAbility = target.ActiveAbility;
+        if (userAbility == targetAbility || userAbility == null)
+        {
+            move.GetHitData(target, hit).Fail();
+            return;
+        }
+        
+        if (userAbility.HasFlag("cant_be_copied") || targetAbility?.HasFlag("cant_be_changed") != false)
+        {
+            move.GetHitData(target, hit).Fail();
+            return;
+        }
+        
+        target.ChangeAbility(userAbility);
+    }
+}

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

@@ -0,0 +1,13 @@
+using System;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "eruption")]
+public class Eruption : Script
+{
+    public override void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref byte basePower)
+    {
+        basePower = Math.Max((byte)(150 * move.User.CurrentHealth / move.User.BoostedStats.Hp), (byte)1);
+    }
+
+}

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

@@ -0,0 +1,11 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "explosion")]
+public class Explosion : Script
+{
+    /// <inheritdoc />
+    public override void OnAfterHits(IExecutingMove move, IPokemon target)
+    {
+        move.User.Damage(move.User.CurrentHealth * 10, DamageSource.Misc);
+    }
+}

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

@@ -0,0 +1,17 @@
+using PkmnLib.Static.Utils;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "facade")]
+public class Facade : Script
+{
+    /// <inheritdoc />
+    public override void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref byte basePower)
+    {
+        var status = move.User.StatusScript.Script?.Name;
+        if (status == "paralyzed" || status == "burned" || status == "poisoned")
+        {
+            basePower.MultiplyOrMax(2);
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+using PkmnLib.Plugin.Gen7.Scripts.Battle;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "fairy_lock")]
+public class FairyLock : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var battle = target.BattleData?.Battle;
+        battle?.Volatile.Add(new FairyLockEffect());
+    }
+}

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

@@ -0,0 +1,23 @@
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "fake_out")]
+public class FakeOut : Script
+{
+    /// <inheritdoc />
+    public override void StopBeforeMove(IExecutingMove move, ref bool stop)
+    {
+        var battleData = move.User.BattleData;
+        if (battleData == null)
+            return;
+        if (battleData.SwitchInTurn != battleData.Battle.CurrentTurnNumber)
+            stop = true;
+    }
+
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        target.Volatile.Add(new FlinchEffect());
+    }
+}

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

@@ -0,0 +1,14 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "false_swipe")]
+public class FalseSwipe : Script
+{
+    /// <inheritdoc />
+    public override void ChangeMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    {
+        if (target.CurrentHealth - damage < 1)
+        {
+            damage = target.CurrentHealth - 1;
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+using PkmnLib.Static;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "fell_stinger")]
+public class FellStinger : Script
+{
+    /// <inheritdoc />
+    public override void OnAfterHits(IExecutingMove move, IPokemon target)
+    {
+        if (target.IsFainted)
+        {
+            move.User.ChangeStatBoost(Statistic.Attack, 2, true);
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "final_gambit")]
+public class FinalGambit : Script
+{
+    /// <inheritdoc />
+    public override void ChangeMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    {
+        damage = move.User.CurrentHealth;
+    }
+
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        move.User.Damage(move.User.CurrentHealth * 10, DamageSource.Misc);
+    }
+}

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

@@ -0,0 +1,29 @@
+using PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+public class FireFang : Script
+{
+    /// <inheritdoc />
+    public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
+    {
+        var battleData = target.BattleData;
+        if (battleData == null)
+            return;
+        var random = battleData.Battle.Random;
+        if (random.EffectChance(10, move, target, hit))
+        {
+            target.SetStatus("burned");
+        }
+
+        // It also has an independent 10% chance of causing the target to flinch, if the user attacks before the target. 
+        var choiceQueue = battleData.Battle.ChoiceQueue;
+        if (choiceQueue?.FirstOrDefault(x => x.User == target) != null)
+        {
+            if (random.EffectChance(10, move, target, hit))
+            {
+                target.Volatile.Add(new FlinchEffect());
+            }
+        }
+    }
+}

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

@@ -0,0 +1,7 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
+
+[Script(ScriptCategory.Move, "fire_pledge")]
+public class FirePledge : Script
+{
+    // TODO: pledge moves
+}

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

@@ -6,7 +6,7 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 [Script(ScriptCategory.Move, "protect")]
 public class ProtectionScript : Script
 {
-    protected virtual ProtectionEffectScript GetEffectScript() => new();
+    protected virtual Script GetEffectScript() => new ProtectionEffectScript();
 
     /// <inheritdoc />
     public override void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)

Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ChargeBounceEffect.cs

@@ -27,7 +27,7 @@ public class ChargeBounceEffect : Script
     }
 
     /// <inheritdoc />
-    public override void ChangeIncomingDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    public override void ChangeIncomingMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
     {
         if (!move.UseMove.HasFlag("effective_against_fly"))
             damage *= 2;

Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DigEffect.cs

@@ -26,7 +26,7 @@ public class DigEffect : Script
     }
 
     /// <inheritdoc />
-    public override void ChangeIncomingDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    public override void ChangeIncomingMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
     {
         if (!move.UseMove.HasFlag("effective_against_underground"))
             damage *= 2;

Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DiveEffect.cs

@@ -26,7 +26,7 @@ public class DiveEffect : Script
     }
 
     /// <inheritdoc />
-    public override void ChangeIncomingDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    public override void ChangeIncomingMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
     {
         if (!move.UseMove.HasFlag("effective_against_underwater"))
             damage *= 2;

Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/EmbargoEffect.cs

@@ -0,0 +1,31 @@
+using PkmnLib.Static;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+[Script(ScriptCategory.Pokemon, "embargo")]
+public class EmbargoEffect : Script
+{
+    private int _turns = 5;
+    
+    /// <inheritdoc />
+    public override void PreventHeldItemConsume(IPokemon pokemon, IItem heldItem, ref bool prevented)
+    {
+        prevented = true;
+    }
+
+    /// <inheritdoc />
+    public override void Stack()
+    {
+        _turns = 5;
+    }
+
+    /// <inheritdoc />
+    public override void OnEndTurn(IBattle battle)
+    {
+        _turns--;
+        if (_turns == 0)
+        {
+            RemoveSelf();
+        }
+    }
+}

Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/EncoreEffect.cs

@@ -0,0 +1,42 @@
+using PkmnLib.Plugin.Gen7.Scripts.Utils;
+using PkmnLib.Static.Utils;
+
+namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+[Script(ScriptCategory.Pokemon, "encore")]
+public class EncoreEffect : Script
+{
+    private readonly IPokemon _owner;
+    private readonly StringKey _move;
+    private int _turns;
+
+    public EncoreEffect(IPokemon owner, StringKey move, int turns)
+    {
+        _owner = owner;
+        _move = move;
+        _turns = turns;
+    }
+    
+    /// <inheritdoc />
+    public override void ForceTurnSelection(byte sideIndex, byte position, ref ITurnChoice? choice)
+    {
+        var opposingSideIndex = (byte)(_owner.BattleData?.SideIndex == 0 ? 1 : 0);
+        choice = TurnChoiceHelper.CreateMoveChoice(_owner, _move, opposingSideIndex, position);
+        if (choice is IMoveChoice { ChosenMove.CurrentPp: <= 0 } moveChoice)
+        {
+            choice =
+                moveChoice.User.BattleData?.Battle.Library.MiscLibrary.ReplacementChoice(_owner, opposingSideIndex,
+                    position);
+        }
+    }
+
+    /// <inheritdoc />
+    public override void OnEndTurn(IBattle battle)
+    {
+        _turns--;
+        if (_turns <= 0)
+        {
+            RemoveSelf();
+        }
+    }
+}

Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/EndureEffect.cs

@@ -0,0 +1,15 @@
+namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
+
+[Script(ScriptCategory.Pokemon, "endure")]
+public class EndureEffect : Script
+{
+    /// <inheritdoc />
+    public override void ChangeIncomingDamage(IPokemon pokemon, DamageSource source, ref uint damage)
+    {
+        if (damage > pokemon.CurrentHealth)
+            damage = pokemon.CurrentHealth - 1;
+    }
+
+    /// <inheritdoc />
+    public override void OnEndTurn(IBattle battle) => RemoveSelf();
+}

Plugins/PkmnLib.Plugin.Gen7/Scripts/Side/AuroraVeilEffect.cs

@@ -43,7 +43,7 @@ public class AuroraVeilEffect : Script
     }
 
     /// <inheritdoc />
-    public override void ChangeIncomingDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
+    public override void ChangeIncomingMoveDamage(IExecutingMove move, IPokemon target, byte hit, ref uint damage)
     {
         var hitData = move.GetHitData(target, hit);
         if (hitData.IsCritical)

Plugins/PkmnLib.Plugin.Gen7/Scripts/Utils/TurnChoiceHelper.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Linq;
+using PkmnLib.Static.Utils;
 
 namespace PkmnLib.Plugin.Gen7.Scripts.Utils;
 
 public static class TurnChoiceHelper
 {
-    public static IMoveChoice CreateMoveChoice(IPokemon owner, string moveName, byte targetSide, byte targetPosition)
+    public static IMoveChoice CreateMoveChoice(IPokemon owner, StringKey moveName, byte targetSide, byte targetPosition)
     {
         var move = owner.Moves.FirstOrDefault(x => x?.MoveData.Name == moveName);
         if (move == null)