comparison Main.lua @ 333:601d3e517460 WoD

Post-merge cleanup.
author James D. Callahan III <jcallahan@curse.com>
date Tue, 26 Aug 2014 10:46:59 -0500
parents 5ef583564381
children 5bc69e705add
comparison
equal deleted inserted replaced
332:5ef583564381 333:601d3e517460
989 989
990 upgrade_id = tonumber(upgrade_id) 990 upgrade_id = tonumber(upgrade_id)
991 instance_difficulty_id = tonumber(instance_difficulty_id) 991 instance_difficulty_id = tonumber(instance_difficulty_id)
992 num_bonus_ids = tonumber(num_bonus_ids) 992 num_bonus_ids = tonumber(num_bonus_ids)
993 suffix_id = tonumber(suffix_id) 993 suffix_id = tonumber(suffix_id)
994 if (not num_bonus_ids) or (num_bonus_ids == 0) then 994
995 if not num_bonus_ids or num_bonus_ids == 0 then
995 if (suffix_id and suffix_id ~= 0) or (instance_difficulty_id and instance_difficulty_id ~= 0) then 996 if (suffix_id and suffix_id ~= 0) or (instance_difficulty_id and instance_difficulty_id ~= 0) then
996 item = DBEntry("items", item_id) 997 item = DBEntry("items", item_id)
997 item.unique_id = bit.band(unique_id, 0xFFFF) 998 item.unique_id = bit.band(unique_id, 0xFFFF)
998 999
999 if suffix_id and suffix_id ~= 0 then 1000 if suffix_id and suffix_id ~= 0 then