Skip to content

Commit 4af89a1

Browse files
authored
Merge pull request #8 from mstop4/data-update
Data update
2 parents 8000d9e + ca5f50d commit 4af89a1

File tree

5 files changed

+217
-32
lines changed

5 files changed

+217
-32
lines changed

src/components/objects/mapObjects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ export function createDoor(doorData: DoorData, id: number) {
315315
if (import.meta.env.DEV && featureConfig.debugForceLabels) {
316316
const labelDiv = document.createElement('div');
317317
labelDiv.className = 'portalLabel';
318-
labelDiv.textContent = `Door${id}`;
318+
labelDiv.textContent = `Door${id + 1}`;
319319

320320
debugDoorLabel = new CSS2DObject(labelDiv);
321321
debugDoorLabel.center.set(0.5, 1.5);

src/data/doors.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,9 +717,9 @@
717717
{
718718
"quantity": 2,
719719
"type": "conn",
720-
"orientation": "z",
720+
"orientation": "x",
721721
"deprecated": false,
722-
"location": [-90.5, 86, -331]
722+
"location": [-95, 38, -332.5]
723723
},
724724
{
725725
"quantity": 2,
@@ -734,5 +734,19 @@
734734
"orientation": "x",
735735
"deprecated": false,
736736
"location": [-138, 70, 493.5]
737+
},
738+
{
739+
"quantity": 1,
740+
"type": "conn",
741+
"orientation": "z",
742+
"deprecated": false,
743+
"location": [-91, 38, -338]
744+
},
745+
{
746+
"quantity": 2,
747+
"type": "conn",
748+
"orientation": "z",
749+
"deprecated": false,
750+
"location": [-41.5, 71, -321]
737751
}
738752
]

src/data/paths.json

Lines changed: 178 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3560,28 +3560,6 @@
35603560
[-74, 93, -279.5]
35613561
]
35623562
},
3563-
{
3564-
"type": "ugTunnel",
3565-
"visible": true,
3566-
"deprecated": false,
3567-
"points": [
3568-
[-106.5, 88, -325.5],
3569-
[-99, 88, -325.5],
3570-
[-97, 86, -325.5],
3571-
[-94, 86, -325.5]
3572-
]
3573-
},
3574-
{
3575-
"type": "exPath",
3576-
"visible": true,
3577-
"deprecated": false,
3578-
"points": [
3579-
[-90.5, 86, -331],
3580-
[-90, 86, -337],
3581-
[-101, 84, -340],
3582-
[-106.5, 85, -341]
3583-
]
3584-
},
35853563
{
35863564
"type": "nCave",
35873565
"visible": true,
@@ -3814,7 +3792,184 @@
38143792
"deprecated": false,
38153793
"points": [
38163794
[-146, 43, 493.5],
3817-
[-143.5, 44, 493.5]
3795+
[-143.5, 44, 493.5],
3796+
[-143.5, 44, 491],
3797+
[-142, 44, 491]
3798+
]
3799+
},
3800+
{
3801+
"type": "ladder",
3802+
"visible": true,
3803+
"deprecated": false,
3804+
"points": [
3805+
[-142, 44, 491],
3806+
[-142, 38, 491]
3807+
]
3808+
},
3809+
{
3810+
"type": "ogTunnel",
3811+
"visible": true,
3812+
"deprecated": false,
3813+
"points": [
3814+
[-142, 38, 491],
3815+
[-142, 38, 477],
3816+
[-156, 38, 478],
3817+
[-157, 38, 478],
3818+
[-157, 35, 485]
3819+
]
3820+
},
3821+
{
3822+
"type": "oBridge",
3823+
"visible": true,
3824+
"deprecated": false,
3825+
"points": [
3826+
[-157, 35, 485],
3827+
[-157, 35, 492],
3828+
[-157, 36, 494]
3829+
]
3830+
},
3831+
{
3832+
"type": "nCave",
3833+
"visible": true,
3834+
"deprecated": false,
3835+
"points": [
3836+
[-103, 39, -332.5],
3837+
[-100, 39, -332.5],
3838+
[-99, 38, -332.5],
3839+
[-95, 38, -332.5]
3840+
]
3841+
},
3842+
{
3843+
"type": "ugTunnel",
3844+
"visible": true,
3845+
"deprecated": false,
3846+
"points": [
3847+
[-103.5, 39, -314.5],
3848+
[-105, 39, -314.5],
3849+
[-109, 43, -314.5],
3850+
[-110.5, 43, -314.5],
3851+
[-110.5, 43, -311.5],
3852+
[-101, 43, -311.5],
3853+
[-98, 46, -311.5],
3854+
[-97.5, 46, -311.5],
3855+
[-97.5, 46, -314.5],
3856+
[-99, 46, -314.5],
3857+
[-109, 56, -314.5],
3858+
[-109.5, 56, -314.5],
3859+
[-109.5, 56, -311.5],
3860+
[-108, 56, -311.5],
3861+
[-98, 66, -311.5],
3862+
[-97.5, 66, -311.5],
3863+
[-97.5, 66, -314.5],
3864+
[-99, 66, -314.5],
3865+
[-109, 76, -314.5],
3866+
[-110.5, 76, -314.5],
3867+
[-110.5, 76, -311.5],
3868+
[-109, 76, -311.5],
3869+
[-97, 88, -311.5],
3870+
[-96.5, 88, -311.5],
3871+
[-96.5, 88, -308.5]
3872+
]
3873+
},
3874+
{
3875+
"type": "ugTunnel",
3876+
"visible": true,
3877+
"deprecated": true,
3878+
"points": [
3879+
[-103.5, 39, -314.5],
3880+
[-89, 39, -314.5],
3881+
[-88, 38, -314.5],
3882+
[-77, 38, -314.5]
3883+
]
3884+
},
3885+
{
3886+
"type": "nCave",
3887+
"visible": true,
3888+
"deprecated": true,
3889+
"points": [
3890+
[-77, 38, -314.5],
3891+
[-71, 38, -314.5],
3892+
[-70, 39, -314.5],
3893+
[-68, 39, -314.5],
3894+
[-66, 41, -314.5],
3895+
[-64, 41, -314.5],
3896+
[-63, 42, -314.5],
3897+
[-62, 42, -314.5],
3898+
[-60, 44, -314.5],
3899+
[-59, 44, -314.5],
3900+
[-58, 45, -314.5],
3901+
[-56.5, 45, -314.5],
3902+
[-56.5, 45, -316],
3903+
[-56.5, 47, -318],
3904+
[-51, 47, -326],
3905+
[-28, 47, -326]
3906+
]
3907+
},
3908+
{
3909+
"type": "exPath",
3910+
"visible": true,
3911+
"deprecated": false,
3912+
"points": [
3913+
[-106.5, 85, -340],
3914+
[-101, 84, -340],
3915+
[-94, 86, -339],
3916+
[-90, 86, -337],
3917+
[-86, 86, -336],
3918+
[-86, 86, -336],
3919+
[-76, 86, -336],
3920+
[-65, 84, -335],
3921+
[-61, 82, -335],
3922+
[-55, 80, -335],
3923+
[-50, 77, -334],
3924+
[-49, 73, -327],
3925+
[-48, 70, -319],
3926+
[-47, 68, -313.5]
3927+
]
3928+
},
3929+
{
3930+
"type": "exPath",
3931+
"visible": true,
3932+
"deprecated": false,
3933+
"points": [
3934+
[-41.5, 71, -321],
3935+
[-41.5, 68, -318],
3936+
[-42, 67, -313.5],
3937+
[-51, 68, -313.5],
3938+
[-52, 69, -313.5],
3939+
[-59, 69, -313.5],
3940+
[-61, 71, -313.5]
3941+
]
3942+
},
3943+
{
3944+
"type": "ugTunnel",
3945+
"visible": true,
3946+
"deprecated": false,
3947+
"points": [
3948+
[-61, 71, -313.5],
3949+
[-78, 71, -313.5],
3950+
[-85, 77, -313.5]
3951+
]
3952+
},
3953+
{
3954+
"type": "nCave",
3955+
"visible": true,
3956+
"deprecated": false,
3957+
"points": [
3958+
[-85, 77, -313.5],
3959+
[-86.5, 77, -313.5],
3960+
[-86.5, 77, -315],
3961+
[-86.5, 78, -316],
3962+
[-91, 78, -319],
3963+
[-94, 76, -324],
3964+
[-96, 76, -327],
3965+
[-101.5, 76, -327],
3966+
[-101.5, 76, -316],
3967+
[-101.5, 77, -315],
3968+
[-102.5, 77, -311],
3969+
[-102.5, 76, -310],
3970+
[-102.5, 76, -308.5],
3971+
[-110.5, 76, -308.5],
3972+
[-110.5, 76, -311.5]
38183973
]
38193974
}
38203975
]

