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

Spells/DK

Browse Source 
* fixed setup flagging wrong spells as hidden
 * fixed menu structure for DK spells not requiring DK class
 * fixed type for rune cost in spell tooltip
This commit is contained in:
Sarjuuk
2019-01-04 17:14:49 +01:00
parent 7f36dc87cf
commit 0fd2944d8b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -759,14 +759,14 @@ class SpellList extends BaseType
$pt = $this->curTpl['powerType']; $pt = $this->curTpl['powerType'];
if ($pt == POWER_RUNE && ($rCost = ($this->curTpl['powerCostRunes'] & 0x333))) if ($pt == POWER_RUNE && ($rCost = ($this->curTpl['powerCostRunes'] & 0x333)))
{ // Blood 2|1 - Unholy 2|1 - Frost 2|1 { // Frost 2|1 - Unholy 2|1 - Blood 2|1
$runes = []; $runes = [];
if ($_ = (($rCost & 0x300) >> 8)) if ($_ = (($rCost & 0x300) >> 8))
$runes[] = $_.' '.Lang::spell('powerRunes', 0); $runes[] = $_.' '.Lang::spell('powerRunes', 2);
if ($_ = (($rCost & 0x030) >> 4)) if ($_ = (($rCost & 0x030) >> 4))
$runes[] = $_.' '.Lang::spell('powerRunes', 1); $runes[] = $_.' '.Lang::spell('powerRunes', 1);
if ($_ = ($rCost & 0x003)) if ($_ = ($rCost & 0x003))
$runes[] = $_.' '.Lang::spell('powerRunes', 2); $runes[] = $_.' '.Lang::spell('powerRunes', 0);
$str .= implode(', ', $runes); $str .= implode(', ', $runes);
} }

2
pages/spell.php
View File

@@ -78,6 +78,8 @@ class SpellPage extends GenericPage
case -13: case -13:
if ($cl = $this->subject->getField('reqClassMask')) if ($cl = $this->subject->getField('reqClassMask'))
$this->path[] = log($cl, 2) + 1; $this->path[] = log($cl, 2) + 1;
else if ($cl = array_search($this->subject->getField('spellFamilyId'), Game::$class2SpellFamily))
$this->path[] = $cl;
if ($cat == -13) if ($cat == -13)
$this->path[] = ($cf & (SPELL_CU_GLYPH_MAJOR | SPELL_CU_GLYPH_MINOR)) >> 6; $this->path[] = ($cf & (SPELL_CU_GLYPH_MAJOR | SPELL_CU_GLYPH_MINOR)) >> 6;

4
setup/tools/sqlgen/spell.func.php
View File

@@ -593,7 +593,7 @@ function spell()
DB::Aowow()->query('UPDATE ?_spell s SET s.cuFlags = ?d WHERE s.typeCat = 7 AND ( DB::Aowow()->query('UPDATE ?_spell s SET s.cuFlags = ?d WHERE s.typeCat = 7 AND (
s.name_loc0 LIKE "%passive%" OR s.name_loc0 LIKE "%effect%" OR s.name_loc0 LIKE "%improved%" OR s.name_loc0 LIKE "%prototype%" OR -- can probably be extended s.name_loc0 LIKE "%passive%" OR s.name_loc0 LIKE "%effect%" OR s.name_loc0 LIKE "%improved%" OR s.name_loc0 LIKE "%prototype%" OR -- can probably be extended
(s.id NOT IN (47241, 59879, 59671) AND s.baseLevel <= 1 AND s.reqclassMask = 0) OR -- can probably still be extended (s.id NOT IN (47241, 59879, 59671) AND s.baseLevel <= 1 AND s.reqclassMask = 0) OR -- can probably still be extended
(s.SpellFamilyId = 15 AND s.SpellDescriptionVariableId <> 84) OR -- DK: Skill Coil (s.SpellFamilyId = 15 AND s.SpellFamilyFlags1 & 0x2000 AND s.SpellDescriptionVariableId <> 84) OR -- DK: Skill Coil
(s.SpellFamilyId = 10 AND s.SpellFamilyFlags2 & 0x1000000 AND s.attributes1 = 0) OR -- Paladin: Bacon of Light hmm.. Bacon.... :] (s.SpellFamilyId = 10 AND s.SpellFamilyFlags2 & 0x1000000 AND s.attributes1 = 0) OR -- Paladin: Bacon of Light hmm.. Bacon.... :]
(s.SpellFamilyId = 6 AND s.SpellFamilyFlags3 & 0x4000) OR -- Priest: Lolwell Renew (s.SpellFamilyId = 6 AND s.SpellFamilyFlags3 & 0x4000) OR -- Priest: Lolwell Renew
(s.SpellFamilyId = 6 AND s.SpellFamilyFlags1 & 0x8000000 AND s.rank_loc0 <> "") OR -- Priest: Bling Bling (s.SpellFamilyId = 6 AND s.SpellFamilyFlags1 & 0x8000000 AND s.rank_loc0 <> "") OR -- Priest: Bling Bling
@@ -601,7 +601,7 @@ function spell()
(s.SpellfamilyId = 11 AND s.SpellFamilyFlags1 & 3 AND s.attributes1 = 1024) OR -- Shaman: Lightning Overload procs (s.SpellfamilyId = 11 AND s.SpellFamilyFlags1 & 3 AND s.attributes1 = 1024) OR -- Shaman: Lightning Overload procs
(s.attributes0 = 0x20000000 AND s.attributes3 = 0x10000000) OR -- Master Demonologist (FamilyId = 0) (s.attributes0 = 0x20000000 AND s.attributes3 = 0x10000000) OR -- Master Demonologist (FamilyId = 0)
s.id IN (47633, 22845, 29442, 31643, 44450, 32841, 20154, 34919, 27813, 27817, 27818, 30708, 30874, 379, 21169, 19483, 29886, 58889, 23885, 29841, 29842, 64380, 58427) OR -- Misc s.id IN (47633, 22845, 29442, 31643, 44450, 32841, 20154, 34919, 27813, 27817, 27818, 30708, 30874, 379, 21169, 19483, 29886, 58889, 23885, 29841, 29842, 64380, 58427) OR -- Misc
s.id IN (48954, 17567, 66175, 66122, 66123, 66124) -- Misc cont. s.id IN (48954, 17567, 66175, 66122, 66123, 66124, 52374, 49575, 56816, 50536) -- Misc cont.
)', CUSTOM_EXCLUDE_FOR_LISTVIEW); )', CUSTOM_EXCLUDE_FOR_LISTVIEW);
foreach ([1, 2, 3, 4, 5, 6, 7, 8, 9, 11] as $classId) foreach ([1, 2, 3, 4, 5, 6, 7, 8, 9, 11] as $classId)