Fixes and reworking of item use
All checks were successful
Build / Build (push) Successful in 57s

This commit is contained in:
2025-11-08 11:43:07 +01:00
parent fa05cdd773
commit 21ec4b28c7
11 changed files with 150 additions and 34 deletions

View File

@@ -179,13 +179,8 @@ public static class TurnRunner
var battleData = user.BattleData;
if (battleData == null)
return;
IPokemon? target = null;
if (itemChoice is { TargetSide: not null, TargetPosition: not null })
{
var side = battle.Sides[itemChoice.TargetSide.Value];
target = side.Pokemon[itemChoice.TargetPosition.Value];
}
var target = itemChoice.GetTargetPokemon(battle);
battle.EventHook.Invoke(new ItemUseEvent(user, itemChoice.Item));
itemChoice.Item.RunItemScript(battle.Library.ScriptResolver, target ?? user, battle.EventHook);
itemChoice.Item.RunItemScript(battle.Library.ScriptResolver, target ?? user, user, battle, battle.EventHook);
}
}