item another one >.<

includes/defines.php

@@ -87,6 +87,7 @@ define('LOCALE_DE',                         3);
 define('LOCALE_ES',                         6);
 define('LOCALE_RU',                         8);
 
+// generic filter handler
 define('FILTER_CR_BOOLEAN',                 1);
 define('FILTER_CR_FLAG',                    2);
 define('FILTER_CR_NUMERIC',                 3);
@@ -98,12 +99,13 @@ define('FILTER_CR_STAFFFLAG',               6);
 define('GLOBALINFO_SELF',                   0x1);           // id, name, icon
 define('GLOBALINFO_RELATED',                0x2);           // spells used by pet, classes/races required by spell, ect
 define('GLOBALINFO_REWARDS',                0x4);           // items rewarded by achievement/quest, ect
+define('GLOBALINFO_EXTRA',                  0x8);           // items / spells .. sends exra tooltip info to template for js-manipulation
 define('GLOBALINFO_ANY',                    0xF);
 
 define('ITEMINFO_JSON',                     0x01);
 define('ITEMINFO_SUBITEMS',                 0x02);
 define('ITEMINFO_VENDOR',                   0x04);
-define('ITEMINFO_LOOT',                     0x08);
+// define('ITEMINFO_LOOT',                     0x08);       // get these infos from dedicatd loot function [count, stack, pctstack, modes]
 define('ITEMINFO_GEM',                      0x10);
 
 define('NPCINFO_TAMEABLE',                  0x1);
@@ -150,6 +152,20 @@ define('OBJECT_CU_NOT_PERSISTANT',          0x80);
 
 define('MAX_LEVEL',                         80);
 
+// Loot handles
+define('LOOT_FISHING',            'fishing_loot_template');
+define('LOOT_CREATURE',          'creature_loot_template');
+define('LOOT_GAMEOBJECT',      'gameobject_loot_template');
+define('LOOT_ITEM',                  'item_loot_template');
+define('LOOT_DISENCHANT',      'disenchant_loot_template');
+define('LOOT_PROSPECTING',    'prospecting_loot_template');
+define('LOOT_MILLING',            'milling_loot_template');
+define('LOOT_PICKPOCKET',   'pickpocketing_loot_template');
+define('LOOT_SKINNING',          'skinning_loot_template');
+define('LOOT_QUEST',           'quest_mail_loot_template');
+define('LOOT_SPELL',                'spell_loot_template');
+define('LOOT_REFERENCE',        'reference_loot_template');
+
 // Sides
 define('SIDE_ALLIANCE',                     1);
 define('SIDE_HORDE',                        2);
@@ -332,7 +348,7 @@ define('OBJECT_DESTRUCTIBLE_BUILDING',      33);
 define('OBJECT_GUILD_BANK',                 34);
 define('OBJECT_TRAPDOOR',                   35);
 
-// InventoryType [slot]
+// InventoryType
 define('INVTYPE_NON_EQUIP',                 0);
 define('INVTYPE_HEAD',                      1);
 define('INVTYPE_NECK',                      2);
@@ -391,7 +407,7 @@ define('ITEM_CLASS_AMMUNITION',             6);
 define('ITEM_CLASS_TRADEGOOD',              7);
 // define('ITEM_CLASS_GENERIC',             8);
 define('ITEM_CLASS_RECIPE',                 9);
-// define('ITEM_CLASS_MONEY',               10);
+define('ITEM_CLASS_MONEY',                  10);
 define('ITEM_CLASS_QUIVER',                 11);
 define('ITEM_CLASS_QUEST',                  12);
 define('ITEM_CLASS_KEY',                    13);
@@ -400,14 +416,21 @@ define('ITEM_CLASS_MISC',                   15);
 define('ITEM_CLASS_GLYPH',                  16);
 
 // ItemFlags
