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

Misc/Fixups

Browse Source 
* fixed file generators involving ?_icons table
 * known spells onspell detail page should have a localized tooltip
 * fixed numer formating in spell tooltips for locales with a ',' as decimal
 * fixed php-tag in contribute template, causing parse error
This commit is contained in:
Sarjuuk
2017-04-06 23:40:25 +02:00
parent b74b03151b
commit 0360f6f600
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/types/spell.class.php
View File

@@ -1471,12 +1471,12 @@ class SpellList extends BaseType
} }
list($formOutVal, $formOutStr, $ratingId) = $this->resolveFormulaString($formOutStr, $formPrecision ?: ($topLevel ? 0 : 10), $scaling); list($formOutVal, $formOutStr, $ratingId) = $this->resolveFormulaString($formOutStr, $formPrecision ?: ($topLevel ? 0 : 10), $scaling);
if ($ratingId && is_numeric($formOutVal) && $this->interactive) if ($ratingId && Util::checkNumeric($formOutVal) && $this->interactive)
$resolved = sprintf($formOutStr, $ratingId, abs($formOutVal), sprintf(Util::$setRatingLevelString, $this->charLevel, $ratingId, abs($formOutVal), Util::setRatingLevel($this->charLevel, $ratingId, abs($formOutVal)))); $resolved = sprintf($formOutStr, $ratingId, abs($formOutVal), sprintf(Util::$setRatingLevelString, $this->charLevel, $ratingId, abs($formOutVal), Util::setRatingLevel($this->charLevel, $ratingId, abs($formOutVal))));
else if ($ratingId && is_numeric($formOutVal)) else if ($ratingId && Util::checkNumeric($formOutVal))
$resolved = sprintf($formOutStr, $ratingId, abs($formOutVal), Util::setRatingLevel($this->charLevel, $ratingId, abs($formOutVal))); $resolved = sprintf($formOutStr, $ratingId, abs($formOutVal), Util::setRatingLevel($this->charLevel, $ratingId, abs($formOutVal)));
else else
$resolved = sprintf($formOutStr, is_numeric($formOutVal) ? abs($formOutVal) : $formOutVal); $resolved = sprintf($formOutStr, Util::checkNumeric($formOutVal) ? abs($formOutVal) : $formOutVal);
$data = substr_replace($data, $resolved, $formStartPos, ($formCurPos - $formStartPos)); $data = substr_replace($data, $resolved, $formStartPos, ($formCurPos - $formStartPos));
} }

2
setup/tools/filegen/enchants.func.php
View File

@@ -65,7 +65,7 @@ if (!CLI)
effect1MiscValue, effect1MiscValue,
equippedItemClass, equippedItemInventoryTypeMask, equippedItemSubClassMask, equippedItemClass, equippedItemInventoryTypeMask, equippedItemSubClassMask,
skillLine1, skillLine1,
IFNULL(i.iconString, "inv_misc_questionmark") AS iconString, IFNULL(i.name, "inv_misc_questionmark") AS iconString,
name_loc0, name_loc2, name_loc3, name_loc6, name_loc8 name_loc0, name_loc2, name_loc3, name_loc6, name_loc8
FROM FROM
?_spell s ?_spell s

4
setup/tools/filegen/gems.func.php
View File

@@ -33,11 +33,11 @@ if (!CLI)
i.name_loc0, i.name_loc2, i.name_loc3, i.name_loc6, i.name_loc8, i.name_loc0, i.name_loc2, i.name_loc3, i.name_loc6, i.name_loc8,
IF (i.id < 36000 OR i.itemLevel < 70, 1 , 2) AS expansion, IF (i.id < 36000 OR i.itemLevel < 70, 1 , 2) AS expansion,
i.quality, i.quality,
ic.iconString AS icon, ic.name AS icon,
i.gemEnchantmentId AS enchId, i.gemEnchantmentId AS enchId,
i.gemColorMask AS colors i.gemColorMask AS colors
FROM ?_items i FROM ?_items i
JOIN ?_icons ic ON ic.id = -i.displayId JOIN ?_icons ic ON ic.id = i.iconId
WHERE i.gemEnchantmentId <> 0 WHERE i.gemEnchantmentId <> 0
ORDER BY i.id DESC'); ORDER BY i.id DESC');
$success = true; $success = true;

