Module:ModifierTables: Difference between revisions

From Melvor Idle
(Fix skill ID determination)
(Further skill ID fixes)
Line 22: Line 22:


--Make sure we have the skillID and not the name
--Make sure we have the skillID and not the name
if skill == '' then
if skill ~= nil then
skill = nil
if skill == '' then
elseif Constants.getSkillID(skill) ~= nil then
skill = nil
-- skill is a skill name
elseif Constants.getSkillID(skill) ~= nil then
skill = Constants.getSkillID(skill)
-- skill is a skill name
elseif Constants.getSkillName(skill) == nil then
skill = Constants.getSkillID(skill)
-- skill is neither a skill name or ID
elseif Constants.getSkillName(skill) == nil then
return 0
-- skill is neither a skill name or ID
return 0
end
end
end


Line 212: Line 214:
local modifierCount = Shared.tableCount(modifiers)
local modifierCount = Shared.tableCount(modifiers)


if skill == '' then
if skill ~= nil then
skill = nil
if skill == '' then
elseif Constants.getSkillID(skill) ~= nil then
skill = nil
-- skill is a skill name
elseif Constants.getSkillID(skill) ~= nil then
skill = Constants.getSkillID(skill)
-- skill is a skill name
elseif Constants.getSkillName(skill) == nil then
skill = Constants.getSkillID(skill)
-- skill is neither a skill name or ID
elseif Constants.getSkillName(skill) == nil then
return 'ERROR: Failed to find a skill ID for ' .. skill .. '[[Category:Pages with script errors]]'
-- skill is neither a skill name or ID
return 'ERROR: Failed to find a skill ID for ' .. skill .. '[[Category:Pages with script errors]]'
end
end
end