-define('ITEM_FLAG_CONJURED',                0x0000002);
+define('ITEM_FLAG_CONJURED',                0x00000002);
-define('ITEM_FLAG_OPENABLE',                0x0000004);
+define('ITEM_FLAG_OPENABLE',                0x00000004);
-define('ITEM_FLAG_HEROIC',                  0x0000008);
+define('ITEM_FLAG_HEROIC',                  0x00000008);
-define('ITEM_FLAG_DEPRECATED',              0x0000010);
+define('ITEM_FLAG_DEPRECATED',              0x00000010);
-define('ITEM_FLAG_PARTYLOOT',               0x0000800);
+define('ITEM_FLAG_INDESTRUCTIBLE',          0x00000020);
-define('ITEM_FLAG_REFUNDABLE',              0x0001000);
+define('ITEM_FLAG_NO_EQUIPCD',              0x00000080);
-define('ITEM_FLAG_UNIQUEEQUIPPED',          0x0080000);
+define('ITEM_FLAG_PARTYLOOT',               0x00000800);
-define('ITEM_FLAG_ACCOUNTBOUND',            0x8000000);
+define('ITEM_FLAG_REFUNDABLE',              0x00001000);
+define('ITEM_FLAG_PROSPECTABLE',            0x00040000);
+define('ITEM_FLAG_UNIQUEEQUIPPED',          0x00080000);
+define('ITEM_FLAG_USABLE_ARENA',            0x00200000);
+define('ITEM_FLAG_USABLE_SHAPED',           0x00800000);
+define('ITEM_FLAG_SMARTLOOT',               0x02000000);
+define('ITEM_FLAG_ACCOUNTBOUND',            0x08000000);
+define('ITEM_FLAG_MILLABLE',                0x20000000);
 
 // ItemMod  (differ slightly from client, see g_statToJson)
 define('ITEM_MOD_WEAPON_DMG',               0);             // < custom

includes/kernel.php

@@ -14,21 +14,21 @@ error_reporting($e);
 
 define('STATIC_URL', substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1));
 
-require 'includes/Smarty-2.6.26/libs/Smarty.class.php';     // Libraray: http://www.smarty.net/
+require 'includes/libs/Smarty-2.6.26/libs/Smarty.class.php';// Libraray: http://www.smarty.net/
-// require 'includes/Smarty-3.1.14/libs/Smarty.class.php';     // Libraray: http://www.smarty.net/
+// require 'includes/libs/Smarty-3.1.14/libs/Smarty.class.php';     // Libraray: http://www.smarty.net/
-require 'includes/DbSimple/Generic.php';                    // Libraray: http://en.dklab.ru/lib/DbSimple (mysqli: https://bitbucket.org/brainreaver/dbsimple/src)
+require 'includes/libs/DbSimple/Generic.php';               // Libraray: http://en.dklab.ru/lib/DbSimple (using mysqli variant: https://bitbucket.org/brainreaver/dbsimple/src)
 require 'includes/utilities.php';
-require 'includes/class.user.php';
+require 'includes/user.class.php';
-require 'includes/class.database.php';
+require 'includes/database.class.php';
 
 // autoload List-Classes and Associated Filters
 spl_autoload_register(function ($class) {
     if (strpos($class, 'List') && !class_exists($class))
     {
         if (!class_exists('BaseType'))
-            require 'includes/class.basetype.php';
+            require 'includes/types/basetype.class.php';
 
-        require 'includes/class.'.strtr($class, ['List' => '']).'.php';
+        require 'includes/types/'.strtr($class, ['List' => '']).'.class.php';
     }
 });
 

includes/types/basetype.class.php

@@ -521,7 +521,6 @@ trait spawnHelper
     }
 }
 
