From 5d39b54edd055d8e0293294bb2e174d4035a7b6f Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Sun, 20 Sep 2020 16:36:36 -0400 Subject: Add Livid Daggers to F5 tracker --- src/main/java/me/Danker/TheMod.java | 9 +++++++++ src/main/java/me/Danker/commands/LootCommand.java | 4 ++++ src/main/java/me/Danker/commands/ResetLootCommand.java | 1 + src/main/java/me/Danker/handlers/ConfigHandler.java | 2 ++ 4 files changed, 16 insertions(+) (limited to 'src/main') diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java index 953956a..fc38e6f 100644 --- a/src/main/java/me/Danker/TheMod.java +++ b/src/main/java/me/Danker/TheMod.java @@ -938,6 +938,11 @@ public class TheMod lc.shadowAssBootsSession++; cf.writeIntConfig("catacombs", "shadowAssassinBoot", lc.shadowAssBoots); } + if (message.contains(" Livid Dagger")) { + lc.lividDaggers++; + lc.lividDaggersSession++; + cf.writeIntConfig("catacombs", "lividDagger", lc.lividDaggers); + } // Chat Maddox if (message.contains("[OPEN MENU]")) { @@ -1601,6 +1606,7 @@ public class TheMod EnumChatFormatting.DARK_PURPLE + "Shadow Chestplates:\n" + EnumChatFormatting.DARK_PURPLE + "Shadow Leggings:\n" + EnumChatFormatting.DARK_PURPLE + "Shadow Boots:\n" + + EnumChatFormatting.GOLD + "Livid Daggers:\n" + EnumChatFormatting.AQUA + "Coins Spent:\n" + EnumChatFormatting.AQUA + "Time Spent:"; countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" + @@ -1610,6 +1616,7 @@ public class TheMod EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssChests) + "\n" + EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssLegs) + "\n" + EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssBoots) + "\n" + + EnumChatFormatting.GOLD + nf.format(lc.lividDaggers) + "\n" + EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f5CoinsSpent) + "\n" + EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f5TimeSpent); } else if (ds.display.equals("catacombs_floor_five_session")) { @@ -1620,6 +1627,7 @@ public class TheMod EnumChatFormatting.DARK_PURPLE + "Shadow Chestplates:\n" + EnumChatFormatting.DARK_PURPLE + "Shadow Leggings:\n" + EnumChatFormatting.DARK_PURPLE + "Shadow Boots:\n" + + EnumChatFormatting.GOLD + "Livid Daggers:\n" + EnumChatFormatting.AQUA + "Coins Spent:\n" + EnumChatFormatting.AQUA + "Time Spent:"; countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" + @@ -1629,6 +1637,7 @@ public class TheMod EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssChestsSession) + "\n" + EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssLegsSession) + "\n" + EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssBootsSession) + "\n" + + EnumChatFormatting.GOLD + nf.format(lc.lividDaggersSession) + "\n" + EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f5CoinsSpentSession) + "\n" + EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f5TimeSpentSession); } else { diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java index a66db01..c63779e 100644 --- a/src/main/java/me/Danker/commands/LootCommand.java +++ b/src/main/java/me/Danker/commands/LootCommand.java @@ -124,6 +124,7 @@ public class LootCommand extends CommandBase { public static int shadowAssChests; public static int shadowAssLegs; public static int shadowAssBoots; + public static int lividDaggers; public static double f5CoinsSpent; public static double f5TimeSpent; @@ -238,6 +239,7 @@ public class LootCommand extends CommandBase { public static int shadowAssChestsSession = 0; public static int shadowAssLegsSession = 0; public static int shadowAssBootsSession = 0; + public static int lividDaggersSession = 0; public static double f5CoinsSpentSession = 0; public static double f5TimeSpentSession = 0; @@ -741,6 +743,7 @@ public class LootCommand extends CommandBase { EnumChatFormatting.DARK_PURPLE + " Shadow Assassin Chests: " + nf.format(shadowAssChestsSession) + "\n" + EnumChatFormatting.DARK_PURPLE + " Shadow Assassin Legs: " + nf.format(shadowAssLegsSession) + "\n" + EnumChatFormatting.DARK_PURPLE + " Shadow Assassin Boots: " + nf.format(shadowAssBootsSession) + "\n" + + EnumChatFormatting.GOLD + " Livid Daggers: " + nf.format(lividDaggersSession) + "\n" + EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f5CoinsSpentSession) + "\n" + EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f5TimeSpentSession) + "\n" + EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------")); @@ -755,6 +758,7 @@ public class LootCommand extends CommandBase { EnumChatFormatting.DARK_PURPLE + " Shadow Assassin Chests: " + nf.format(shadowAssChests) + "\n" + EnumChatFormatting.DARK_PURPLE + " Shadow Assassin Legs: " + nf.format(shadowAssLegs) + "\n" + EnumChatFormatting.DARK_PURPLE + " Shadow Assassin Boots: " + nf.format(shadowAssBoots) + "\n" + + EnumChatFormatting.GOLD + " Livid Daggers: " + nf.format(lividDaggers) + "\n" + EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f5CoinsSpent) + "\n" + EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f5TimeSpent) + "\n" + EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------")); diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java index a6da64d..844ec0a 100644 --- a/src/main/java/me/Danker/commands/ResetLootCommand.java +++ b/src/main/java/me/Danker/commands/ResetLootCommand.java @@ -216,6 +216,7 @@ public class ResetLootCommand extends CommandBase { lc.shadowAssChestsSession = 0; lc.shadowAssLegsSession = 0; lc.shadowAssBootsSession = 0; + lc.lividDaggersSession = 0; lc.f5CoinsSpentSession = 0; lc.f5TimeSpentSession = 0; cf.deleteCategory("catacombs"); diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 0f730e2..e58d092 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -298,6 +298,7 @@ public class ConfigHandler { if (!hasKey("catacombs", "shadowAssassinChest")) writeIntConfig("catacombs", "shadowAssassinChest", 0); if (!hasKey("catacombs", "shadowAssassinLegging")) writeIntConfig("catacombs", "shadowAssassinLegging", 0); if (!hasKey("catacombs", "shadowAssassinBoot")) writeIntConfig("catacombs", "shadowAssassinBoot", 0); + if (!hasKey("catacombs", "lividDagger")) writeIntConfig("catacombs", "lividDagger", 0); if (!hasKey("catacombs", "floorFiveCoins")) writeDoubleConfig("catacombs", "floorFiveCoins", 0); if (!hasKey("catacombs", "floorFiveTime")) writeDoubleConfig("catacombs", "floorFiveTime", 0); @@ -449,6 +450,7 @@ public class ConfigHandler { lc.shadowAssChests = getInt("catacombs", "shadowAssassinChest"); lc.shadowAssLegs = getInt("catacombs", "shadowAssassinLegging"); lc.shadowAssBoots = getInt("catacombs", "shadowAssassinBoot"); + lc.lividDaggers = getInt("catacombs", "lividDagger"); lc.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins"); lc.f5TimeSpent = getDouble("catacombs", "floorFiveTime"); -- cgit