diff Import.lua @ 81:0515882856f1 v38

updated for 7.0
author yellowfive
date Tue, 19 Jul 2016 10:05:32 -0700
parents 69db1c3025ac
children 6bbe64d587b4
line wrap: on
line diff
--- a/Import.lua	Tue Apr 05 16:19:31 2016 -0700
+++ b/Import.lua	Tue Jul 19 10:05:32 2016 -0700
@@ -202,6 +202,7 @@
     local prevEnchantId = 0
     local prevUpgradeId = 0
     local prevBonusId = 0
+	local prevLevel = 0
     local digits = {
         ["-"] = true,
         ["0"] = true,
@@ -215,7 +216,7 @@
         ["8"] = true,
         ["9"] = true,
     }
-    for i = 16, #parts do
+    for i = 18, #parts do
         local itemString = parts[i]
         if itemString ~= "" and itemString ~= "_" then
             local tokens = {}
@@ -240,6 +241,9 @@
                     elseif prop == "u" then
                         val = val + prevUpgradeId
                         prevUpgradeId = val
+					elseif prop == "v" then
+						val = val + prevLevel
+						prevLevel = val
                     elseif prop == "b" then
                         val = val + prevBonusId
                         prevBonusId = val
@@ -272,6 +276,7 @@
             obj.id = tokens["i"]
             obj.suffixId = tokens["f"] or 0
             obj.upgradeId = tokens["u"] or 0
+			obj.level = tokens["v"] or 0
             obj.enchantId = tokens["e"] or 0
             
             obj.gemIds = {}
@@ -336,7 +341,7 @@
             	end            	
             end            
 
-            gemInfo[gemObj.enchantId] = gemObj
+            gemInfo[gemObj.id] = gemObj
             
         elseif infoParts[1] == "e" then