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

Objects/Fixup

Browse source 
* don't show loot charges in infobox if restock cd is set but min/max charges are not
 * fixes #493
This commit is contained in:
Sarjuuk 2026-01-29 21:10:17 +01:00
parent b25a70458b
commit 26292d17c5
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
endpoints/object/object.php
View file

@ -179,20 +179,17 @@ class ObjectBaseResponse extends TemplateResponse implements ICache
$infobox[] = '[tooltip name=focus]'.Lang::gameObject('focusDesc').'[/tooltip][span class=tip tooltip=focus]'.Lang::gameObject('focus').Lang::main('colon').Util::localizedString($sfo, 'name').'[/span]';
// lootinfo: [min, max, restock]
if ($this->subject->getField('lootStack'))
if (([$min, $max, $restock] = $this->subject->getField('lootStack')) && $min)
{
[$min, $max, $restock] = $this->subject->getField('lootStack');
$buff = Lang::spell('spellModOp', 4).Lang::main('colon').Util::createNumRange($min, $max);
// since Veins don't have charges anymore, the timer is questionable
// ore veins don't have charges in 335a, but the functionality is still there
$infobox[] = $restock > 1 ? '[tooltip name=restock]'.Lang::gameObject('restock', [DateTime::formatTimeElapsed($restock * 1000)]).'[/tooltip][span class=tip tooltip=restock]'.$buff.'[/span]' : $buff;
}
// meeting stone [minLevel, maxLevel, zone]
if ($this->subject->getField('type') == OBJECT_MEETINGSTONE && $this->subject->getField('mStone'))
// meeting stone (only on type: OBJECT_MEETINGSTONE)
if ([$minLevel, $maxLevel, $zone] = $this->subject->getField('mStone'))
{
[$minLevel, $maxLevel, $zone] = $this->subject->getField('mStone');
$this->extendGlobalIds(Type::ZONE, $zone);
$m = Lang::game('meetingStone').'[zone='.$zone.']';
$l = Util::createNumRange($minLevel, min($maxLevel, MAX_LEVEL));
@ -200,11 +197,9 @@ class ObjectBaseResponse extends TemplateResponse implements ICache
$infobox[] = $l ? '[tooltip name=meetingstone]'.Lang::game('reqLevel', [$l]).'[/tooltip][span class=tip tooltip=meetingstone]'.$m.'[/span]' : $m;
}
// capture area
if ($this->subject->getField('type') == OBJECT_CAPTURE_POINT && $this->subject->getField('capture'))
// capture area (only on type: OBJECT_CAPTURE_POINT)
if ([$minPlayer, $maxPlayer, $minTime, $maxTime, $radius] = $this->subject->getField('capture'))
{
[$minPlayer, $maxPlayer, $minTime, $maxTime, $radius] = $this->subject->getField('capture');
$buff = Lang::gameObject('capturePoint');
if ($minTime > 1 || $minPlayer || $radius)

4
includes/dbtypes/gameobject.class.php
View file

@ -37,7 +37,9 @@ class GameObjectList extends DBTypeList
$curTpl['name_loc0'] = 'Unnamed Object #' . $_id;
// unpack miscInfo
$curTpl['lootStack'] = [];
$curTpl['mStone'] =
$curTpl['capture'] =
$curTpl['lootStack'] = null;
$curTpl['spells'] = [];
if (in_array($curTpl['type'], [OBJECT_GOOBER, OBJECT_RITUAL, OBJECT_SPELLCASTER, OBJECT_FLAGSTAND, OBJECT_FLAGDROP, OBJECT_AURA_GENERATOR, OBJECT_TRAP]))