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

@@ -10,7 +10,7 @@ public class SolarPower : Script, IScriptChangeOffensiveStatValue, IScriptOnEndT
IAIInfoScriptExpectedEndOfTurnDamage
{
/// <inheritdoc />
public void ChangeOffensiveStatValue(IExecutingMove move, IPokemon target, byte hit, uint defensiveStat,
public void ChangeOffensiveStatValue(IExecutingMove move, IBattlePokemon target, byte hit, uint defensiveStat,
ImmutableStatisticSet<uint> targetStats, Statistic stat, ref uint value)
{
if ((stat == Statistic.SpecialAttack &&
@@ -24,13 +24,13 @@ public class SolarPower : Script, IScriptChangeOffensiveStatValue, IScriptOnEndT
/// <inheritdoc />
public void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (owner is not IPokemon pokemon)
if (owner is not IBattlePokemon pokemon)
return;
if (!pokemon.IsUsable)
return;
var weatherName = pokemon.BattleData?.Battle.WeatherName;
var weatherName = pokemon.Battle.WeatherName;
if (weatherName != ScriptUtils.ResolveName<Weather.HarshSunlight>() &&
weatherName != ScriptUtils.ResolveName<Weather.DesolateLands>())
{
@@ -41,9 +41,9 @@ public class SolarPower : Script, IScriptChangeOffensiveStatValue, IScriptOnEndT
}
/// <inheritdoc />
public void ExpectedEndOfTurnDamage(IPokemon pokemon, ref int damage)
public void ExpectedEndOfTurnDamage(IBattlePokemon pokemon, ref int damage)
{
var weatherName = pokemon.BattleData?.Battle.WeatherName;
var weatherName = pokemon.Battle.WeatherName;
if (weatherName != ScriptUtils.ResolveName<Weather.HarshSunlight>() &&
weatherName != ScriptUtils.ResolveName<Weather.DesolateLands>())
{