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

any 'Id' => 'id' as i'm mighty tired of the conflicts between js (lower) and php (ucFirst)

Browse Source 
added achievemnts-page to enable display of tooltips
This commit is contained in:
Sarjuuk
2013-03-05 23:21:19 +01:00
parent edd0ff5209
commit d848faa1fa
27 changed files with 643 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
setup/tools/dataset-assembler/enchants.php
View File

@@ -105,8 +105,8 @@ if (!defined('AOWOW_REVISION'))
}
// costy and locale-independant -> cache
if (!isset($jsonEnchants[$enchant['Id']]))
$jsonEnchants[$enchant['Id']] = Util::parseItemEnchantment($enchant);
if (!isset($jsonEnchants[$enchant['id']]))
$jsonEnchants[$enchant['id']] = Util::parseItemEnchantment($enchant);
// defaults
$ench = array(
@@ -117,7 +117,7 @@ if (!defined('AOWOW_REVISION'))
'skill' => -1, // modified if skill
'slots' => [], // determied per spell but set per item
'enchantment' => Util::jsEscape(Util::localizedString($enchant, 'text')),
'jsonequip' => $jsonEnchants[$enchant['Id']],
'jsonequip' => $jsonEnchants[$enchant['id']],
'temp' => 0, // always 0
'classes' => 0, // modified by item
);
@@ -132,23 +132,23 @@ if (!defined('AOWOW_REVISION'))
$ench['jsonequip']['reqlevel'] = $enchant['requiredLevel'];
// check if the spell has an entry in skill_line_ability -> Source:Profession
if ($skill = DB::Aowow()->SelectCell('SELECT skillId FROM ?_skill_line_ability WHERE spellId = ?d', $enchantSpells->Id))
if ($skill = DB::Aowow()->SelectCell('SELECT skillId FROM ?_skill_line_ability WHERE spellId = ?d', $enchantSpells->id))
{
$ench['name'][] = Util::jsEscape($enchantSpells->names[$enchantSpells->Id]));
$ench['source'][] = $enchantSpells->Id;
$ench['name'][] = Util::jsEscape($enchantSpells->names[$enchantSpells->id]));
$ench['source'][] = $enchantSpells->id;
$ench['skill'] = $skill;
$ench['slots'][] = $slot;
}
// check if this item can be cast via item -> Source:Item
if (!isset($castItems[$enchantSpells->Id]))
$castItems[$enchantSpells->Id] = new ItemList([['spellid_1', $enchantSpells->Id], ['name', 'Scroll of Enchant%', '!']]); // do not reuse enchantment scrolls
if (!isset($castItems[$enchantSpells->id]))
$castItems[$enchantSpells->id] = new ItemList([['spellid_1', $enchantSpells->id], ['name', 'Scroll of Enchant%', '!']]); // do not reuse enchantment scrolls
$cI &= $castItems[$enchantSpells->Id]; // this construct is a bit .. unwieldy
$cI &= $castItems[$enchantSpells->id]; // this construct is a bit .. unwieldy
while ($cI->iterate())
{
$ench['name'][] = Util::jsEscape($cI->names[$cI->Id]);
$ench['source'][] = -$cI->Id;
$ench['name'][] = Util::jsEscape($cI->names[$cI->id]);
$ench['source'][] = -$cI->id;
$ench['icon'] = strTolower($cI->getField('icon'));
$ench['slots'][] = $slot;
@@ -171,33 +171,33 @@ if (!defined('AOWOW_REVISION'))
continue;
// everything gathered
if (isset($enchantsOut[$enchant['Id']])) // already found, append data
if (isset($enchantsOut[$enchant['id']])) // already found, append data
{
foreach ($enchantsOut[$enchant['Id']] as $k => $v)
foreach ($enchantsOut[$enchant['id']] as $k => $v)
{
if (is_array($v))
{
while ($pop = array_pop($ench[$k]))
$enchantsOut[$enchant['Id']][$k][] = $pop;
$enchantsOut[$enchant['id']][$k][] = $pop;
}
else
{
if ($k == 'quality') // quality:-1 if spells and items are mixed
{
if ($enchantsOut[$enchant['Id']]['source'][0] > 0 && $ench['source'][0] < 0)
$enchantsOut[$enchant['Id']][$k] = -1;
else if ($enchantsOut[$enchant['Id']]['source'][0] < 0 && $ench['source'][0] > 0)
$enchantsOut[$enchant['Id']][$k] = -1;
if ($enchantsOut[$enchant['id']]['source'][0] > 0 && $ench['source'][0] < 0)
$enchantsOut[$enchant['id']][$k] = -1;
else if ($enchantsOut[$enchant['id']]['source'][0] < 0 && $ench['source'][0] > 0)
$enchantsOut[$enchant['id']][$k] = -1;
else
$enchantsOut[$enchant['Id']][$k] = $ench[$k];
$enchantsOut[$enchant['id']][$k] = $ench[$k];
}
else if ($enchantsOut[$enchant['Id']][$k] <= 0)
$enchantsOut[$enchant['Id']][$k] = $ench[$k];
else if ($enchantsOut[$enchant['id']][$k] <= 0)
$enchantsOut[$enchant['id']][$k] = $ench[$k];
}
}
}
else // nothing yet, create new
$enchantsOut[$enchant['Id']] = $ench;
$enchantsOut[$enchant['id']] = $ench;
}
// walk over each entry and strip single-item arrays