-
 /*
     roight!
         just noticed, that the filters on pages originally pointed to ?filter=<pageName>
@@ -771,10 +770,10 @@ abstract class Filter
     {
         if ($this->int2Bool($op))
         {
-            if ($isString)
+            $value    = $isString ? '' : 0;
-                return [$field, '', $op ? '!' : null];
+            $operator = $op ? '!' : null;
-            else
+
-                return [$field, 0, $op ? '>' : '<='];
+            return [$field, $value, $operator];
         }
 
         return null;

includes/types/quest.class.php

@@ -160,28 +160,11 @@ class QuestList extends BaseType
 
     private function parseText($type = 'Objectives')
     {
-        $replace = array(
-            '$c' => '<'.Util::ucFirst(Lang::$game['class']).'>',
-            '$C' => '<'.Util::ucFirst(Lang::$game['class']).'>',
-            '$r' => '<'.Util::ucFirst(Lang::$game['race']).'>',
-            '$R' => '<'.Util::ucFirst(Lang::$game['race']).'>',
-            '$n' => '<'.Util::ucFirst(Lang::$main['name']).'>',
-            '$N' => '<'.Util::ucFirst(Lang::$main['name']).'>',
-            '$b' => '<br />',
-            '$B' => '<br />'
-        );
-
         $text = $this->getField($type, true);
         if (!$text)
             return '';
 
-        $text = strtr($text, $replace);
+        $text = Util::parseHtmlText($text);
-
-        // gender switch
-        $text = preg_replace('/$g([^:;]+):([^:;]+);/ui', '&lt;\1/\2&lt;', $text);
-
-        // nonesense, that the client apparently ignores
-        $text = preg_replace('/$t([^;]+);/ui', '', $text);
 
         return Util::jsEscape($text);
     }

includes/types/spell.class.php

@@ -48,8 +48,8 @@ class SpellList extends BaseType
         foreach ($this->iterate() as &$_curTpl)
         {
             // required for globals
-            for ($i = 1; $i <= 3; $i++)
+            if ($idx = $this->canCreateItem())
-                if ($this->canCreateItem())
+                foreach ($idx as $i)
                     $foo[] = (int)$_curTpl['effect'.$i.'CreateItemId'];
 
             for ($i = 1; $i <= 8; $i++)
@@ -129,13 +129,24 @@ class SpellList extends BaseType
 
             for ($i = 1; $i <= 3; $i++)
             {
-                if (!in_array($this->curTpl["effect".$i."AuraId"], [8, 13, 22, 29, 34, 35, 83, 84, 85, 99, 124, 135, 143, 158, 161, 189, 230, 235, 240, 250]))
+                $mv = $this->curTpl['effect'.$i.'MiscValue'];
+                $bp = $this->curTpl['effect'.$i.'BasePoints'] + 1;
+                $au = $this->curTpl['effect'.$i.'AuraId'];
+
+                // Enchant Item Permanent (53) / Temporary (54)
+                if (in_array($this->curTpl['effect'.$i.'Id'], [53, 54]))
+                {
+                    if ($mv)
+                        Util::arraySumByKey($stats, Util::parseItemEnchantment($mv, true));
+
+                    continue;
+                }
+
+                // Aura Effects
+                if (!in_array($au, [8, 13, 22, 29, 34, 35, 83, 84, 85, 99, 124, 135, 143, 158, 161, 189, 220, 230, 235, 240, 250]))
                     continue;
 
-                $mv = $this->curTpl["effect".$i."MiscValue"];
+                switch ($au)
-                $bp = $this->curTpl["effect".$i."BasePoints"] + 1;
-
-                switch ($this->curTpl["effect".$i."AuraId"])
                 {
                     case 29:                                // ModStat MiscVal:type
                     {
@@ -219,20 +230,9 @@ class SpellList extends BaseType
                         break;
                     }
                     case 189:                               // CombatRating MiscVal:ratingMask
-                        // special case: resilience -  consists of 3 ratings strung together. MOD_CRIT_TAKEN_MELEE|RANGED|SPELL (14,15,16)
+                    case 220:
-                        if (($mv & 0x1C000) == 0x1C000)
+                        if ($mod = Util::itemModByRatingMask($mv))
-                            @$stats[ITEM_MOD_RESILIENCE_RATING] += $bp;
+                            @$stats[$mod] += $bp;
-
-                        for ($j = 0; $j < count(Util::$combatRatingToItemMod); $j++)
-                        {
-                            if (!Util::$combatRatingToItemMod[$j])
-                                continue;
-
-                            if (($mv & (1 << $j)) == 0)
-                                continue;
-
-                            @$stats[Util::$combatRatingToItemMod[$j]] += $bp;
-                        }
                         break;
                     case 143:                               // Resistance MiscVal:school
                     case 83:
@@ -304,7 +304,18 @@ class SpellList extends BaseType
     }
 
     // halper
-    private function getToolsForCurrent()
+    public function getReagentsForCurrent()
+    {
+        $data = [];
+
+        for ($i = 1; $i <= 8; $i++)
+            if ($this->curTpl['reagent'.$i] > 0 && $this->curTpl['reagentCount'.$i])
+                $data[$this->curTpl['reagent'.$i]] = [$this->curTpl['reagent'.$i], $this->curTpl['reagentCount'.$i]];
+
+        return $data;
+    }
+
+    public function getToolsForCurrent()
     {
         if ($this->tools)
             return $this->tools;
@@ -321,7 +332,7 @@ class SpellList extends BaseType
                 if ($relId != $this->curTpl['tool'.$i])
                     continue;
 
-                $tools[$i-1] = array(
+                $tools[$i - 1] = array(
                     'itemId'  => $relId,
                     'name'    => $this->relItems->getField('name', true),
                     'quality' => $this->relItems->getField('quality')
@@ -334,8 +345,8 @@ class SpellList extends BaseType
             if ($_ = $this->curTpl['toolCategory'.$i])
             {
                 $tc = DB::Aowow()->selectRow('SELECT * FROM ?_totemcategory WHERE id = ?d', $_);
-                $tools[$i+1] = array(
+                $tools[$i + 1] = array(
-                    'id' => $_,
+                    'id'   => $_,
                     'name' => Util::localizedString($tc, 'name'));
             }
         }
@@ -367,7 +378,7 @@ class SpellList extends BaseType
             return sprintf(Lang::$spell['range'], $this->curTpl['rangeMaxHostile']);
     }
 
-    private function createPowerCostForCurrent()
+    public function createPowerCostForCurrent()
     {
         $str = '';
 
@@ -403,7 +414,7 @@ class SpellList extends BaseType
         return $str;
     }
 
-    private function createCastTimeForCurrent($short = true, $noInstant = true)
+    public function createCastTimeForCurrent($short = true, $noInstant = true)
     {
         if ($this->curTpl['interruptFlagsChannel'])
             return Lang::$spell['channeled'];
@@ -462,12 +473,28 @@ class SpellList extends BaseType
 
     public function canCreateItem()
     {
-        // 24: createItem; 34: changeItem; 59: randomItem; 66: createManaGem; 157: createitem2; 86: channelDeathItem
+        $idx = [];
+        // effect - 24: createItem; 34: changeItem; 59: randomItem; 66: createManaGem; 157: createItem2
+        // aura   - 86: channelDeathItem
         for ($i = 1; $i < 4; $i++)
-            if (in_array($this->curTpl['effect'.$i.'Id'], [24, 34, 59, 66, 157]) || $this->curTpl['effect'.$i.'AuraId'] == 86)
+            if (in_array($this->curTpl['effect'.$i.'Id'], [24, 34, 59, 66, 157]) || in_array($this->curTpl['effect'.$i.'AuraId'], [86]))
-                return true;
+                if ($this->curTpl['effect'.$i.'CreateItemId'] > 0)
+                    $idx[] = $i;
 
-        return false;
+        return $idx;
+    }
+
+    public function canTriggerSpell()
+    {
+        $idx = [];
+        // effect - 3: dummy; 32: trigger missile; 36: learn spell; 57: learn pet spell; 64/151: trigger spell (2); 101: feed pet; 133: unlearn specialization; 140/142: force cast (with value); 148/152/160: unk; 164: remove aura
+        // aura   - 4: dummy; 23/227: periodic trigger spell (with value); 42/231: proc trigger spell (with value); 48: unk; 109: add target trigger; 226: periodic dummy; 236: control vehicle; 284: linked
+        for ($i = 1; $i < 4; $i++)
+            if (in_array($this->curTpl['effect'.$i.'Id'], [3, 32, 36, 57, 64, 101, 133, 142, 148, 151, 152, 160, 164]) || in_array($this->curTpl['effect'.$i.'AuraId'], [4, 23, 42, 48, 109, 226, 227, 231, 236, 284]))
+                if ($this->curTpl['effect'.$i.'TriggerSpell'] > 0)
+                    $idx[] = $i;
+
+        return $idx;
     }
 
     // description-, buff-parsing component
@@ -547,7 +574,7 @@ class SpellList extends BaseType
     }
 
     // description-, buff-parsing component
-    private function resolveVariableString($variable)
+    private function resolveVariableString($variable, &$usesScalingRating)
     {
         $signs  = ['+', '-', '/', '*', '%', '^'];
 
@@ -684,20 +711,9 @@ class SpellList extends BaseType
 
                 // Aura giving combat ratings
                 $rType = 0;
-                if ($aura == 189)
+                if (in_array($aura, [189, 220]))
-                {
+                    if ($rType = Util::itemModByRatingMask($mv))
-                    for ($j = 0; $j < count(Util::$combatRatingToItemMod); $j++)
+                        $usesScalingRating = true;
-                    {
-                        if (!Util::$combatRatingToItemMod[$j])
-                            continue;
-
-                        if (($mv & (1 << $j)) == 0)
-                            continue;
-
-                        $rType = Util::$combatRatingToItemMod[$j];
-                        break;
-                    }
-                }
                 // Aura end
 
                 if ($rType && $this->interactive)
@@ -794,20 +810,9 @@ class SpellList extends BaseType
 
                 // Aura giving combat ratings
                 $rType = 0;
-                if ($aura == 189)
+                if (in_array($aura, [189, 220]))
-                {
+                    if ($rType = Util::itemModByRatingMask($mv))
-                    for ($j = 0; $j < count(Util::$combatRatingToItemMod); $j++)
+                        $usesScalingRating = true;
-                    {
-                        if (!Util::$combatRatingToItemMod[$j])
-                            continue;
-
-                        if (($mv & (1 << $j)) == 0)
-                            continue;
-
-                        $rType = Util::$combatRatingToItemMod[$j];
-                        break;
-                    }
-                }
                 // Aura end
 
                 if ($rType && $equal && $this->interactive)
@@ -868,7 +873,7 @@ class SpellList extends BaseType
     }
 
     // description-, buff-parsing component
-    private function resolveFormulaString($formula, $precision = 0)
+    private function resolveFormulaString($formula, $precision = 0, &$scaling)
     {
         // step 1: formula unpacking redux
         while (($formStartPos = strpos($formula, '${')) !== false)
@@ -904,7 +909,7 @@ class SpellList extends BaseType
                 ++$formCurPos;                              // for some odd reason the precision decimal survives if wo dont increment further..
             }
 
-            $formOutStr = $this->resolveFormulaString($formOutStr, $formPrecision);
+            $formOutStr = $this->resolveFormulaString($formOutStr, $formPrecision, $scaling);
 
             $formula = substr_replace($formula, $formOutStr, $formStartPos, ($formCurPos - $formStartPos));
         }
@@ -930,7 +935,7 @@ class SpellList extends BaseType
             }
             $pos += strlen($result[0]);
 
-            $var = $this->resolveVariableString($result);
+            $var = $this->resolveVariableString($result, $scaling);
             if (is_array($var))
             {
                 $str   .= $var[0];
@@ -951,7 +956,7 @@ class SpellList extends BaseType
 
     // should probably used only once to create ?_spell. come to think of it, it yields the same results every time.. it absolutely has to!
     // although it seems to be pretty fast, even on those pesky test-spells with extra complex tooltips (Ron Test Spell X))
-    public function parseText($type = 'description', $level = MAX_LEVEL, $interactive = false)
+    public function parseText($type = 'description', $level = MAX_LEVEL, $interactive = false, &$scaling = false)
     {
         // oooo..kaaayy.. parsing text in 6 or 7 easy steps
         // we don't use the internal iterator here. This func has to be called for the individual template.
@@ -1028,8 +1033,8 @@ class SpellList extends BaseType
             $max(a, b)     - max()
     */
 
