Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper

This commit is contained in:
2026-08-28 15:20:26 +02:00
parent 942be8eaeb
commit 8a2733a0a9
859 changed files with 4408 additions and 5331 deletions

View File

@@ -15,11 +15,11 @@ namespace PkmnLib.Plugin.Gen7.Tests.Scripts.Moves;
/// </summary>
public class ChargeTests
{
private static (Charge script, IExecutingMove move, IPokemon user, IScriptSet userVolatile) CreateTestSetup()
private static (Charge script, IExecutingMove move, IBattlePokemon user, IScriptSet userVolatile) CreateTestSetup()
{
var script = new Charge();
var move = Substitute.For<IExecutingMove>();
var user = Substitute.For<IPokemon>();
var user = Substitute.For<IBattlePokemon>();
// Use a real script set so the volatile script added by Charge can be inspected afterwards.
var userVolatile = new ScriptSet(user);
user.Volatile.Returns(userVolatile);
@@ -32,16 +32,14 @@ public class ChargeTests
/// Creates an executing move of the given type whose damage modifier can be changed by
/// <see cref="ChargeEffect.ChangeDamageModifier"/>.
/// </summary>
private static (IExecutingMove move, IPokemon target) CreateExecutingMoveOfType(string typeName)
private static (IExecutingMove move, IBattlePokemon target) CreateExecutingMoveOfType(string typeName)
{
var library = LibraryHelpers.LoadLibrary();
var battle = Substitute.For<IBattle>();
battle.Library.Returns(library);
var battleData = Substitute.For<IPokemonBattleData>();
battleData.Battle.Returns(battle);
var target = Substitute.For<IPokemon>();
target.BattleData.Returns(battleData);
var target = Substitute.For<IBattlePokemon>();
target.Battle.Returns(battle);
library.StaticLibrary.Types.TryGetTypeIdentifier(typeName, out var typeIdentifier);
var useMove = Substitute.For<IMoveData>();
useMove.MoveType.Returns(typeIdentifier);
@@ -61,7 +59,7 @@ public class ChargeTests
var (script, move, user, _) = CreateTestSetup();
// Act
script.OnSecondaryEffect(move, Substitute.For<IPokemon>(), 0);
script.OnSecondaryEffect(move, Substitute.For<IBattlePokemon>(), 0);
// Assert
var boost = user.ReceivedCalls().SingleOrDefault(c => c.GetMethodInfo().Name == "ChangeStatBoost");
@@ -82,7 +80,7 @@ public class ChargeTests
var (script, move, _, userVolatile) = CreateTestSetup();
// Act
script.OnSecondaryEffect(move, Substitute.For<IPokemon>(), 0);
script.OnSecondaryEffect(move, Substitute.For<IBattlePokemon>(), 0);
// Assert
await Assert.That(userVolatile.Contains(ScriptUtils.ResolveName<ChargeEffect>())).IsTrue();
@@ -134,7 +132,7 @@ public class ChargeTests
{
// Arrange
var (script, move, user, userVolatile) = CreateTestSetup();
script.OnSecondaryEffect(move, Substitute.For<IPokemon>(), 0);
script.OnSecondaryEffect(move, Substitute.For<IBattlePokemon>(), 0);
await Assert.That(userVolatile.TryGet<ChargeEffect>(out var effect)).IsTrue();
var battle = Substitute.For<IBattle>();