Skip to content

Commit 05905af

Browse files
committed
Extra bugfixes from watcher map and bump version
1 parent 1921b02 commit 05905af

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

assets/map-frontend/map.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@
467467
html += `
468468
<label>
469469
<div class="region-btn">
470-
<input type="radio" class="rw-ui" name="regions" onclick="selectRegion(this.value);" value="${r}"${r == region ? ' checked' : ''} autocomplete = "off">
470+
<input type="radio" class="rw-ui" name="regions" onclick="selectRegion(this.value);" value="${r}"${r == params.get("region") ? ' checked' : ''} autocomplete = "off">
471471
<span>${regions[r]["name"].toUpperCase()} (${r})</span>
472472
</div>
473473
</label>`
@@ -945,8 +945,12 @@
945945
else if (region.toLowerCase() == "wara") icon = "waua";
946946
if (warpData.destRegion != null) icon = warpData.destRegion.toLowerCase();
947947

948+
let regionName = regions[icon.toUpperCase()];
949+
if (regionName != undefined) regionName = regionName["name"];
950+
else regionName = "Random warp";
951+
948952
taghtml += "<div class=\"warppoint-filter\">";
949-
taghtml += `<img class="warppoint-image" src="./resources/warp/${icon}.png"/>`;
953+
taghtml += `<img class="warppoint-image" src="./resources/warp/${icon}.png" title="${regionName}"/>`;
950954
taghtml += "</div>";
951955

952956
return L.marker(latlng, {
@@ -964,7 +968,7 @@
964968
click: function (e) {
965969
if (warpData.destRegion != null) {
966970
region = warpData.destRegion.toUpperCase();
967-
room = warpData.destRoom;
971+
room = warpData.destRoom?.toUpperCase();
968972
pushState();
969973
} else if (region.toLowerCase() == "wara") {
970974
region = "WAUA";
@@ -1075,8 +1079,8 @@
10751079

10761080
// Don't enable certain layers when loaded for the first time
10771081
if (loadedCount == 1) {
1078-
map.removeLayer(placedObjectsLayer);
10791082
map.removeLayer(roomTagsLayer);
1083+
setCollapsibleWidths();
10801084
}
10811085
loadedCount++;
10821086
}, true);
@@ -1517,7 +1521,6 @@
15171521
var uncollapsed = null;
15181522
var collapsible = document.querySelectorAll(".collapsible");
15191523
for (const el of collapsible) {
1520-
el.style.setProperty("--hide-pos", "-" + (el.getBoundingClientRect().width) + "px");
15211524
var button = el.querySelector(".collapse-tab");
15221525
button.addEventListener("click", (e) => {
15231526
if (uncollapsed != null) {

assets/map-frontend/placedobjectsdata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"deadvulturegrub": {"use": "vulturegrub"},
1212
"albinohazer": {"use": "hazer"},
1313
"deadalbinohazer": {"use": "hazer"},
14+
"sandgrubnetwork": {"displayif": "(false)"},
1415
"bluetoken": {
1516
"text": [
1617
"(setting 5)"

assets/modinfo.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"id": "mapexporter",
33
"name": "Map Exporter",
4-
"version": "Beta 1.2",
4+
"version": "Beta 1.3",
55
"authors": "Henpemaz, Dual-Iron, Noblecat57, Alduris<LINE>Code help: Bro748, Vigaro, BensoneWhite, iwantbread, Aissurteivos, LudoCrypt",
66
"description": "An interactive map maker",
7-
"tags": [],
7+
"tags": ["Tools"],
88
"requirements": [],
99
"requirements_names": [],
1010
"checksum_override_version": true

0 commit comments

Comments
 (0)