src/data/portals.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
{
123123
"label": "Scenic Village",
124124
"location": [346, 88, 222.5],
125-
"hasEnderChest": false,
125+
"hasEnderChest": true,
126126
"hasCherryTree": false
127127
},
128128
{
@@ -300,9 +300,15 @@
300300
"hasCherryTree": false
301301
},
302302
{
303-
"label": "Chill Flora Deep Dark",
304-
"location": [-90.5, 86, -327],
303+
"label": "Lava Donut Cave",
304+
"location": [-91, 38, -332.5],
305305
"hasEnderChest": false,
306306
"hasCherryTree": false
307+
},
308+
{
309+
"label": "Striped Jungle",
310+
"location": [-41.5, 71, -325],
311+
"hasEnderChest": true,
312+
"hasCherryTree": false
307313
}
308314
]

src/data/rooms.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,13 +469,23 @@
469469
]
470470
},
471471
{
472-
"label": "Chill Flora Deep Dark Portal Room",
472+
"label": "Lava Donut Cave Portal Room",
473473
"displayLabel": false,
474474
"type": "ogRoom",
475475
"shape": "cuboid",
476476
"corners": [
477-
[-94, 90, -330],
478-
[-87, 86, -324]
477+
[-94, 41, -337],
478+
[-88, 38, -328]
479+
]
480+
},
481+
{
482+
"label": "Striped Jungle Portal Room",
483+
"displayLabel": false,
484+
"type": "ogRoom",
485+
"shape": "cuboid",
486+
"corners": [
487+
[-45, 75, -325],
488+
[-38, 71, -322]
479489
]
480490
}
481491
]

0 commit comments

Comments
 (0)