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

Moved most code related to jsGlobals to template. (Except for Globals, that belong to the object already created, it makes zero sense to look them up again from the template.)

Browse Source 
I'm not overly happy with passing the templateObject to each typeObject, but it works .. for now.
Effectively this should reduce db-lookups as each type should be looked up only twice at max (once for relevant data on the page and maybe again to get related jsGlobals for the template)
also removed BaseType::addRewardsToJscript() get it with BaseType::addGlobalsToJscript() and the appropriate addMask

* added ListviewHelper::getSetFields() wich is more appropriate in some cases (like reagents for spells should be shown even if they are all the same)
* load bricks as needed, removed the if-blocks (maybe add the filename to every TypeClass..?)
This commit is contained in:
Sarjuuk
2013-07-11 21:29:05 +02:00
parent a8804f6440
commit 49800da2c8
43 changed files with 445 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
includes/class.creature.php
View File

@@ -8,10 +8,12 @@ class CreatureList extends BaseType
{
use spawnHelper;
public $tooltips = [];
public static $type = TYPE_NPC;
protected $setupQuery = 'SELECT ct.*, ct.id AS ARRAY_KEY, ft.A, ft.H, ft.factionId FROM ?_creature ct LEFT JOIN ?_factiontemplate ft ON ft.id = ct.faction_A WHERE [filter] [cond]';
protected $matchQuery = 'SELECT COUNT(*) FROM ?_creature ct WHERE [filter] [cond]';
public $tooltips = [];
protected $setupQuery = 'SELECT ct.*, ct.id AS ARRAY_KEY, ft.A, ft.H, ft.factionId FROM ?_creature ct LEFT JOIN ?_factiontemplate ft ON ft.id = ct.faction_A WHERE [filter] [cond]';
protected $matchQuery = 'SELECT COUNT(*) FROM ?_creature ct WHERE [filter] [cond]';
public static function getName($id)
{
@@ -151,16 +153,12 @@ class CreatureList extends BaseType
'location' => json_encode($this->getSpawns(SPAWNINFO_ZONES), JSON_NUMERIC_CHECK),
'name' => $this->getField('name', true),
'tag' => $this->getField('subname', true),
'type' => $this->curTpl['type']
'type' => $this->curTpl['type'],
'react' => '['.$this->curTpl['A'].', '.$this->curTpl['H'].']'
);
if ($addInfoMask & NPCINFO_TAMEABLE)
{
// only first skin of first model ... we're omitting potentially 11 skins here .. but the lv accepts only one .. w/e
if ($addInfoMask & NPCINFO_TAMEABLE) // only first skin of first model ... we're omitting potentially 11 skins here .. but the lv accepts only one .. w/e
$data[$this->id]['skin'] = $this->curTpl['textureString'];
$data[$this->id]['react'] = '['.$this->curTpl['A'].', '.$this->curTpl['H'].']';
}
}
}
@@ -168,13 +166,10 @@ class CreatureList extends BaseType
return $data;
}
public function addGlobalsToJScript(&$refs)
public function addGlobalsToJScript(&$template, $addMask = 0)
{
if (!isset($refs['gCreatures']))
$refs['gCreatures'] = [];
while ($this->iterate())
$refs['gCreatures'][$this->id] = ['name' => $this->getField('name', true)];
$template->extendGlobalData(TYPE_NPC, [$this->id => ['name' => $this->getField('name', true)]]);
}
public function addRewardsToJScript(&$refs) { }