diff --git a/src/engine/db/handlers/dbPowerHandler.java b/src/engine/db/handlers/dbPowerHandler.java index dacb1da5..5bed2cff 100644 --- a/src/engine/db/handlers/dbPowerHandler.java +++ b/src/engine/db/handlers/dbPowerHandler.java @@ -10,7 +10,6 @@ package engine.db.handlers; import engine.gameManager.DbManager; -import engine.gameManager.PowersManager; import engine.mbEnums; import engine.objects.Mob; import engine.powers.EffectsBase; @@ -53,30 +52,4 @@ public class dbPowerHandler extends dbHandlerBase { } } - public static void addAllAnimationOverrides() { - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_animation_override")) { - - ResultSet rs = preparedStatement.executeQuery(); - - String IDString; - int animation; - while (rs.next()) { - IDString = rs.getString("IDString"); - - EffectsBase eb = PowersManager.getEffectByIDString(IDString); - if (eb != null) - IDString = eb.getIDString(); - - animation = rs.getInt("animation"); - PowersManager.AnimationOverrides.put(IDString, animation); - - } - } catch (Exception e) { - Logger.error(e); - } - - } - } diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index 9befadfa..0dc04570 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -56,7 +56,6 @@ public enum PowersManager { public static HashMap powerActionsByIDString = new HashMap<>(); public static HashMap powerActionsByID = new HashMap<>(); public static HashMap ActionTokenByIDString = new HashMap<>(); - public static HashMap AnimationOverrides = new HashMap<>(); public static HashMap> _allRunePowers; public static HashMap> _allRuneSkillAdjusts; public static HashMap> _effect_costMaps = new HashMap<>(); @@ -162,14 +161,10 @@ public enum PowersManager { // Add Source Types to Effects dbPowerHandler.addAllSourceTypes(); - dbPowerHandler.addAllAnimationOverrides(); // Add PowerActions AbstractPowerAction.getAllPowerActions(PowersManager.powerActionsByIDString, PowersManager.powerActionsByID, PowersManager.effectsBaseByIDString); - // Load valid Item Flags - // AbstractPowerAction.loadValidItemFlags(PowersManager.powerActionsByIDString); - // get all PowersBase ArrayList pbList = dbSkillReqHandler.getAllPowersBase(); for (PowersBase pb : pbList) { diff --git a/src/engine/powers/poweractions/AbstractPowerAction.java b/src/engine/powers/poweractions/AbstractPowerAction.java index c588b59b..c223e343 100644 --- a/src/engine/powers/poweractions/AbstractPowerAction.java +++ b/src/engine/powers/poweractions/AbstractPowerAction.java @@ -34,7 +34,6 @@ public abstract class AbstractPowerAction { protected String IDString; protected String type; protected boolean isAggressive; - protected long validItemFlags; /** * No Table ID Constructor @@ -55,8 +54,7 @@ public abstract class AbstractPowerAction { this.isAggressive = ((flags & 128) != 0) ? true : false; } - public AbstractPowerAction(int uUID, String iDString, String type, boolean isAggressive, - long validItemFlags) { + public AbstractPowerAction(int uUID, String iDString, String type, boolean isAggressive) { super(); UUID = uUID; IDString = iDString; @@ -184,7 +182,6 @@ public abstract class AbstractPowerAction { } powerActions.put(IDString, apa); powerActionsByID.put(apa.UUID, apa); - apa.validItemFlags = 0; } rs.close(); } catch (Exception e) { @@ -192,7 +189,7 @@ public abstract class AbstractPowerAction { } //Add OpenGatePowerAction - AbstractPowerAction openGateAction = new OpenGatePowerAction(5000, "OPENGATE", "OpenGate", false, 0); + AbstractPowerAction openGateAction = new OpenGatePowerAction(5000, "OPENGATE", "OpenGate", false); powerActions.put("OPENGATE", openGateAction); powerActionsByID.put(openGateAction.UUID, openGateAction); } @@ -267,11 +264,6 @@ public abstract class AbstractPowerAction { return null; } - //These functions verify a powerAction is valid for an item type - public long getValidItemFlags() { - return this.validItemFlags; - } - public String getType() { return type; } diff --git a/src/engine/powers/poweractions/OpenGatePowerAction.java b/src/engine/powers/poweractions/OpenGatePowerAction.java index 7991e531..f45d2902 100644 --- a/src/engine/powers/poweractions/OpenGatePowerAction.java +++ b/src/engine/powers/poweractions/OpenGatePowerAction.java @@ -32,8 +32,8 @@ public class OpenGatePowerAction extends AbstractPowerAction { super(rs); } - public OpenGatePowerAction(int uUID, String iDString, String type, boolean isAggressive, long validItemFlags) { - super(uUID, iDString, type, isAggressive, validItemFlags); + public OpenGatePowerAction(int uUID, String iDString, String type, boolean isAggressive) { + super(uUID, iDString, type, isAggressive); // TODO Auto-generated constructor stub }