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

@@ -9,12 +9,12 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Abilities;
[Script(ScriptCategory.Ability, "arena_trap")]
public class ArenaTrap : Script, IScriptPreventOpponentRunAway, IScriptPreventOpponentSwitch
{
private IPokemon? _owner;
private IBattlePokemon? _owner;
/// <inheritdoc />
public override void OnAddedToParent(IScriptSource source)
{
if (source is not IPokemon pokemon)
if (source is not IBattlePokemon pokemon)
throw new InvalidOperationException("ArenaTrap can only be added to a Pokemon.");
_owner = pokemon;
}
@@ -25,7 +25,7 @@ public class ArenaTrap : Script, IScriptPreventOpponentRunAway, IScriptPreventOp
if (choice.User.IsFloating)
return;
if (_owner is not null)
choice.User.BattleData?.Battle.EventHook.Invoke(new AbilityTriggerEvent(_owner));
choice.User.Battle.EventHook.Invoke(new AbilityTriggerEvent(_owner));
prevent = true;
}
@@ -35,7 +35,7 @@ public class ArenaTrap : Script, IScriptPreventOpponentRunAway, IScriptPreventOp
if (choice.User.IsFloating)
return;
if (_owner is not null)
choice.User.BattleData?.Battle.EventHook.Invoke(new AbilityTriggerEvent(_owner));
choice.User.Battle.EventHook.Invoke(new AbilityTriggerEvent(_owner));
prevent = true;
}
}