Skip to content

Commit

Permalink
fix: region menu not updating Teleport tab
Browse files Browse the repository at this point in the history
  • Loading branch information
PeenScreeker committed Sep 25, 2024
1 parent db66c2d commit 2e545a8
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions scripts/pages/zoning/zoning.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,13 @@ class ZoneMenuHandler {
this.panels.regionHeight.text = (region?.height ?? 0).toFixed(2);
this.panels.regionSafeHeight.text = (region?.safeHeight ?? 0).toFixed(2);

const tpIndex = region.teleDestTargetname === '' ? 0 : this.teleDestList?.indexOf(region.teleDestTargetname);
const tpIndex = !region.teleDestTargetname
? region.teleDestPos !== undefined && region.teleDestYaw !== undefined
? 1
: 0
: this.teleDestList?.indexOf(region.teleDestTargetname);
this.panels.regionTPDest.SetSelectedIndex(tpIndex);
this.updateRegionTPDest();
}

addRegion() {
Expand Down Expand Up @@ -558,37 +563,30 @@ class ZoneMenuHandler {
delete region.teleDestPos;
delete region.teleDestYaw;

this.panels.regionTPPos.x.text = '';
this.panels.regionTPPos.y.text = '';
this.panels.regionTPPos.z.text = '';
this.panels.regionTPYaw.text = '';
this.setRegionTPDestTextEntriesActive(false);
} else if (teleDestIndex === 1 && region.points.length > 0) {
if (!region.teleDestPos || !region.teleDestYaw) {
if (region.teleDestPos === undefined || region.teleDestYaw === undefined) {
region.teleDestPos = [0, 0, region.bottom];
const den = 1 / region.points.length;
region.points.forEach((val) => {
region.teleDestPos[0] += val[0] * den;
region.teleDestPos[1] += val[1] * den;
});
region.teleDestYaw = 0;
region.teleDestTargetname = '';
}

this.panels.regionTPPos.x.text = region.teleDestPos[0].toFixed(2);
this.panels.regionTPPos.y.text = region.teleDestPos[1].toFixed(2);
this.panels.regionTPPos.z.text = region.teleDestPos[2].toFixed(2);
this.panels.regionTPYaw.text = region.teleDestYaw.toFixed(2);

this.setRegionTPDestTextEntriesActive(true);
} else {
region.teleDestTargetname = this.teleDestList[teleDestIndex];

delete region.teleDestPos;
delete region.teleDestYaw;

this.panels.regionTPPos.x.text = '';
this.panels.regionTPPos.y.text = '';
this.panels.regionTPPos.z.text = '';
this.panels.regionTPYaw.text = '';
this.setRegionTPDestTextEntriesActive(false);
}

Expand Down Expand Up @@ -618,6 +616,13 @@ class ZoneMenuHandler {
this.panels.regionTPPosPick.enabled = enable;
this.panels.regionTPYaw.enabled = enable;
this.panels.regionTPYawPick.enabled = enable;

if (!enable) {
this.panels.regionTPPos.x.text = '';
this.panels.regionTPPos.y.text = '';
this.panels.regionTPPos.z.text = '';
this.panels.regionTPYaw.text = '';
}
}

onPointPicked(point: { x: number; y: number; z: number }) {
Expand Down

0 comments on commit 2e545a8

Please sign in to comment.