Deukhoofd/PkmnLib.NET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper

Browse Source
This commit is contained in:
Deukhoofd
2026-08-28 15:20:26 +02:00
parent 942be8eaeb
commit 8a2733a0a9
859 changed files with 4408 additions and 5331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/SnatchEffect.cs
View File

@@ -6,23 +6,23 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Battle;
[Script(ScriptCategory.Battle, "snatch_effect")]
public class SnatchEffect : Script, IScriptStopBeforeMove, IScriptOnEndTurn
{
private Queue<IPokemon> _snatchers = new();
private Queue<IBattlePokemon> _snatchers = new();
public void AddSnatcher(IPokemon snatcher)
public void AddSnatcher(IBattlePokemon snatcher)
{
if (_snatchers.Contains(snatcher))
{
_snatchers = new Queue<IPokemon>(_snatchers.Where(s => s != snatcher));
_snatchers = new Queue<IBattlePokemon>(_snatchers.Where(s => s != snatcher));
}
_snatchers.Enqueue(snatcher);
}
private bool TryGetSnatcher([NotNullWhen(true)] out IPokemon? snatcher)
private bool TryGetSnatcher([NotNullWhen(true)] out IBattlePokemon? snatcher)
{
while (_snatchers.Any())
{
var s = _snatchers.Dequeue();
if (s.BattleData != null && s.IsUsable)
if (s.IsUsable)
{
snatcher = s;
return true;
@@ -38,7 +38,7 @@ public class SnatchEffect : Script, IScriptStopBeforeMove, IScriptOnEndTurn
if (move.UseMove.HasFlag(MoveFlags.Snatch) && TryGetSnatcher(out var snatcher))
{
stop = true;
var battleData = snatcher.BattleData;
var battleData = snatcher;
if (battleData == null)
return;