From f89ce2ee158a5e70e97e0add48d22ecd6d50e72a Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 22 Aug 2024 16:06:56 -0400 Subject: [PATCH] Parsing cleanup work. --- src/engine/wpak/EffectsParser.java | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/engine/wpak/EffectsParser.java b/src/engine/wpak/EffectsParser.java index 36b55f85..915f3cb6 100644 --- a/src/engine/wpak/EffectsParser.java +++ b/src/engine/wpak/EffectsParser.java @@ -165,24 +165,6 @@ public class EffectsParser { effectModifier.type = mbEnums.ModType.valueOf(modValues.get(0).trim()); switch (effectModifier.type) { - case BladeTrails: // No parm modifiers - case ImmuneToAttack: - case ImmuneToPowers: - case Ambidexterity: - case Silenced: - case IgnorePassiveDefense: - case Stunned: - case PowerCostHealth: - case Charmed: - case Fly: - case CannotMove: - case CannotTrack: - case CannotAttack: - case CannotCast: - case SpireBlock: - case Invisible: - case SeeInvisible: - break; case AnimOverride: effectModifier.min = Float.parseFloat(modValues.get(1).trim()); effectModifier.max = Float.parseFloat(modValues.get(2).trim()); @@ -267,6 +249,24 @@ public class EffectsParser { effectModifier.arg1 = modValues.get(2).trim(); effectModifier.max = Float.parseFloat(modValues.get(3).trim()); break; + case BladeTrails: // These tags have no parms or are not parsed + case ImmuneToAttack: + case ImmuneToPowers: + case Ambidexterity: + case Silenced: + case IgnorePassiveDefense: + case Stunned: + case PowerCostHealth: + case Charmed: + case Fly: + case CannotMove: + case CannotTrack: + case CannotAttack: + case CannotCast: + case SpireBlock: + case Invisible: + case SeeInvisible: + break; default: Logger.error("Unhandled type: " + effectModifier.type); break;