-    $this->interactive = $interactive;
+        $this->interactive = $interactive;
-    $this->charLevel   = $level;
+        $this->charLevel   = $level;
 
     // step 0: get text
         $data = $this->getField($type, true);
@@ -1096,8 +1101,8 @@ Turns the Shaman into a Ghost Wolf, increasing speed by $s2%$?s59289[ and regene
 Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
 */
 
-            else if (!empty($matches[2]))                   // aura/spell-condition .. use false; TODO (low): catch cases and port "know"-param for tooltips from 5.0
+            else if (!empty($matches[2]))
-            {                                               // tooltip_enus: Charge to an enemy, stunning it <!--sp58377:0--><!--sp58377-->for <!--sp103828:0-->1 sec<!--sp103828-->.; spells_enus: {"58377": [["", "and 2 additional nearby targets "]], "103828": [["1 sec", "3 sec"]]};
+            {
                 $condStartPos = strpos($data, $matches[2]) - 2;
                 $condCurPos   = $condStartPos;
             }
@@ -1191,7 +1196,7 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
                 $formPrecision = $data[$formCurPos + 1];
                 $formCurPos += 2;
             }
-            $formOutStr = $this->resolveFormulaString($formOutStr, $formPrecision);
+            $formOutStr = $this->resolveFormulaString($formOutStr, $formPrecision, $scaling);
 
             $data = substr_replace($data, $formOutStr, $formStartPos, ($formCurPos - $formStartPos));
         }
