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

4
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/EvolutionItem.cs
View File

@@ -17,7 +17,7 @@ public class EvolutionItem : ItemScript
public override ItemTargetType TargetType => ItemTargetType.OwnPokemon;
/// <inheritdoc />
public override bool IsTargetValid(IPokemon target)
public override bool IsTargetValid(IBattlePokemon target)
{
foreach (var x in target.Species.EvolutionData)
{
@@ -33,7 +33,7 @@ public class EvolutionItem : ItemScript
}
/// <inheritdoc />
public override void OnUseWithTarget(IPokemon target, EventHook eventHook)
public override void OnUseWithTarget(IBattlePokemon target, EventHook eventHook)
{
var evolutionData = target.Species.EvolutionData.FirstOrDefault(x =>
{

5
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/HealingItem.cs
View File

@@ -29,10 +29,11 @@ public class HealingItem : ItemScript
}
/// <inheritdoc />
public override bool IsTargetValid(IPokemon target) => !target.IsFainted && target.CurrentHealth < target.MaxHealth;
public override bool IsTargetValid(IBattlePokemon target) =>
!target.IsFainted && target.CurrentHealth < target.MaxHealth;
/// <inheritdoc />
public override void OnUseWithTarget(IPokemon target, EventHook eventHook)
public override void OnUseWithTarget(IBattlePokemon target, EventHook eventHook)
{
target.Heal(_healAmount, customEventHook: eventHook);
}

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/FastBall.cs
View File

@@ -9,7 +9,7 @@ public class FastBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
var modifier = target.Form.BaseStats.Speed >= 100 ? 4f : 1f;
catchRate = catchRate.MultiplyOrMax(modifier);

4
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/FriendBall.cs
View File

@@ -9,12 +9,12 @@ public class FriendBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
}
/// <inheritdoc />
public override void OnAfterSuccessfulCapture(IPokemon target)
public override void OnAfterSuccessfulCapture(IBattlePokemon target)
{
target.Happiness = 200;
}

4
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/HealBall.cs
View File

@@ -9,12 +9,12 @@ public class HealBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
}
/// <inheritdoc />
public override void OnAfterSuccessfulCapture(IPokemon target)
public override void OnAfterSuccessfulCapture(IBattlePokemon target)
{
target.Heal(target.MaxHealth, true, forceHeal: true);
target.ClearStatus();

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/HeavyBall.cs
View File

@@ -9,7 +9,7 @@ public class HeavyBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
var weight = target.WeightInKg;
switch (weight)

8
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/LevelBall.cs
View File

@@ -9,12 +9,10 @@ public class LevelBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
if (target.BattleData is null)
return;
var opponentSide = target.BattleData.SideIndex == 0 ? 1 : 0;
var opponent = target.BattleData.Battle.Sides[opponentSide].Pokemon.FirstOrDefault(x => x is not null);
var opponentSide = target.SideIndex == 0 ? 1 : 0;
var opponent = target.Battle.Sides[opponentSide].Pokemon.FirstOrDefault(x => x is not null);
if (opponent is null)
return;

8
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/LoveBall.cs
View File

@@ -9,12 +9,10 @@ public class LoveBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
if (target.BattleData is null)
return;
var opponentSide = target.BattleData.SideIndex == 0 ? 1 : 0;
var opponent = target.BattleData.Battle.Sides[opponentSide].Pokemon.FirstOrDefault(x => x is not null);
var opponentSide = target.SideIndex == 0 ? 1 : 0;
var opponent = target.Battle.Sides[opponentSide].Pokemon.FirstOrDefault(x => x is not null);
if (opponent is null)
return;

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/MoonBall.cs
View File

@@ -11,7 +11,7 @@ public class MoonBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
if (target.Species.EvolutionData.Any(x =>
{

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/NestBall.cs
View File

@@ -9,7 +9,7 @@ public class NestBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
if (target.Level >= 30)
return;

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/NetBall.cs
View File

@@ -9,7 +9,7 @@ public class NetBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
if (target.Types.Any(x => x.Name == TypeNames.Water || x.Name == TypeNames.Bug))
{

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/PokeballFlatModifier.cs
View File

@@ -31,7 +31,7 @@ public class PokeballFlatModifier : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
catchRate = catchRate.MultiplyOrMax(_catchModifier);
}

4
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/QuickBall.cs
View File

@@ -9,9 +9,9 @@ public class QuickBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
var battleData = target.BattleData;
var battleData = target;
if (battleData is null)
return;

2
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/RepeatBall.cs
View File

@@ -11,7 +11,7 @@ public class RepeatBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
if (target.Library.CaptureLibrary is Gen7CaptureLibrary captureLibrary &&
captureLibrary.HasPokemonBeenCaughtBefore(target.Species))

4
Plugins/PkmnLib.Plugin.Gen7/Scripts/Items/Pokeballs/TimerBall.cs
View File

@@ -9,9 +9,9 @@ public class TimerBall : PokeballScript
}
/// <inheritdoc />
public override void ChangeCatchRate(IPokemon target, ref byte catchRate)
public override void ChangeCatchRate(IBattlePokemon target, ref byte catchRate)
{
var battleData = target.BattleData;
var battleData = target;
if (battleData is null)
return;