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

Browse Source 
* fixed note in quest tab on zone detail page
 * fixed a notice when creating item tooltips while passing an empty randomEnchantment value
 * fixed currencies having no icons on zone detail page
This commit is contained in:
Sarjuuk
2017-03-09 12:46:29 +01:00
parent a48f30e8a4
commit 849872d181
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/types/item.class.php
View File

@@ -671,9 +671,9 @@ class ItemList extends BaseType
}
// Random Enchantment - if random enchantment is set, prepend stats from it
if ($this->curTpl['randomEnchant'] && !isset($enhance['r']))
if ($this->curTpl['randomEnchant'] && empty($enhance['r']))
$x .= '<span class="q2">'.Lang::item('randEnchant').'</span><br />';
else if (isset($enhance['r']))
else if (!empty($enhance['r']))
$x .= $randEnchant;
// itemMods (display stats and save ratings for later use)

20
pages/zone.php
View File

@@ -247,7 +247,7 @@ class ZonePage extends GenericPage
$questsLV[$id] = $data;
}
$this->extendGlobalData($started->getJSGlobals(GLOBALINFO_SELF | GLOBALINFO_REWARDS));
$this->extendGlobalData($started->getJSGlobals());
if (($tpl['A'] != -1) & ($_ = $started->getSOMData(SIDE_ALLIANCE)))
$addToSOM('alliancequests', array(
@@ -344,6 +344,8 @@ class ZonePage extends GenericPage
$questsLV[$id] = $data;
}
$this->extendGlobalData($started->getJSGlobals());
if (($tpl['A'] != -1) & ($_ = $started->getSOMData(SIDE_ALLIANCE)))
$addToSOM('alliancequests', array(
'coords' => [[$spawn['posX'], $spawn['posY']]],
@@ -494,10 +496,18 @@ class ZonePage extends GenericPage
// tab: Quests [data collected by SOM-routine]
if ($questsLV)
{
$this->lvTabs[] = ['quest', array(
'data' => array_values($questsLV),
'note' => '$$WH.sprintf(LANG.lvnote_zonequests, '.$this->subject->getField('mapId').', '.$this->typeId.',"'.$this->subject->getField('name', true).'", '.$this->typeId.')'
)];
$tabData = ['quest', ['data' => array_values($questsLV)]];
foreach (Util::$questClasses as $parent => $children)
{
if (in_array($this->typeId, $children))
{
$tabData[1]['note'] = '$$WH.sprintf(LANG.lvnote_zonequests, '.$parent.', '.$this->typeId.',"'.$this->subject->getField('name', true).'", '.$this->typeId.')';
break;
}
}
$this->lvTabs[] = $tabData;
}
// tab: item-quest starter

8
static/js/locale_dede.js
View File

@@ -2666,11 +2666,11 @@ var LANG = {
lvnote_createafilter: '<small><a href="$1">Filter erstellen</a></small>',
lvnote_filterresults: '<small><a href="$1">Diese Ergebnisse filtern</a></small>',
lvnote_questgivers: '<small><a href="?zone=$1">Questgeber</a> in <b>$2</a> anzeigen &nbsp;<b>|</b>&nbsp; Nach <a href="?items&filter=cr=126;crs=$3;crv=0">Questbelohnungen</a> filtern</small>',
lvnote_allpets: '<small>Alle Begleiter können alle <a href=&?spells=-3.270&>passiven Fertigkeiten</a> erlernen</small>',
lvnote_allpets: '<small>Alle Begleiter können alle <a href="?spells=-3.270">passiven Fertigkeiten</a> erlernen</small>',
lvnote_pettalents: '<small><a href="$1">Begleiter anzeigen</a>, die diese Talente erlernen können</small>',
lvnote_zonequests: '<small><a href=&?quests=$1.$2&>Quests</a> in der Kategorie <b>$3</b> durchsuchen &nbsp;<b>|</b>&nbsp; Nach <a href=&?items&filter=cr=126;crs=$4;crv=0&>Questbelohnungen</a> filtern</small>',
lvnote_crafteditems: '<small>Nach <a href=&?items&filter=cr=86;crs=$1;crv=0&>hergestellten Gegenständen</a> filtern</small>',
lvnote_viewmoreslot: '<small><a href=&?items$1&filter=$2&>Mehr Ergebnisse</a> für diesen Platz anzeigen</small>',
lvnote_zonequests: '<small><a href="?quests=$1.$2">Quests</a> in der Kategorie <b>$3</b> durchsuchen &nbsp;<b>|</b>&nbsp; Nach <a href="?items&filter=cr=126;crs=$4;crv=0">Questbelohnungen</a> filtern</small>',
lvnote_crafteditems: '<small>Nach <a href="?items&filter=cr=86;crs=$1;crv=0">hergestellten Gegenständen</a> filtern</small>',
lvnote_viewmoreslot: '<small><a href="?items$1&filter=$2">Mehr Ergebnisse</a> für diesen Platz anzeigen</small>',
lvnote_viewmorelevel: '<small><a href="?items$1&filter=$2">Mehr Ergebnisse</a> für diese Gegenstandsstufe anzeigen</small>',
lvnote_viewmoresource: '<small><a href="?items$1&filter=$2">Mehr Ergebnisse</a> für diese Quelle anzeigen</small>',