@@ -1218,7 +1223,7 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
 
             $pos += strlen($result[0]);
 
-            $var = $this->resolveVariableString($result);
+            $var = $this->resolveVariableString($result, $scaling);
             $resolved = is_array($var) ? $var[0] : $var;
             $str .= is_numeric($resolved) ? abs($resolved) : $resolved;
             if (is_array($var))
@@ -1227,7 +1232,7 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
         $str .= substr($data, $pos);
         $str = str_replace('#', '$', $str);                 // reset marker
 
-    // step 5: variable-depentant variable-text
+    // step 5: variable-dependant variable-text
         // special case $lONE:ELSE;
         // todo (low): russian uses THREE (wtf?! oO) cases ($l[singular]:[plural1]:[plural2]) .. explode() chooses always the first plural option :/
         while (preg_match('/([\d\.]+)([^\d]*)(\$l:*)([^:]*):([^;]*);/i', $str, $m))
@@ -1271,7 +1276,7 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
         $x .= '<table><tr><td>';
 
         // parse Buff-Text
-        $btt = $this->parseText('buff', $level, $this->interactive);
+        $btt = $this->parseText('buff', $level, $this->interactive, $scaling);
         $x .= $btt[0].'<br>';
 
         // duration
@@ -1280,6 +1285,9 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
 
         $x .= '</td></tr></table>';
 
