12,718
edits
(Correct Slayer function issues) |
(_getModifierText: Fix issue with interpretation of 'V+100' modifier values) |
||
(3 intermediate revisions by the same user not shown) | |||
Line 65: | Line 65: | ||
["MaxHitPercent"] = { text = "{V}% Max Hit", skills = {'Combat'} }, | ["MaxHitPercent"] = { text = "{V}% Max Hit", skills = {'Combat'} }, | ||
["AltMagicSkillXP"] = { text = "{V}% Alt. Magic Skill XP", skills = {'Magic'} }, | ["AltMagicSkillXP"] = { text = "{V}% Alt. Magic Skill XP", skills = {'Magic'} }, | ||
["MinAirSpellDmg"] = { text = "{VX} Min Air Spell Dmg", skills = {' | ["MinAirSpellDmg"] = { text = "{VX} Min Air Spell Dmg", skills = {'Magic'} }, | ||
["AutoEatEfficiency"] = { text = "{V}% Auto Eat Efficiency", skills = {'Combat'} }, | ["AutoEatEfficiency"] = { text = "{V}% Auto Eat Efficiency", skills = {'Combat'} }, | ||
["GPFromThieving"] = { text = "{V}% GP From Thieving", skills = {'Thieving'} }, | ["GPFromThieving"] = { text = "{V}% GP From Thieving", skills = {'Thieving'} }, | ||
Line 409: | Line 409: | ||
return Shared.titleCase(styleName) | return Shared.titleCase(styleName) | ||
end | end | ||
elseif type(styleNum) == 'string' and type(ConstantData.attackType[string.lower(styleNum)]) == 'number' then | |||
return Shared.titleCase(styleNum) | |||
end | end | ||
return "ERROR: Invalid combat style[[Category:Pages with script errors]]" | return "ERROR: Invalid combat style[[Category:Pages with script errors]]" | ||
Line 443: | Line 445: | ||
function p.getSlayerTierByLevel(level) -- returns a full table | function p.getSlayerTierByLevel(level) -- returns a full table | ||
if type(level) ~= 'number' or level < | if type(level) ~= 'number' or level < 1 then | ||
return "ERROR: Invalid Slayer level [[Category:Pages with script errors]]" | return "ERROR: Invalid Slayer level [[Category:Pages with script errors]]" | ||
end | end | ||
for i, tier in ipairs(ConstantData.Slayer.Tiers) do | for i, tier in ipairs(ConstantData.Slayer.Tiers) do | ||
if tier.minLevel <= level and (tier.maxLevel == nil | if tier.minLevel <= level and (tier.maxLevel == nil or tier.maxLevel >= level) then | ||
return p.getSlayerTierByID(i - 1) | return p.getSlayerTierByID(i - 1) | ||
end | end | ||
Line 523: | Line 525: | ||
['VX'] = function(val) return val * 10 end, | ['VX'] = function(val) return val * 10 end, | ||
['VX100'] = function(val) return val * 100 end, | ['VX100'] = function(val) return val * 100 end, | ||
['V | ['V+100'] = function(val) return val + 100 end, | ||
['VMUL'] = function(val) return 2^val end, | ['VMUL'] = function(val) return 2^val end, | ||
['VITEM'] = function(val) | ['VITEM'] = function(val) |