6
setup/tools/dataset-assembler/glyphs.php
View File

@@ -132,7 +132,7 @@ if (!defined('AOWOW_REVISION'))
if ($pop['glyphEffect'])
$glyphSpells[] = $pop['glyphEffect'];
$glyphSpells = new SpellList(array(['Id', $glyphSpells]));
$glyphSpells = new SpellList(array(['id', $glyphSpells]));
foreach ($locales as $lId)
{
@@ -145,7 +145,7 @@ if (!defined('AOWOW_REVISION'))
if (!$pop['glyphEffect'])
continue;
while ($glyphSpells->Id != $pop['glyphEffect'])
while ($glyphSpells->id != $pop['glyphEffect'])
$glyphSpells->iterate();
if ($glyphSpells->getField('effect1Id') != 6 && $glyphSpells->getField('effect2Id') != 6 && $glyphSpells->getField('effect3Id') != 6)
@@ -193,7 +193,7 @@ if (!defined('AOWOW_REVISION'))
$m2 = $glyphSpells->getField('effect2SpellClassMask'.$l[$i]);
$m3 = $glyphSpells->getField('effect3SpellClassMask'.$l[$i]);
if ($glyphSpells->getField('effect'.$i.'Id') != 6 || (!$m1 && !$m2 && !$m3))
if ($glyphSpells->getField('effect'.$i.'id') != 6 || (!$m1 && !$m2 && !$m3))
continue;
$where = "SpellFamilyId = ?d AND ((SpellFamilyFlags3 & 0xFFFFFFFF) & ?d OR (SpellFamilyFlags2 & 0xFFFFFFFF) & ?d OR (SpellFamilyFlags1 & 0xFFFFFFFF) & ?d)";

2
setup/tools/dataset-assembler/itemsets.php
View File

@@ -113,7 +113,7 @@ if (!defined('AOWOW_REVISION'))
// costy and locale-independant -> cache
if (!isset($jsonBonus[$set['spell'.$i]]))
{
$bSpell = new SpellList(array(['Id', $set['spell'.$i]]));
$bSpell = new SpellList(array(['id', $set['spell'.$i]]));
$jsonBonus[$set['spell'.$i]] = $bSpell->getStatGain();
}

2
setup/tools/dataset-assembler/talents.php
View File

@@ -114,7 +114,7 @@ if (!defined('AOWOW_REVISION'))
for ($k = 0; $k <= ($m - 1); $k++)
{
$tSpell = new SpellList(array(['Id', $talents[$j]['rank'.($k + 1)]]));
$tSpell = new SpellList(array(['id', $talents[$j]['rank'.($k + 1)]]));
$d[] = $tSpell->parseText();
$s[] = $talents[$j]['rank'.($k + 1)];