Merge pull request #381 from AzureAaron/aotv-pearl-secret-waypoints

AOTV & Pearl Secret Waypoints

2 files changed, 113 insertions, 16 deletions

diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
index d5e38345..a0a97c67 100644
--- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
+++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
@@ -263,6 +263,13 @@
       "z":21
     },
     {
+	  "secretName":"1 - Pearl",
+	  "category":"pearl",
+	  "x":25,
+	  "y":75,
+	  "z":27
+	},
+    {
       "secretName":"1 - Item",
       "category":"item",
       "x":27,
@@ -835,6 +842,13 @@
       "z":21
     },
     {
+	  "secretName":"2 - AOTV",
+	  "category":"aotv",
+	  "x":25,
+	  "y":76,
+	  "z":22
+	},
+    {
       "secretName":"2 - Stonk",
       "category":"stonk",
       "x":23,
@@ -1713,13 +1727,6 @@
   ],
   "Redstone-Key-3":[
     {
-      "secretName":"1 - Redstone Skull (right click)",
-      "category":"lever",
-      "x":10,
-      "y":70,
-      "z":26
-    },
-    {
       "secretName":"1 - Superboom",
       "category":"superboom",
       "x":20,
@@ -1727,13 +1734,6 @@
       "z":7
     },
     {
-      "secretName":"1 - Redstone Skull (right click)",
-      "category":"lever",
-      "x":19,
-      "y":66,
-      "z":7
-    },
-    {
       "secretName":"1 - Lever behind Crypt",
       "category":"lever",
       "x":5,
@@ -1748,6 +1748,20 @@
       "z":6
     },
     {
+      "secretName":"2 - Redstone Skull (right click)",
+      "category":"lever",
+      "x":10,
+      "y":70,
+      "z":26
+    },
+    {
+      "secretName":"2 - Redstone Skull (right click)",
+      "category":"lever",
+      "x":19,
+      "y":66,
+      "z":7
+    },
+    {
       "secretName":"2 - Place Skull",
       "category":"lever",
       "x":27,
@@ -2945,9 +2959,9 @@
     {
       "secretName":"6 - Stonk",
       "category":"stonk",
-      "x":17,
+      "x":18,
       "y":70,
-      "z":15
+      "z":14
     },
     {
       "secretName":"6 - Pressure Plate 2",
@@ -3059,6 +3073,13 @@
       "z":5
     },
     {
+	  "secretName":"2 - AOTV",
+	  "category":"aotv",
+	  "x":77,
+	  "y":82,
+	  "z":16
+	},
+    {
       "secretName":"2 - Wither Essence",
       "category":"wither",
       "x":79,
@@ -3110,6 +3131,13 @@
       "z":9
     },
     {
+	  "secretName":"3 - AOTV",
+	  "category":"aotv",
+	  "x":7,
+	  "y":80,
+	  "z":15
+	},
+    {
       "secretName":"3 - Superboom",
       "category":"superboom",
       "x":6,
@@ -3226,6 +3254,13 @@
       "z":24
     },
     {
+	  "secretName":"1/2 - AOTV",
+	  "category":"aotv",
+	  "x":84,
+	  "y":91,
+	  "z":26
+	},
+    {
       "secretName":"1 - Bat",
       "category":"bat",
       "x":81,
@@ -3800,6 +3835,13 @@
       "z":51
     },
     {
+	  "secretName":"5 - AOTV",
+	  "category":"aotv",
+	  "x":16,
+	  "y":81,
+	  "z":53
+	},
+    {
       "secretName":"5 - Chest",
       "category":"chest",
       "x":31,
@@ -4072,6 +4114,13 @@
       "z":30
     },
     {
+	  "secretName":"5 - AOTV",
+	  "category":"aotv",
+	  "x":52,
+	  "y":78,
+	  "z":9
+	},
+    {
       "secretName":"5 - Crypt",
       "category":"superboom",
       "x":52,
@@ -4846,6 +4895,13 @@
       "z":52
     },
     {
+	  "secretName":"2 - AOTV",
+	  "category":"aotv",
+	  "x":45,
+	  "y":78,
+	  "z":47
+	},
+    {
       "secretName":"2 - Chest",
       "category":"chest",
       "x":46,
@@ -4881,6 +4937,13 @@
       "z":41
     },
     {
+	  "secretName":"5 - Pearl",
+	  "category":"pearl",
+	  "x":15,
+	  "y":84,
+	  "z":56
+	},
+    {
       "secretName":"5 - Stonk",
       "category":"stonk",
       "x":18,
@@ -5081,6 +5144,13 @@
       "z":61
     },
     {
+	  "secretName": "7 - AOTV",
+	  "category":"aotv",
+	  "x":39,
+	  "y":84,
+	  "z":58
+	},
+    {
       "secretName":"7 - Chest",
       "category":"chest",
       "x":41,
@@ -5332,6 +5402,13 @@
       "z":43
     },
     {
+	  "secretName":"3/4 - AOTV",
+	  "category":"aotv",
+	  "x":49,
+	  "y":83,
+	  "z":36
+	},
+    {
       "secretName":"3 - Chest",
       "category":"chest",
       "x":49,
@@ -5553,6 +5630,13 @@
       "z":15
     },
     {
+	  "secretName":"5 - Pearl",
+	  "category":"pearl",
+	  "x":8,
+	  "y":59,
+	  "z":14
+	},
+    {
       "secretName":"5 - Entrance",
       "category":"entrance",
       "x":25,
@@ -5835,6 +5919,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 aaa21814..a37e5d37 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -162,6 +162,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",
@@ -266,6 +269,9 @@
   "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: %s, X: %d, Y: %d, Z: %d",
+  "skyblocker.dungeons.secrets.noTarget": "§cNo target block found! (Are you pointing at a block in range?)",
+  "skyblocker.dungeons.secrets.notMatched": "§cThe current room is not matched! (Are you in a dungeon room?)",
 
   "skyblocker.fishing.reelNow": "Reel in now!",
   "skyblocker.rift.healNow": "Heal now!",