Update Dungeon Secrets (#618)

4 files changed, 767 insertions, 12 deletions

diff --git a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json
index f7d50d36..f626623d 100644
--- a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json
+++ b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json
@@ -886,5 +886,66 @@
     "fairysoul": false,
     "dsg": "/channels/727426780381577291/732154637506969650/733875583536201820",
     "sbp": "spider"
+  },
+  "Redstone-Skull-3": {
+    "category": "1x1",
+    "secrets": 3,
+    "fairysoul": false,
+    "sbp": "redstone-skull"
+  },
+  "Sewer-7": {
+    "category": "1x4",
+    "secrets": 7,
+    "fairysoul": false,
+    "sbp": "sewer"
+  },
+  "Altar-6": {
+    "category": "L-shape",
+    "secrets": 6,
+    "fairysoul": false,
+    "sbp": "altar"
+  },
+  "Slime-5": {
+    "category": "1x3",
+    "secrets": 5,
+    "fairysoul": false,
+    "sbp": "slime"
+  },
+  "Crypts-1": {
+    "category": "1x1",
+    "secrets": 1,
+    "fairysoul": false,
+    "sbp": "crypts"
+  },
+  "Draw-Bridge-6": {
+    "category": "1x1",
+    "secrets": 6,
+    "fairysoul": false,
+    "sbp": "draw-bridge"
+  },
+  "Double-Stair-3": {
+    "category": "1x1",
+    "secrets": 3,
+    "fairysoul": false,
+    "sbp": "double-stair"
+  },
+  "Lava-Skulls-3": {
+    "category": "1x1",
+    "secrets": 3,
+    "fairysoul": false,
+    "sbp": "lava-skulls"
+  },
+  "Four-Banner-1": {
+    "category": "1x1",
+    "secrets": 1,
+    "fairysoul": false,
+    "sbp": "four-banner"
+  },
+  "Zodd-1": {
+    "category": "1x1",
+    "secrets": 1,
+    "fairysoul": false,
+    "dsg": "null",
+    "sbp": null
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton
index a0be54e0..b2193e71 100644
--- a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton
+++ b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton
diff --git a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeleton b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeleton
new file mode 100644
index 00000000..099d5547
--- /dev/null
+++ b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeleton
diff --git a/src/test/resources/assets/skyblocker/dungeons/secretlocations.json b/src/test/resources/assets/skyblocker/dungeons/secretlocations.json
index 031e1d03..3815e759 100644
--- a/src/test/resources/assets/skyblocker/dungeons/secretlocations.json
+++ b/src/test/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,
@@ -1419,6 +1433,13 @@
       "z":9
     },
     {
+      "secretName":"3 - Stonk",
+      "category":"stonk",
+      "x":2,
+      "y":77,
+      "z":15
+    },
+    {
       "secretName":"3 - Superboom (not the chest in front)",
       "category":"superboom",
       "x":11,
@@ -1706,11 +1727,11 @@
   ],
   "Redstone-Key-3":[
     {
-      "secretName":"1 - Redstone Skull (right click)",
-      "category":"lever",
-      "x":10,
-      "y":70,
-      "z":26
+      "secretName":"1 - Superboom",
+      "category":"superboom",
+      "x":20,
+      "y":68,
+      "z":7
     },
     {
       "secretName":"1 - Lever behind Crypt",
@@ -1727,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,
@@ -2138,7 +2173,7 @@
     },
     {
       "secretName":"3 - Lever 2",
-      "category":"Lever",
+      "category":"lever",
       "x":31,
       "y":53,
       "z":24
@@ -2340,7 +2375,7 @@
     },
     {
       "secretName":"2 - Item",
-      "category":"Item",
+      "category":"item",
       "x":27,
       "y":56,
       "z":19
@@ -2924,9 +2959,9 @@
     {
       "secretName":"6 - Stonk",
       "category":"stonk",
-      "x":17,
+      "x":18,
       "y":70,
-      "z":15
+      "z":14
     },
     {
       "secretName":"6 - Pressure Plate 2",
@@ -3038,6 +3073,13 @@
       "z":5
     },
     {
+      "secretName":"2 - AOTV",
+      "category":"aotv",
+      "x":77,
+      "y":82,
+      "z":16
+    },
+    {
       "secretName":"2 - Wither Essence",
       "category":"wither",
       "x":79,
@@ -3089,6 +3131,13 @@
       "z":9
     },
     {
+      "secretName":"3 - AOTV",
+      "category":"aotv",
+      "x":7,
+      "y":80,
+      "z":15
+    },
+    {
       "secretName":"3 - Superboom",
       "category":"superboom",
       "x":6,
@@ -3205,6 +3254,13 @@
       "z":24
     },
     {
+      "secretName":"1/2 - AOTV",
+      "category":"aotv",
+      "x":84,
+      "y":91,
+      "z":26
+    },
+    {
       "secretName":"1 - Bat",
       "category":"bat",
       "x":81,
@@ -3779,6 +3835,13 @@
       "z":51
     },
     {
+      "secretName":"5 - AOTV",
+      "category":"aotv",
+      "x":16,
+      "y":81,
+      "z":53
+    },
+    {
       "secretName":"5 - Chest",
       "category":"chest",
       "x":31,
@@ -3873,7 +3936,7 @@
     },
     {
       "secretName":"4/5/6 - Entrance 3",
-      "category":"",
+      "category":"entrance",
       "x":31,
       "y":142,
       "z":39
@@ -4051,6 +4114,13 @@
       "z":30
     },
     {
+      "secretName":"5 - AOTV",
+      "category":"aotv",
+      "x":52,
+      "y":78,
+      "z":9
+    },
+    {
       "secretName":"5 - Crypt",
       "category":"superboom",
       "x":52,
@@ -4660,7 +4730,7 @@
       "z":15
     },
     {
-      "secretName":"2 - Stonk",
+      "secretName":"1 - Stonk",
       "category":"stonk",
       "x":26,
       "y":112,
@@ -4825,6 +4895,13 @@
       "z":52
     },
     {
+      "secretName":"2 - AOTV",
+      "category":"aotv",
+      "x":45,
+      "y":78,
+      "z":47
+    },
+    {
       "secretName":"2 - Chest",
       "category":"chest",
       "x":46,
@@ -4860,6 +4937,13 @@
       "z":41
     },
     {
+      "secretName":"5 - Pearl",
+      "category":"pearl",
+      "x":15,
+      "y":84,
+      "z":56
+    },
+    {
       "secretName":"5 - Stonk",
       "category":"stonk",
       "x":18,
@@ -5060,6 +5144,13 @@
       "z":61
     },
     {
+      "secretName": "7 - AOTV",
+      "category":"aotv",
+      "x":39,
+      "y":84,
+      "z":58
+    },
+    {
       "secretName":"7 - Chest",
       "category":"chest",
       "x":41,
@@ -5311,6 +5402,13 @@
       "z":43
     },
     {
+      "secretName":"3/4 - AOTV",
+      "category":"aotv",
+      "x":49,
+      "y":83,
+      "z":36
+    },
+    {
       "secretName":"3 - Chest",
       "category":"chest",
       "x":49,
@@ -5387,5 +5485,601 @@
       "y":91,
       "z":39
     }
+  ],
+  "Redstone-Skull-3":[
+    {
+      "secretName":"1 - Superboom",
+      "category":"superboom",
+      "x":22,
+      "y":70,
+      "z":24
+    },
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":21,
+      "y":69,
+      "z":27
+    },
+    {
+      "secretName":"2/3 - Superboom",
+      "category":"superboom",
+      "x":24,
+      "y":70,
+      "z":26
+    },
+    {
+      "secretName":"2/3 - Redstone Skull (right click)",
+      "category":"lever",
+      "x":26,
+      "y":71,
+      "z":26
+    },
+    {
+      "secretName":"2/3 - Place Skull",
+      "category":"lever",
+      "x":4,
+      "y":73,
+      "z":24
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":18,
+      "y":70,
+      "z":15
+    },
+    {
+      "secretName":"3 - Lever",
+      "category":"lever",
+      "x":15,
+      "y":68,
+      "z":15
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":5,
+      "y":70,
+      "z":15
+    },
+    {
+      "secretName":"3 - Chest",
+      "category":"chest",
+      "x":1,
+      "y":70,
+      "z":15
+    }
+  ],
+  "Sewer-7":[
+    {
+      "secretName":"1 - Superboom",
+      "category":"superboom",
+      "x":120,
+      "y":48,
+      "z":14
+    },
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":119,
+      "y":42,
+      "z":27
+    },
+    {
+      "secretName":"2 - Under Crypt",
+      "category":"superboom",
+      "x":93,
+      "y":43,
+      "z":24
+    },
+    {
+      "secretName":"2 - Item",
+      "category":"item",
+      "x":77,
+      "y":32,
+      "z":24
+    },
+    {
+      "secretName":"3 - Stonk",
+      "category":"stonk",
+      "x":63,
+      "y":55,
+      "z":7
+    },
+    {
+      "secretName":"3 - Lever",
+      "category":"lever",
+      "x":74,
+      "y":94,
+      "z":15
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":63,
+      "y":54,
+      "z":7
+    },
+    {
+      "secretName":"3 - Chest",
+      "category":"chest",
+      "x":63,
+      "y":55,
+      "z":4
+    },
+    {
+      "secretName":"4 - Stonk",
+      "category":"stonk",
+      "x":20,
+      "y":46,
+      "z":15
+    },
+    {
+      "secretName":"4 - Entrance",
+      "category":"entrance",
+      "x":8,
+      "y":45,
+      "z":24
+    },
+    {
+      "secretName":"4 - Chest",
+      "category":"chest",
+      "x":19,
+      "y":45,
+      "z":15
+    },
+    {
+      "secretName":"5 - Pearl",
+      "category":"pearl",
+      "x":8,
+      "y":59,
+      "z":14
+    },
+    {
+      "secretName":"5 - Entrance",
+      "category":"entrance",
+      "x":25,
+      "y":62,
+      "z":25
+    },
+    {
+      "secretName":"5 - Chest",
+      "category":"chest",
+      "x":9,
+      "y":62,
+      "z":4
+    },
+    {
+      "secretName":"6 - Superboom",
+      "category":"superboom",
+      "x":16,
+      "y":55,
+      "z":25
+    },
+    {
+      "secretName":"6 - Chest",
+      "category":"chest",
+      "x":7,
+      "y":54,
+      "z":25
+    },
+    {
+      "secretName":"7 - Superboom",
+      "category":"superboom",
+      "x":7,
+      "y":56,
+      "z":22
+    },
+    {
+      "secretName":"7 - Bat",
+      "category":"bat",
+      "x":4,
+      "y":57,
+      "z":11
+    }
+  ],
+  "Altar-6":[
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":19,
+      "y":83,
+      "z":43
+    },
+    {
+      "secretName":"2 - Item",
+      "category":"item",
+      "x":14,
+      "y":71,
+      "z":48
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":25,
+      "y":87,
+      "z":22
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":51,
+      "y":80,
+      "z":45
+    },
+    {
+      "secretName":"3 - Chest",
+      "category":"chest",
+      "x":51,
+      "y":88,
+      "z":45
+    },
+    {
+      "secretName":"4 - Entrance",
+      "category":"entrance",
+      "x":25,
+      "y":94,
+      "z":19
+    },
+    {
+      "secretName":"4 - Wither Essence",
+      "category":"wither",
+      "x":17,
+      "y":93,
+      "z":27
+    },
+    {
+      "secretName":"5 - Entrance",
+      "category":"entrance",
+      "x":30,
+      "y":58,
+      "z":38
+    },
+    {
+      "secretName":"5 - Bat",
+      "category":"bat",
+      "x":36,
+      "y":55,
+      "z":35
+    },
+    {
+      "secretName":"6 - Chest",
+      "category":"chest",
+      "x":11,
+      "y":44,
+      "z":39
+    }
+  ],
+  "Slime-5":[
+    {
+      "secretName":"1/2 - Superboom",
+      "category":"superboom",
+      "x":88,
+      "y":71,
+      "z":22
+    },
+    {
+      "secretName":"1 - Wither Essence",
+      "category":"wither",
+      "x":74,
+      "y":86,
+      "z":15
+    },
+    {
+      "secretName":"2 - Item",
+      "category":"item",
+      "x":91,
+      "y":86,
+      "z":20
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":71,
+      "y":53,
+      "z":18
+    },
+    {
+      "secretName":"3 - Bat",
+      "category":"bat",
+      "x":80,
+      "y":52,
+      "z":16
+    },
+    {
+      "secretName":"4 - Chest",
+      "category":"chest",
+      "x":65,
+      "y":87,
+      "z":16
+    },
+    {
+      "secretName":"5 - Entrance",
+      "category":"entrance",
+      "x":12,
+      "y":70,
+      "z":15
+    },
+    {
+      "secretName":"5 - Entrance",
+      "category":"entrance",
+      "x":20,
+      "y":59,
+      "z":12
+    },
+    {
+      "secretName":"5 - Item",
+      "category":"item",
+      "x":4,
+      "y":57,
+      "z":15
+    }
+  ],
+  "Crypts-1":[
+    {
+      "secretName":"1 - Lever behind Crypt",
+      "category":"lever",
+      "x":29,
+      "y":75,
+      "z":15
+    },
+    {
+      "secretName":"1 - Entrance",
+      "category":"entrance",
+      "x":17,
+      "y":67,
+      "z":15
+    },
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":6,
+      "y":66,
+      "z":15
+    }
+  ],
+  "Draw-Bridge-6":[
+    {
+      "secretName":"1 - Item",
+      "category":"item",
+      "x":4,
+      "y":60,
+      "z":58
+    },
+    {
+      "secretName":"2/3 - Superboom",
+      "category":"superboom",
+      "x":16,
+      "y":61,
+      "z":41
+    },
+    {
+      "secretName":"2 - Chest",
+      "category":"chest",
+      "x":15,
+      "y":60,
+      "z":46
+    },
+    {
+      "secretName":"3 - Bat",
+      "category":"bat",
+      "x":15,
+      "y":62,
+      "z":45
+    },
+    {
+      "secretName":"4 - Entrance",
+      "category":"entrance",
+      "x":5,
+      "y":61,
+      "z":20
+    },
+    {
+      "secretName":"4 - Wither Essence",
+      "category":"wither",
+      "x":19,
+      "y":60,
+      "z":4
+    },
+    {
+      "secretName":"5 - Lever",
+      "category":"lever",
+      "x":15,
+      "y":82,
+      "z":19
+    },
+    {
+      "secretName":"5 - Entrance",
+      "category":"entrance",
+      "x":16,
+      "y":83,
+      "z":56
+    },
+    {
+      "secretName":"5 - Chest",
+      "category":"chest",
+      "x":17,
+      "y":83,
+      "z":60
+    },
+    {
+      "secretName":"6 - Entrance",
+      "category":"entrance",
+      "x":41,
+      "y":60,
+      "z":55
+    },
+    {
+      "secretName":"6 - Chest",
+      "category":"chest",
+      "x":46,
+      "y":84,
+      "z":57
+    }
+  ],
+  "Double-Stair-3":[
+    {
+      "secretName":"1 - Pearl",
+      "category":"pearl",
+      "x":24,
+      "y":72,
+      "z":11
+    },
+    {
+      "secretName":"1 - Wither Essence",
+      "category":"wither",
+      "x":22,
+      "y":75,
+      "z":2
+    },
+    {
+      "secretName":"2 - Item",
+      "category":"item",
+      "x":11,
+      "y":78,
+      "z":27
+    },
+    {
+      "secretName":"3 - Superboom",
+      "category":"superboom",
+      "x":24,
+      "y":66,
+      "z":6
+    },
+    {
+      "secretName":"3 - Chest",
+      "category":"chest",
+      "x":28,
+      "y":66,
+      "z":3
+    }
+  ],
+  "Lava-Skulls-3":[
+    {
+      "secretName":"1 - Entrance",
+      "category":"entrance",
+      "x":5,
+      "y":71,
+      "z":26
+    },
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":3,
+      "y":69,
+      "z":28
+    },
+    {
+      "secretName":"2/3 - Entrance",
+      "category":"entrance",
+      "x":23,
+      "y":73,
+      "z":15
+    },
+    {
+      "secretName":"2/3 - Entrance",
+      "category":"entrance",
+      "x":7,
+      "y":73,
+      "z":15
+    },
+    {
+      "secretName":"2 - Chest",
+      "category":"chest",
+      "x":15,
+      "y":80,
+      "z":27
+    },
+    {
+      "secretName":"3 - Bat",
+      "category":"bat",
+      "x":13,
+      "y":89,
+      "z":4
+    }
+  ],
+  "Four-Banner-1":[
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":15,
+      "y":85,
+      "z":15
+    }
+  ],
+  "Trinity-4":[
+    {
+      "secretName":"1 - Entrance",
+      "category":"entrance",
+      "x":19,
+      "y":76,
+      "z":29
+    },
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":14,
+      "y":75,
+      "z":27
+    },
+    {
+      "secretName":"2/3/4 - Entrance",
+      "category":"entrance",
+      "x":10,
+      "y":77,
+      "z":22
+    },
+    {
+      "secretName":"2 - Item",
+      "category":"item",
+      "x":7,
+      "y":74,
+      "z":27
+    },
+    {
+      "secretName":"3 - Entrance",
+      "category":"entrance",
+      "x":11,
+      "y":86,
+      "z":22
+    },
+    {
+      "secretName":"3 - Bat",
+      "category":"bat",
+      "x":8,
+      "y":87,
+      "z":18
+    },
+    {
+      "secretName":"4 - Entrance",
+      "category":"entrance",
+      "x":7,
+      "y":92,
+      "z":16
+    },
+    {
+      "secretName":"4 - Superboom",
+      "category":"superboom",
+      "x":17,
+      "y":91,
+      "z":24
+    },
+    {
+      "secretName":"4 - Bat",
+      "category":"bat",
+      "x":2,
+      "y":94,
+      "z":26
+    }
+  ],
+  "Zodd-1": [
+    {
+      "secretName":"1 - Chest",
+      "category":"chest",
+      "x":7,
+      "y":70,
+      "z":3
+    }
   ]
 }