diff --git a/data/actions/scripts/misc/spellbook.lua b/data/actions/scripts/misc/spellbook.lua index 2445cba..61d0099 100644 --- a/data/actions/scripts/misc/spellbook.lua +++ b/data/actions/scripts/misc/spellbook.lua @@ -4,25 +4,23 @@ function onUse(player, item, fromPosition, target, toPosition, isHotkey) local spells = {} for i = 0, count - 1 do local spell = getPlayerInstantSpellInfo(player, i) - if spell.level ~= 0 then - if spell.manapercent > 0 then - spell.mana = spell.manapercent .. "%" - end - spells[#spells + 1] = spell + if spell.manapercent > 0 then + spell.mana = spell.manapercent .. "%" end + spells[#spells + 1] = spell end - table.sort(spells, function(a, b) return a.level < b.level end) + table.sort(spells, function(a, b) return a.mlevel < b.mlevel end) local prevLevel = -1 for i, spell in ipairs(spells) do local line = "" - if prevLevel ~= spell.level then + if prevLevel ~= spell.mlevel then if i ~= 1 then line = "\n" end - line = line .. "Spells for Level " .. spell.level .. "\n" - prevLevel = spell.level + line = line .. "Spells for Magic Level " .. spell.mlevel .. "\n" + prevLevel = spell.mlevel end text = text .. line .. " " .. spell.words .. " - " .. spell.name .. " : " .. spell.mana .. "\n" end diff --git a/data/spells/spells.xml b/data/spells/spells.xml index 8d5529b..462b74f 100644 --- a/data/spells/spells.xml +++ b/data/spells/spells.xml @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -81,7 +81,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -139,19 +139,19 @@ - + - + - + @@ -161,7 +161,7 @@ - + @@ -169,13 +169,13 @@ - + - + @@ -185,7 +185,7 @@ - + @@ -193,37 +193,37 @@ - + - + - + - + - + - + @@ -237,17 +237,17 @@ - + - + - - - - - - + + + + + + @@ -258,46 +258,46 @@ - + - - + + - + - + - + - + - + - + - + - + @@ -305,7 +305,7 @@ - + @@ -313,13 +313,13 @@ - + - + @@ -327,97 +327,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -425,7 +425,7 @@ - + @@ -433,11 +433,11 @@ - + - +