Browse Source

One or more whitspaces

feature-config-parsing2
MagicBot 3 months ago
parent
commit
31f8b5a294
  1. 2
      src/engine/wpak/EffectsParser.java
  2. 10
      src/engine/wpak/PowersParser.java

2
src/engine/wpak/EffectsParser.java

@ -114,7 +114,7 @@ public class EffectsParser {
String[] conditions = matcher.group().trim().split("\n"); String[] conditions = matcher.group().trim().split("\n");
for (String condition : conditions) { for (String condition : conditions) {
String[] parameters = condition.trim().split(" "); String[] parameters = condition.trim().split("\\s+");
effectEntry.conditions.put(parameters[0], Float.parseFloat(parameters[1])); effectEntry.conditions.put(parameters[0], Float.parseFloat(parameters[1]));
} }
} }

10
src/engine/wpak/PowersParser.java

@ -152,7 +152,11 @@ public class PowersParser {
switch (key) { switch (key) {
case "ACTION": case "ACTION":
powerAction = new PowerAction(); powerAction = new PowerAction();
arguments = lineValues[1].trim().split(" "); arguments = lineValues[1].trim().split("\\s+");
if (powerEntry.power_id.equals("HNT-050"))
Logger.error("debug");
powerAction.effect_id = arguments[0]; powerAction.effect_id = arguments[0];
powerAction.minTrains = Integer.parseInt(arguments[1]); powerAction.minTrains = Integer.parseInt(arguments[1]);
powerAction.maxTrains = Integer.parseInt(arguments[2]); powerAction.maxTrains = Integer.parseInt(arguments[2]);
@ -167,7 +171,7 @@ public class PowersParser {
powerEntry.maxLevel = Integer.parseInt(lineValues[1].trim()); powerEntry.maxLevel = Integer.parseInt(lineValues[1].trim());
break; break;
case "HateValue": case "HateValue":
arguments = lineValues[1].trim().split(" "); arguments = lineValues[1].trim().split("\\s+");
powerEntry.hateValue = Integer.parseInt(arguments[0]); powerEntry.hateValue = Integer.parseInt(arguments[0]);
// Not all entries have a curve. Defaults to DefaultFlat; // Not all entries have a curve. Defaults to DefaultFlat;
@ -188,7 +192,7 @@ public class PowersParser {
powerEntry.category = lineValues[1].trim(); powerEntry.category = lineValues[1].trim();
break; break;
case "CURVE": case "CURVE":
arguments = lineValues[1].trim().split(" "); arguments = lineValues[1].trim().split("\\s+");
powerEntry.slopeType = arguments[0]; powerEntry.slopeType = arguments[0];
powerEntry.curve = mbEnums.CompoundCurveType.valueOf(arguments[1]); powerEntry.curve = mbEnums.CompoundCurveType.valueOf(arguments[1]);
break; break;

Loading…
Cancel
Save