diff --git a/src/engine/gameManager/ConfigManager.java b/src/engine/gameManager/ConfigManager.java index 568937eb..a2446379 100644 --- a/src/engine/gameManager/ConfigManager.java +++ b/src/engine/gameManager/ConfigManager.java @@ -167,6 +167,8 @@ public enum ConfigManager { Logger.info("Loading WPAK data"); + // *** Needs powermanager collection + // defined before activation. // EffectsParser.parseWpakFile(); // PowersParser.parseWpakFile(); // PowerActionParser.parseWpakFile(); diff --git a/src/engine/wpak/EffectsParser.java b/src/engine/wpak/EffectsParser.java index e1d0a1fd..b7f57bcd 100644 --- a/src/engine/wpak/EffectsParser.java +++ b/src/engine/wpak/EffectsParser.java @@ -13,7 +13,6 @@ import engine.mbEnums; import engine.wpak.data.ConditionEntry; import engine.wpak.data.Effect; import engine.wpak.data.ModifierEntry; -import engine.wpakpowers.WpakPowerManager; import org.pmw.tinylog.Logger; import java.io.IOException; @@ -56,7 +55,7 @@ public class EffectsParser { while (matcher.find()) { try { Effect effect = parseEffectEntry(matcher.group()); - WpakPowerManager._effectsLookup.put(effect.effect_id, effect); + // WpakPowerManager._effectsLookup.put(effect.effect_id, effect); } catch (Exception e) { Logger.error("EFFECT PARSE FAILED: " + e); } diff --git a/src/engine/wpak/PowerActionParser.java b/src/engine/wpak/PowerActionParser.java index d2017efb..b187fd13 100644 --- a/src/engine/wpak/PowerActionParser.java +++ b/src/engine/wpak/PowerActionParser.java @@ -10,12 +10,10 @@ package engine.wpak; import engine.gameManager.ConfigManager; import engine.mbEnums; -import engine.util.Hasher; import engine.wpak.data.Effect; import engine.wpak.data.PowerAction; import engine.wpak.data.StatTransfer; import engine.wpak.data.TrackEntry; -import engine.wpakpowers.WpakPowerManager; import org.pmw.tinylog.Logger; import java.io.IOException; @@ -54,7 +52,7 @@ public class PowerActionParser { while (matcher.find()) { PowerAction powerAction = parsePowerActionEntry(matcher.group().trim()); - WpakPowerManager._powerActionLookup.put(Hasher.SBStringHash(powerAction.action_id), powerAction); + // WpakPowerManager._powerActionLookup.put(Hasher.SBStringHash(powerAction.action_id), powerAction); } } diff --git a/src/engine/wpak/PowersParser.java b/src/engine/wpak/PowersParser.java index 65e1cc3b..efe1c59c 100644 --- a/src/engine/wpak/PowersParser.java +++ b/src/engine/wpak/PowersParser.java @@ -10,9 +10,7 @@ package engine.wpak; import engine.gameManager.ConfigManager; import engine.mbEnums; -import engine.util.Hasher; import engine.wpak.data.*; -import engine.wpakpowers.WpakPowerManager; import org.pmw.tinylog.Logger; import java.io.IOException; @@ -52,7 +50,7 @@ public class PowersParser { while (matcher.find()) { Power power = parsePowerEntry(matcher.group().trim()); - WpakPowerManager._powersLookup.put(Hasher.SBStringHash(power.power_id), power); + // @TODO WpakPowerManager._powersLookup.put(Hasher.SBStringHash(power.power_id), power); } }