From fac426a09cb605e77157119cef19cdcde680c5c2 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 20 Feb 2025 14:02:28 -0500 Subject: [PATCH] bugfix in parser --- src/engine/wpak/PowersParser.java | 2 +- src/engine/wpak/data/ActionEntry.java | 2 +- src/engine/wpakpowers/WpakPowerManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/wpak/PowersParser.java b/src/engine/wpak/PowersParser.java index 27717169..7d47bb39 100644 --- a/src/engine/wpak/PowersParser.java +++ b/src/engine/wpak/PowersParser.java @@ -159,7 +159,7 @@ public class PowersParser { case "ACTION": actionEntry = new ActionEntry(); arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+")); - actionEntry.effect_id = arguments.get(0); + actionEntry.action_id = arguments.get(0); actionEntry.minTrains = Integer.parseInt(arguments.get(1)); actionEntry.maxTrains = Integer.parseInt(arguments.get(2)); actionEntry.duration = Float.parseFloat(arguments.get(3)); diff --git a/src/engine/wpak/data/ActionEntry.java b/src/engine/wpak/data/ActionEntry.java index 98c8cce7..8a997d1d 100644 --- a/src/engine/wpak/data/ActionEntry.java +++ b/src/engine/wpak/data/ActionEntry.java @@ -12,7 +12,7 @@ import engine.mbEnums; public class ActionEntry { - public String effect_id; + public String action_id; public int minTrains; public int maxTrains; public float duration; diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index f765a581..dd9f4767 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -337,10 +337,10 @@ public class WpakPowerManager { for (ActionEntry actionEntry : power.actionEntries) { - Effect effect = effect_data.get(actionEntry.effect_id); + Effect effect = effect_data.get(actionEntry.action_id); if (effect == null) { - Logger.error("Null effect for " + actionEntry.effect_id); + Logger.error("Null effect for " + actionEntry.action_id); continue; }