From adb10e34f3e163867ce04b1dc1c3765039e6c03f Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Wed, 14 Aug 2024 16:57:34 -0400
Subject: [PATCH] Naming convention update

---
 src/engine/wpak/EffectEntry.java   | 4 ++--
 src/engine/wpak/EffectsParser.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/engine/wpak/EffectEntry.java b/src/engine/wpak/EffectEntry.java
index d77415f4..ca1b8df2 100644
--- a/src/engine/wpak/EffectEntry.java
+++ b/src/engine/wpak/EffectEntry.java
@@ -13,8 +13,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 public class EffectEntry {
-    public String id;
-    public String name;
+    public String effect_id;
+    public String effect_name;
     public int icon;
     public HashSet<String> sources = new HashSet<>();
     public ArrayList<EffectModifier> mods = new ArrayList<>();
diff --git a/src/engine/wpak/EffectsParser.java b/src/engine/wpak/EffectsParser.java
index b7a53fc5..2aa9833b 100644
--- a/src/engine/wpak/EffectsParser.java
+++ b/src/engine/wpak/EffectsParser.java
@@ -43,7 +43,7 @@ public class EffectsParser {
 
         while (matcher.find()) {
             EffectEntry effectEntry = parseEffectEntry(matcher.group());
-            effect_data.put(effectEntry.id, effectEntry);
+            effect_data.put(effectEntry.effect_id, effectEntry);
         }
     }
 
@@ -73,9 +73,9 @@ public class EffectsParser {
         while (matcher.find())
             effectHeader.add(matcher.group().trim());
 
-        effectEntry.id = effectHeader.get(0);
-        effectEntry.name = effectHeader.get(1);
-        effectEntry.name = effectEntry.name.replaceAll("\"", "");
+        effectEntry.effect_id = effectHeader.get(0);
+        effectEntry.effect_name = effectHeader.get(1);
+        effectEntry.effect_name = effectEntry.effect_name.replaceAll("\"", "");
 
         // Some effect mods have no icon
         // (SEEINVIS-SHADE "See Invis")