Ravenholdt/Wowdb-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing spells some more

Browse Source
This commit is contained in:
Antonis Farangitakis
2016-12-29 18:00:10 +02:00
committed by Antz
parent a0ed581e6c
commit f79e902477
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/allspells.php
+2 -1
View File
@@ -835,7 +835,8 @@ function allspellsinfo2(&$row, $level=0) {
// Тултип спелла // Тултип спелла
if ($level > 0) { if ($level > 0) {
$allspells[$num]['name'] = $row['spellname']; $spellNameKey = 'spellname' . '_loc' . $_SESSION['locale'];
$allspells[$num]['name'] = $row[$spellNameKey] ;
$allspells[$num]['info'] = render_spell_tooltip($row); $allspells[$num]['info'] = render_spell_tooltip($row);
} }
spell.php
+6 -10
View File
@@ -237,7 +237,7 @@ if (!$spell = load_cache(13, intval($id))) {
$spell['effect'][$i]['item']['count'] = $row['effect' . $j . 'BasePoints'] + 1; $spell['effect'][$i]['item']['count'] = $row['effect' . $j . 'BasePoints'] + 1;
// Иконка итема, если спелл создает этот итем // Иконка итема, если спелл создает этот итем
if (!IsSet($spell['icon'])) if (!IsSet($spell['icon']))
$spell['icon'] = $tmpRow['iconname']; $spell['icon'] = trim($tmpRow['iconname'], "\r");
allitemsinfo2($tmpRow, 0); allitemsinfo2($tmpRow, 0);
} }
// Создает спелл // Создает спелл
@@ -252,7 +252,7 @@ if (!$spell = load_cache(13, intval($id))) {
} }
if (!IsSet($spell['icon'])) if (!IsSet($spell['icon']))
$spell['icon'] = $row['iconname']; $spell['icon'] = trim($row['iconname'], "\r");
// Спеллы с таким же названием // Спеллы с таким же названием
$seealso = $DB->select(' $seealso = $DB->select('
@@ -286,7 +286,7 @@ if (!$spell = load_cache(13, intval($id))) {
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? } { LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE WHERE
c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell=?d) c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell=?d)
AND factiontemplateID=faction_A AND factiontemplateID=FactionAlliance
', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $spell['entry'] ', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $spell['entry']
); );
if ($taughtbytrainers) { if ($taughtbytrainers) {
@@ -334,7 +334,7 @@ if (!$spell = load_cache(13, intval($id))) {
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? } { LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE WHERE
c.entry IN (SELECT entry FROM ?_petcreateinfo_spell WHERE (Spell1 IN (?a)) OR (Spell2 IN (?a)) OR (Spell3 IN (?a)) OR (Spell4 IN (?a))) c.entry IN (SELECT entry FROM ?_petcreateinfo_spell WHERE (Spell1 IN (?a)) OR (Spell2 IN (?a)) OR (Spell3 IN (?a)) OR (Spell4 IN (?a)))
AND factiontemplateID=faction_A AND factiontemplateID=FactionAlliance
', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $taughtbyspells, $taughtbyspells, $taughtbyspells, $taughtbyspells ', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $taughtbyspells, $taughtbyspells, $taughtbyspells, $taughtbyspells
); );
// Перебираем этих петов // Перебираем этих петов
@@ -369,7 +369,7 @@ if (!$spell = load_cache(13, intval($id))) {
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? } { LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE WHERE
c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell in (?a)) c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell in (?a))
AND factiontemplateID=faction_A AND factiontemplateID=FactionAlliance
', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $taughtbyspells ', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $taughtbyspells
); );
if ($taughtbytrainers) { if ($taughtbytrainers) {
@@ -407,11 +407,7 @@ if (!$spell = load_cache(13, intval($id))) {
FROM ?_aowow_factiontemplate, ?_creature_template c FROM ?_aowow_factiontemplate, ?_creature_template c
{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? } { LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
WHERE WHERE
(spell1=?d factiontemplateID=FactionAlliance
OR spell2=?d
OR spell3=?d
OR spell4=?d)
AND factiontemplateID=faction_A
', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'] ', $npc_cols[0], ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry']
); );
if ($usedbynpc) { if ($usedbynpc) {