coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Quests/Fixup

Browse source 
* rename columns of quests table to avoid name collisions
   and to match the dbc they are referencing
 * fixes #463
This commit is contained in:
Sarjuuk 2025-12-30 19:15:06 +01:00
parent c44bf4f575
commit eec21c2763
11 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
endpoints/quest/quest.php
View file

@ -117,11 +117,11 @@ class QuestBaseResponse extends TemplateResponse implements ICache
}
// loremaster (i dearly hope those flags cover every case...)
if ($this->subject->getField('zoneOrSortBak') > 0 && !$this->subject->isRepeatable())
if ($this->subject->getField('questSortIdBak') > 0 && !$this->subject->isRepeatable())
{
$conditions = array(
['ac.type', ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE],
['ac.value1', $this->subject->getField('zoneOrSortBak')],
['ac.value1', $this->subject->getField('questSortIdBak')],
['a.faction', $_side, '&']
);
$loremaster = new AchievementList($conditions);
@ -153,7 +153,7 @@ class QuestBaseResponse extends TemplateResponse implements ICache
else if ($_specialFlags & QUEST_FLAG_SPECIAL_MONTHLY)
$_[] = Lang::quest('monthly');
if ($t = $this->subject->getField('type'))
if ($t = $this->subject->getField('questInfoId'))
$_[] = Lang::quest('questInfo', $t);
if ($_)

4
endpoints/quests/quests.php
View file

@ -74,9 +74,9 @@ class QuestsBaseResponse extends TemplateResponse implements ICache
$conditions[] = $_;
if (isset($this->category[1]))
$conditions[] = ['zoneOrSort', $this->category[1]];
$conditions[] = ['questSortId', $this->category[1]];
else if (isset($this->category[0]))
$conditions[] = ['zoneOrSort', $this->validCats[$this->category[0]]];
$conditions[] = ['questSortId', $this->validCats[$this->category[0]]];
/*************/

2
endpoints/skill/skill.php
View file

@ -337,7 +337,7 @@ class SkillBaseResponse extends TemplateResponse implements ICache
if ($sort)
{
$quests = new QuestList(array(['zoneOrSort', -$sort]));
$quests = new QuestList(array(['questSortId', -$sort]));
if (!$quests->error)
{
$this->extendGlobalData($quests->getJSGlobals());

6
endpoints/zone/zone.php
View file

@ -327,7 +327,7 @@ class ZoneBaseResponse extends TemplateResponse implements ICache
// store data for misc tabs
foreach ($started->getListviewData() as $id => $data)
{
if ($started->getField('zoneOrSort') > 0 && !in_array($started->getField('zoneOrSort'), $relQuestZOS))
if ($started->getField('questSortId') > 0 && !in_array($started->getField('questSortId'), $relQuestZOS))
continue;
if (!empty($started->rewards[$id][Type::ITEM]))
@ -424,7 +424,7 @@ class ZoneBaseResponse extends TemplateResponse implements ICache
// store data for misc tabs
foreach ($started->getListviewData() as $id => $data)
{
if ($started->getField('zoneOrSort') > 0 && !in_array($started->getField('zoneOrSort'), $relQuestZOS))
if ($started->getField('questSortId') > 0 && !in_array($started->getField('questSortId'), $relQuestZOS))
continue;
if (!empty($started->rewards[$id][Type::ITEM]))
@ -643,7 +643,7 @@ class ZoneBaseResponse extends TemplateResponse implements ICache
$this->lvTabs->addListviewTab(new Listview($tabData, GameObjectList::$brickFile));
}
$quests = new QuestList(array(['zoneOrSort', $this->typeId]));
$quests = new QuestList(array(['questSortId', $this->typeId]));
if (!$quests->error)
{
$this->extendGlobalData($quests->getJSGlobals());