From 562bee5f4800efadc5b25e54f3541c0770440a49 Mon Sep 17 00:00:00 2001
From: bowser0000 <bowser0000@gmail.com>
Date: Sat, 5 Sep 2020 17:23:55 -0400
Subject: Don't colour dungeon classes, fix /resetloot catacombs and update
 README

---
 src/main/java/me/Danker/TheMod.java                    | 4 +++-
 src/main/java/me/Danker/commands/ResetLootCommand.java | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index ac3de48..29eed1e 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -1652,7 +1652,9 @@ public class TheMod
     		for (Slot slot : invSlots) {
     			ItemStack item = slot.getStack();
     			if (item == null) continue;
-    			if (item.getDisplayName().contains("[Lvl ")) {
+    			String name = item.getDisplayName();
+    			if (name.contains("[Lvl ")) {
+    				if (name.endsWith("aHealer") || name.endsWith("aMage") || name.endsWith("aBerserk") || name.endsWith("aArcher") || name.endsWith("aTank")) continue;
     				int colour;
     				int petLevel = Integer.parseInt(item.getDisplayName().substring(item.getDisplayName().indexOf(" ") + 1, item.getDisplayName().indexOf("]")));
     				if (petLevel == 100) {
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index fa80ad5..dd540d6 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -188,17 +188,25 @@ public class ResetLootCommand extends CommandBase {
 		lc.recombobulatorsSession = 0;
 		lc.fumingPotatoBooksSession = 0;
 		lc.bonzoStaffsSession = 0;
+		lc.f1CoinsSpentSession = 0;
+		lc.f1TimeSpentSession = 0;
 		lc.scarfStudiesSession = 0;
+		lc.f2CoinsSpentSession = 0;
+		lc.f2TimeSpentSession = 0;
 		lc.adaptiveHelmsSession = 0;
 		lc.adaptiveChestsSession = 0;
 		lc.adaptiveLegsSession = 0;
 		lc.adaptiveBootsSession = 0;
 		lc.adaptiveSwordsSession = 0;
+		lc.f3CoinsSpentSession = 0;
+		lc.f3TimeSpentSession = 0;
 		lc.spiritWingsSession = 0;
 		lc.spiritBonesSession = 0;
 		lc.spiritBootsSession = 0;
 		lc.spiritSwordsSession = 0;
 		lc.epicSpiritPetsSession = 0;
+		lc.f4CoinsSpentSession = 0;
+		lc.f4TimeSpentSession = 0;
 		cf.deleteCategory("catacombs");
 		cf.reloadConfig();
 	}
-- 
cgit