comparison Import.lua @ 81:0515882856f1 v38

updated for 7.0
author yellowfive
date Tue, 19 Jul 2016 10:05:32 -0700
parents 69db1c3025ac
children 6bbe64d587b4
comparison
equal deleted inserted replaced
80:8f235b016212 81:0515882856f1
200 local prevItemId = 0 200 local prevItemId = 0
201 local prevGemId = 0 201 local prevGemId = 0
202 local prevEnchantId = 0 202 local prevEnchantId = 0
203 local prevUpgradeId = 0 203 local prevUpgradeId = 0
204 local prevBonusId = 0 204 local prevBonusId = 0
205 local prevLevel = 0
205 local digits = { 206 local digits = {
206 ["-"] = true, 207 ["-"] = true,
207 ["0"] = true, 208 ["0"] = true,
208 ["1"] = true, 209 ["1"] = true,
209 ["2"] = true, 210 ["2"] = true,
213 ["6"] = true, 214 ["6"] = true,
214 ["7"] = true, 215 ["7"] = true,
215 ["8"] = true, 216 ["8"] = true,
216 ["9"] = true, 217 ["9"] = true,
217 } 218 }
218 for i = 16, #parts do 219 for i = 18, #parts do
219 local itemString = parts[i] 220 local itemString = parts[i]
220 if itemString ~= "" and itemString ~= "_" then 221 if itemString ~= "" and itemString ~= "_" then
221 local tokens = {} 222 local tokens = {}
222 local bonusIds = {} 223 local bonusIds = {}
223 local hasBonuses = false 224 local hasBonuses = false
238 val = val + prevItemId 239 val = val + prevItemId
239 prevItemId = val 240 prevItemId = val
240 elseif prop == "u" then 241 elseif prop == "u" then
241 val = val + prevUpgradeId 242 val = val + prevUpgradeId
242 prevUpgradeId = val 243 prevUpgradeId = val
244 elseif prop == "v" then
245 val = val + prevLevel
246 prevLevel = val
243 elseif prop == "b" then 247 elseif prop == "b" then
244 val = val + prevBonusId 248 val = val + prevBonusId
245 prevBonusId = val 249 prevBonusId = val
246 elseif prop == "x" or prop == "y" or prop == "z" then 250 elseif prop == "x" or prop == "y" or prop == "z" then
247 val = val + prevGemId 251 val = val + prevGemId
270 importData[tonumber(tokens["s"])] = obj 274 importData[tonumber(tokens["s"])] = obj
271 275
272 obj.id = tokens["i"] 276 obj.id = tokens["i"]
273 obj.suffixId = tokens["f"] or 0 277 obj.suffixId = tokens["f"] or 0
274 obj.upgradeId = tokens["u"] or 0 278 obj.upgradeId = tokens["u"] or 0
279 obj.level = tokens["v"] or 0
275 obj.enchantId = tokens["e"] or 0 280 obj.enchantId = tokens["e"] or 0
276 281
277 obj.gemIds = {} 282 obj.gemIds = {}
278 table.insert(obj.gemIds, tokens["x"] or 0) 283 table.insert(obj.gemIds, tokens["x"] or 0)
279 table.insert(obj.gemIds, tokens["y"] or 0) 284 table.insert(obj.gemIds, tokens["y"] or 0)
334 for j = 1, #identicalIds do 339 for j = 1, #identicalIds do
335 gemObj.identicalItemGroup[tonumber(identicalIds[j])] = true 340 gemObj.identicalItemGroup[tonumber(identicalIds[j])] = true
336 end 341 end
337 end 342 end
338 343
339 gemInfo[gemObj.enchantId] = gemObj 344 gemInfo[gemObj.id] = gemObj
340 345
341 elseif infoParts[1] == "e" then 346 elseif infoParts[1] == "e" then
342 347
343 local enchObj = {} 348 local enchObj = {}
344 enchObj.id = tonumber(infoParts[2]) 349 enchObj.id = tonumber(infoParts[2])