+        // scaling information - spellId:min:max:curr
+        $x .= '<!--?'.$this->id.':1:'.($scaling ? MAX_LEVEL : 1).':'.$level.'-->';
+
         $this->buffs[$this->id] = array($x, $btt[1]);
 
         return $this->buffs[$this->id];
@@ -1298,7 +1306,7 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
         // fetch needed texts
         $name  = $this->getField('name', true);
         $rank  = $this->getField('rank', true);
-        $desc  = $this->parseText('description', $level, $this->interactive);
+        $desc  = $this->parseText('description', $level, $this->interactive, $scaling);
         $tools = $this->getToolsForCurrent();
         $cool  = $this->createCooldownForCurrent();
         $cast  = $this->createCastTimeForCurrent();
@@ -1306,18 +1314,10 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
         $range = $this->createRangesForCurrent();
 
         // get reagents
-        $reagents = [];
+        $reagents = $this->getReagentsForCurrent();
-        for ($j = 1; $j <= 8; $j++)
+        foreach ($reagents as &$r)
-        {
+            $r[2] = ItemList::getName($r[0]);
-            if($this->curTpl['reagent'.$j] <= 0)
-                continue;
 
-            $reagents[] = array(
-                'id' => $this->curTpl['reagent'.$j],
-                'name' => ItemList::getName($this->curTpl['reagent'.$j]),
-                'count' => $this->curTpl['reagentCount'.$j]          // if < 0 : require, but don't use
-            );
-        }
         $reagents = array_reverse($reagents);
 
         // get stances (check: SPELL_ATTR2_NOT_NEED_SHAPESHIFT)
@@ -1414,9 +1414,9 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
             $_ = Lang::$spell['reagents'].':<br/><div class="indent q1">';
             while ($reagent = array_pop($reagents))
             {
-                $_ .= '<a href="?item='.$reagent['id'].'">'.$reagent['name'].'</a>';
+                $_ .= '<a href="?item='.$reagent[0].'">'.$reagent[2].'</a>';
-                if ($reagent['count'] > 1)
+                if ($reagent[1] > 1)
-                    $_ .= ' ('.$reagent['count'].')';
+                    $_ .= ' ('.$reagent[1].')';
 
                 if(!empty($reagents))
                     $_ .= ', ';
@@ -1439,6 +1439,9 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
         if ($xTmp)
             $x .= '<table><tr><td>'.implode('<br />', $xTmp).'</td></tr></table>';
 
+        // scaling information - spellId:min:max:curr
+        $x .= '<!--?'.$this->id.':1:'.($scaling ? MAX_LEVEL : 1).':'.$level.'-->';
+
         $this->tooltips[$this->id] = array($x, $desc ? $desc[1] : null);
 
         return $this->tooltips[$this->id];
@@ -1517,7 +1520,7 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
                 'cat'          => $this->curTpl['typeCat'],
                 'trainingcost' => $this->curTpl['trainingCost'],
                 'skill'        => count($this->curTpl['skillLines']) > 4 ? array_merge(array_splice($this->curTpl['skillLines'], 0, 4), [-1]): $this->curTpl['skillLines'], // display max 4 skillLines (fills max three lines in listview)
-                'reagents'     => [],
+                'reagents'     => $this->getReagentsForCurrent(),
                 'source'       => []
             );
 
