From 11076ff586191a895f75636b9b1f01ed5556a0ab Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Fri, 16 Aug 2024 12:36:54 -0400
Subject: [PATCH] Variables mirror executable

---
 src/engine/wpak/PowerEntry.java   | 28 ++++++++++++++--------------
 src/engine/wpak/PowersParser.java | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/engine/wpak/PowerEntry.java b/src/engine/wpak/PowerEntry.java
index 0de21c70..3af486fe 100644
--- a/src/engine/wpak/PowerEntry.java
+++ b/src/engine/wpak/PowerEntry.java
@@ -13,23 +13,23 @@ public class PowerEntry {
     public String power_id;
     public String power_name;
     public String power_type;
-    public int skill_id;
-    public String skill_name;
+    public int icon;
+    public String powerbase;
     public String target_type;
     public int range;
-    public String radiusType;
-    public int radius;
-    public String groupReq;
+    public String areaType;
+    public int areaRange;
+    public String excludeType;
     public String costType;
     public float cost;
-    public int unknown01;
-    public int unknown02;
-    public float cast_time;
-    public float cool_down;
+    public int difficulty;
+    public int precision;
+    public float init_time;
+    public float release_time;
     public float recycle_time;
-    public int unknown03;
-    public String combatRequirement;
-    public int unknown04;
-    public int unknown05;
-    public String targetRequirement;
+    public int hitRollYN;
+    public String castingMode;
+    public int initAmin;
+    public int releaseAnim;
+    public String targetSelect;
 }
diff --git a/src/engine/wpak/PowersParser.java b/src/engine/wpak/PowersParser.java
index 18cfafb0..b96e87ec 100644
--- a/src/engine/wpak/PowersParser.java
+++ b/src/engine/wpak/PowersParser.java
@@ -69,25 +69,25 @@ public class PowersParser {
 
             powerEntry.power_name = powerHeader.get(1).replaceAll("\"", "");
             powerEntry.power_type = powerHeader.get(2);
-            powerEntry.skill_id = Integer.parseInt(powerHeader.get(3));
-            powerEntry.skill_name = powerHeader.get(4).replaceAll("\"", "");
+            powerEntry.icon = Integer.parseInt(powerHeader.get(3));
+            powerEntry.powerbase = powerHeader.get(4).replaceAll("\"", "");
             powerEntry.target_type = powerHeader.get(5);
             powerEntry.range = Integer.parseInt(powerHeader.get(6));
-            powerEntry.radiusType = powerHeader.get(7);
-            powerEntry.radius = Integer.parseInt(powerHeader.get(8));
-            powerEntry.groupReq = powerHeader.get(9);
+            powerEntry.areaType = powerHeader.get(7);
+            powerEntry.areaRange = Integer.parseInt(powerHeader.get(8));
+            powerEntry.excludeType = powerHeader.get(9);
             powerEntry.costType = powerHeader.get(10);
             powerEntry.cost = Float.parseFloat(powerHeader.get(11));
-            powerEntry.unknown01 = Integer.parseInt(powerHeader.get(12));
-            powerEntry.unknown02 = Integer.parseInt(powerHeader.get(13));
-            powerEntry.cast_time = Float.parseFloat(powerHeader.get(14));
-            powerEntry.cool_down = Float.parseFloat(powerHeader.get(15));
+            powerEntry.difficulty = Integer.parseInt(powerHeader.get(12));
+            powerEntry.precision = Integer.parseInt(powerHeader.get(13));
+            powerEntry.init_time = Float.parseFloat(powerHeader.get(14));
+            powerEntry.release_time = Float.parseFloat(powerHeader.get(15));
             powerEntry.recycle_time = Float.parseFloat(powerHeader.get(16));
-            powerEntry.unknown03 = Integer.parseInt(powerHeader.get(17));
-            powerEntry.combatRequirement = powerHeader.get(18);
-            powerEntry.unknown04 = Integer.parseInt(powerHeader.get(19));
-            powerEntry.unknown05 = Integer.parseInt(powerHeader.get(20));
-            powerEntry.targetRequirement = powerHeader.get(21);
+            powerEntry.hitRollYN = Integer.parseInt(powerHeader.get(17));
+            powerEntry.castingMode = powerHeader.get(18);
+            powerEntry.initAmin = Integer.parseInt(powerHeader.get(19));
+            powerEntry.releaseAnim = Integer.parseInt(powerHeader.get(20));
+            powerEntry.targetSelect = powerHeader.get(21);
 
 
         for (int x = 2; x < powerEntries.length; x++) {