aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/Danker
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2020-10-05 11:42:01 -0400
committerbowser0000 <bowser0000@gmail.com>2020-10-05 11:42:01 -0400
commit2a1c6ec74089d247e63e80682b48e1777b9dd388 (patch)
tree0340f6ba3af16526d4c4c5f9232ac550f5a1f29b /src/main/java/me/Danker
parent5ee051205869192a61ee2abdf119ea7b5d4bce14 (diff)
downloadSkyblockMod-2a1c6ec74089d247e63e80682b48e1777b9dd388.tar.gz
SkyblockMod-2a1c6ec74089d247e63e80682b48e1777b9dd388.tar.bz2
SkyblockMod-2a1c6ec74089d247e63e80682b48e1777b9dd388.zip
Add F6 tracker
Diffstat (limited to 'src/main/java/me/Danker')
-rw-r--r--src/main/java/me/Danker/TheMod.java90
-rw-r--r--src/main/java/me/Danker/commands/DHelpCommand.java4
-rw-r--r--src/main/java/me/Danker/commands/DisplayCommand.java12
-rw-r--r--src/main/java/me/Danker/commands/LootCommand.java62
-rw-r--r--src/main/java/me/Danker/handlers/ConfigHandler.java22
5 files changed, 182 insertions, 8 deletions
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 68e516b..ababc34 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -757,6 +757,10 @@ public class TheMod
lc.f5TimeSpent = Math.floor(lc.f5TimeSpent + timeToAdd);
lc.f5TimeSpentSession = Math.floor(lc.f5TimeSpentSession + timeToAdd);
cf.writeDoubleConfig("catacombs", "floorFiveTime", lc.f5TimeSpent);
+ } else if (sCleaned.contains("F6")) {
+ lc.f6TimeSpent = Math.floor(lc.f6TimeSpent + timeToAdd);
+ lc.f6TimeSpentSession = Math.floor(lc.f6TimeSpentSession + timeToAdd);
+ cf.writeDoubleConfig("catacombs", "floorSixTime", lc.f6TimeSpent);
}
} else if (sCleaned.contains("Time Elapsed:")) {
// Get floor time
@@ -892,6 +896,38 @@ public class TheMod
lc.shadowFurys++;
lc.shadowFurysSession++;
cf.writeIntConfig("catacombs", "shadowFury", lc.shadowFurys);
+ } else if (message.contains("Ancient Rose")) { // F6
+ lc.ancientRoses++;
+ lc.ancientRosesSession++;
+ cf.writeIntConfig("catacombs", "ancientRose", lc.ancientRoses);
+ } else if (message.contains("Precursor Eye")) {
+ lc.precursorEyes++;
+ lc.precursorEyesSession++;
+ cf.writeIntConfig("catacombs", "precursorEye", lc.precursorEyes);
+ } else if (message.contains("Giant's Sword")) {
+ lc.giantsSwords++;
+ lc.giantsSwordsSession++;
+ cf.writeIntConfig("catacombs", "giantsSword", lc.giantsSwords);
+ } else if (message.contains("Necromancer Lord Helmet")) {
+ lc.necroLordHelms++;
+ lc.necroLordHelmsSession++;
+ cf.writeIntConfig("catacombs", "necroLordHelm", lc.necroLordHelms);
+ } else if (message.contains("Necromancer Lord Chestplate")) {
+ lc.necroLordChests++;
+ lc.necroLordChestsSession++;
+ cf.writeIntConfig("catacombs", "necroLordChest", lc.necroLordChests);
+ } else if (message.contains("Necromancer Lord Leggings")) {
+ lc.necroLordLegs++;
+ lc.necroLordLegsSession++;
+ cf.writeIntConfig("catacombs", "necroLordLegging", lc.necroLordLegs);
+ } else if (message.contains("Necromancer Lord Boots")) {
+ lc.necroLordBoots++;
+ lc.necroLordBootsSession++;
+ cf.writeIntConfig("catacombs", "necroLordBoot", lc.necroLordBoots);
+ } else if (message.contains("Necromancer Sword")) {
+ lc.necroSwords++;
+ lc.necroSwordsSession++;
+ cf.writeIntConfig("catacombs", "necroSword", lc.necroSwords);
}
}
@@ -1608,6 +1644,56 @@ public class TheMod
EnumChatFormatting.GOLD + nf.format(lc.shadowFurysSession) + "\n" +
EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f5CoinsSpentSession) + "\n" +
EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f5TimeSpentSession);
+ } else if (ds.display.equals("catacombs_floor_six")) {
+ dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+ EnumChatFormatting.BLUE + "Ancient Roses:\n" +
+ EnumChatFormatting.GOLD + "Precursor Eyes:\n" +
+ EnumChatFormatting.GOLD + "Giant's Swords:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Helmets:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Chests:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Leggings:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Boots:\n" +
+ EnumChatFormatting.GOLD + "Necro Swords:\n" +
+ EnumChatFormatting.AQUA + "Coins Spent:\n" +
+ EnumChatFormatting.AQUA + "Time Spent:";
+ countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
+ EnumChatFormatting.BLUE + nf.format(lc.ancientRoses) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.precursorEyes) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.giantsSwords) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordHelms) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordChests) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordLegs) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordBoots) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroSwords) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f6CoinsSpent) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f6TimeSpent);
+ } else if (ds.display.equals("catacombs_floor_six_session")) {
+ dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
+ EnumChatFormatting.BLUE + "Ancient Roses:\n" +
+ EnumChatFormatting.GOLD + "Precursor Eyes:\n" +
+ EnumChatFormatting.GOLD + "Giant's Swords:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Helmets:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Chests:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Leggings:\n" +
+ EnumChatFormatting.GOLD + "Necro Lord Boots:\n" +
+ EnumChatFormatting.GOLD + "Necro Swords:\n" +
+ EnumChatFormatting.AQUA + "Coins Spent:\n" +
+ EnumChatFormatting.AQUA + "Time Spent:";
+ countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
+ EnumChatFormatting.BLUE + nf.format(lc.ancientRosesSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.precursorEyesSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.giantsSwordsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordHelmsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordChestsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordLegsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroLordBootsSession) + "\n" +
+ EnumChatFormatting.GOLD + nf.format(lc.necroSwordsSession) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f6CoinsSpentSession) + "\n" +
+ EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f6TimeSpentSession);
} else {
ConfigHandler cf = new ConfigHandler();
@@ -1815,6 +1901,10 @@ public class TheMod
lc.f5CoinsSpent += coinsSpent;
lc.f5CoinsSpentSession += coinsSpent;
cf.writeDoubleConfig("catacombs", "floorFiveCoins", lc.f5CoinsSpent);
+ } else if (sCleaned.contains("F6")) {
+ lc.f6CoinsSpent += coinsSpent;
+ lc.f6CoinsSpentSession += coinsSpent;
+ cf.writeDoubleConfig("catacombs", "floorSixCoins", lc.f6CoinsSpent);
}
break;
}
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index ecb327e..d9e6d21 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -36,8 +36,8 @@ public class DHelpCommand extends CommandBase {
EnumChatFormatting.GOLD + " /toggle <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalerts/aotd/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
EnumChatFormatting.GOLD + " /setkey <key>" + EnumChatFormatting.AQUA + " - Sets API key.\n" +
EnumChatFormatting.GOLD + " /getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey and copies it to your clipboard.\n" +
- EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing/catacombs> [winter/f(1-5)/session]" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
- EnumChatFormatting.GOLD + " /display <zombie/spider/wolf/fishing/catacombs/off> [winter/f(1-5)/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead.\n" +
+ EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf/fishing/catacombs> [winter/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
+ EnumChatFormatting.GOLD + " /display <zombie/spider/wolf/fishing/catacombs/off> [winter/f(1-6)/session]" + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead.\n" +
EnumChatFormatting.GOLD + " /resetloot <zombie/spider/wolf/fishing/catacombs/confirm/cancel>" + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
EnumChatFormatting.GOLD + " /move <coords/display/dungeontimer/skill50> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
EnumChatFormatting.GOLD + " /scale <coords/display/dungeontimer/skill50> <scale (0.1 - 10)>" + EnumChatFormatting.AQUA + " - Scales text display to a specified multipler between 0.1x and 10x.\n" +
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index a0b49d6..271b172 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -21,7 +21,7 @@ public class DisplayCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/off> [winter/festival/session/f(1-5)]";
+ return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs/off> [winter/festival/session/f(1-6)]";
}
@Override
@@ -36,7 +36,7 @@ public class DisplayCommand extends CommandBase {
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
return getListOfStringsMatchingLastWord(args, "winter", "festival", "session");
} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
- return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5");
+ return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6");
} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) {
return getListOfStringsMatchingLastWord(args, "session");
}
@@ -130,8 +130,14 @@ public class DisplayCommand extends CommandBase {
} else {
display = "catacombs_floor_five";
}
+ } else if (arg1[1].equalsIgnoreCase("f6") || arg1[1].equalsIgnoreCase("floor6")) {
+ if (showSession) {
+ display = "catacombs_floor_six_session";
+ } else {
+ display = "catacombs_floor_six";
+ }
} else {
- player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /display catacombs <f1/f2/f3/f4/f5>"));
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /display catacombs <f1/f2/f3/f4/f5/f6>"));
return;
}
} else if (arg1[0].equalsIgnoreCase("off")) {
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 0d8f3b8..bbe4f73 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -128,6 +128,17 @@ public class LootCommand extends CommandBase {
public static int shadowFurys;
public static double f5CoinsSpent;
public static double f5TimeSpent;
+ // F6
+ public static int ancientRoses;
+ public static int precursorEyes;
+ public static int giantsSwords;
+ public static int necroLordHelms;
+ public static int necroLordChests;
+ public static int necroLordLegs;
+ public static int necroLordBoots;
+ public static int necroSwords;
+ public static double f6CoinsSpent;
+ public static double f6TimeSpent;
// Single sessions (No config saves)
// Wolf
@@ -244,6 +255,17 @@ public class LootCommand extends CommandBase {
public static int shadowFurysSession = 0;
public static double f5CoinsSpentSession = 0;
public static double f5TimeSpentSession = 0;
+ // F6
+ public static int ancientRosesSession = 0;
+ public static int precursorEyesSession = 0;
+ public static int giantsSwordsSession = 0;
+ public static int necroLordHelmsSession = 0;
+ public static int necroLordChestsSession = 0;
+ public static int necroLordLegsSession = 0;
+ public static int necroLordBootsSession = 0;
+ public static int necroSwordsSession = 0;
+ public static double f6CoinsSpentSession = 0;
+ public static double f6TimeSpentSession = 0;
@Override
public String getCommandName() {
@@ -252,7 +274,7 @@ public class LootCommand extends CommandBase {
@Override
public String getCommandUsage(ICommandSender arg0) {
- return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/f(1-5)/session]";
+ return "/" + getCommandName() + " <zombie/spider/wolf/fishing/catacombs> [winter/festival/f(1-6)/session]";
}
@Override
@@ -267,7 +289,7 @@ public class LootCommand extends CommandBase {
} else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) {
return getListOfStringsMatchingLastWord(args, "winter", "festival", "session");
} else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) {
- return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5");
+ return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6");
} else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) {
return getListOfStringsMatchingLastWord(args, "session");
}
@@ -766,8 +788,42 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f5CoinsSpent) + "\n" +
EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f5TimeSpent) + "\n" +
EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+ } else if (arg1[1].equalsIgnoreCase("f6") || arg1[1].equalsIgnoreCase("floor6")) {
+ if (showSession) {
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+ EnumChatFormatting.RED + EnumChatFormatting.BOLD + " Catacombs F6 Summary (Current Session):\n" +
+ EnumChatFormatting.GOLD + " Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
+ EnumChatFormatting.BLUE + " Ancient Roses: " + nf.format(ancientRosesSession) + "\n" +
+ EnumChatFormatting.GOLD + " Precursor Eyes: " + nf.format(precursorEyesSession) + "\n" +
+ EnumChatFormatting.GOLD + " Giant's Swords: " + nf.format(giantsSwordsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Helmets: " + nf.format(necroLordHelmsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Chestplates: " + nf.format(necroLordChestsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Leggings: " + nf.format(necroLordLegsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Boots: " + nf.format(necroLordBootsSession) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Swords: " + nf.format(necroSwordsSession) + "\n" +
+ EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f6CoinsSpentSession) + "\n" +
+ EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f6TimeSpentSession) + "\n" +
+ EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
+ return;
+ }
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+ EnumChatFormatting.RED + EnumChatFormatting.BOLD + " Catacombs F6 Summary:\n" +
+ EnumChatFormatting.GOLD + " Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
+ EnumChatFormatting.DARK_PURPLE + " Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
+ EnumChatFormatting.BLUE + " Ancient Roses: " + nf.format(ancientRoses) + "\n" +
+ EnumChatFormatting.GOLD + " Precursor Eyes: " + nf.format(precursorEyes) + "\n" +
+ EnumChatFormatting.GOLD + " Giant's Swords: " + nf.format(giantsSwords) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Helmets: " + nf.format(necroLordHelms) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Chestplates: " + nf.format(necroLordChests) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Leggings: " + nf.format(necroLordLegs) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Lord Boots: " + nf.format(necroLordBoots) + "\n" +
+ EnumChatFormatting.GOLD + " Necro Swords: " + nf.format(necroSwords) + "\n" +
+ EnumChatFormatting.AQUA + " Coins Spent: " + Utils.getMoneySpent(f6CoinsSpent) + "\n" +
+ EnumChatFormatting.AQUA + " Time Spent: " + Utils.getTimeBetween(0, f6TimeSpent) + "\n" +
+ EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
} else {
- player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot catacombs <f1/f2/f3/f4/f5>"));
+ player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /loot catacombs <f1/f2/f3/f4/f5/f6>"));
}
} else {
player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(arg0)));
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 4138fcb..dede01f 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -303,6 +303,17 @@ public class ConfigHandler {
if (!hasKey("catacombs", "shadowFury")) writeIntConfig("catacombs", "shadowFury", 0);
if (!hasKey("catacombs", "floorFiveCoins")) writeDoubleConfig("catacombs", "floorFiveCoins", 0);
if (!hasKey("catacombs", "floorFiveTime")) writeDoubleConfig("catacombs", "floorFiveTime", 0);
+ // F6
+ if (!hasKey("catacombs", "ancientRose")) writeIntConfig("catacombs", "ancientRose", 0);
+ if (!hasKey("catacombs", "precursorEye")) writeIntConfig("catacombs", "precursorEye", 0);
+ if (!hasKey("catacombs", "giantsSword")) writeIntConfig("catacombs", "giantsSword", 0);
+ if (!hasKey("catacombs", "necroLordHelm")) writeIntConfig("catacombs", "necroHelm", 0);
+ if (!hasKey("catacombs", "necroLordChest")) writeIntConfig("catacombs", "necroChest", 0);
+ if (!hasKey("catacombs", "necroLordLegging")) writeIntConfig("catacombs", "necroLegging", 0);
+ if (!hasKey("catacombs", "necroLordBoot")) writeIntConfig("catacombs", "necroBoot", 0);
+ if (!hasKey("catacombs", "necroSword")) writeIntConfig("catacombs", "necroSword", 0);
+ if (!hasKey("catacombs", "floorSixCoins")) writeDoubleConfig("catacombs", "floorSixCoins", 0);
+ if (!hasKey("catacombs", "floorSixTime")) writeDoubleConfig("catacombs", "floorSixTime", 0);
if (!hasKey("misc", "display")) writeStringConfig("misc", "display", "off");
@@ -460,6 +471,17 @@ public class ConfigHandler {
lc.shadowFurys = getInt("catacombs", "shadowFury");
lc.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins");
lc.f5TimeSpent = getDouble("catacombs", "floorFiveTime");
+ // F6
+ lc.ancientRoses = getInt("catacombs", "ancientRose");
+ lc.precursorEyes = getInt("catacombs", "precursorEye");
+ lc.giantsSwords = getInt("catacombs", "giantsSword");
+ lc.necroLordHelms = getInt("catacombs", "necroLordHelm");
+ lc.necroLordChests = getInt("catacombs", "necroLordChest");
+ lc.necroLordLegs = getInt("catacombs", "necroLordLegging");
+ lc.necroLordBoots = getInt("catacombs", "necroLordBoot");
+ lc.necroSwords = getInt("catacombs", "necroSword");
+ lc.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
+ lc.f6TimeSpent = getDouble("catacombs", "floorSixTime");
final DisplayCommand ds = new DisplayCommand();
ds.display = getString("misc", "display");