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

Quests/Map

Browse Source 
* correctly apply styles to map selector
 * correcly prepare map selector string
This commit is contained in:
Sarjuuk
2017-03-16 18:48:41 +01:00
parent d6b722a967
commit 5598b80ef4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/quest.php
View File

@@ -831,11 +831,11 @@ class QuestPage extends GenericPage
$areas = new ZoneList(array(['id', array_keys($mObjectives)])); $areas = new ZoneList(array(['id', array_keys($mObjectives)]));
if (!$areas->error) if (!$areas->error)
{ {
$someIDX = 0; // todo (low): UNK value ... map priority, floor, mapId..? values seen: 0,3; doesn't seem to affect anything $someIDX = 0; // todo (low): UNK value ... map priority, floor, mapId..? values seen: 0 - 3; doesn't seem to affect anything
foreach ($areas->iterate() as $id => $__) foreach ($areas->iterate() as $id => $__)
{ {
$mObjectives[$id]['zone'] = $areas->getField('name', true); $mObjectives[$id]['zone'] = $areas->getField('name', true);
$mZones[] = [$id, $someIDX]; $mZones[] = [$id, ++$someIDX];
} }
} }
} }

18
static/js/global.js
View File

@@ -18412,20 +18412,20 @@ Mapper.prototype = {
if(types.start && types.end) if(types.start && types.end)
{ {
entry.className += ' icontiny'; entry.className += ' icontiny';
entry.style += ' background-image', 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_startend.gif)'; entry.style.backgroundImage = 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_startend.gif)';
entry.style += ' padding-left', '20px'; entry.style.paddingLeft = '20px';
} }
else if(types.start) else if(types.start)
{ {
entry.className += ' icontiny'; entry.className += ' icontiny';
entry.style += ' background-image', 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_start.gif)'; entry.style.backgroundImage = 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_start.gif)';
entry.style += ' padding-left', '14px'; entry.style.paddingLeft = '14px';
} }
else if(types.end) else if(types.end)
{ {
entry.className += ' icontiny'; entry.className += ' icontiny';
entry.style += ' background-image', 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_end.gif)'; entry.style.backgroundImage = 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_end.gif)';
entry.style += ' padding-left', '16px'; entry.style.paddingLeft = '16px';
} }
} }
$WH.ae(container, entry); $WH.ae(container, entry);
@@ -18554,10 +18554,10 @@ Mapper.prototype = {
{ {
var parts = LANG.mapper_objectives.oex_sy.split('$$'); var parts = LANG.mapper_objectives.oex_sy.split('$$');
$WH.ae(span, $WH.ct(parts[0])); $WH.ae(span, $WH.ct(parts[0]));
primaryLink = zoneLinks(this, span, startZones, typesByZone);
$WH.ae(span, $WH.ct(parts[1]));
secondaryLink = zoneLinks(this, span, objZones, typesByZone); secondaryLink = zoneLinks(this, span, objZones, typesByZone);
$WH.ae(span, $WH.ct(parts[1])); $WH.ae(span, $WH.ct(parts[1]));
primaryLink = zoneLinks(this, span, startZones, typesByZone);
$WH.ae(span, $WH.ct(parts[2]));
} }
else if(types.start.length > 0 && types.end.length > 0 && types.objective.length > 0) // objectives in x, starts in y, ends in z else if(types.start.length > 0 && types.end.length > 0 && types.objective.length > 0) // objectives in x, starts in y, ends in z
{ {
@@ -18566,7 +18566,7 @@ Mapper.prototype = {
primaryLink = zoneLinks(this, span, startZones, typesByZone); primaryLink = zoneLinks(this, span, startZones, typesByZone);
$WH.ae(span, $WH.ct(parts[1])); $WH.ae(span, $WH.ct(parts[1]));
secondaryLink = zoneLinks(this, span, objZones, typesByZone); secondaryLink = zoneLinks(this, span, objZones, typesByZone);
$WH.ae(span, $WH.ct(parts[1])); $WH.ae(span, $WH.ct(parts[2]));
tertiaryLink = zoneLinks(this, span, endZones, typesByZone); tertiaryLink = zoneLinks(this, span, endZones, typesByZone);
$WH.ae(span, $WH.ct(parts[3])); $WH.ae(span, $WH.ct(parts[3]));
} }