yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Fixup

Browse Source 
* restore display of creature targets on quest detail page
 * fix ShowOnMap utility for quest displays
This commit is contained in:
Sarjuuk
2024-06-27 20:49:33 +02:00
parent 69de457108
commit cdf06deb90
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/quest.php
View File

@@ -613,7 +613,7 @@ class QuestPage extends GenericPage
switch ($file) switch ($file)
{ {
case 'creature': case 'npc':
$mapNPCs[] = [$data['id'], $method, $itemId]; $mapNPCs[] = [$data['id'], $method, $itemId];
break; break;
case 'object': case 'object':

24
static/js/ShowOnMap.js
View File

@@ -553,30 +553,30 @@ ShowOnMap.combinePins = function(pins, dailyOnly, hasPaths) {
} }
else if (hasPaths) { else if (hasPaths) {
// Don't combine pins that have paths // Don't combine pins that have paths
coord = getCoord([pin.id, 0], true); coord = getCoord([pin.id, 0], pin.level, true);
x = coord[0]; y = coord[1]; x = coord[0]; y = coord[1]; l = pin.level || 0;
var newPin = $WH.dO(pin); var newPin = $WH.dO(pin);
newPin.coord = pin.coords[0]; newPin.coord = pin.coords[0];
combined[x][y].push(newPin); combined[l][x][y].push(newPin);
nPins++; nPins++;
continue; continue;
} }
if (pin.point == 'start' || pin.point == 'end') { if (pin.point == 'start' || pin.point == 'end') {
coord = getCoord(pin.coord); coord = getCoord(pin.coord, pin.level);
x = coord[0]; y = coord[1]; x = coord[0]; y = coord[1]; l = pin.level || 0;
if (combined[x][y].length > 3) { if (combined[l][x][y].length > 3) {
var temp = combined[x][y]; var temp = combined[l][x][y];
combined[x][y] = []; combined[l][x][y] = [];
for (var i = 0; i < temp.length; ++i) { for (var i = 0; i < temp.length; ++i) {
tmpCoord = getCoord(temp[i].coord, true); tmpCoord = getCoord(temp[i].coord, pin.level, true);
combined[tmpCoord[0]][tmpCoord[1]].push(temp[i]); combined[l][tmpCoord[0]][tmpCoord[1]].push(temp[i]);
} }
} }
combined[x][y].push(pin); combined[l][x][y].push(pin);
nPins++; nPins++;
} }
else { else {
@@ -591,7 +591,7 @@ ShowOnMap.combinePins = function(pins, dailyOnly, hasPaths) {
combined[l][x][y] = []; combined[l][x][y] = [];
for (var i = 0; i < temp.length; ++i) { for (var i = 0; i < temp.length; ++i) {
tmpCoord = getCoord(temp[i].coord, temp[i].level, true); tmpCoord = getCoord(temp[i].coord, temp[i].level, true);
combined[temp[i].level][tmpCoord[0]][tmpCoord[1]].push(temp[i]); combined[temp[i].level || 0][tmpCoord[0]][tmpCoord[1]].push(temp[i]);
} }
} }