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

@@ -17,7 +17,7 @@ public class FreezeDryTests
/// <summary>
/// Creates a test setup with the real Gen7 type library, and a target in battle with the given types.
/// </summary>
private static (FreezeDry script, IExecutingMove move, IPokemon target, IDynamicLibrary library)
private static (FreezeDry script, IExecutingMove move, IBattlePokemon target, IDynamicLibrary library)
CreateEffectivenessSetup(params string[] targetTypes)
{
var script = new FreezeDry();
@@ -25,18 +25,16 @@ public class FreezeDryTests
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.Types.Returns(targetTypes.Select(name => GetTypeId(library, name)).ToList());
target.Battle.Returns(battle);
var move = Substitute.For<IExecutingMove>();
var hitData = Substitute.For<IHitData>();
hitData.Type.Returns(GetTypeId(library, "ice"));
move.GetHitData(Arg.Any<IPokemon>(), Arg.Any<byte>()).Returns(hitData);
var user = Substitute.For<IPokemon>();
move.GetHitData(Arg.Any<IBattlePokemon>(), Arg.Any<byte>()).Returns(hitData);
var user = Substitute.For<IBattlePokemon>();
move.User.Returns(user);
return (script, move, target, library);
@@ -46,24 +44,21 @@ public class FreezeDryTests
/// Creates a fully mocked test setup for the secondary (freeze) effect tests, with a battle random
/// that reports the given result for effect chance rolls.
/// </summary>
private static (FreezeDry script, IExecutingMove move, IPokemon target, IPokemon user, IBattleRandom random)
CreateSecondaryEffectSetup(bool effectChanceResult)
private static (FreezeDry script, IExecutingMove move, IBattlePokemon target, IBattlePokemon user, IBattleRandom
random) CreateSecondaryEffectSetup(bool effectChanceResult)
{
var script = new FreezeDry();
var random = Substitute.For<IBattleRandom>();
random.EffectChance(Arg.Any<float>(), Arg.Any<IExecutingMove>(), Arg.Any<IPokemon>(), Arg.Any<byte>())
random.EffectChance(Arg.Any<float>(), Arg.Any<IExecutingMove>(), Arg.Any<IBattlePokemon>(), Arg.Any<byte>())
.Returns(effectChanceResult);
var battle = Substitute.For<IBattle>();
battle.Random.Returns(random);
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);
var move = Substitute.For<IExecutingMove>();
var user = Substitute.For<IPokemon>();
var user = Substitute.For<IBattlePokemon>();
move.User.Returns(user);
return (script, move, target, user, random);
@@ -139,25 +134,6 @@ public class FreezeDryTests
await Assert.That(effectiveness).IsEqualTo(2f);
}
/// <summary>
/// If the target has no <see cref="IPokemon.BattleData"/>, the script cannot resolve the type library,
/// so the effectiveness must be left untouched.
/// </summary>
[Test]
public async Task ChangeEffectiveness_NullBattleData_EffectivenessUnchanged()
{
// Arrange
var (script, move, target, _) = CreateEffectivenessSetup("water");
target.BattleData.Returns((IPokemonBattleData?)null);
var effectiveness = 0.5f;
// Act
script.ChangeEffectiveness(move, target, 0, ref effectiveness);
// Assert
await Assert.That(effectiveness).IsEqualTo(0.5f);
}
/// <summary>
/// Bulbapedia (Generation VI to VIII): "Freeze-Dry has a 10% chance of freezing the target."
/// When the effect chance roll succeeds, the target is frozen, with the user as the origin.
@@ -213,22 +189,4 @@ public class FreezeDryTests
await Assert.That(call).IsNotNull();
await Assert.That((float)call!.GetArguments()[0]!).IsEqualTo(10f);
}
/// <summary>
/// If the target has no <see cref="IPokemon.BattleData"/>, no effect chance can be rolled, so the
/// target may not be frozen.
/// </summary>
[Test]
public async Task OnSecondaryEffect_NullBattleData_TargetNotFrozen()
{
// Arrange
var (script, move, target, _, _) = CreateSecondaryEffectSetup(true);
target.BattleData.Returns((IPokemonBattleData?)null);
// Act
script.OnSecondaryEffect(move, target, 0);
// Assert
await Assert.That(target.ReceivedCalls().Any(c => c.GetMethodInfo().Name == "SetStatus")).IsFalse();
}
}