2
setup/tools/filegen/glyphs.func.php
View File

@@ -32,7 +32,7 @@ if (!CLI)
i.subclass AS classs, i.subclass AS classs,
i.requiredLevel AS level, i.requiredLevel AS level,
s1.Id AS glyphSpell, s1.Id AS glyphSpell,
ic.iconString AS icon, ic.name AS icon,
s1.skillLine1 AS skillId, s1.skillLine1 AS skillId,
s2.Id AS glyphEffect, s2.Id AS glyphEffect,
s2.Id AS ARRAY_KEY s2.Id AS ARRAY_KEY

2
setup/tools/filegen/talentIcons.func.php
View File

@@ -15,7 +15,7 @@ if (!CLI)
function talentIcons() function talentIcons()
{ {
$success = true; $success = true;
$query = 'SELECT ic.iconString FROM ?_icons ic JOIN dbc_spell s ON s.iconId = ic.Id JOIN dbc_talent t ON t.rank1 = s.Id JOIN dbc_talenttab tt ON tt.Id = t.tabId WHERE tt.?# = ?d AND tt.tabNumber = ?d ORDER BY t.row, t.column, t.petCategory1 ASC'; $query = 'SELECT ic.name AS iconString FROM ?_icons ic JOIN ?_spell s ON s.iconId = ic.Id JOIN dbc_talent t ON t.rank1 = s.id JOIN dbc_talenttab tt ON tt.Id = t.tabId WHERE tt.?# = ?d AND tt.tabNumber = ?d ORDER BY t.row, t.column, t.petCategory1 ASC';
$dims = 36; //v-pets $dims = 36; //v-pets
$filenames = ['icons', 'warrior', 'paladin', 'hunter', 'rogue', 'priest', 'deathknight', 'shaman', 'mage', 'warlock', null, 'druid']; $filenames = ['icons', 'warrior', 'paladin', 'hunter', 'rogue', 'priest', 'deathknight', 'shaman', 'mage', 'warlock', null, 'druid'];

2
static/js/basic.js
View File

@@ -1627,7 +1627,7 @@ $WH.g_enhanceTooltip = function(tooltip, isStatic, useGets, showSlider, buff, kn
$(chooseSpells) $(chooseSpells)
.append('<input type="checkbox" id="known-' + i + '" />') .append('<input type="checkbox" id="known-' + i + '" />')
.append('<label for="known-' + i + '"><a rel="spell=' + i + '&know=' + i + '">' + g_spells[i]['name_' + Locale.getName()] + (g_spells[i]['rank_' + Locale.getName()] ? ' (' + g_spells[i]['rank_' + Locale.getName()] + ')' : '') + '</a></label>') .append('<label for="known-' + i + '"><a rel="spell=' + i + '&know=' + i + '&domain=' + Locale.current.domain + '">' + g_spells[i]['name_' + Locale.getName()] + (g_spells[i]['rank_' + Locale.getName()] ? ' (' + g_spells[i]['rank_' + Locale.getName()] + ')' : '') + '</a></label>')
.append('<br />'); .append('<br />');
$('#known-' + i).change($WH.g_tooltipSpellsChange.bind(this)); $('#known-' + i).change($WH.g_tooltipSpellsChange.bind(this));

2
template/bricks/contribute.tpl.php
View File

@@ -29,4 +29,4 @@ if (!empty($this->contribute)):
?> ?>
tabsContribute.flush(); tabsContribute.flush();
</script> </script>
<? endif; ?> <?php endif; ?>