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

Quest/Filter

Browse source 
* update quest flags to current knowledge base
 * implemented filter criterium for pvp-enabling quests
This commit is contained in:
Sarjuuk 2026-02-13 00:34:07 +01:00
parent 68ca4973b1
commit f6d7ccbb69
11 changed files with 79 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/quest/quest.php
View file

@ -233,7 +233,7 @@ class QuestBaseResponse extends TemplateResponse implements ICache
$infobox[] = implode('[br]', $e); $infobox[] = implode('[br]', $e);
// auto accept // auto accept
if ($_flags & QUEST_FLAG_AUTO_ACCEPT) if ($this->subject->isAutoAccept())
$infobox[] = Lang::quest('autoaccept'); $infobox[] = Lang::quest('autoaccept');
// Repeatable // Repeatable
@ -244,7 +244,7 @@ class QuestBaseResponse extends TemplateResponse implements ICache
$infobox[] = $_flags & QUEST_FLAG_SHARABLE ? Lang::quest('sharable') : Lang::quest('notSharable'); $infobox[] = $_flags & QUEST_FLAG_SHARABLE ? Lang::quest('sharable') : Lang::quest('notSharable');
// Keeps you PvP flagged // Keeps you PvP flagged
if ($this->subject->isPvPEnabled()) if ($_flags & QUEST_FLAG_FLAGS_PVP)
$infobox[] = Lang::quest('keepsPvpFlag'); $infobox[] = Lang::quest('keepsPvpFlag');
// difficulty (todo (low): formula unclear. seems to be [minLevel,] -4, -2, (level), +3, +(9 to 15)) // difficulty (todo (low): formula unclear. seems to be [minLevel,] -4, -2, (level), +3, +(9 to 15))

97
includes/dbtypes/quest.class.php
View file

