Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper
This commit is contained in:
@@ -3,11 +3,11 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Terrain;
|
||||
[Script(ScriptCategory.Terrain, "electric_terrain")]
|
||||
public class ElectricTerrain : Script, IScriptChangeBasePower, IScriptPreventStatusChange, IScriptPreventVolatileAdd
|
||||
{
|
||||
private static bool IsAffectedByTerrain(IPokemon pokemon) =>
|
||||
private static bool IsAffectedByTerrain(IBattlePokemon pokemon) =>
|
||||
!pokemon.IsFloating;
|
||||
|
||||
/// <inheritdoc />
|
||||
public void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref ushort basePower)
|
||||
public void ChangeBasePower(IExecutingMove move, IBattlePokemon target, byte hit, ref ushort basePower)
|
||||
{
|
||||
if (!IsAffectedByTerrain(move.User))
|
||||
return;
|
||||
@@ -17,7 +17,8 @@ public class ElectricTerrain : Script, IScriptChangeBasePower, IScriptPreventSta
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void PreventStatusChange(IPokemon pokemon, StringKey status, bool selfInflicted, ref bool preventStatus)
|
||||
public void PreventStatusChange(IBattlePokemon pokemon, StringKey status, bool selfInflicted,
|
||||
ref bool preventStatus)
|
||||
{
|
||||
if (!IsAffectedByTerrain(pokemon))
|
||||
return;
|
||||
@@ -28,7 +29,7 @@ public class ElectricTerrain : Script, IScriptChangeBasePower, IScriptPreventSta
|
||||
/// <inheritdoc />
|
||||
public void PreventVolatileAdd(IScriptSource parent, Script script, ref bool preventVolatileAdd)
|
||||
{
|
||||
if (parent is IPokemon pokemon && !IsAffectedByTerrain(pokemon))
|
||||
if (parent is IBattlePokemon pokemon && !IsAffectedByTerrain(pokemon))
|
||||
return;
|
||||
|
||||
if (script is Pokemon.YawnEffect)
|
||||
|
||||
@@ -3,11 +3,11 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Terrain;
|
||||
[Script(ScriptCategory.Terrain, "grassy_terrain")]
|
||||
public class GrassyTerrain : Script, IScriptChangeBasePower, IScriptOnEndTurn
|
||||
{
|
||||
private static bool IsAffectedByTerrain(IPokemon pokemon) =>
|
||||
private static bool IsAffectedByTerrain(IBattlePokemon pokemon) =>
|
||||
!pokemon.IsFloating;
|
||||
|
||||
/// <inheritdoc />
|
||||
public void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref ushort basePower)
|
||||
public void ChangeBasePower(IExecutingMove move, IBattlePokemon target, byte hit, ref ushort basePower)
|
||||
{
|
||||
// It boosts the power of Grass-type moves used by affected Pokémon by 50% (regardless of whether the target of
|
||||
// the move is affected by Grassy Terrain).
|
||||
|
||||
@@ -5,11 +5,11 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Terrain;
|
||||
[Script(ScriptCategory.Terrain, "misty_terrain")]
|
||||
public class MistyTerrain : Script, IScriptChangeBasePower, IScriptPreventStatusChange, IScriptPreventVolatileAdd
|
||||
{
|
||||
private static bool IsAffectedByTerrain(IPokemon pokemon) =>
|
||||
private static bool IsAffectedByTerrain(IBattlePokemon pokemon) =>
|
||||
!pokemon.IsFloating;
|
||||
|
||||
/// <inheritdoc />
|
||||
public void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref ushort basePower)
|
||||
public void ChangeBasePower(IExecutingMove move, IBattlePokemon target, byte hit, ref ushort basePower)
|
||||
{
|
||||
if (!IsAffectedByTerrain(target))
|
||||
return;
|
||||
@@ -20,7 +20,8 @@ public class MistyTerrain : Script, IScriptChangeBasePower, IScriptPreventStatus
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void PreventStatusChange(IPokemon pokemon, StringKey status, bool selfInflicted, ref bool preventStatus)
|
||||
public void PreventStatusChange(IBattlePokemon pokemon, StringKey status, bool selfInflicted,
|
||||
ref bool preventStatus)
|
||||
{
|
||||
if (!IsAffectedByTerrain(pokemon))
|
||||
return;
|
||||
|
||||
@@ -3,11 +3,11 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Terrain;
|
||||
[Script(ScriptCategory.Terrain, "psychic_terrain")]
|
||||
public class PsychicTerrain : Script, IScriptIsInvulnerableToMove, IScriptChangeBasePower
|
||||
{
|
||||
private static bool IsAffectedByTerrain(IPokemon pokemon) =>
|
||||
private static bool IsAffectedByTerrain(IBattlePokemon pokemon) =>
|
||||
!pokemon.IsFloating;
|
||||
|
||||
/// <inheritdoc />
|
||||
public void ChangeBasePower(IExecutingMove move, IPokemon target, byte hit, ref ushort basePower)
|
||||
public void ChangeBasePower(IExecutingMove move, IBattlePokemon target, byte hit, ref ushort basePower)
|
||||
{
|
||||
if (!IsAffectedByTerrain(move.User))
|
||||
return;
|
||||
@@ -22,7 +22,7 @@ public class PsychicTerrain : Script, IScriptIsInvulnerableToMove, IScriptChange
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void IsInvulnerableToMove(IExecutingMove move, IPokemon target, ref bool invulnerable)
|
||||
public void IsInvulnerableToMove(IExecutingMove move, IBattlePokemon target, ref bool invulnerable)
|
||||
{
|
||||
if (!IsAffectedByTerrain(target))
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user