From d966d50bd5a29f602b127972eec5d0c7db6778cc Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 9 Sep 2023 20:40:52 -0500
Subject: [PATCH] removed duplicate variables in MobBase

---
 src/engine/objects/Mob.java     | 28 ++++++++++++++--------------
 src/engine/objects/MobBase.java | 28 ----------------------------
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index 479b5fb8..97c08b4c 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -1125,14 +1125,14 @@ public class Mob extends AbstractIntelligenceAgent {
             return;
         }
         this.atrHandOne = (short) this.mobBase.getAttackRating();
-        this.minDamageHandOne = (short) this.mobBase.getMinDmg();
-        this.maxDamageHandOne = (short) this.mobBase.getMaxDmg();
+        this.minDamageHandOne = (short) this.mobBase.getDamageMin();
+        this.maxDamageHandOne = (short) this.mobBase.getDamageMax();
         this.rangeHandOne = 6.5f;
         this.speedHandOne = 20;
 
         this.atrHandTwo = (short) this.mobBase.getAttackRating();
-        this.minDamageHandTwo = (short) this.mobBase.getMinDmg();
-        this.maxDamageHandTwo = (short) this.mobBase.getMaxDmg();
+        this.minDamageHandTwo = (short) this.mobBase.getDamageMin();
+        this.maxDamageHandTwo = (short) this.mobBase.getDamageMax();
         this.rangeHandTwo = 6.5f;
         this.speedHandTwo = 20;
 
@@ -1150,8 +1150,8 @@ public class Mob extends AbstractIntelligenceAgent {
         } catch (Exception e) {
 
             this.atrHandOne = (short) this.mobBase.getAttackRating();
-            this.minDamageHandOne = (short) this.mobBase.getMinDmg();
-            this.maxDamageHandOne = (short) this.mobBase.getMaxDmg();
+            this.minDamageHandOne = (short) this.mobBase.getDamageMin();
+            this.maxDamageHandOne = (short) this.mobBase.getDamageMax();
             this.rangeHandOne = 6.5f;
             this.speedHandOne = 20;
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. setting to default ATR and Damage." + e.getMessage());
@@ -1163,8 +1163,8 @@ public class Mob extends AbstractIntelligenceAgent {
         } catch (Exception e) {
 
             this.atrHandTwo = (short) this.mobBase.getAttackRating();
-            this.minDamageHandTwo = (short) this.mobBase.getMinDmg();
-            this.maxDamageHandTwo = (short) this.mobBase.getMaxDmg();
+            this.minDamageHandTwo = (short) this.mobBase.getDamageMin();
+            this.maxDamageHandTwo = (short) this.mobBase.getDamageMax();
             this.rangeHandTwo = 6.5f;
             this.speedHandTwo = 20;
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. setting to default ATR and Damage." + e.getMessage());
@@ -1208,7 +1208,7 @@ public class Mob extends AbstractIntelligenceAgent {
             this.defenseRating = (short) (defense + 0.5f);
         } catch (Exception e) {
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. Setting to Default Defense." + e.getMessage());
-            this.defenseRating = (short) this.mobBase.getDefense();
+            this.defenseRating = (short) this.mobBase.getDefenseRating();
         }
         // calculate defense for equipment
     }
@@ -1359,8 +1359,8 @@ public class Mob extends AbstractIntelligenceAgent {
                 mastDam = masteryPercentage;
 
             // TODO Correct these
-            min = this.mobBase.getMinDmg();
-            max = this.mobBase.getMaxDmg();
+            min = this.mobBase.getDamageMin();
+            max = this.mobBase.getDamageMax();
         } else {
 
             if (mainHand)
@@ -1616,11 +1616,11 @@ public class Mob extends AbstractIntelligenceAgent {
         //TODO set these correctly later
         this.rangeHandOne = this.mobBase.getAttackRange();
         this.rangeHandTwo = -1;
-        this.minDamageHandOne = (int) this.mobBase.getMinDmg();
-        this.maxDamageHandOne = (int) this.mobBase.getMaxDmg();
+        this.minDamageHandOne = (int) this.mobBase.getDamageMin();
+        this.maxDamageHandOne = (int) this.mobBase.getDamageMax();
         this.minDamageHandTwo = 0;
         this.maxDamageHandTwo = 0;
-        this.atrHandOne = this.mobBase.getAtr();
+        this.atrHandOne = this.mobBase.getAttackRating();
         this.defenseRating = (short) this.mobBase.getDefenseRating();
         this.isActive = true;
 
diff --git a/src/engine/objects/MobBase.java b/src/engine/objects/MobBase.java
index 66a58b7a..b2b7da3b 100644
--- a/src/engine/objects/MobBase.java
+++ b/src/engine/objects/MobBase.java
@@ -43,10 +43,6 @@ public class MobBase extends AbstractGameObject {
     private int goldMod;
     private int seeInvis;
     private int spawnTime = 0;
-    private int defense = 0;
-    private int atr = 0;
-    private float minDmg = 0;
-    private float maxDmg = 0;
     private float attackRange;
     private boolean isNecroPet = false;
     private MobBaseStats mobBaseStats;
@@ -248,30 +244,6 @@ public class MobBase extends AbstractGameObject {
         return mobBaseStats;
     }
 
-    public float getMaxDmg() {
-        return maxDmg;
-    }
-
-    public float getMinDmg() {
-        return minDmg;
-    }
-
-    public int getAtr() {
-        return atr;
-    }
-
-    public void setAtr(int atr) {
-        this.atr = atr;
-    }
-
-    public int getDefense() {
-        return defense;
-    }
-
-    public void setDefense(int defense) {
-        this.defense = defense;
-    }
-
     public float getAttackRange() {
         return attackRange;
     }