Merge pull request #8 from mstop4/data-update

Data update
mstop4 · Feb 8, 2024 · 4af89a1 · 4af89a1
2 parents 8000d9e + ca5f50d
commit 4af89a1
Show file tree

Hide file tree

Showing 5 changed files with 217 additions and 32 deletions.
diff --git a/src/components/objects/mapObjects.ts b/src/components/objects/mapObjects.ts
@@ -315,7 +315,7 @@ export function createDoor(doorData: DoorData, id: number) {
   if (import.meta.env.DEV && featureConfig.debugForceLabels) {
     const labelDiv = document.createElement('div');
     labelDiv.className = 'portalLabel';
-    labelDiv.textContent = `Door${id}`;
+    labelDiv.textContent = `Door${id + 1}`;
 
     debugDoorLabel = new CSS2DObject(labelDiv);
     debugDoorLabel.center.set(0.5, 1.5);

diff --git a/src/data/doors.json b/src/data/doors.json
@@ -717,9 +717,9 @@
   {
     "quantity": 2,
     "type": "conn",
-    "orientation": "z",
+    "orientation": "x",
     "deprecated": false,
-    "location": [-90.5, 86, -331]
+    "location": [-95, 38, -332.5]
   },
   {
     "quantity": 2,
@@ -734,5 +734,19 @@
     "orientation": "x",
     "deprecated": false,
     "location": [-138, 70, 493.5]
+  },
+  {
+    "quantity": 1,
+    "type": "conn",
+    "orientation": "z",
+    "deprecated": false,
+    "location": [-91, 38, -338]
+  },
+  {
+    "quantity": 2,
+    "type": "conn",
+    "orientation": "z",
+    "deprecated": false,
+    "location": [-41.5, 71, -321]
   }
 ]
diff --git a/src/data/paths.json b/src/data/paths.json
@@ -3560,28 +3560,6 @@
       [-74, 93, -279.5]
     ]
   },
