aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/Danker/features/loot
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2021-03-14 22:34:12 -0400
committerbowser0000 <bowser0000@gmail.com>2021-03-14 22:34:12 -0400
commite1fd25b6841e94e0b1861528f3f05378fc23a04f (patch)
treea336ea1e2de1cd5768a3b9acccd4c1e9df2f043c /src/main/java/me/Danker/features/loot
parent668a2e184c270d01b259bd3f9269892a05bcc870 (diff)
downloadSkyblockMod-e1fd25b6841e94e0b1861528f3f05378fc23a04f.tar.gz
SkyblockMod-e1fd25b6841e94e0b1861528f3f05378fc23a04f.tar.bz2
SkyblockMod-e1fd25b6841e94e0b1861528f3f05378fc23a04f.zip
Add support for rev 5 and auto slayer
Diffstat (limited to 'src/main/java/me/Danker/features/loot')
-rw-r--r--src/main/java/me/Danker/features/loot/LootDisplay.java8
-rw-r--r--src/main/java/me/Danker/features/loot/LootTracker.java22
2 files changed, 27 insertions, 3 deletions
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index 363b70c..f51157b 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -221,6 +221,8 @@ public class LootDisplay {
EnumChatFormatting.RED + "Revenant Catalysts:\n" +
EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
EnumChatFormatting.GOLD + "Scythe Blades:\n" +
+ EnumChatFormatting.RED + "Shard of Shreddeds:\n" +
+ EnumChatFormatting.RED + "Warden Hearts:\n" +
EnumChatFormatting.AQUA + "Time Since RNG:\n" +
EnumChatFormatting.AQUA + "Bosses Since RNG:";
countText = EnumChatFormatting.GOLD + nf.format(LootTracker.zombieRevs) + "\n" +
@@ -233,6 +235,8 @@ public class LootDisplay {
EnumChatFormatting.RED + LootTracker.zombieRevCatas + "\n" +
EnumChatFormatting.DARK_GREEN + LootTracker.zombieSnakes + "\n" +
EnumChatFormatting.GOLD + LootTracker.zombieScythes + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieShards + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieWardenHearts + "\n" +
EnumChatFormatting.AQUA + timeBetween + "\n" +
EnumChatFormatting.AQUA + bossesBetween;
break;
@@ -263,6 +267,8 @@ public class LootDisplay {
EnumChatFormatting.RED + "Revenant Catalysts:\n" +
EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
EnumChatFormatting.GOLD + "Scythe Blades:\n" +
+ EnumChatFormatting.RED + "Shard of Shreddeds:\n" +
+ EnumChatFormatting.RED + "Warden Hearts:\n" +
EnumChatFormatting.AQUA + "Time Since RNG:\n" +
EnumChatFormatting.AQUA + "Bosses Since RNG:";
countText = EnumChatFormatting.GOLD + nf.format(LootTracker.zombieRevsSession) + "\n" +
@@ -275,6 +281,8 @@ public class LootDisplay {
EnumChatFormatting.RED + LootTracker.zombieRevCatasSession + "\n" +
EnumChatFormatting.DARK_GREEN + LootTracker.zombieSnakesSession + "\n" +
EnumChatFormatting.GOLD + LootTracker.zombieScythes + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieShardsSession + "\n" +
+ EnumChatFormatting.RED + LootTracker.zombieWardenHeartsSession + "\n" +
EnumChatFormatting.AQUA + timeBetween + "\n" +
EnumChatFormatting.AQUA + bossesBetween;
break;
diff --git a/src/main/java/me/Danker/features/loot/LootTracker.java b/src/main/java/me/Danker/features/loot/LootTracker.java
index f7f7044..68cd8b0 100644
--- a/src/main/java/me/Danker/features/loot/LootTracker.java
+++ b/src/main/java/me/Danker/features/loot/LootTracker.java
@@ -56,6 +56,8 @@ public class LootTracker {
public static int zombieRevCatas;
public static int zombieSnakes;
public static int zombieScythes;
+ public static int zombieShards;
+ public static int zombieWardenHearts;
public static double zombieTime;
public static int zombieBosses;
@@ -216,6 +218,8 @@ public class LootTracker {
public static int zombieRevCatasSession = 0;
public static int zombieSnakesSession = 0;
public static int zombieScythesSession = 0;
+ public static int zombieShardsSession = 0;
+ public static int zombieWardenHeartsSession = 0;
public static double zombieTimeSession = -1;
public static int zombieBossesSession = -1;
@@ -373,7 +377,7 @@ public class LootTracker {
}
// Wolf
- if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
+ if (message.contains(" Wolf Slayer LVL ")) {
wolfSvens++;
wolfSvensSession++;
if (wolfBosses != -1) {
@@ -416,7 +420,7 @@ public class LootTracker {
wolfFluxesSession++;
ConfigHandler.writeIntConfig("wolf", "flux", wolfFluxes);
if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
- } else if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) { // Spider
+ } else if (message.contains(" Spider Slayer LVL ")) { // Spider
spiderTarantulas++;
spiderTarantulasSession++;
if (spiderBosses != -1) {
@@ -457,7 +461,7 @@ public class LootTracker {
spiderMosquitosSession++;
ConfigHandler.writeIntConfig("spider", "mosquito", spiderMosquitos);
if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
- } else if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) { // Zombie
+ } else if (message.contains(" Zombie Slayer LVL ")) { // Zombie
zombieRevs++;
zombieRevsSession++;
if (zombieBosses != -1) {
@@ -502,6 +506,18 @@ public class LootTracker {
zombieScythesSession++;
ConfigHandler.writeIntConfig("zombie", "scythe", zombieScythes);
if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
+ } else if (message.contains("INSANE DROP! (Shard of the Shredded)")) {
+ zombieRNG = true;
+ zombieShards++;
+ zombieShardsSession++;
+ ConfigHandler.writeIntConfig("zombie", "shard", zombieShards);
+ if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "SHARD OF THE SHREDDED!", 5);
+ } else if (message.contains("INSANE DROP! (Warden Heart)")) {
+ zombieRNG = true;
+ zombieWardenHearts++;
+ zombieWardenHeartsSession++;
+ ConfigHandler.writeIntConfig("zombie", "heart", zombieWardenHearts);
+ if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.RED + "WARDEN HEART!", 5);
}
if (wolfRNG) {