bdnugget/rs-sdk
1
0 Fork 0
mirror of https://github.com/bdnugget/rs-sdk.git synced 2026-11-07 09:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from jamie-legg/fix/map-labels

Browse Source
This commit is contained in:
Max Bittker authored and GitHub committed 2026-08-26 11:32:13 -04:00
2 parents c4880dc82e c27bb69cbf
commit 2b89920c70
1 file changed
+16 -14
Download Patch File Download Diff File Expand all files Collapse all files
server/webclient/src/mapview/MapView.ts
+16 -14
View File
@@ -1499,7 +1499,7 @@ export class MapView extends GameShell {
}
}
if (this.zoom == this.targetZoom && MapView.shouldDrawLabels) {
if (MapView.shouldDrawLabels) {
for (let i: number = 0; i < this.mapLabelCount; i++) {
let x = this.mapLabelX[i];
let y = this.mapLabelY[i];
@@ -1513,36 +1513,38 @@ export class MapView extends GameShell {
let rgb: number = 0xffffff;
let font: WorldMapFont | null = null;
// Wheel and pinch zoom settle on arbitrary values, so choose a font
// across the full zoom range instead of only at the preset zooms.
if (labelSize == 0) {
if (this.zoom == 3.0) {
if (this.zoom < 4.0) {
font = this.f11;
} else if (this.zoom == 4.0) {
} else if (this.zoom < 6.0) {
font = this.f12;
} else if (this.zoom == 6.0) {
} else if (this.zoom < 8.0) {
font = this.f14;
} else if (this.zoom == 8.0) {
} else {
font = this.f17;
}
} else if (labelSize == 1) {
if (this.zoom == 3.0) {
if (this.zoom < 4.0) {
font = this.f14;
} else if (this.zoom == 4.0) {
} else if (this.zoom < 6.0) {
font = this.f17;
} else if (this.zoom == 6.0) {
} else if (this.zoom < 8.0) {
font = this.f19;
} else if (this.zoom == 8.0) {
} else {
font = this.f22;
}
} else if (labelSize == 2) {
rgb = 0xffaa00;
if (this.zoom == 3.0) {
if (this.zoom < 4.0) {
font = this.f19;
} else if (this.zoom == 4.0) {
} else if (this.zoom < 6.0) {
font = this.f22;
} else if (this.zoom == 6.0) {
} else if (this.zoom < 8.0) {
font = this.f26;
} else if (this.zoom == 8.0) {
} else {
font = this.f30;
}
}
@@ -1578,7 +1580,7 @@ export class MapView extends GameShell {
}
// custom: region labels for unified map
if (this.zoom == this.targetZoom && MapView.shouldDrawLabels) {
if (MapView.shouldDrawLabels) {
const regionLabels: {label: string, x: number, z: number}[] = [
{ label: 'Underground', x: 41 * 64 + 32, z: 71 * 64 + 32 },
{ label: 'Misc', x: 41 * 64 + 32, z: 83 * 64 + 32 }