From 17b4b993e2711a76dde2d8168a04c6dde1e1f50d Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 5 Sep 2024 15:46:59 -0400 Subject: [PATCH] Signature argument renamed --- .../poweractions/AbstractPowerAction.java | 19 +++++-------------- .../poweractions/ApplyEffectPowerAction.java | 10 ++++------ .../poweractions/ApplyEffectsPowerAction.java | 12 +++++------- .../powers/poweractions/BlockPowerAction.java | 4 ++-- .../powers/poweractions/CharmPowerAction.java | 11 ++++------- .../poweractions/ClaimMinePowerAction.java | 4 ++-- .../poweractions/ClearAggroPowerAction.java | 4 ++-- .../ClearNearbyAggroPowerAction.java | 4 ++-- .../poweractions/ConfusionPowerAction.java | 7 ++----- .../poweractions/CreateMobPowerAction.java | 8 ++++---- .../DamageOverTimePowerAction.java | 10 ++++------ .../DeferredPowerPowerAction.java | 10 ++++------ .../poweractions/DirectDamagePowerAction.java | 8 +++----- .../powers/poweractions/FearPowerAction.java | 11 ++++------- .../powers/poweractions/InvisPowerAction.java | 6 +++--- .../poweractions/MobRecallPowerAction.java | 4 ++-- .../poweractions/OpenGatePowerAction.java | 4 ++-- .../powers/poweractions/PeekPowerAction.java | 6 ++---- .../poweractions/RecallPowerAction.java | 4 ++-- .../poweractions/RemoveEffectPowerAction.java | 11 ++++------- .../poweractions/ResurrectPowerAction.java | 4 ++-- .../RunegateTeleportPowerAction.java | 4 ++-- .../poweractions/SimpleDamagePowerAction.java | 4 ++-- .../poweractions/SpireDisablePowerAction.java | 4 ++-- .../powers/poweractions/StealPowerAction.java | 4 ++-- .../poweractions/SummonPowerAction.java | 4 ++-- .../poweractions/TransformPowerAction.java | 6 +++--- .../poweractions/TreeChokePowerAction.java | 4 ++-- 28 files changed, 79 insertions(+), 112 deletions(-) diff --git a/src/engine/powers/poweractions/AbstractPowerAction.java b/src/engine/powers/poweractions/AbstractPowerAction.java index 915ed25b..1086a1f5 100644 --- a/src/engine/powers/poweractions/AbstractPowerAction.java +++ b/src/engine/powers/poweractions/AbstractPowerAction.java @@ -9,8 +9,6 @@ package engine.powers.poweractions; -import engine.gameManager.DbManager; -import engine.gameManager.PowersManager; import engine.math.Vector3fImmutable; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; @@ -19,13 +17,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import org.pmw.tinylog.Logger; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.HashMap; public abstract class AbstractPowerAction { @@ -47,12 +38,12 @@ public abstract class AbstractPowerAction { /** * ResultSet Constructor */ - public AbstractPowerAction(PowerAction rs){ + public AbstractPowerAction(PowerAction powerAction) { - this.IDString = rs.action_id; - this.type = rs.action_type; - int flags = rs.itemFlag.ordinal(); - this.isAggressive = rs.isAggressive; + this.IDString = powerAction.action_id; + this.type = powerAction.action_type; + int flags = powerAction.itemFlag.ordinal(); + this.isAggressive = powerAction.isAggressive; } public AbstractPowerAction(int uUID, String iDString, String type, boolean isAggressive, diff --git a/src/engine/powers/poweractions/ApplyEffectPowerAction.java b/src/engine/powers/poweractions/ApplyEffectPowerAction.java index 70b125ff..b706ad18 100644 --- a/src/engine/powers/poweractions/ApplyEffectPowerAction.java +++ b/src/engine/powers/poweractions/ApplyEffectPowerAction.java @@ -28,8 +28,6 @@ import engine.server.MBServerStatics; import engine.wpak.data.PowerAction; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; public class ApplyEffectPowerAction extends AbstractPowerAction { @@ -39,11 +37,11 @@ public class ApplyEffectPowerAction extends AbstractPowerAction { private String effectParentID; private EffectsBase effectParent; - public ApplyEffectPowerAction(PowerAction rs, HashMap effects){ - super(rs); - this.effectParentID = rs.effects.get(0).effect_id; + public ApplyEffectPowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); + this.effectParentID = powerAction.effects.get(0).effect_id; this.effectParent = effects.get(this.effectParentID); - this.effectID = rs.effects.get(0).effect_id; + this.effectID = powerAction.effects.get(0).effect_id; this.effect = effects.get(this.effectID); } diff --git a/src/engine/powers/poweractions/ApplyEffectsPowerAction.java b/src/engine/powers/poweractions/ApplyEffectsPowerAction.java index d23c8a46..77e8ecc5 100644 --- a/src/engine/powers/poweractions/ApplyEffectsPowerAction.java +++ b/src/engine/powers/poweractions/ApplyEffectsPowerAction.java @@ -20,8 +20,6 @@ import engine.powers.PowersBase; import engine.wpak.data.PowerAction; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -33,11 +31,11 @@ public class ApplyEffectsPowerAction extends AbstractPowerAction { private EffectsBase effect2; private EffectsBase effectParent; - public ApplyEffectsPowerAction(PowerAction rs, HashMap effects){ - super(rs); - this.IDString = rs.action_id; - this.effectID = rs.effects.get(0).effect_id; - this.effectID2 = rs.effects.get(2).effect_id; + public ApplyEffectsPowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); + this.IDString = powerAction.action_id; + this.effectID = powerAction.effects.get(0).effect_id; + this.effectID2 = powerAction.effects.get(2).effect_id; this.effect = effects.get(this.effectID); this.effect2 = effects.get(this.effectID2); this.effectParent = effects.get(this.IDString); diff --git a/src/engine/powers/poweractions/BlockPowerAction.java b/src/engine/powers/poweractions/BlockPowerAction.java index 9a85c94c..f3b9e634 100644 --- a/src/engine/powers/poweractions/BlockPowerAction.java +++ b/src/engine/powers/poweractions/BlockPowerAction.java @@ -19,8 +19,8 @@ import engine.wpak.data.PowerAction; public class BlockPowerAction extends AbstractPowerAction { - public BlockPowerAction(PowerAction rs) { - super(rs); + public BlockPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/CharmPowerAction.java b/src/engine/powers/poweractions/CharmPowerAction.java index e7e5bb88..13eba3ed 100644 --- a/src/engine/powers/poweractions/CharmPowerAction.java +++ b/src/engine/powers/poweractions/CharmPowerAction.java @@ -20,19 +20,16 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CharmPowerAction extends AbstractPowerAction { private int levelCap; private int levelCapRamp; - public CharmPowerAction(PowerAction rs){ - super(rs); - this.levelCap = rs.levelCap; - this.levelCapRamp = rs.levelCurve.ordinal(); + public CharmPowerAction(PowerAction powerAction) { + super(powerAction); + this.levelCap = powerAction.levelCap; + this.levelCapRamp = powerAction.levelCurve.ordinal(); } @Override diff --git a/src/engine/powers/poweractions/ClaimMinePowerAction.java b/src/engine/powers/poweractions/ClaimMinePowerAction.java index 3c51acdd..ad8c1f50 100644 --- a/src/engine/powers/poweractions/ClaimMinePowerAction.java +++ b/src/engine/powers/poweractions/ClaimMinePowerAction.java @@ -20,8 +20,8 @@ import engine.wpak.data.PowerAction; public class ClaimMinePowerAction extends AbstractPowerAction { - public ClaimMinePowerAction(PowerAction rs) { - super(rs); + public ClaimMinePowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/ClearAggroPowerAction.java b/src/engine/powers/poweractions/ClearAggroPowerAction.java index 9db10289..362d8ddc 100644 --- a/src/engine/powers/poweractions/ClearAggroPowerAction.java +++ b/src/engine/powers/poweractions/ClearAggroPowerAction.java @@ -21,8 +21,8 @@ import engine.wpak.data.PowerAction; public class ClearAggroPowerAction extends AbstractPowerAction { - public ClearAggroPowerAction(PowerAction rs) { - super(rs); + public ClearAggroPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java b/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java index 76f7af8d..b3e42129 100644 --- a/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java +++ b/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java @@ -20,8 +20,8 @@ import engine.wpak.data.PowerAction; public class ClearNearbyAggroPowerAction extends AbstractPowerAction { - public ClearNearbyAggroPowerAction(PowerAction rs) { - super(rs); + public ClearNearbyAggroPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/ConfusionPowerAction.java b/src/engine/powers/poweractions/ConfusionPowerAction.java index 0829ea91..f0cbf089 100644 --- a/src/engine/powers/poweractions/ConfusionPowerAction.java +++ b/src/engine/powers/poweractions/ConfusionPowerAction.java @@ -16,14 +16,11 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ConfusionPowerAction extends AbstractPowerAction { - public ConfusionPowerAction(PowerAction rs){ - super(rs); + public ConfusionPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/CreateMobPowerAction.java b/src/engine/powers/poweractions/CreateMobPowerAction.java index 13f26576..50d2c02c 100644 --- a/src/engine/powers/poweractions/CreateMobPowerAction.java +++ b/src/engine/powers/poweractions/CreateMobPowerAction.java @@ -31,11 +31,11 @@ public class CreateMobPowerAction extends AbstractPowerAction { private int mobID; private int mobLevel; - public CreateMobPowerAction(PowerAction rs) { - super(rs); + public CreateMobPowerAction(PowerAction powerAction) { + super(powerAction); - this.mobID = rs.petRace; - this.mobLevel = rs.petLevel; + this.mobID = powerAction.petRace; + this.mobLevel = powerAction.petLevel; } @Override diff --git a/src/engine/powers/poweractions/DamageOverTimePowerAction.java b/src/engine/powers/poweractions/DamageOverTimePowerAction.java index 2c90e83f..99739756 100644 --- a/src/engine/powers/poweractions/DamageOverTimePowerAction.java +++ b/src/engine/powers/poweractions/DamageOverTimePowerAction.java @@ -18,8 +18,6 @@ import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -29,11 +27,11 @@ public class DamageOverTimePowerAction extends AbstractPowerAction { private int numIterations; private EffectsBase effect; - public DamageOverTimePowerAction(PowerAction rs, HashMap effects){ - super(rs); + public DamageOverTimePowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); - this.effectID = rs.action_id; - this.numIterations = rs.effects.get(0).cycleDelay; + this.effectID = powerAction.action_id; + this.numIterations = powerAction.effects.get(0).cycleDelay; this.effect = effects.get(this.effectID); } diff --git a/src/engine/powers/poweractions/DeferredPowerPowerAction.java b/src/engine/powers/poweractions/DeferredPowerPowerAction.java index 47838251..0f502475 100644 --- a/src/engine/powers/poweractions/DeferredPowerPowerAction.java +++ b/src/engine/powers/poweractions/DeferredPowerPowerAction.java @@ -20,8 +20,6 @@ import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -32,11 +30,11 @@ public class DeferredPowerPowerAction extends AbstractPowerAction { private EffectsBase effect; // private EffectsBase deferedPower; - public DeferredPowerPowerAction(PowerAction rs, HashMap effects){ - super(rs); + public DeferredPowerPowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); - this.effectID = rs.effects.get(0).effect_id; - this.deferedPowerID = rs.action_id; + this.effectID = powerAction.effects.get(0).effect_id; + this.deferedPowerID = powerAction.action_id; this.effect = effects.get(this.effectID); } diff --git a/src/engine/powers/poweractions/DirectDamagePowerAction.java b/src/engine/powers/poweractions/DirectDamagePowerAction.java index 9de92a69..b476daf4 100644 --- a/src/engine/powers/poweractions/DirectDamagePowerAction.java +++ b/src/engine/powers/poweractions/DirectDamagePowerAction.java @@ -19,8 +19,6 @@ import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -29,10 +27,10 @@ public class DirectDamagePowerAction extends AbstractPowerAction { private String effectID; private EffectsBase effect; - public DirectDamagePowerAction(PowerAction rs, HashMap effects){ - super(rs); + public DirectDamagePowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); - this.effectID = rs.effects.get(0).effect_id; + this.effectID = powerAction.effects.get(0).effect_id; this.effect = effects.get(this.effectID); } diff --git a/src/engine/powers/poweractions/FearPowerAction.java b/src/engine/powers/poweractions/FearPowerAction.java index 10614d22..4867bb4d 100644 --- a/src/engine/powers/poweractions/FearPowerAction.java +++ b/src/engine/powers/poweractions/FearPowerAction.java @@ -22,18 +22,15 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; - public class FearPowerAction extends AbstractPowerAction { private int levelCap; private int levelCapRamp; - public FearPowerAction(PowerAction rs){ - super(rs); - this.levelCap = rs.levelCap; - this.levelCapRamp = rs.levelCurve.ordinal(); + public FearPowerAction(PowerAction powerAction) { + super(powerAction); + this.levelCap = powerAction.levelCap; + this.levelCapRamp = powerAction.levelCurve.ordinal(); } @Override diff --git a/src/engine/powers/poweractions/InvisPowerAction.java b/src/engine/powers/poweractions/InvisPowerAction.java index 02a43f63..b2af2b4f 100644 --- a/src/engine/powers/poweractions/InvisPowerAction.java +++ b/src/engine/powers/poweractions/InvisPowerAction.java @@ -26,10 +26,10 @@ public class InvisPowerAction extends AbstractPowerAction { private String effectID; private EffectsBase effect; - public InvisPowerAction(PowerAction rs, HashMap effects) { - super(rs); + public InvisPowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); - this.effectID = rs.effects.get(0).effect_id; + this.effectID = powerAction.effects.get(0).effect_id; ; this.effect = effects.get(this.effectID); } diff --git a/src/engine/powers/poweractions/MobRecallPowerAction.java b/src/engine/powers/poweractions/MobRecallPowerAction.java index 373704af..ba5ea4d0 100644 --- a/src/engine/powers/poweractions/MobRecallPowerAction.java +++ b/src/engine/powers/poweractions/MobRecallPowerAction.java @@ -21,8 +21,8 @@ import engine.wpak.data.PowerAction; public class MobRecallPowerAction extends AbstractPowerAction { - public MobRecallPowerAction(PowerAction rs) { - super(rs); + public MobRecallPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/OpenGatePowerAction.java b/src/engine/powers/poweractions/OpenGatePowerAction.java index 6a3c304a..cb4bfbc3 100644 --- a/src/engine/powers/poweractions/OpenGatePowerAction.java +++ b/src/engine/powers/poweractions/OpenGatePowerAction.java @@ -26,8 +26,8 @@ public class OpenGatePowerAction extends AbstractPowerAction { /** * ResultSet Constructor */ - public OpenGatePowerAction(PowerAction rs) { - super(rs); + public OpenGatePowerAction(PowerAction powerAction) { + super(powerAction); } public OpenGatePowerAction(int uUID, String iDString, String type, boolean isAggressive, long validItemFlags) { diff --git a/src/engine/powers/poweractions/PeekPowerAction.java b/src/engine/powers/poweractions/PeekPowerAction.java index 326f6e5c..5a6d4f85 100644 --- a/src/engine/powers/poweractions/PeekPowerAction.java +++ b/src/engine/powers/poweractions/PeekPowerAction.java @@ -20,15 +20,13 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.ThreadLocalRandom; public class PeekPowerAction extends AbstractPowerAction { - public PeekPowerAction(PowerAction rs){ - super(rs); + public PeekPowerAction(PowerAction powerAction) { + super(powerAction); } protected static boolean peekSuccess(AbstractCharacter pc, AbstractWorldObject awo) { diff --git a/src/engine/powers/poweractions/RecallPowerAction.java b/src/engine/powers/poweractions/RecallPowerAction.java index 81bae0a1..0a96b61d 100644 --- a/src/engine/powers/poweractions/RecallPowerAction.java +++ b/src/engine/powers/poweractions/RecallPowerAction.java @@ -30,8 +30,8 @@ import engine.wpak.data.PowerAction; public class RecallPowerAction extends AbstractPowerAction { - public RecallPowerAction(PowerAction rs) { - super(rs); + public RecallPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/RemoveEffectPowerAction.java b/src/engine/powers/poweractions/RemoveEffectPowerAction.java index 52758b0c..a3a3c12c 100644 --- a/src/engine/powers/poweractions/RemoveEffectPowerAction.java +++ b/src/engine/powers/poweractions/RemoveEffectPowerAction.java @@ -17,9 +17,6 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.wpak.data.PowerAction; -import java.sql.ResultSet; -import java.sql.SQLException; - public class RemoveEffectPowerAction extends AbstractPowerAction { @@ -27,11 +24,11 @@ public class RemoveEffectPowerAction extends AbstractPowerAction { public EffectSourceType sourceType; private boolean removeAll; - public RemoveEffectPowerAction(PowerAction rs){ - super(rs); - String effectTypeToRemove = rs.damageType.name(); + public RemoveEffectPowerAction(PowerAction powerAction) { + super(powerAction); + String effectTypeToRemove = powerAction.damageType.name(); sourceType = EffectSourceType.GetEffectSourceType(effectTypeToRemove); - this.removeAll = rs.removeAll; + this.removeAll = powerAction.removeAll; } diff --git a/src/engine/powers/poweractions/ResurrectPowerAction.java b/src/engine/powers/poweractions/ResurrectPowerAction.java index 8b3c4c68..e98856d7 100644 --- a/src/engine/powers/poweractions/ResurrectPowerAction.java +++ b/src/engine/powers/poweractions/ResurrectPowerAction.java @@ -19,8 +19,8 @@ import engine.wpak.data.PowerAction; public class ResurrectPowerAction extends AbstractPowerAction { - public ResurrectPowerAction(PowerAction rs) { - super(rs); + public ResurrectPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/RunegateTeleportPowerAction.java b/src/engine/powers/poweractions/RunegateTeleportPowerAction.java index 048e8372..d6f39f66 100644 --- a/src/engine/powers/poweractions/RunegateTeleportPowerAction.java +++ b/src/engine/powers/poweractions/RunegateTeleportPowerAction.java @@ -27,8 +27,8 @@ public class RunegateTeleportPowerAction extends AbstractPowerAction { /** * ResultSet Constructor */ - public RunegateTeleportPowerAction(PowerAction rs) { - super(rs); + public RunegateTeleportPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/SimpleDamagePowerAction.java b/src/engine/powers/poweractions/SimpleDamagePowerAction.java index 328c70c9..6d1f54cc 100644 --- a/src/engine/powers/poweractions/SimpleDamagePowerAction.java +++ b/src/engine/powers/poweractions/SimpleDamagePowerAction.java @@ -21,8 +21,8 @@ public class SimpleDamagePowerAction extends AbstractPowerAction { private int simpleDamage; - public SimpleDamagePowerAction(PowerAction rs) { - super(rs); + public SimpleDamagePowerAction(PowerAction powerAction) { + super(powerAction); this.simpleDamage = 1; } diff --git a/src/engine/powers/poweractions/SpireDisablePowerAction.java b/src/engine/powers/poweractions/SpireDisablePowerAction.java index e1f032a0..5f3ba823 100644 --- a/src/engine/powers/poweractions/SpireDisablePowerAction.java +++ b/src/engine/powers/poweractions/SpireDisablePowerAction.java @@ -26,8 +26,8 @@ public class SpireDisablePowerAction extends AbstractPowerAction { /** * ResultSet Constructor */ - public SpireDisablePowerAction(PowerAction rs) { - super(rs); + public SpireDisablePowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/StealPowerAction.java b/src/engine/powers/poweractions/StealPowerAction.java index 02c366f4..3ec6f95b 100644 --- a/src/engine/powers/poweractions/StealPowerAction.java +++ b/src/engine/powers/poweractions/StealPowerAction.java @@ -34,8 +34,8 @@ public class StealPowerAction extends AbstractPowerAction { /** * ResultSet Constructor */ - public StealPowerAction(PowerAction rs) { - super(rs); + public StealPowerAction(PowerAction powerAction) { + super(powerAction); } protected static boolean stealSuccess(PlayerCharacter pc, AbstractWorldObject awo) { diff --git a/src/engine/powers/poweractions/SummonPowerAction.java b/src/engine/powers/poweractions/SummonPowerAction.java index 4d4a8876..037aa000 100644 --- a/src/engine/powers/poweractions/SummonPowerAction.java +++ b/src/engine/powers/poweractions/SummonPowerAction.java @@ -30,8 +30,8 @@ public class SummonPowerAction extends AbstractPowerAction { /** * ResultSet Constructor */ - public SummonPowerAction(PowerAction rs) { - super(rs); + public SummonPowerAction(PowerAction powerAction) { + super(powerAction); } @Override diff --git a/src/engine/powers/poweractions/TransformPowerAction.java b/src/engine/powers/poweractions/TransformPowerAction.java index f115e07e..6e6f4809 100644 --- a/src/engine/powers/poweractions/TransformPowerAction.java +++ b/src/engine/powers/poweractions/TransformPowerAction.java @@ -26,10 +26,10 @@ public class TransformPowerAction extends AbstractPowerAction { private String effectID; private EffectsBase effect; - public TransformPowerAction(PowerAction rs, HashMap effects) { - super(rs); + public TransformPowerAction(PowerAction powerAction, HashMap effects) { + super(powerAction); - this.effectID = rs.effects.get(0).effect_id; + this.effectID = powerAction.effects.get(0).effect_id; this.effect = effects.get(this.effectID); } diff --git a/src/engine/powers/poweractions/TreeChokePowerAction.java b/src/engine/powers/poweractions/TreeChokePowerAction.java index 1bcdd8eb..4aa58bcb 100644 --- a/src/engine/powers/poweractions/TreeChokePowerAction.java +++ b/src/engine/powers/poweractions/TreeChokePowerAction.java @@ -19,8 +19,8 @@ import engine.wpak.data.PowerAction; public class TreeChokePowerAction extends AbstractPowerAction { - public TreeChokePowerAction(PowerAction rs) { - super(rs); + public TreeChokePowerAction(PowerAction powerAction) { + super(powerAction); } @Override