Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper
This commit is contained in:
@@ -8,12 +8,12 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Abilities;
|
||||
[Script(ScriptCategory.Ability, "healer")]
|
||||
public class Healer : Script, IScriptOnEndTurn
|
||||
{
|
||||
private IPokemon? _pokemon;
|
||||
private IBattlePokemon? _pokemon;
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnAddedToParent(IScriptSource source)
|
||||
{
|
||||
if (source is not IPokemon pokemon)
|
||||
if (source is not IBattlePokemon pokemon)
|
||||
throw new InvalidOperationException("Harvest can only be added to a Pokemon script source.");
|
||||
_pokemon = pokemon;
|
||||
}
|
||||
@@ -21,22 +21,22 @@ public class Healer : Script, IScriptOnEndTurn
|
||||
/// <inheritdoc />
|
||||
public void OnEndTurn(IScriptSource owner, IBattle battle)
|
||||
{
|
||||
if (_pokemon?.BattleData is null)
|
||||
if (_pokemon is null)
|
||||
return;
|
||||
|
||||
if (_pokemon.BattleData.Position > 0)
|
||||
if (_pokemon.Position > 0)
|
||||
{
|
||||
var leftAlly = _pokemon.BattleData.BattleSide.Pokemon[_pokemon.BattleData.Position - 1];
|
||||
var leftAlly = _pokemon.BattleSide.Pokemon[_pokemon.Position - 1];
|
||||
TryClearStatus(battle, leftAlly);
|
||||
}
|
||||
if (_pokemon.BattleData.Position < _pokemon.BattleData.BattleSide.Pokemon.Count - 1)
|
||||
if (_pokemon.Position < _pokemon.BattleSide.Pokemon.Count - 1)
|
||||
{
|
||||
var rightAlly = _pokemon.BattleData.BattleSide.Pokemon[_pokemon.BattleData.Position + 1];
|
||||
var rightAlly = _pokemon.BattleSide.Pokemon[_pokemon.Position + 1];
|
||||
TryClearStatus(battle, rightAlly);
|
||||
}
|
||||
}
|
||||
|
||||
private static void TryClearStatus(IBattle battle, IPokemon? leftAlly)
|
||||
private static void TryClearStatus(IBattle battle, IBattlePokemon? leftAlly)
|
||||
{
|
||||
if (leftAlly is null)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user