@@ -1555,11 +1558,6 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
                 $data[$this->id]['colors'] = $this->getColorsForCurrent();
             }
 
-            // reagents
-            for ($i = 1; $i <= 8; $i++)
-                if ($this->curTpl['reagent'.$i] > 0 && $this->curTpl['reagentCount'.$i] > 0)
-                    $data[$this->id]['reagents'][] = [$this->curTpl['reagent'.$i], $this->curTpl['reagentCount'.$i]];
-
             // glyph
             if ($this->curTpl['typeCat'] == -13)
                 $data[$this->id]['glyphtype'] = $this->curTpl['cuFlags'] & SPELL_CU_GLYPH_MAJOR ? 1 : 2;
@@ -1577,86 +1575,12 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
         return $data;
     }
 
-    public function getDetailPageData()
+    public function addGlobalsToJScript(&$template, $addMask = GLOBALINFO_SELF)
-    {
-        $result = array(
-            'id'        => $this->id,
-            'name'      => $this->getField('name', true),
-            'icon'      => $this->curTpl['iconString'],
-            'stack'     => $this->curTpl['stackAmount'],
-            'powerCost' => $this->createPowerCostForCurrent(),
-            'level'     => $this->curTpl['spellLevel'],
-            'rangeName' => $this->getField('rangeText', true),
-            'range'     => $this->curTpl['rangeMaxHostile'],
-            'castTime'  => $this->createCastTimeForCurrent(false, false),
-            'cooldown'  => $this->curTpl['recoveryTime'] > 0 ? Util::formatTime($this->curTpl['recoveryTime']) : '<span class="q0">'.Lang::$main['n_a'].'</span>',
-            'gcd'       => Util::formatTime($this->curTpl['startRecoveryTime']),
-            'gcdCat'    => "[NYI]",
-            'duration'  => $this->curTpl['duration'] > 0 ? Util::formatTime($this->curTpl['duration']) : '<span class="q0">'.Lang::$main['n_a'].'</span>',
-            'school'    => sprintf(Util::$dfnString, Util::asHex($this->getField('schoolMask')), Lang::getMagicSchools($this->getField('schoolMask'))),
-            'dispel'    => isset(Lang::$game['dt'][$this->curTpl['dispelType']]) ? Lang::$game['dt'][$this->curTpl['dispelType']] : '<span class="q0">'.Lang::$main['n_a'].'</span>',
-            'mechanic'  => isset(Lang::$game['me'][$this->curTpl['mechanic']]) ? Lang::$game['me'][$this->curTpl['mechanic']] : '<span class="q0">'.Lang::$main['n_a'].'</span>',
-            'stances'   => $this->curTpl['attributes2'] & 0x80000 ? '' : Lang::getStances($this->curTpl['stanceMask']),
-            'tools'     => $this->getToolsForCurrent(),
-            'reagents'  => [],
-            'items'     => []
-        );
-
-        // minRange exists..  prepend
-        if ($_ = $this->curTpl['rangeMinHostile'])
-            $result['range'] = $_.' - '.$result['range'];
-
-        // fill reagents
-        for ($i = 1; $i < 9; $i++)
-            if ($this->curTpl['reagent'.$i] > 0 && $this->curTpl['reagentCount'.$i] > 0)
-                $result['reagents'][$this->curTpl['reagent'.$i]] = $this->curTpl['reagentCount'.$i];
-
-        // parse itemClass & itemSubClassMask
-        $class    = $this->getField('equippedItemClass');
-        $subClass = $this->getField('equippedItemSubClassMask');
-
-        if ($class > 0 && $subClass > 0)
-        {
-            $title = ['CLASS: '.$class, 'SUBCLASS: '.Util::asHex($subClass)];
-            $text  = Lang::getRequiredItems($class, $subClass, false);
-
-            if ($invType = $this->getField('equippedItemInventoryTypeMask'))
-            {
-                // remap some duplicated strings            'Off Hand' and 'Shield' are never used simultaneously
-                if ($invType & (1 << INVTYPE_ROBE))         // Robe => Chest
-                {
-                    $invType &= ~(1 << INVTYPE_ROBE);
-                    $invType &=  (1 << INVTYPE_CHEST);
-                }
-
-                if ($invType & (1 << INVTYPE_RANGEDRIGHT))  // Ranged2 => Ranged
-                {
-                    $invType &= ~(1 << INVTYPE_RANGEDRIGHT);
-                    $invType &=  (1 << INVTYPE_RANGED);
-                }
-
-                $_ = [];
-                $strs = Lang::$item['inventoryType'];
-                foreach ($strs as $k => $str)
-                    if ($invType & 1 << $k && $str)
-                        $_[] = $str;
-
-                $title[] = 'INVENTORYTYPE: '.Util::asHex($invType);
-                $text   .= ' '.Lang::$spell['_inSlot'].': '.implode(', ', $_);
-            }
-
-            $result['items'] = sprintf(Util::$dfnString, implode(' - ', $title), $text);
-        }
-
-        return $result;
-    }
-
-    public function addGlobalsToJScript(&$template, $addMask = GLOBALINFO_ANY)
     {
         if ($this->relItems && ($addMask & GLOBALINFO_RELATED))
             $this->relItems->addGlobalsToJscript($template);
 
-        foreach ($this->iterate() as $__)
+        foreach ($this->iterate() as $id => $__)
         {
             if ($addMask & GLOBALINFO_RELATED)
             {
@@ -1671,15 +1595,42 @@ Lasts 5 min. $?$gte($pl,68)[][Cannot be used on items level 138 and higher.]
                             $template->extendGlobalIds(TYPE_RACE, $i + 1);
             }
 
+            $data  = null;
+            $extra = null;
             if ($addMask & GLOBALINFO_SELF)
             {
                 $iconString = $this->curTpl['iconStringAlt'] ? 'iconStringAlt' : 'iconString';
 
-                $template->extendGlobalData(self::$type, [$this->id => array(
+                $data = array(
-                    'icon' => $this->curTpl[$iconString],
+                    $id => array(
-                    'name' => $this->getField('name', true),
+                        'icon' => $this->curTpl[$iconString],
-                )]);
+                        'name' => $this->getField('name', true),
+                    )
+                );
             }
+
+            if ($addMask & GLOBALINFO_EXTRA)
+            {
+/*
+spells / buffspells = {
+    "58377": [["", "and 2 additional nearby targets "]],
+    "103828": [["stunning", "rooting"], ["1 sec", "4 sec and reducing movement speed by 50% for 15 sec"]]
+};
+*/
+                $buff = $this->renderBuff(MAX_LEVEL, true);
+                $tTip = $this->renderTooltip(MAX_LEVEL, true);
+
+                $extra = array(
+                    'id'         => $id,
+                    'tooltip'    => Util::jsEscape($tTip[0]),
+                    'buff'       => @Util::jsEscape($buff[0]),
+                    'spells'     => $tTip[1],
+                    'buffspells' => @$buff[1]
+                );
+            }
+
+            if ($data || $extra)
+                $template->extendGlobalData(self::$type, $data, $extra);
         }
     }
 }
@@ -1784,7 +1735,7 @@ class SpellListFilter extends Filter
                 $parts[] = ['name_loc'.User::$localeId, $_v['na']];
         }
 
-        // spellLevel min
+        // spellLevel min                                   todo (low): talentSpells (typeCat -2) commonly have spellLevel 1 (and talentLevel >1) -> query is inaccurate
         if (isset($_v['minle']))
         {
             if (is_int($_v['minle']) && $_v['minle'] > 0)

includes/types/title.class.php

@@ -141,7 +141,7 @@ class TitleList extends BaseType
     public function getHtmlizedName($gender = GENDER_MALE)
     {
         $field = $gender == GENDER_FEMALE ? 'female' : 'male';
-        return str_replace('%s', '<span class="q0">&lt;'.Lang::$main['name'].'&gt;</span>', $this->getField($field, true));
+        return str_replace('%s', '<span class="q0">&lt;'.Util::ucFirst(Lang::$main['name']).'&gt;</span>', $this->getField($field, true));
     }
 
     public function renderTooltip() { }