@ -112,7 +112,7 @@ class QuestList extends DBTypeList
public function isRepeatable() : bool public function isRepeatable() : bool
{ {
return $this->curTpl['flags'] & QUEST_FLAG_REPEATABLE || $this->curTpl['specialFlags'] & QUEST_FLAG_SPECIAL_REPEATABLE; return $this->curTpl['specialFlags'] & QUEST_FLAG_SPECIAL_REPEATABLE;
} }
public function isDaily() : int public function isDaily() : int
@ -129,10 +129,9 @@ class QuestList extends DBTypeList
return 0; return 0;
} }
// using reqPlayerKills and rewardHonor as a crutch .. has TC this even implemented..? public function isAutoAccept() : bool
public function isPvPEnabled() : bool
{ {
return $this->curTpl['reqPlayerKills'] || $this->curTpl['rewardHonorPoints'] || $this->curTpl['rewardArenaPoints']; return $this->curTpl['flags'] & QUEST_FLAG_AUTO_ACCEPT || $this->curTpl['specialFlags'] & QUEST_FLAG_SPECIAL_AUTO_ACCEPT;
} }
// by TC definition // by TC definition
@ -263,14 +262,14 @@ class QuestList extends DBTypeList
if ($this->isSeasonal()) if ($this->isSeasonal())
$data[$this->id]['wflags'] |= QUEST_CU_SEASONAL; $data[$this->id]['wflags'] |= QUEST_CU_SEASONAL;
if ($this->curTpl['flags'] & QUEST_FLAG_AUTO_REWARDED) // not shown in log if ($this->curTpl['flags'] & QUEST_FLAG_TRACKING) // not shown in log
$data[$this->id]['wflags'] |= QUEST_CU_SKIP_LOG; $data[$this->id]['wflags'] |= QUEST_CU_SKIP_LOG;
if ($this->curTpl['flags'] & QUEST_FLAG_AUTO_ACCEPT) // self-explanatory if ($this->isAutoAccept())
$data[$this->id]['wflags'] |= QUEST_CU_AUTO_ACCEPT; $data[$this->id]['wflags'] |= QUEST_CU_AUTO_ACCEPT;
if ($this->isPvPEnabled()) // not sure why this flag also requires auto-accept to be set if ($this->curTpl['flags'] & QUEST_FLAG_FLAGS_PVP) // this flag is only displayed if auto-accept is also set. not sure why.
$data[$this->id]['wflags'] |= (QUEST_CU_AUTO_ACCEPT | QUEST_CU_PVP_ENABLED); $data[$this->id]['wflags'] |= QUEST_CU_PVP_ENABLED;
$data[$this->id]['reprewards'] = []; $data[$this->id]['reprewards'] = [];
for ($i = 1; $i < 6; $i++) for ($i = 1; $i < 6; $i++)
@ -447,42 +446,43 @@ class QuestListFilter extends Filter
); );
protected static array $genericFilter = array( protected static array $genericFilter = array(
1 => [parent::CR_CALLBACK, 'cbReputation', '>', null], // increasesrepwith 1 => [parent::CR_CALLBACK, 'cbReputation', '>', null], // increasesrepwith
2 => [parent::CR_NUMERIC, 'rewardXP', NUM_CAST_INT ], // experiencegained 2 => [parent::CR_NUMERIC, 'rewardXP', NUM_CAST_INT ], // experiencegained
3 => [parent::CR_NUMERIC, 'rewardOrReqMoney', NUM_CAST_INT ], // moneyrewarded 3 => [parent::CR_NUMERIC, 'rewardOrReqMoney', NUM_CAST_INT ], // moneyrewarded
4 => [parent::CR_CALLBACK, 'cbSpellRewards', null, null], // spellrewarded [yn] 4 => [parent::CR_CALLBACK, 'cbSpellRewards', null, null], // spellrewarded [yn]
5 => [parent::CR_FLAG, 'flags', QUEST_FLAG_SHARABLE ], // sharable 5 => [parent::CR_FLAG, 'flags', QUEST_FLAG_SHARABLE ], // sharable
6 => [parent::CR_NUMERIC, 'timeLimit', NUM_CAST_INT ], // timer 6 => [parent::CR_NUMERIC, 'timeLimit', NUM_CAST_INT ], // timer
7 => [parent::CR_FLAG, 'cuFlags', QUEST_CU_FIRST_SERIES ], // firstquestseries 7 => [parent::CR_FLAG, 'cuFlags', QUEST_CU_FIRST_SERIES ], // firstquestseries
9 => [parent::CR_CALLBACK, 'cbEarnReputation', null, null], // objectiveearnrepwith [enum] 9 => [parent::CR_CALLBACK, 'cbEarnReputation', null, null], // objectiveearnrepwith [enum]
10 => [parent::CR_CALLBACK, 'cbReputation', '<', null], // decreasesrepwith 10 => [parent::CR_CALLBACK, 'cbReputation', '<', null], // decreasesrepwith
11 => [parent::CR_NUMERIC, 'suggestedPlayers', NUM_CAST_INT ], // suggestedplayers 11 => [parent::CR_NUMERIC, 'suggestedPlayers', NUM_CAST_INT ], // suggestedplayers
15 => [parent::CR_FLAG, 'cuFlags', QUEST_CU_LAST_SERIES ], // lastquestseries 15 => [parent::CR_FLAG, 'cuFlags', QUEST_CU_LAST_SERIES ], // lastquestseries
16 => [parent::CR_FLAG, 'cuFlags', QUEST_CU_PART_OF_SERIES ], // partseries 16 => [parent::CR_FLAG, 'cuFlags', QUEST_CU_PART_OF_SERIES ], // partseries
18 => [parent::CR_FLAG, 'cuFlags', CUSTOM_HAS_SCREENSHOT ], // hasscreenshots 18 => [parent::CR_FLAG, 'cuFlags', CUSTOM_HAS_SCREENSHOT ], // hasscreenshots
19 => [parent::CR_CALLBACK, 'cbQuestRelation', 0x1, null], // startsfrom [enum] 19 => [parent::CR_CALLBACK, 'cbQuestRelation', 0x1, null], // startsfrom [enum]
21 => [parent::CR_CALLBACK, 'cbQuestRelation', 0x2, null], // endsat [enum] 21 => [parent::CR_CALLBACK, 'cbQuestRelation', 0x2, null], // endsat [enum]
22 => [parent::CR_CALLBACK, 'cbItemRewards', null, null], // itemrewards [op] [int] 22 => [parent::CR_CALLBACK, 'cbItemRewards', null, null], // itemrewards [op] [int]
23 => [parent::CR_CALLBACK, 'cbItemChoices', null, null], // itemchoices [op] [int] 23 => [parent::CR_CALLBACK, 'cbItemChoices', null, null], // itemchoices [op] [int]
24 => [parent::CR_CALLBACK, 'cbLacksStartEnd', null, null], // lacksstartend [yn] 24 => [parent::CR_CALLBACK, 'cbLacksStartEnd', null, null], // lacksstartend [yn]
25 => [parent::CR_FLAG, 'cuFlags', CUSTOM_HAS_COMMENT ], // hascomments 25 => [parent::CR_FLAG, 'cuFlags', CUSTOM_HAS_COMMENT ], // hascomments
27 => [parent::CR_FLAG, 'flags', QUEST_FLAG_DAILY ], // daily 27 => [parent::CR_FLAG, 'flags', QUEST_FLAG_DAILY ], // daily
28 => [parent::CR_FLAG, 'flags', QUEST_FLAG_WEEKLY ], // weekly 28 => [parent::CR_FLAG, 'flags', QUEST_FLAG_WEEKLY ], // weekly
29 => [parent::CR_CALLBACK, 'cbRepeatable', null ], // repeatable 29 => [parent::CR_FLAG, 'specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE], // repeatable
30 => [parent::CR_NUMERIC, 'id', NUM_CAST_INT, true], // id 30 => [parent::CR_NUMERIC, 'id', NUM_CAST_INT, true], // id
33 => [parent::CR_ENUM, 'e.holidayId', true, true], // relatedevent 33 => [parent::CR_ENUM, 'e.holidayId', true, true], // relatedevent
34 => [parent::CR_CALLBACK, 'cbAvailable', null, null], // availabletoplayers [yn] 34 => [parent::CR_CALLBACK, 'cbAvailable', null, null], // availabletoplayers [yn]
36 => [parent::CR_FLAG, 'cuFlags', CUSTOM_HAS_VIDEO ], // hasvideos 36 => [parent::CR_FLAG, 'cuFlags', CUSTOM_HAS_VIDEO ], // hasvideos
37 => [parent::CR_CALLBACK, 'cbClassSpec', null, null], // classspecific [enum] 37 => [parent::CR_CALLBACK, 'cbClassSpec', null, null], // classspecific [enum]
38 => [parent::CR_CALLBACK, 'cbRaceSpec', null, null], // racespecific [enum] 38 => [parent::CR_CALLBACK, 'cbRaceSpec', null, null], // racespecific [enum]
42 => [parent::CR_STAFFFLAG, 'flags' ], // flags 42 => [parent::CR_STAFFFLAG, 'flags' ], // flags
43 => [parent::CR_CALLBACK, 'cbCurrencyReward', null, null], // currencyrewarded [enum] 43 => [parent::CR_CALLBACK, 'cbCurrencyReward', null, null], // currencyrewarded [enum]
44 => [parent::CR_CALLBACK, 'cbLoremaster', null, null], // countsforloremaster_stc [yn] 44 => [parent::CR_CALLBACK, 'cbLoremaster', null, null], // countsforloremaster_stc [yn]
45 => [parent::CR_BOOLEAN, 'rewardTitleId' ] // titlerewarded 45 => [parent::CR_BOOLEAN, 'rewardTitleId' ], // titlerewarded
47 => [parent::CR_FLAG, 'flags', QUEST_FLAG_FLAGS_PVP ] // setspvpflag
); );
protected static array $inputFields = array( protected static array $inputFields = array(
'cr' => [parent::V_RANGE, [1, 45], true ], // criteria ids 'cr' => [parent::V_RANGE, [1, 47], true ], // criteria ids
'crs' => [parent::V_LIST, [parent::ENUM_NONE, parent::ENUM_ANY, [0, 99999]], true ], // criteria operators 'crs' => [parent::V_LIST, [parent::ENUM_NONE, parent::ENUM_ANY, [0, 99999]], true ], // criteria operators
'crv' => [parent::V_REGEX, parent::PATTERN_INT, true ], // criteria values - only numerals 'crv' => [parent::V_REGEX, parent::PATTERN_INT, true ], // criteria values - only numerals
'na' => [parent::V_NAME, false, false], // name / text - only printable chars, no delimiter 'na' => [parent::V_NAME, false, false], // name / text - only printable chars, no delimiter
@ -616,17 +616,6 @@ class QuestListFilter extends Filter
return ['cuFlags', CUSTOM_UNAVAILABLE | CUSTOM_DISABLED, '&']; return ['cuFlags', CUSTOM_UNAVAILABLE | CUSTOM_DISABLED, '&'];
} }
protected function cbRepeatable(int $cr, int $crs, string $crv) : ?array
{
if (!$this->int2Bool($crs))
return null;
if ($crs)
return ['OR', ['flags', QUEST_FLAG_REPEATABLE, '&'], ['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE, '&']];
else
return ['AND', [['flags', QUEST_FLAG_REPEATABLE, '&'], 0], [['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE, '&'], 0]];
}
protected function cbItemChoices(int $cr, int $crs, string $crv) : ?array protected function cbItemChoices(int $cr, int $crs, string $crv) : ?array
{ {
if (!Util::checkNumeric($crv, NUM_CAST_INT) || !$this->int2Op($crs)) if (!Util::checkNumeric($crv, NUM_CAST_INT) || !$this->int2Op($crs))
@ -653,9 +642,9 @@ class QuestListFilter extends Filter
return null; return null;
if ($crs) if ($crs)
return ['AND', ['questSortId', 0, '>'], [['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE, '&'], 0], [['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY, '&'], 0]]; return ['AND', ['questSortId', 0, '>'], [['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY, '&'], 0], [['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY, '&'], 0]];
else else
return ['OR', ['questSortId', 0, '<'], ['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE, '&'], ['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY, '&']]; return ['OR', ['questSortId', 0, '<'], ['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY, '&'], ['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_MONTHLY, '&']];
} }
protected function cbSpellRewards(int $cr, int $crs, string $crv) : ?array protected function cbSpellRewards(int $cr, int $crs, string $crv) : ?array

43
includes/defines.php
View file

@ -801,24 +801,33 @@ define('PET_TALENT_TYPE_TENACITY', 1);
define('PET_TALENT_TYPE_CUNNING', 2); define('PET_TALENT_TYPE_CUNNING', 2);
// quest // quest
define('QUEST_FLAG_STAY_ALIVE', 0x00001); define('QUEST_FLAG_STAY_ALIVE', 0x00001);
define('QUEST_FLAG_PARTY_ACCEPT', 0x00002); define('QUEST_FLAG_PARTY_ACCEPT', 0x00002);
define('QUEST_FLAG_EXPLORATION', 0x00004); define('QUEST_FLAG_EXPLORATION', 0x00004);
define('QUEST_FLAG_SHARABLE', 0x00008); define('QUEST_FLAG_SHARABLE', 0x00008);
define('QUEST_FLAG_AUTO_REWARDED', 0x00400); define('QUEST_FLAG_HAS_CONDITION', 0x00010); // TC: Not used currently
define('QUEST_FLAG_DAILY', 0x01000); define('QUEST_FLAG_HIDE_REWARD_POI', 0x00020); // TC: Not used currently: Unsure of content
define('QUEST_FLAG_REPEATABLE', 0x02000); define('QUEST_FLAG_RAID', 0x00040);
define('QUEST_FLAG_UNAVAILABLE', 0x04000); define('QUEST_FLAG_TBC', 0x00080);
define('QUEST_FLAG_WEEKLY', 0x08000); define('QUEST_FLAG_NO_MONEY_FROM_XP', 0x00100);
define('QUEST_FLAG_AUTO_COMPLETE', 0x10000); define('QUEST_FLAG_HIDDEN_REWARDS', 0x00200);
define('QUEST_FLAG_AUTO_ACCEPT', 0x80000); define('QUEST_FLAG_TRACKING', 0x00400); // TC: These quests are automatically rewarded on quest complete and they will never appear in quest log client side.
define('QUEST_FLAG_DEPRECATE_REPUTATION', 0x00800); // TC: Not used currently
define('QUEST_FLAG_DAILY', 0x01000);
define('QUEST_FLAG_FLAGS_PVP', 0x02000);
define('QUEST_FLAG_UNAVAILABLE', 0x04000);
define('QUEST_FLAG_WEEKLY', 0x08000);
define('QUEST_FLAG_AUTO_COMPLETE', 0x10000);
define('QUEST_FLAG_DISPLAY_ITEM_IN_TRACKER', 0x20000); // TC: Displays usable item in quest tracker
define('QUEST_FLAG_OBJ_TEXT', 0x40000); // TC: use Objective text as Complete text
define('QUEST_FLAG_AUTO_ACCEPT', 0x80000);
define('QUEST_FLAG_SPECIAL_REPEATABLE', 0x01); define('QUEST_FLAG_SPECIAL_REPEATABLE', 0x01);
define('QUEST_FLAG_SPECIAL_EXT_COMPLETE', 0x02); define('QUEST_FLAG_SPECIAL_EXT_COMPLETE', 0x02);
define('QUEST_FLAG_SPECIAL_AUTO_ACCEPT', 0x04); define('QUEST_FLAG_SPECIAL_AUTO_ACCEPT', 0x04);
define('QUEST_FLAG_SPECIAL_DUNGEON_FINDER', 0x08); define('QUEST_FLAG_SPECIAL_DUNGEON_FINDER', 0x08);
define('QUEST_FLAG_SPECIAL_MONTHLY', 0x10); define('QUEST_FLAG_SPECIAL_MONTHLY', 0x10);
define('QUEST_FLAG_SPECIAL_SPELLCAST', 0x20); // not documented in wiki! :[ define('QUEST_FLAG_SPECIAL_SPELLCAST', 0x20); // not documented in wiki! :[
// GameObject // GameObject
define('OBJECT_DOOR', 0); define('OBJECT_DOOR', 0);

2
setup/tools/filegen/profiler.ss.php
View file

@ -58,7 +58,7 @@ CLISetup::registerSetup("build", new class extends SetupScript
$condition = [ $condition = [
'AND', 'AND',
[['cuFlags', CUSTOM_EXCLUDE_FOR_LISTVIEW | CUSTOM_UNAVAILABLE | CUSTOM_DISABLED, '&'], 0], [['cuFlags', CUSTOM_EXCLUDE_FOR_LISTVIEW | CUSTOM_UNAVAILABLE | CUSTOM_DISABLED, '&'], 0],
[['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_REPEATABLE | QUEST_FLAG_AUTO_REWARDED, '&'], 0], [['flags', QUEST_FLAG_DAILY | QUEST_FLAG_WEEKLY | QUEST_FLAG_TRACKING, '&'], 0],
[['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_DUNGEON_FINDER | QUEST_FLAG_SPECIAL_MONTHLY, '&'], 0] [['specialFlags', QUEST_FLAG_SPECIAL_REPEATABLE | QUEST_FLAG_SPECIAL_DUNGEON_FINDER | QUEST_FLAG_SPECIAL_MONTHLY, '&'], 0]
]; ];

1
static/js/filters.js
View file

@ -280,6 +280,7 @@ var fi_filters = {
{ id: 29, name: 'repeatable', type: 'yn' }, { id: 29, name: 'repeatable', type: 'yn' },
{ id: 30, name: 'id', type: 'num', before: 'name' }, { id: 30, name: 'id', type: 'num', before: 'name' },
{ id: 44, name: 'countsforloremaster_stc', type: 'yn' }, { id: 44, name: 'countsforloremaster_stc', type: 'yn' },
{ id: 47, name: 'setspvpflag', type: 'yn' },
{ id: 9, name: 'objectiveearnrepwith', type: 'faction-any+none' }, { id: 9, name: 'objectiveearnrepwith', type: 'faction-any+none' },
{ id: 33, name: 'relatedevent', type: 'event-any+none' }, { id: 33, name: 'relatedevent', type: 'event-any+none' },
{ id: 5, name: 'sharable', type: 'yn' }, { id: 5, name: 'sharable', type: 'yn' },

1
static/js/locale_dede.js
View file

@ -4167,6 +4167,7 @@ var LANG = {
id: "ID", id: "ID",
classspecific: "Klassenspezifisch", classspecific: "Klassenspezifisch",
racespecific: "Volksspezifisch", racespecific: "Volksspezifisch",
setspvpflag: "Hält Euch im PvP",
sepgainsrewards: "Belohnungen/Steigerungen", sepgainsrewards: "Belohnungen/Steigerungen",
experiencegained: "Erhaltene Erfahrung", experiencegained: "Erhaltene Erfahrung",

1
static/js/locale_enus.js
View file

@ -4211,6 +4211,7 @@ var LANG = {
id: "ID", id: "ID",
classspecific: "Class-specific", classspecific: "Class-specific",
racespecific: "Race-specific", racespecific: "Race-specific",
setspvpflag: "Keeps you PvP flagged",
sepgainsrewards: "Gains/rewards", sepgainsrewards: "Gains/rewards",
experiencegained: "Experience gained", experiencegained: "Experience gained",

1
static/js/locale_eses.js
View file

@ -4167,6 +4167,7 @@ var LANG = {
id: "ID", id: "ID",
classspecific: "Específico de clase", classspecific: "Específico de clase",
racespecific: "Específico de raza", racespecific: "Específico de raza",
setspvpflag: "Mantiene el JcJ activado",
sepgainsrewards: "Ganancias/recompensas", sepgainsrewards: "Ganancias/recompensas",
experiencegained: "Experiencia ganada", experiencegained: "Experiencia ganada",

1
static/js/locale_frfr.js
View file

@ -4167,6 +4167,7 @@ var LANG = {
id: "ID", id: "ID",
classspecific: "Classe-spécifique", classspecific: "Classe-spécifique",
racespecific: "Spécifique à la race", racespecific: "Spécifique à la race",
setspvpflag: "Vous garde en mode JvJ",
sepgainsrewards: "Gains/récompenses", sepgainsrewards: "Gains/récompenses",
experiencegained: "Expérience gagnée", experiencegained: "Expérience gagnée",

1
static/js/locale_ruru.js
View file

@ -4166,6 +4166,7 @@ var LANG = {
id: "Номер", id: "Номер",
classspecific: "Только для класса", classspecific: "Только для класса",
racespecific: "Расовый", racespecific: "Расовый",
setspvpflag: "Включает доступность PvP",
sepgainsrewards: "Награда за выполнение", sepgainsrewards: "Награда за выполнение",
experiencegained: "Получаемый опыт", experiencegained: "Получаемый опыт",

1
static/js/locale_zhcn.js
View file

@ -4208,6 +4208,7 @@ var LANG = {
id: "ID", id: "ID",
classspecific: "职业专属", classspecific: "职业专属",
racespecific: "种族特定", racespecific: "种族特定",
setspvpflag: "保持PvP旗帜标记",
sepgainsrewards: "收获/奖励", sepgainsrewards: "收获/奖励",
experiencegained: "获得的经验", experiencegained: "获得的经验",