From 9cc09de788ce6f1003a92d1bdedabe8f0fd20c4e Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Sun, 22 Oct 2023 04:01:26 -0400
Subject: Add AOTV & Pearl Secret Waypoints

---
 .../skyblocker/dungeons/secretlocations.json       | 65 +++++++++++++++++++++-
 .../resources/assets/skyblocker/lang/en_us.json    |  5 +-
 2 files changed, 68 insertions(+), 2 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
index d5e38345..5972659f 100644
--- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
+++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
@@ -834,6 +834,13 @@
       "y":75,
       "z":21
     },
+    {
+	  "secretName":"2 - AOTV",
+	  "category":"aotv",
+	  "x":25,
+	  "y":76,
+	  "z":22
+	},
     {
       "secretName":"2 - Stonk",
       "category":"stonk",
@@ -2947,7 +2954,7 @@
       "category":"stonk",
       "x":17,
       "y":70,
-      "z":15
+      "z":14
     },
     {
       "secretName":"6 - Pressure Plate 2",
@@ -3058,6 +3065,13 @@
       "y":70,
       "z":5
     },
+    {
+	  "secretName":"2 - AOTV",
+	  "category":"aotv",
+	  "x":77,
+	  "y":82,
+	  "z":16
+	},
     {
       "secretName":"2 - Wither Essence",
       "category":"wither",
@@ -3109,6 +3123,13 @@
       "y":50,
       "z":9
     },
+    {
+	  "secretName":"3 - AOTV",
+	  "category":"aotv",
+	  "x":7,
+	  "y":80,
+	  "z":15
+	},
     {
       "secretName":"3 - Superboom",
       "category":"superboom",
@@ -3225,6 +3246,13 @@
       "y":89,
       "z":24
     },
+    {
+	  "secretName":"1/2 - AOTV",
+	  "category":"aotv",
+	  "x":84,
+	  "y":91,
+	  "z":26
+	},
     {
       "secretName":"1 - Bat",
       "category":"bat",
@@ -4071,6 +4099,13 @@
       "y":109,
       "z":30
     },
+    {
+	  "secretName":"5 - AOTV",
+	  "category":"aotv",
+	  "x":52,
+	  "y":78,
+	  "z":9
+	},
     {
       "secretName":"5 - Crypt",
       "category":"superboom",
@@ -5080,6 +5115,13 @@
       "y":86,
       "z":61
     },
+    {
+	  "secretName": "7 - AOTV",
+	  "category":"aotv",
+	  "x":39,
+	  "y":84,
+	  "z":58
+	},
     {
       "secretName":"7 - Chest",
       "category":"chest",
@@ -5331,6 +5373,13 @@
       "y":85,
       "z":43
     },
+    {
+	  "secretName":"3/4 - AOTV",
+	  "category":"aotv",
+	  "x":49,
+	  "y":83,
+	  "z":36
+	},
     {
       "secretName":"3 - Chest",
       "category":"chest",
@@ -5552,6 +5601,13 @@
       "y":45,
       "z":15
     },
+    {
+	  "secretName":"5 - Pearl",
+	  "category":"pearl",
+	  "x":8,
+	  "y":59,
+	  "z":14
+	},
     {
       "secretName":"5 - Entrance",
       "category":"entrance",
@@ -5835,6 +5891,13 @@
     }
   ],
   "Double-Stair-3":[
+	{
+	  "secretName":"1 - Pearl",
+	  "category":"pearl",
+	  "x":24,
+	  "y":72,
+	  "z":11
+	},
     {
       "secretName":"1 - Wither Essence",
       "category":"wither",
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index b42ab1e3..a6bf6b49 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -164,6 +164,9 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableLeverWaypoints" : "Enable Lever Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableFairySoulWaypoints" : "Enable Fairy Soul Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableStonkWaypoints" : "Enable Stonk Waypoints",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableAotvWaypoints" : "Enable AOTV Waypoints",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints": "Enable Pearl Waypoints",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints.@Tooltip": "With these waypoints, you throw a pearl towards the block and at the same time AOTV up.",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints" : "Enable Default Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints.@Tooltip" : "This includes all waypoints that do not belong to a category.",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit": "Dungeon Chest Profit Calculator",
@@ -272,7 +275,7 @@
   "skyblocker.dungeons.secrets.markSecretMissing": "§rMarked secret #%d as missing.",
   "skyblocker.dungeons.secrets.markSecretFoundUnable": "§cUnable to mark secret #%d as found.",
   "skyblocker.dungeons.secrets.markSecretMissingUnable": "§cUnable to mark secret #%d as missing.",
-  "skyblocker.dungeons.secrets.posMessage": "§rRoom Pos: X: %d, Y: %d, Z: %d",
+  "skyblocker.dungeons.secrets.posMessage": "§rRoom: %s, X: %d, Y: %d, Z: %d",
   "skyblocker.dungeons.secrets.unableToFindPos": "§cUnable to find room position! (Are you in a dungeon room, are you facing a block?)",
 
   "skyblocker.fishing.reelNow": "Reel in now!",
-- 
cgit