Surprisingly, more abilities
All checks were successful
Build / Build (push) Successful in 50s

This commit is contained in:
2025-06-14 13:37:58 +02:00
parent 5961bb746e
commit 1b9d137bb0
86 changed files with 311 additions and 88 deletions

View File

@@ -15,7 +15,7 @@ public class BindEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_owner == null)
return;

View File

@@ -18,7 +18,7 @@ public class ChargeEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_turnOfUse)
{

View File

@@ -21,7 +21,7 @@ public class DisableEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turnsLeft--;
if (_turnsLeft <= 0)

View File

@@ -18,7 +18,7 @@ public class EmbargoEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turns--;
if (_turns == 0)

View File

@@ -30,7 +30,7 @@ public class EncoreEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turns--;
if (_turns <= 0)

View File

@@ -11,5 +11,5 @@ public class EndureEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle) => RemoveSelf();
public override void OnEndTurn(IScriptSource owner, IBattle battle) => RemoveSelf();
}

View File

@@ -11,7 +11,7 @@ public class FireSpinEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_owner.Damage(_owner.BoostedStats.Hp / 8, DamageSource.Misc);
}

View File

@@ -11,7 +11,7 @@ public class GhostCurseEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_pokemon.Damage(_pokemon.CurrentHealth / 4, DamageSource.Misc);
}

View File

@@ -11,7 +11,7 @@ public class HealBlockEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_duration--;
if (_duration <= 0)

View File

@@ -16,9 +16,10 @@ public class HealEachEndOfTurnEffect : Script
_pokemon = pokemon;
}
/// <param name="owner"></param>
/// <param name="battle"></param>
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_pokemon is null)
return;

View File

@@ -9,5 +9,5 @@ public class HelpingHandEffect : Script
basePower = basePower.MultiplyOrMax(1.5f);
/// <inheritdoc />
public override void OnEndTurn(IBattle battle) => RemoveSelf();
public override void OnEndTurn(IScriptSource owner, IBattle battle) => RemoveSelf();
}

View File

@@ -31,7 +31,7 @@ public class IceBallEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (TurnCount < 5)
TurnCount++;

View File

@@ -19,7 +19,7 @@ public class InfestationEffect : Script
public override void PreventSelfRunAway(IFleeChoice choice, ref bool prevent) => prevent = true;
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
var damage = _owner.BoostedStats.Hp / 8;
_owner.Damage(damage, DamageSource.Misc);

View File

@@ -19,7 +19,7 @@ public class IngrainEffect : Script
public override void PreventSelfRunAway(IFleeChoice choice, ref bool prevent) => prevent = true;
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
var heal = _owner.BoostedStats.Hp / 16;
_owner.Heal(heal);

View File

@@ -13,7 +13,7 @@ public class LeechSeedEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
var damage = _owner.BoostedStats.Hp / 8;
if (_owner.CurrentHealth <= damage)

View File

@@ -20,7 +20,7 @@ public class LockOnEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
RemoveSelf();
}

View File

@@ -11,7 +11,7 @@ public class LuckyChantEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turnsLeft--;
if (_turnsLeft > 0)

View File

@@ -11,7 +11,7 @@ public class MagmaStormEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_owner.Damage(_owner.BoostedStats.Hp / 16, DamageSource.Misc);
}

View File

@@ -15,7 +15,7 @@ public class MagnetRiseEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_turnsRemaining > 0)
_turnsRemaining--;

View File

@@ -13,7 +13,7 @@ public class NightmareEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (!_owner.HasStatus(ScriptUtils.ResolveName<Sleep>()))
{

View File

@@ -13,7 +13,7 @@ public class PerishSongEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turns--;
if (_turns <= 0)

View File

@@ -17,7 +17,7 @@ public class ProtectionFailureScript : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (!UsedProtect)
{

View File

@@ -10,7 +10,7 @@ public class RageEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
RemoveSelf();
}

View File

@@ -13,5 +13,5 @@ public class RoostEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle) => RemoveSelf();
public override void OnEndTurn(IScriptSource owner, IBattle battle) => RemoveSelf();
}

View File

@@ -20,7 +20,7 @@ public class SlowStartEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_turnsRemaining <= 0)
return;

View File

@@ -25,7 +25,7 @@ public class TauntEffect(int turns) : Script
}
}
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turns--;
if (_turns <= 0)

View File

@@ -20,7 +20,7 @@ public class ThroatChopEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
_turns--;
if (_turns <= 0)

View File

@@ -56,7 +56,7 @@ public class WhirlpoolEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_user == null)
return;

View File

@@ -17,7 +17,7 @@ public class WishEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_pokemon == null)
return;

View File

@@ -20,7 +20,7 @@ public class YawnEffect : Script
}
/// <inheritdoc />
public override void OnEndTurn(IBattle battle)
public override void OnEndTurn(IScriptSource owner, IBattle battle)
{
if (_pokemon == null)
{