Remove Lich asset warning and fix JIT 2.1 Issues

runtime/lua/dkjson.lua

@@ -130,6 +130,26 @@ local function escapeutf8 (uchar)
   end
 end
 
+local function sortedkeys(tbl)
+  local keys = {}
+  for k in pairs(tbl) do
+    keys[#keys + 1] = k
+  end
+  table.sort(keys, function(a, b)
+    local ta, tb = type(a), type(b)
+    if ta == tb then
+      return a < b
+    end
+    if ta == "number" then
+      return true
+    elseif tb == "number" then
+      return false
+    end
+    return ta < tb
+  end)
+  return keys
+end
+
 local function fsub (str, pattern, repl)
   -- gsub always builds a new string in a buffer, even when no match
   -- exists. First using find should be more efficient when most strings
@@ -333,7 +353,10 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, s
           end
         end
       else -- unordered
-        for k,v in pairs (value) do
+        local keys = sortedkeys(value)
+        for i = 1, #keys do
+          local k = keys[i]
+          local v = value[k]
           buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
           if not buflen then return nil, msg end
           prev = true -- add a seperator before the next element
@@ -711,4 +734,3 @@ if always_try_using_lpeg then
 end
 
 return json
-

src/Export/Scripts/passivetree.lua

@@ -144,7 +144,7 @@ local function calculateDDSPack(sheet, from_base, to_base, is4kEnabled)
 	end
 	main.ggpk:ExtractList(filesToExtract, cacheExtract)
 
-	for icon, sections in pairs(sheet.files) do
+	for icon, sections in pairsSortByKey(sheet.files) do
 		local tex = Texture.new()
 		local rc
 		if is4kEnabled then
@@ -170,7 +170,7 @@ local function calculateDDSPack(sheet, from_base, to_base, is4kEnabled)
 	end
 
 
-	for iden, stackInfo in pairs(stackTextures) do
+	for iden, stackInfo in pairsSortByKey(stackTextures) do
 		local stacks = {}
 		local file = sheet.name .. "_" .. iden .. ".dds.zst"
 		ddsCoords[file] = {}
@@ -713,7 +713,10 @@ for i, classId in ipairs(psg.passives) do
 			addToSheet(getSheet("group-background"), ascFrameLargeAllocated, "frame", commonMetadata(ascendency.Name .. "FrameLargeAllocated"))
 
 			-- include the connection art in case doesn't exist
-			connectionArtToDecompose[ascendency.UIArt.ConnectionsArt.Id] = true
+			-- ignore Lich art as it currently breaks the GIMP script to extract lines
+			if ascendency.UIArt.ConnectionsArt.Id:find("Lich") == nil then
+				connectionArtToDecompose[ascendency.UIArt.ConnectionsArt.Id] = true
+			end
 			:: continue3 ::
 		end
 
@@ -979,7 +982,7 @@ for i, group in ipairs(psg.groups) do
 				node["stats"] = node["stats"] or {}
 
 				for _, gemEffect in pairs(passiveRow.GrantedSkill.GemEffects) do
-					local skillName = gemEffect.GrantedEffect.ActiveSkill.DisplayName
+					local skillName = passiveRow.GrantedSkill.BaseItemType.Name
 					table.insert(node["stats"], "Grants Skill: " .. skillName)
 
 					-- -- include the stat description
@@ -1353,7 +1356,7 @@ local typeOfConnections = {
 	"Normal", "Intermediate", "IntermediateActive"
 }
 
-for connectionArtId, _ in pairs(connectionArtToDecompose) do
+for connectionArtId, _ in pairsSortByKey(connectionArtToDecompose) do
 	local connectionArt = dat("PassiveSkillTreeConnectionArt"):GetRow("Id", connectionArtId)
 	if connectionArt == nil then
 		printf("Connection art " .. connectionArtId .. " not found")