From 91da9746c4bafa39d098c883ba1f83cabb2410ed Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Tue, 22 Oct 2019 18:16:29 +1300
Subject: [PATCH] track all combat skills when attacking

---
 src/main/java/ParaScript/data/Variables.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ParaScript/data/Variables.java b/src/main/java/ParaScript/data/Variables.java
index 2b766e1..3c401a2 100644
--- a/src/main/java/ParaScript/data/Variables.java
+++ b/src/main/java/ParaScript/data/Variables.java
@@ -148,12 +148,14 @@ public class Variables {
 
     public static void setBaseExp(){
         if (skill_to_train == null) return;
-        baseExperience = skill_to_train.getExperience();
+        if (skill_to_train == Skill.ATTACK) baseExperience = Skill.ATTACK.getExperience() + Skill.STRENGTH.getExperience() + Skill.DEFENSE.getExperience() + Skill.HITPOINTS.getExperience() + Skill.RANGE.getExperience() + Skill.MAGIC.getExperience() + Skill.PRAYER.getExperience();
+        else baseExperience = skill_to_train.getExperience();
     }
 
     public static void updateExpGained(){
         if (skill_to_train == null) return;
-        expGained = skill_to_train.getExperience() - baseExperience;
+        if (skill_to_train == Skill.ATTACK) expGained = Skill.ATTACK.getExperience() + Skill.STRENGTH.getExperience() + Skill.DEFENSE.getExperience() + Skill.HITPOINTS.getExperience() + Skill.RANGE.getExperience() + Skill.MAGIC.getExperience() + Skill.PRAYER.getExperience() - baseExperience;
+        else expGained = skill_to_train.getExperience() - baseExperience;
     }
 
     public static int[] getItemIDs(){