-  {
-    "type": "ugTunnel",
-    "visible": true,
-    "deprecated": false,
-    "points": [
-      [-106.5, 88, -325.5],
-      [-99, 88, -325.5],
-      [-97, 86, -325.5],
-      [-94, 86, -325.5]
-    ]
-  },
-  {
-    "type": "exPath",
-    "visible": true,
-    "deprecated": false,
-    "points": [
-      [-90.5, 86, -331],
-      [-90, 86, -337],
-      [-101, 84, -340],
-      [-106.5, 85, -341]
-    ]
-  },
   {
     "type": "nCave",
     "visible": true,
@@ -3814,7 +3792,184 @@
     "deprecated": false,
     "points": [
       [-146, 43, 493.5],
-      [-143.5, 44, 493.5]
+      [-143.5, 44, 493.5],
+      [-143.5, 44, 491],
+      [-142, 44, 491]
+    ]
+  },
+  {
+    "type": "ladder",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-142, 44, 491],
+      [-142, 38, 491]
+    ]
+  },
+  {
+    "type": "ogTunnel",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-142, 38, 491],
+      [-142, 38, 477],
+      [-156, 38, 478],
+      [-157, 38, 478],
+      [-157, 35, 485]
+    ]
+  },
+  {
+    "type": "oBridge",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-157, 35, 485],
+      [-157, 35, 492],
+      [-157, 36, 494]
+    ]
+  },
+  {
+    "type": "nCave",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-103, 39, -332.5],
+      [-100, 39, -332.5],
+      [-99, 38, -332.5],
+      [-95, 38, -332.5]
+    ]
+  },
+  {
+    "type": "ugTunnel",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-103.5, 39, -314.5],
+      [-105, 39, -314.5],
+      [-109, 43, -314.5],
+      [-110.5, 43, -314.5],
+      [-110.5, 43, -311.5],
+      [-101, 43, -311.5],
+      [-98, 46, -311.5],
+      [-97.5, 46, -311.5],
+      [-97.5, 46, -314.5],
+      [-99, 46, -314.5],
+      [-109, 56, -314.5],
+      [-109.5, 56, -314.5],
+      [-109.5, 56, -311.5],
+      [-108, 56, -311.5],
+      [-98, 66, -311.5],
+      [-97.5, 66, -311.5],
+      [-97.5, 66, -314.5],
+      [-99, 66, -314.5],
+      [-109, 76, -314.5],
+      [-110.5, 76, -314.5],
+      [-110.5, 76, -311.5],
+      [-109, 76, -311.5],
+      [-97, 88, -311.5],
+      [-96.5, 88, -311.5],
+      [-96.5, 88, -308.5]
+    ]
+  },
+  {
+    "type": "ugTunnel",
+    "visible": true,
+    "deprecated": true,
+    "points": [
+      [-103.5, 39, -314.5],
+      [-89, 39, -314.5],
+      [-88, 38, -314.5],
+      [-77, 38, -314.5]
+    ]
+  },
+  {
+    "type": "nCave",
+    "visible": true,
+    "deprecated": true,
+    "points": [
+      [-77, 38, -314.5],
+      [-71, 38, -314.5],
+      [-70, 39, -314.5],
+      [-68, 39, -314.5],
+      [-66, 41, -314.5],
+      [-64, 41, -314.5],
+      [-63, 42, -314.5],
+      [-62, 42, -314.5],
+      [-60, 44, -314.5],
+      [-59, 44, -314.5],
+      [-58, 45, -314.5],
+      [-56.5, 45, -314.5],
+      [-56.5, 45, -316],
+      [-56.5, 47, -318],
+      [-51, 47, -326],
+      [-28, 47, -326]
+    ]
+  },
+  {
+    "type": "exPath",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-106.5, 85, -340],
+      [-101, 84, -340],
+      [-94, 86, -339],
+      [-90, 86, -337],
+      [-86, 86, -336],
+      [-86, 86, -336],
+      [-76, 86, -336],
+      [-65, 84, -335],
+      [-61, 82, -335],
+      [-55, 80, -335],
+      [-50, 77, -334],
+      [-49, 73, -327],
+      [-48, 70, -319],
+      [-47, 68, -313.5]
+    ]
+  },
+  {
+    "type": "exPath",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-41.5, 71, -321],
+      [-41.5, 68, -318],
+      [-42, 67, -313.5],
+      [-51, 68, -313.5],
+      [-52, 69, -313.5],
+      [-59, 69, -313.5],
+      [-61, 71, -313.5]
+    ]
+  },
+  {
+    "type": "ugTunnel",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-61, 71, -313.5],
+      [-78, 71, -313.5],
+      [-85, 77, -313.5]
+    ]
+  },
+  {
+    "type": "nCave",
+    "visible": true,
+    "deprecated": false,
+    "points": [
+      [-85, 77, -313.5],
+      [-86.5, 77, -313.5],
+      [-86.5, 77, -315],
+      [-86.5, 78, -316],
+      [-91, 78, -319],
+      [-94, 76, -324],
+      [-96, 76, -327],
+      [-101.5, 76, -327],
+      [-101.5, 76, -316],
+      [-101.5, 77, -315],
+      [-102.5, 77, -311],
+      [-102.5, 76, -310],
+      [-102.5, 76, -308.5],
+      [-110.5, 76, -308.5],
+      [-110.5, 76, -311.5]
     ]
   }
 ]
diff --git a/src/data/portals.json b/src/data/portals.json
@@ -122,7 +122,7 @@
   {
     "label": "Scenic Village",
     "location": [346, 88, 222.5],
-    "hasEnderChest": false,
+    "hasEnderChest": true,
     "hasCherryTree": false
   },
   {
@@ -300,9 +300,15 @@
     "hasCherryTree": false
   },
   {
-    "label": "Chill Flora Deep Dark",
-    "location": [-90.5, 86, -327],
+    "label": "Lava Donut Cave",
+    "location": [-91, 38, -332.5],
     "hasEnderChest": false,
     "hasCherryTree": false
+  },
+  {
+    "label": "Striped Jungle",
+    "location": [-41.5, 71, -325],
+    "hasEnderChest": true,
+    "hasCherryTree": false
   }
 ]
diff --git a/src/data/rooms.json b/src/data/rooms.json
@@ -469,13 +469,23 @@
     ]
   },
   {
-    "label": "Chill Flora Deep Dark Portal Room",
+    "label": "Lava Donut Cave Portal Room",
     "displayLabel": false,
     "type": "ogRoom",
     "shape": "cuboid",
     "corners": [
-      [-94, 90, -330],
-      [-87, 86, -324]
+      [-94, 41, -337],
+      [-88, 38, -328]
+    ]
+  },
+  {
+    "label": "Striped Jungle Portal Room",
+    "displayLabel": false,
+    "type": "ogRoom",
+    "shape": "cuboid",
+    "corners": [
+      [-45, 75, -325],
+      [-38, 71, -322]
     ]
   }
 ]