Use ItemConfig for more stuff that was done by the LUT (#838)

* Use ItemConfig for more stuff that was done by the LUT

* Missed some stuff

* Update lookuptable_generator.py

.github/scripts/lookuptable_generator.py

@@ -21,38 +21,41 @@ recipes = []
 itempools = {}
 itemIDToPool = {}
 maxItemID = 0
-cardMetadatas = []
 pillMetadatas = []
 entityNames = []
 locusts = []
 locustColors = []
 
 recipeIngredients = {}
-# Poop, Penny
+recipeIngredients["h"] = 1 # Red Heart
-recipeIngredients["_"] = 29
+recipeIngredients["s"] = 2 # Soul Heart
-recipeIngredients["."] = 8
+recipeIngredients["b"] = 3 # Black Heart
-# Red, Soul, Black Heart
+recipeIngredients["e"] = 4 # Eternal Heart
-recipeIngredients["h"] = 1
+recipeIngredients["g"] = 5 # Gold Heart
-recipeIngredients["s"] = 2
+recipeIngredients["B"] = 6 # Bone Heart
-recipeIngredients["b"] = 3
+recipeIngredients["r"] = 7 # Rotten Heart
-# Key, Bomb, Card
+recipeIngredients["."] = 8 # Penny
-recipeIngredients["/"] = 12
+recipeIngredients["o"] = 9 # Nickel
-recipeIngredients["v"] = 15
+recipeIngredients["O"] = 10 # Dime
-recipeIngredients["["] = 21
+recipeIngredients["Q"] = 11 # Lucky Penny
-# Gold Heart, Eternal Heart, Pill
+recipeIngredients["/"] = 12 # Key
-recipeIngredients["g"] = 5
+recipeIngredients["|"] = 13 # Golden Key
-recipeIngredients["e"] = 4
+recipeIngredients["%"] = 14 # Charged Key
-recipeIngredients["("] = 22
+recipeIngredients["v"] = 15 # Bomb
-# Rotten Heart, Gold Key, Giga Bomb
+recipeIngredients["^"] = 16 # Golden Bomb
-recipeIngredients["r"] = 7
+recipeIngredients["V"] = 17 # Giga Bomb
-recipeIngredients["|"] = 13
+recipeIngredients["1"] = 18 # Micro Battery
-recipeIngredients["V"] = 17
+recipeIngredients["2"] = 19 # Lil Battery
-# Gold Bomb, Bone Heart
+recipeIngredients["3"] = 20 # Mega Battery
-recipeIngredients["^"] = 16
+recipeIngredients["["] = 21 # Card
-recipeIngredients["B"] = 6
+recipeIngredients["("] = 22 # Pill
-# Dice Shard, Cracked Key
+recipeIngredients[">"] = 23 # Rune
-recipeIngredients["?"] = 24
+recipeIngredients["?"] = 24 # Dice Shard
-recipeIngredients["~"] = 25
+recipeIngredients["~"] = 25 # Cracked Key
+recipeIngredients["$"] = 26 # Golden Penny
+recipeIngredients["{"] = 27 # Golden Pill
+recipeIngredients["4"] = 28 # Golden Battery
+recipeIngredients["_"] = 29 # Poop Nugget
 
 # Read recipes.xml
 recipesXML = ET.parse(filePath+'recipes.xml').getroot()
@@ -89,15 +92,8 @@ for pool in itempoolsXML.findall('Pool'):
 # Read pocketitems.xml
 pocketitemsXML = ET.parse(filePath+'pocketitems.xml').getroot()
 
-for card in pocketitemsXML.findall('card'):
-    cardMetadatas.append({ "id": card.get('id'), "mimiccharge": card.get('mimiccharge', 0)})
-
-for rune in pocketitemsXML.findall('rune'):
-    cardMetadatas.append({ "id": rune.get('id'), "mimiccharge": rune.get('mimiccharge', 0)})
-cardMetadatas.sort(key=sortByID)
-
 for pilleffect in pocketitemsXML.findall('pilleffect'):
-    pillMetadatas.append({ "id": pilleffect.get('id'), "mimiccharge": pilleffect.get('mimiccharge', 0), "class":pilleffect.get('class')})
+    pillMetadatas.append({ "id": pilleffect.get('id'), "class":pilleffect.get('class')})
 pillMetadatas.sort(key=sortByID)
 
 # Read entities2.xml
@@ -232,14 +228,9 @@ newfile.write("}\n\n")
 
 
 newfile.write("--Metadata found in Pocketitems.xml\n")
-newfile.write("EID.cardMetadata = {")
-for card in cardMetadatas:
-    newfile.write("["+card["id"]+"] = {mimiccharge="+str(card["mimiccharge"])+"}, ")
-newfile.write("}\n\n")
-
 newfile.write("EID.pillMetadata = {")
 for pill in pillMetadatas:
-    newfile.write("["+pill['id']+"] = {mimiccharge="+str(pill['mimiccharge'])+", class=\""+str(pill['class'])+"\"}, ")
+    newfile.write("["+pill['id']+"] = {class=\""+str(pill['class'])+"\"}, ")
 
 newfile.write("}\n\n")
 

features/eid_api.lua

@@ -236,18 +236,8 @@ function EID:addCard(id, description, itemName, language)
 	EID.descriptions[language].custom["5.300." .. id] = {id, itemName, description, EID._currentMod}
 end
 
----Adds a metadata for a card. Used for Blank Card/Clear Rune.
+-- DEPRECATED! Does nothing! Don't use!
----@param id Card
----@param mimicCharge integer @Range: [1, 12]
----@param isRune? boolean @Whether the card is a rune
 function EID:addCardMetadata(id, mimicCharge, isRune)
-	if isRune then
-		EID.blankCardHidden[id] = true
-		EID.runeIDs[id] = true
-	end
-	EID.cardMetadata[id] = {
-		mimiccharge = type(mimicCharge) == "number" and mimicCharge or -1
-	}
 end
 
 ---Adds a description for a PillEffect id
@@ -290,11 +280,10 @@ end
 
 ---Adds a metadata for a pilleffect. Used for Placebo/False PHD
 ---@param id PillEffect
----@param mimicCharge integer @Range: [1, 12]
+---@param mimicCharge integer @DEPRECATED, does nothing
 ---@param class? EID_PillClass @Default: "0". With False PHD, "3-" gives +0.6 Damage, "2-" and "1-" spawn a Black Heart
 function EID:addPillMetadata(id, mimicCharge, class)
 	EID.pillMetadata[id] = {
-		mimiccharge = type(mimicCharge) == "number" and mimicCharge or -1,
 		class = class or "0",
 	}
 end

features/eid_bagofcrafting.lua

@@ -99,7 +99,7 @@ function EID:getBagOfCraftingID(Variant, SubType)
 	elseif Variant == 300 then
 		if SubType == 0 then -- player:GetCard() returned 0
 			return nil
-		elseif EID.runeIDs[SubType] then -- runes
+		elseif EID.itemConfig:GetCard(SubType):IsRune() then -- runes
 			return {23}
 		else -- cards
 			return {21}

features/eid_data.lua

@@ -1087,11 +1087,6 @@ EID.HealthTypesWithoutHealing["None"] = true
 -- Character IDs that have a pocket active (0 = normal, 1 = timed, 2 = special)
 EID.PocketActivePlayerIDs = { [22] = 0, [23] = 2, [24] = 1, [25] = 2, [26] = 1, [29] = 0, [34] = 0, [36] = 0, [37] = 1, [38] = 0, [39] = 1 }
 
--- Cards that don't work with Blank Card in Repentance (Note: ? Card is blacklisted here, don't use this for determining what is a card)
-EID.blankCardHidden = {[32]=true,[33]=true,[34]=true,[35]=true,[36]=true,[37]=true,[38]=true,[39]=true,[40]=true,[41]=true,[48]=true,[49]=true,[50]=true,[55]=true,[78]=true,[81]=true,[82]=true,[83]=true,[84]=true,[85]=true,[86]=true,[87]=true,[88]=true,[89]=true,[90]=true,[91]=true,[92]=true,[93]=true,[94]=true,[95]=true,[96]=true,[97]=true,}
--- Cards that are treated as runes
-EID.runeIDs = {[32]=true,[33]=true,[34]=true,[35]=true,[36]=true,[37]=true,[38]=true,[39]=true,[40]=true,[41]=true,[55]=true,[81]=true,[82]=true,[83]=true,[84]=true,[85]=true,[86]=true,[87]=true,[88]=true,[89]=true,[90]=true,[91]=true,[92]=true,[93]=true,[94]=true,[95]=true,[96]=true,[97]=true,}
-
 -- "Evil" item IDs for Black Feather
 EID.blackFeatherItems = {[215]=true,[216]=true,[230]=true,[260]=true,[262]=true,[339]=true,[344]=true}
 if EID.isRepentance then EID.blackFeatherItems[654] = true end

features/eid_itemprediction.lua

@@ -326,7 +326,7 @@ function EID:D1Prediction(rng)
 			if specialCards[poss[sel].SubType] then
 				local objName = EID:getObjectName(5, poss[sel].Variant, poss[sel].SubType)
 				return "{{" .. variantToName[poss[sel].Variant] .. poss[sel].SubType .. "}} " .. objName
-			elseif EID.runeIDs[poss[sel].SubType] then
+			elseif EID.itemConfig:GetCard(poss[sel].SubType):IsRune() then
 				fullID = "5.301"
 			end
 		end

features/eid_modifiers.lua

@@ -706,37 +706,37 @@ if EID.isRepentance then
 		return descObj
 	end
 	
-	local function VariableCharge(descObj, metadata, collID, chargeText)
+	local function VariableCharge(descObj, config, collID, chargeText)
 		local text = EID:getDescriptionEntry(chargeText or "VariableCharge")
-		if text ~= nil and metadata ~= nil and metadata.mimiccharge and metadata.mimiccharge ~= -1 then
+		if text ~= nil and config ~= nil and config.MimicCharge and config.MimicCharge ~= -1 and descObj.SubType ~= 48 then
 			text = EID:ReplaceVariableStr(text, 1, "{{NameOnlyC" .. collID .. "}}")
-			EID:appendToDescription(descObj, "#{{ColorSilver}}{{Collectible" .. collID .. "}} " .. text .. " {{"..metadata.mimiccharge.."}}{{Battery}}")
+			EID:appendToDescription(descObj, "#{{Collectible" .. collID .. "}} " .. text .. " {{"..config.MimicCharge.."}}{{Battery}}")
 		end
 	end
 	
 	local hasTarot = false
 	-- Handle Blank Card description addition
 	local function BlankCardCallback(descObj)
-		VariableCharge(descObj, EID.cardMetadata[descObj.ObjSubType], 286, "BlankCardCharge")
+		VariableCharge(descObj, EID.itemConfig:GetCard(descObj.ObjSubType), 286)
 		-- If the player has Tarot Cloth and Blank Card, display additional text
 		if hasTarot then
 			local text = EID:getDescriptionEntry("BlankCardEffect")
 			local buffText = EID:getDescriptionEntry("tarotClothBlankCardBuffs", descObj.ObjSubType)
-			if buffText then EID:appendToDescription(descObj, "#{{ColorSilver}}{{Collectible286}} " .. text .. " " .. buffText) end
+			if buffText then EID:appendToDescription(descObj, "#{{Collectible286}} " .. text .. " " .. buffText) end
 		end
 		return descObj
 	end
 
 	-- Handle Clear Rune description addition
 	local function ClearRuneCallback(descObj)
-		VariableCharge(descObj, EID.cardMetadata[descObj.ObjSubType], 263, "ClearRuneCharge")
+		VariableCharge(descObj, EID.itemConfig:GetCard(descObj.ObjSubType), 263)
 		return descObj
 	end
 
 	-- Handle Placebo description addition
 	local function PlaceboCallback(descObj)
 		local adjustedID = EID:getAdjustedSubtype(descObj.ObjType, descObj.ObjVariant, descObj.ObjSubType)
-		VariableCharge(descObj, EID.pillMetadata[adjustedID-1], 348, "PlaceboCharge")
+		VariableCharge(descObj, EID.itemConfig:GetPillEffect(adjustedID-1), 348)
 		return descObj
 	end
 	
@@ -1130,14 +1130,14 @@ if EID.isRepentance then
 		elseif descObj.ObjVariant == PickupVariant.PICKUP_TAROTCARD then
 			hasTarot = EID.collectiblesOwned[451]
 
-			if EID.collectiblesOwned[286] and not EID.blankCardHidden[descObj.ObjSubType] and EID.cardMetadata[descObj.ObjSubType] then table.insert(callbacks, BlankCardCallback) end
+			if EID.collectiblesOwned[286] and EID.itemConfig:GetCard(descObj.ObjSubType) and EID.itemConfig:GetCard(descObj.ObjSubType):IsCard() then table.insert(callbacks, BlankCardCallback) end
-			if EID.collectiblesOwned[263] and EID.runeIDs[descObj.ObjSubType] and EID.cardMetadata[descObj.ObjSubType] then table.insert(callbacks, ClearRuneCallback) end
+			if EID.collectiblesOwned[263] and EID.itemConfig:GetCard(descObj.ObjSubType) and EID.itemConfig:GetCard(descObj.ObjSubType):IsRune() then table.insert(callbacks, ClearRuneCallback) end
 			if descObj.ObjSubType == 80 then table.insert(callbacks, WildCardCallback) end
 			if descObj.ObjSubType == 73 then table.insert(callbacks, TheStarsCallback) end
 		-- Pill Callbacks
 		elseif descObj.ObjVariant == PickupVariant.PICKUP_PILL then
 			if EID.collectiblesOwned[654] then table.insert(callbacks, FalsePHDCallback) end
-			if EID.collectiblesOwned[348] then table.insert(callbacks, PlaceboCallback) end
+			if EID.collectiblesOwned[348] and EID.itemConfig:GetPillEffect(descObj.ObjSubType) then table.insert(callbacks, PlaceboCallback) end
 			table.insert(callbacks, ExperimentalPillCallback)
 
 			if EID.pillPlayer == nil and #EID.coopAllPlayers > 1 then

features/eid_xmldata.lua

@@ -44,9 +44,7 @@ EID.XMLItemPools = {{{1, 1.0}, {2, 1.0}, {3, 1.0}, {4, 1.0}, {5, 1.0}, {6, 1.0},
 EID.XMLItemIsInPools = {[1] = {0, 16, 23}, [2] = {0, 16}, [3] = {0, 16, 23}, [4] = {0, 16, 23}, [5] = {0, 16, 23}, [6] = {0, 16}, [7] = {0, 4, 16, 21, 29}, [8] = {0, 3, 16, 28}, [9] = {7}, [10] = {0, 13, 16, 28}, [11] = {5, 18, 22}, [12] = {0, 16, 17, 24}, [13] = {0, 11, 16, 24}, [14] = {0, 2, 11, 17}, [15] = {0, 17, 24}, [16] = {5, 17, 22}, [17] = {0, 5, 16, 22}, [18] = {}, [19] = {0}, [20] = {5, 22}, [21] = {1, 10, 23}, [22] = {2, 10, 17}, [23] = {2, 10, 17}, [24] = {2, 10, 17}, [25] = {2, 10, 17}, [26] = {2, 10, 17, 30}, [27] = {2, 17, 29}, [28] = {2, 8, 17}, [29] = {2, 8, 15, 17, 27}, [30] = {2, 15, 17, 24, 27}, [31] = {2, 15, 17, 24, 27}, [32] = {2, 8, 17, 23}, [33] = {1, 4, 6}, [34] = {3, 6, 16, 20}, [35] = {3, 5, 6, 16, 20, 22}, [36] = {0, 7}, [37] = {0, 16, 25}, [38] = {0, 16, 23}, [39] = {0, 15, 27}, [40] = {0, 24}, [41] = {0, 15, 27}, [42] = {0, 16, 30}, [44] = {0, 23}, [45] = {0, 16, 24}, [46] = {0, 10, 18, 23}, [47] = {0, 16, 23}, [48] = {0, 16, 23}, [49] = {0, 23, 24}, [50] = {16}, [51] = {2, 3, 11, 12, 19, 20, 23, 24}, [52] = {0, 16}, [53] = {0, 24}, [54] = {1, 10}, [55] = {0, 15, 16, 27}, [56] = {0, 16}, [57] = {0, 13, 16, 28}, [58] = {0, 6}, [59] = {}, [60] = {1, 29}, [62] = {0, 16}, [63] = {1, 14, 18, 23}, [64] = {1, 16}, [65] = {0, 6, 16}, [66] = {0, 23}, [67] = {0, 3, 16, 20, 24, 28}, [68] = {0, 16, 20, 23}, [69] = {0, 16}, [70] = {2, 11, 17}, [71] = {0, 17}, [72] = {0, 4, 21, 24}, [73] = {17, 18, 19, 24, 28}, [74] = {3, 8, 20}, [75] = {0, 1, 18}, [76] = {0, 18}, [77] = {0, 16, 23}, [78] = {0, 4, 6, 16, 21}, [79] = {3, 11, 12, 19, 20, 24}, [80] = {3, 11, 12, 19, 20, 24}, [81] = {3, 9, 12, 19, 20}, [82] = {3, 11, 20, 24}, [83] = {3, 11, 20}, [84] = {3, 5, 18, 22}, [85] = {0, 1, 16, 23}, [86] = {0}, [87] = {0, 11, 16}, [88] = {0, 16, 28}, [89] = {0, 16, 23}, [90] = {23}, [91] = {0, 18, 23}, [92] = {0, 2}, [93] = {0, 16, 23}, [94] = {0, 16}, [95] = {0, 16, 23, 28}, [96] = {0, 16, 24, 28}, [97] = {0, 3, 6, 16, 20}, [98] = {0, 4, 16}, [99] = {0, 16, 28}, [100] = {0, 16, 28}, [101] = {0, 4, 16, 17}, [102] = {0, 1, 10, 11, 15, 16, 23, 27}, [103] = {0, 16}, [104] = {0, 16}, [105] = {0, 18, 23, 24}, [106] = {0, 16, 25}, [107] = {0, 16}, [108] = {0, 4, 16}, [109] = {0, 3, 20, 24}, [110] = {0, 15, 16, 24, 27}, [111] = {0, 10, 16}, [112] = {4, 21, 28}, [113] = {0, 3, 20, 28}, [114] = {0, 3, 15, 16, 20, 27}, [115] = {0, 3, 16, 20}, [116] = {1, 14, 18, 23}, [117] = {0, 16, 28}, [118] = {3, 20, 24}, [119] = {24}, [120] = {0, 5, 16, 17, 22}, [121] = {0, 5, 16, 17, 22}, [122] = {3, 11, 20, 24}, [123] = {0, 3, 6, 20}, [124] = {0, 4, 16}, [125] = {0, 16, 25}, [126] = {0, 11, 12, 16, 19}, [127] = {0, 3, 5, 11, 22}, [128] = {0, 13, 16, 28}, [129] = {0}, [130] = {}, [131] = {0, 16}, [132] = {16, 17, 20}, [133] = {3, 9, 12, 19, 20}, [134] = {3, 9, 12}, [135] = {24}, [136] = {0, 23}, [137] = {0, 1, 16, 23, 24, 25}, [138] = {0, 4, 16, 21, 29}, [139] = {1, 15, 18, 27}, [140] = {0, 9, 16, 25, 30}, [141] = {2}, [142] = {0, 4, 16}, [143] = {0, 2, 11, 17}, [144] = {0, 10, 28}, [145] = {3, 9, 12, 19, 20}, [146] = {0, 4, 16}, [147] = {1, 23}, [148] = {0, 16}, [149] = {0, 16}, [150] = {0, 16}, [151] = {0, 16}, [152] = {0, 16, 23}, [153] = {0, 16, 23}, [154] = {0, 16}, [155] = {0, 16, 28}, [156] = {1, 4, 18}, [157] = {0, 3, 16, 20, 24}, [158] = {}, [159] = {3, 11, 20, 24}, [160] = {0}, [161] = {0, 16}, [162] = {0, 4, 16, 21}, [163] = {0, 3, 16, 28}, [164] = {1}, [165] = {2}, [166] = {0, 18, 23, 24}, [167] = {0, 16, 24, 28}, [168] = {0, 5, 16, 22}, [169] = {0, 16}, [170] = {0, 16, 28}, [171] = {0}, [172] = {0, 3, 16, 20, 28}, [173] = {0, 4}, [174] = {0, 16, 28}, [175] = {0, 13, 16, 27}, [176] = {0, 2, 17, 24}, [177] = {1, 10, 24}, [178] = {0, 4, 21}, [179] = {8}, [180] = {0, 10}, [181] = {}, [182] = {4, 21, 24}, [183] = {2, 17, 29}, [184] = {4, 21}, [185] = {4, 21}, [186] = {0, 3, 16}, [187] = {3, 20}, [188] = {0, 16, 28}, [189] = {0, 16, 23}, [190] = {0, 5, 16, 22, 25}, [191] = {0, 16}, [192] = {0, 6, 16}, [193] = {2, 17, 24}, [194] = {2, 8, 17, 23}, [195] = {1, 2, 10, 11, 15, 17, 27}, [196] = {2, 8, 17, 23}, [197] = {2, 4, 17, 21}, [198] = {2, 10, 17}, [199] = {1, 13, 15, 18, 27}, [200] = {0, 15, 16, 27}, [201] = {0, 16}, [202] = {0}, [203] = {1}, [204] = {1, 10, 18}, [205] = {1, 14}, [206] = {0, 16}, [207] = {17, 28}, [208] = {1, 18, 23, 24}, [209] = {0, 7, 16, 25}, [210] = {0, 16}, [211] = {0}, [212] = {3, 9, 12, 19, 20, 23}, [213] = {0, 5, 16, 22}, [214] = {0, 16, 24}, [215] = {3, 12}, [216] = {3, 11, 12, 19, 20}, [217] = {0, 15, 16, 27}, [218] = {2}, [219] = {2}, [220] = {0, 16, 25}, [221] = {0, 16}, [222] = {0, 16}, [223] = {0, 16}, [224] = {0, 16}, [225] = {0, 3, 11, 12, 19, 20}, [226] = {5, 16, 22}, [227] = {0, 1, 23}, [228] = {0, 15, 16, 27}, [229] = {0, 16}, [230] = {3, 11, 20, 24}, [231] = {0, 16}, [232] = {1, 23}, [233] = {0, 16}, [234] = {0, 16}, [236] = {0, 16}, [237] = {0, 3, 16, 20}, [238] = {}, [239] = {}, [240] = {0, 2, 11, 17}, [241] = {3, 11, 12}, [242] = {0, 5, 16, 22}, [243] = {4, 21}, [244] = {0, 1Line truncated
 
 --Metadata found in Pocketitems.xml
-EID.cardMetadata = {[0] = {mimiccharge=0}, [1] = {mimiccharge=2}, [10] = {mimiccharge=2}, [11] = {mimiccharge=4}, [12] = {mimiccharge=3}, [13] = {mimiccharge=3}, [14] = {mimiccharge=3}, [15] = {mimiccharge=6}, [16] = {mimiccharge=3}, [17] = {mimiccharge=3}, [18] = {mimiccharge=2}, [19] = {mimiccharge=2}, [2] = {mimiccharge=2}, [20] = {mimiccharge=12}, [21] = {mimiccharge=6}, [22] = {mimiccharge=3}, [23] = {mimiccharge=12}, [24] = {mimiccharge=12}, [25] = {mimiccharge=12}, [26] = {mimiccharge=12}, [27] = {mimiccharge=6}, [28] = {mimiccharge=6}, [29] = {mimiccharge=6}, [3] = {mimiccharge=2}, [30] = {mimiccharge=6}, [31] = {mimiccharge=2}, [32] = {mimiccharge=2}, [33] = {mimiccharge=12}, [34] = {mimiccharge=4}, [35] = {mimiccharge=6}, [36] = {mimiccharge=2}, [37] = {mimiccharge=4}, [38] = {mimiccharge=2}, [39] = {mimiccharge=4}, [4] = {mimiccharge=3}, [40] = {mimiccharge=3}, [41] = {mimiccharge=4}, [42] = {mimiccharge=6}, [43] = {mimiccharge=6}, [44] = {mimiccharge=1}, [45] = {mimiccharge=6}, [46] = {mimiccharge=1}, [47] = {mimiccharge=2}, [48] = {mimiccharge=1}, [49] = {mimiccharge=4}, [5] = {mimiccharge=4}, [50] = {mimiccharge=3}, [51] = {mimiccharge=4}, [52] = {mimiccharge=3}, [53] = {mimiccharge=12}, [54] = {mimiccharge=3}, [55] = {mimiccharge=1}, [56] = {mimiccharge=12}, [57] = {mimiccharge=4}, [58] = {mimiccharge=4}, [59] = {mimiccharge=4}, [6] = {mimiccharge=12}, [60] = {mimiccharge=2}, [61] = {mimiccharge=12}, [62] = {mimiccharge=4}, [63] = {mimiccharge=2}, [64] = {mimiccharge=12}, [65] = {mimiccharge=2}, [66] = {mimiccharge=4}, [67] = {mimiccharge=3}, [68] = {mimiccharge=6}, [69] = {mimiccharge=4}, [7] = {mimiccharge=6}, [70] = {mimiccharge=6}, [71] = {mimiccharge=4}, [72] = {mimiccharge=3}, [73] = {mimiccharge=12}, [74] = {mimiccharge=2}, [75] = {mimiccharge=6}, [76] = {mimiccharge=12}, [77] = {mimiccharge=2}, [78] = {mimiccharge=4}, [79] = {mimiccharge=12}, [8] = {mimiccharge=3}, [80] = {mimiccharge=6}, [81] = {mimiccharge=4}, [82] = {mimiccharge=3}, [83] = {mimiccharge=6}, [84] = {mimiccharge=3}, [85] = {mimiccharge=3}, [86] = {mimiccharge=4}, [87] = {mimiccharge=6}, [88] = {mimiccharge=6}, [89] = {mimiccharge=1}, [9] = {mimiccharge=6}, [90] = {mimiccharge=4}, [91] = {mimiccharge=3}, [92] = {mimiccharge=12}, [93] = {mimiccharge=12}, [94] = {mimiccharge=6}, [95] = {mimiccharge=4}, [96] = {mimiccharge=6}, [97] = {mimiccharge=4}, }
+EID.pillMetadata = {[0] = {class="1+"}, [1] = {class="2-"}, [10] = {class="2+"}, [11] = {class="3-"}, [12] = {class="3+"}, [13] = {class="3-"}, [14] = {class="3+"}, [15] = {class="3-"}, [16] = {class="3+"}, [17] = {class="3-"}, [18] = {class="3+"}, [19] = {class="1"}, [2] = {class="2+"}, [20] = {class="2+"}, [21] = {class="2"}, [22] = {class="1-"}, [23] = {class="2+"}, [24] = {class="1+"}, [25] = {class="2-"}, [26] = {class="1+"}, [27] = {class="1-"}, [28] = {class="1+"}, [29] = {class="1-"}, [3] = {class="2"}, [30] = {class="0"}, [31] = {class="1-"}, [32] = {class="1"}, [33] = {class="1"}, [34] = {class="1+"}, [35] = {class="1+"}, [36] = {class="1+"}, [37] = {class="1-"}, [38] = {class="1+"}, [39] = {class="0-"}, [4] = {class="1"}, [40] = {class="0+"}, [41] = {class="1"}, [42] = {class="1"}, [43] = {class="2+"}, [44] = {class="0"}, [45] = {class="1+"}, [46] = {class="2+"}, [47] = {class="1-"}, [48] = {class="1+"}, [49] = {class="3"}, [5] = {class="2+"}, [6] = {class="3-"}, [7] = {class="3+"}, [8] = {class="0"}, [9] = {class="0"}, }
-
-EID.pillMetadata = {[0] = {mimiccharge=1, class="1+"}, [1] = {mimiccharge=2, class="2-"}, [10] = {mimiccharge=6, class="2+"}, [11] = {mimiccharge=4, class="3-"}, [12] = {mimiccharge=6, class="3+"}, [13] = {mimiccharge=4, class="3-"}, [14] = {mimiccharge=6, class="3+"}, [15] = {mimiccharge=4, class="3-"}, [16] = {mimiccharge=6, class="3+"}, [17] = {mimiccharge=4, class="3-"}, [18] = {mimiccharge=6, class="3+"}, [19] = {mimiccharge=1, class="1"}, [2] = {mimiccharge=12, class="2+"}, [20] = {mimiccharge=12, class="2+"}, [21] = {mimiccharge=6, class="2"}, [22] = {mimiccharge=6, class="1-"}, [23] = {mimiccharge=4, class="2+"}, [24] = {mimiccharge=2, class="1+"}, [25] = {mimiccharge=6, class="2-"}, [26] = {mimiccharge=3, class="1+"}, [27] = {mimiccharge=6, class="1-"}, [28] = {mimiccharge=2, class="1+"}, [29] = {mimiccharge=6, class="1-"}, [3] = {mimiccharge=1, class="2"}, [30] = {mimiccharge=2, class="0"}, [31] = {mimiccharge=6, class="1-"}, [32] = {mimiccharge=6, class="1"}, [33] = {mimiccharge=6, class="1"}, [34] = {mimiccharge=2, class="1+"}, [35] = {mimiccharge=2, class="1+"}, [36] = {mimiccharge=3, class="1+"}, [37] = {mimiccharge=6, class="1-"}, [38] = {mimiccharge=1, class="1+"}, [39] = {mimiccharge=1, class="0-"}, [4] = {mimiccharge=3, class="1"}, [40] = {mimiccharge=1, class="0+"}, [41] = {mimiccharge=3, class="1"}, [42] = {mimiccharge=6, class="1"}, [43] = {mimiccharge=4, class="2+"}, [44] = {mimiccharge=1, class="0"}, [45] = {mimiccharge=1, class="1+"}, [46] = {mimiccharge=6, class="2+"}, [47] = {mimiccharge=4, class="1-"}, [48] = {mimiccharge=6, class="1+"}, [49] = {mimiccharge=3, class="3"}, [5] = {mimiccharge=12, class="2+"}, [6] = {mimiccharge=4, class="3-"}, [7] = {mimiccharge=6, class="3+"}, [8] = {mimiccharge=1, class="0"}, [9] = {mimiccharge=1, class="0"}, }
 
 -- locust colors for Abyss
 EID.XMLLocustColors = {["default"] = {0, 0, 0, 0, 0, 0}, ["fly_red"] = {768, 512, 512, 0, -255, -255}, ["fly_green"] = {512, 768, 512, -255, 0, -255}, ["fly_blue"] = {512, 512, 768, -255, -255, 0}, ["fly_yellow"] = {1024, 768, 512, 0, 0, -255}, ["fly_orange"] = {1024, 512, 512, 0, 0, -255}, ["fly_black"] = {255, 255, 255, 0, 0, 0}, ["fly_purple"] = {768, 512, 1024, 0, -255, 0}, ["fly_pink"] = {1024, 512, 768, 0, -255, 0}, ["fly_cyan"] = {680, 1024, 1024, 0, 0, 0}, }

features/eid_xmldata_rep+.lua

@@ -44,9 +44,7 @@ EID.XMLItemPools = {{{1, 1.0}, {2, 1.0}, {3, 1.0}, {4, 1.0}, {5, 1.0}, {6, 1.0},
 EID.XMLItemIsInPools = {[1] = {0, 16, 23}, [2] = {0, 16}, [3] = {0, 16, 23}, [4] = {0, 16, 23}, [5] = {0, 16, 23}, [6] = {0, 16}, [7] = {0, 4, 16, 21, 29}, [8] = {0, 3, 16, 28}, [9] = {7}, [10] = {0, 13, 16, 28}, [11] = {5, 18, 22}, [12] = {0, 16, 17, 24}, [13] = {0, 11, 16, 24}, [14] = {0, 2, 11, 17}, [15] = {0, 16, 24}, [16] = {5, 17, 22}, [17] = {0, 5, 13, 16, 22}, [18] = {}, [19] = {0, 16}, [20] = {5, 22}, [21] = {1, 10, 23}, [22] = {2, 10, 17}, [23] = {2, 10, 17}, [24] = {2, 10, 17}, [25] = {2, 10, 17}, [26] = {2, 10, 17, 30}, [27] = {2, 17, 29}, [28] = {2, 8, 17}, [29] = {2, 8, 15, 17, 27}, [30] = {2, 15, 17, 24, 27}, [31] = {2, 15, 17, 24, 27}, [32] = {2, 8, 17, 23}, [33] = {1, 4, 6, 21}, [34] = {3, 6, 16, 20}, [35] = {3, 5, 6, 16, 20, 22}, [36] = {0, 7, 16}, [37] = {0, 16, 25}, [38] = {0, 16, 23}, [39] = {0, 15, 16, 27}, [40] = {0, 16, 24}, [41] = {0, 15, 16, 27}, [42] = {0, 16, 30}, [44] = {0, 23}, [45] = {0, 16, 24}, [46] = {0, 10, 18, 23}, [47] = {0, 16, 23}, [48] = {0, 16, 23}, [49] = {0, 16, 23, 24}, [50] = {16}, [51] = {2, 3, 11, 12, 17, 19, 20, 23, 24}, [52] = {0, 16}, [53] = {0, 24}, [54] = {1, 10}, [55] = {0, 15, 16, 27}, [56] = {0, 16}, [57] = {0, 13, 16, 28}, [58] = {0, 6}, [59] = {}, [60] = {1, 29}, [62] = {0, 16}, [63] = {1, 14, 18, 23}, [64] = {1, 16}, [65] = {0, 6, 16}, [66] = {0, 16, 23}, [67] = {0, 3, 16, 20, 24, 28}, [68] = {0, 16, 20, 23}, [69] = {0, 16}, [70] = {2, 11, 17}, [71] = {0, 17}, [72] = {0, 4, 21, 24}, [73] = {17, 18, 24, 28}, [74] = {3, 8, 20}, [75] = {0, 1, 18}, [76] = {0, 18}, [77] = {0, 16, 23}, [78] = {0, 4, 6, 16, 21}, [79] = {3, 11, 12, 19, 20, 24}, [80] = {3, 11, 12, 19, 20, 24}, [81] = {3, 9, 12, 19, 20}, [82] = {3, 11, 20, 24}, [83] = {3, 11, 20}, [84] = {3, 5, 18, 22}, [85] = {0, 1, 16, 23}, [86] = {0, 16}, [87] = {0, 11, 16}, [88] = {0, 16, 28}, [89] = {0, 16, 23}, [90] = {23}, [91] = {0, 18, 23}, [92] = {0, 2, 16, 17}, [93] = {0, 16, 23}, [94] = {0, 16}, [95] = {0, 16, 23, 28}, [96] = {0, 16, 24, 28}, [97] = {0, 3, 6, 16, 20}, [98] = {0, 4, 16, 21}, [99] = {0, 16, 28}, [100] = {0, 16, 28}, [101] = {0, 4, 16, 17, 21}, [102] = {0, 1, 10, 11, 15, 16, 23, 27}, [103] = {0, 16}, [104] = {0, 16}, [105] = {0, 18, 23, 24}, [106] = {0, 16, 25}, [107] = {0, 16}, [108] = {0, 4, 16, 21}, [109] = {0, 3, 20, 24}, [110] = {0, 15, 16, 24, 27}, [111] = {0, 10, 16}, [112] = {4, 21, 28}, [113] = {0, 3, 16, 20, 28}, [114] = {0, 3, 15, 16, 20, 27}, [115] = {0, 3, 16, 20}, [116] = {1, 14, 18, 23}, [117] = {0, 16, 28}, [118] = {3, 20, 24}, [119] = {24}, [120] = {0, 5, 16, 17, 22}, [121] = {0, 5, 16, 17, 22}, [122] = {3, 11, 20, 24}, [123] = {0, 3, 6, 16, 20}, [124] = {0, 4, 16, 21}, [125] = {0, 16, 25}, [126] = {0, 11, 12, 16, 19}, [127] = {0, 3, 5, 11, 16, 22}, [128] = {0, 13, 16, 28}, [129] = {0, 16}, [130] = {}, [131] = {0, 16}, [132] = {16, 17, 20}, [133] = {3, 9, 12, 19, 20}, [134] = {3, 9, 12, 19, 20}, [135] = {24}, [136] = {0, 16, 23}, [137] = {0, 1, 16, 18, 23, 24, 25}, [138] = {0, 4, 16, 21, 29}, [139] = {1, 15, 18, 27}, [140] = {0, 9, 16, 25, 30}, [141] = {2}, [142] = {0, 4, 16, 21}, [143] = {0, 2, 11, 17}, [144] = {0, 10, 28}, [145] = {3, 9, 12, 19, 20}, [146] = {0, 4, 16, 21}, [147] = {1, 18, 23}, [148] = {0, 16}, [149] = {0, 16}, [150] = {0, 16}, [151] = {0, 16}, [152] = {0, 16, 23}, [153] = {0, 16, 23}, [154] = {0, 16}, [155] = {0, 16, 28}, [156] = {1, 4, 18}, [157] = {0, 3, 16, 20, 24}, [158] = {}, [159] = {3, 11, 20, 24}, [160] = {0, 16}, [161] = {0, 16}, [162] = {0, 4, 16, 21}, [163] = {0, 3, 16, 28}, [164] = {1, 18}, [165] = {2, 17}, [166] = {0, 18, 23, 24}, [167] = {0, 16, 24, 28}, [168] = {0, 5, 16, 22}, [169] = {0, 16}, [170] = {0, 16, 28}, [171] = {0, 16}, [172] = {0, 3, 16, 20}, [173] = {0, 4}, [174] = {0, 16, 28}, [175] = {0, 13, 16, 27}, [176] = {0, 2, 17, 24}, [177] = {24}, [178] = {0, 4, 16, 21}, [179] = {8}, [180] = {0, 10, 16}, [181] = {}, [182] = {4, 21, 24}, [183] = {2, 17, 29}, [184] = {4, 21}, [185] = {4, 21}, [186] = {0, 3, 16}, [187] = {3, 20}, [188] = {0, 16, 28}, [189] = {0, 16, 23}, [190] = {0, 5, 16, 22, 25}, [191] = {0, 16}, [192] = {0, 6, 16}, [193] = {2, 17, 24}, [194] = {2, 8, 17, 23}, [195] = {1, 2, 10, 11, 15, 17, 27}, [196] = {2, 8, 17, 23}, [197] = {2, 4, 17, 21}, [198] = {2, 10, 17}, [199] = {1, 13, 15, 18, 27}, [200] = {0, 15, 16, 27}, [201] = {0, 16}, [202] = {0, 16}, [203] = {1, 16}, [204] = {1, 10, 18}, [205] = {1, 14, 18}, [206] = {0, 16}, [207] = {17, 28}, [208] = {1, 18, 23, 24}, [209] = {0, 7, 16, 25}, [210] = {0, 16}, [211] = {0, 16}, [212] = {3, 9, 12, 19, 20, 23}, [213] = {0, 5, 16, 22}, [214] = {0, 16, 24}, [215] = {3, 12}, [216] = {3, 11, 12, 19, 20}, [217] = {0, 15, 16, 27}, [218] = {2, 17}, [219] = {2, 17}, [220] = {0, 16, 25}, [221] = {0, 16}, [222] = {0, 16}, [223] = {0, 16, 25}, [224] = {0, 16}, [225] = {0, 3, 11, 12, 19, 20}, [226] = {5, 16, 22}, [227] = {0, 1, 23}, [228] = {0, 15, 16, 27}, [229] = {0, 16}, [230] = {3, 11, 20, 24}, [231] = {0, 16}, [232] = {1, 18, 23}, [233] = {0, 16}, [234] = {0, 16}, [236] = {0,Line truncated
 
 --Metadata found in Pocketitems.xml
-EID.cardMetadata = {[0] = {mimiccharge=0}, [1] = {mimiccharge=2}, [10] = {mimiccharge=2}, [11] = {mimiccharge=4}, [12] = {mimiccharge=3}, [13] = {mimiccharge=3}, [14] = {mimiccharge=3}, [15] = {mimiccharge=6}, [16] = {mimiccharge=3}, [17] = {mimiccharge=3}, [18] = {mimiccharge=2}, [19] = {mimiccharge=2}, [2] = {mimiccharge=2}, [20] = {mimiccharge=12}, [21] = {mimiccharge=6}, [22] = {mimiccharge=3}, [23] = {mimiccharge=12}, [24] = {mimiccharge=12}, [25] = {mimiccharge=12}, [26] = {mimiccharge=12}, [27] = {mimiccharge=6}, [28] = {mimiccharge=6}, [29] = {mimiccharge=6}, [3] = {mimiccharge=2}, [30] = {mimiccharge=6}, [31] = {mimiccharge=2}, [32] = {mimiccharge=2}, [33] = {mimiccharge=12}, [34] = {mimiccharge=4}, [35] = {mimiccharge=6}, [36] = {mimiccharge=2}, [37] = {mimiccharge=4}, [38] = {mimiccharge=4}, [39] = {mimiccharge=4}, [4] = {mimiccharge=3}, [40] = {mimiccharge=3}, [41] = {mimiccharge=4}, [42] = {mimiccharge=6}, [43] = {mimiccharge=6}, [44] = {mimiccharge=1}, [45] = {mimiccharge=6}, [46] = {mimiccharge=1}, [47] = {mimiccharge=2}, [48] = {mimiccharge=1}, [49] = {mimiccharge=4}, [5] = {mimiccharge=4}, [50] = {mimiccharge=3}, [51] = {mimiccharge=4}, [52] = {mimiccharge=3}, [53] = {mimiccharge=12}, [54] = {mimiccharge=3}, [55] = {mimiccharge=1}, [56] = {mimiccharge=12}, [57] = {mimiccharge=4}, [58] = {mimiccharge=4}, [59] = {mimiccharge=4}, [6] = {mimiccharge=12}, [60] = {mimiccharge=2}, [61] = {mimiccharge=12}, [62] = {mimiccharge=4}, [63] = {mimiccharge=2}, [64] = {mimiccharge=12}, [65] = {mimiccharge=2}, [66] = {mimiccharge=4}, [67] = {mimiccharge=3}, [68] = {mimiccharge=6}, [69] = {mimiccharge=4}, [7] = {mimiccharge=6}, [70] = {mimiccharge=6}, [71] = {mimiccharge=4}, [72] = {mimiccharge=4}, [73] = {mimiccharge=12}, [74] = {mimiccharge=2}, [75] = {mimiccharge=6}, [76] = {mimiccharge=12}, [77] = {mimiccharge=2}, [78] = {mimiccharge=4}, [79] = {mimiccharge=12}, [8] = {mimiccharge=3}, [80] = {mimiccharge=6}, [81] = {mimiccharge=4}, [82] = {mimiccharge=3}, [83] = {mimiccharge=6}, [84] = {mimiccharge=2}, [85] = {mimiccharge=3}, [86] = {mimiccharge=4}, [87] = {mimiccharge=6}, [88] = {mimiccharge=6}, [89] = {mimiccharge=1}, [9] = {mimiccharge=6}, [90] = {mimiccharge=4}, [91] = {mimiccharge=3}, [92] = {mimiccharge=12}, [93] = {mimiccharge=12}, [94] = {mimiccharge=6}, [95] = {mimiccharge=4}, [96] = {mimiccharge=6}, [97] = {mimiccharge=4}, }
+EID.pillMetadata = {[0] = {class="1+"}, [1] = {class="2-"}, [10] = {class="2+"}, [11] = {class="3-"}, [12] = {class="3+"}, [13] = {class="3-"}, [14] = {class="3+"}, [15] = {class="3-"}, [16] = {class="3+"}, [17] = {class="3-"}, [18] = {class="3+"}, [19] = {class="1"}, [2] = {class="2+"}, [20] = {class="2+"}, [21] = {class="2"}, [22] = {class="1-"}, [23] = {class="2+"}, [24] = {class="1+"}, [25] = {class="2-"}, [26] = {class="1+"}, [27] = {class="1-"}, [28] = {class="1+"}, [29] = {class="1-"}, [3] = {class="2"}, [30] = {class="0"}, [31] = {class="1-"}, [32] = {class="1"}, [33] = {class="1"}, [34] = {class="1+"}, [35] = {class="1+"}, [36] = {class="1+"}, [37] = {class="1-"}, [38] = {class="1+"}, [39] = {class="0-"}, [4] = {class="1"}, [40] = {class="0+"}, [41] = {class="1"}, [42] = {class="1"}, [43] = {class="2+"}, [44] = {class="0"}, [45] = {class="1+"}, [46] = {class="2+"}, [47] = {class="1-"}, [48] = {class="1+"}, [49] = {class="3"}, [5] = {class="2+"}, [6] = {class="3-"}, [7] = {class="3+"}, [8] = {class="0"}, [9] = {class="0"}, }
-
-EID.pillMetadata = {[0] = {mimiccharge=1, class="1+"}, [1] = {mimiccharge=2, class="2-"}, [10] = {mimiccharge=6, class="2+"}, [11] = {mimiccharge=4, class="3-"}, [12] = {mimiccharge=6, class="3+"}, [13] = {mimiccharge=4, class="3-"}, [14] = {mimiccharge=6, class="3+"}, [15] = {mimiccharge=4, class="3-"}, [16] = {mimiccharge=6, class="3+"}, [17] = {mimiccharge=4, class="3-"}, [18] = {mimiccharge=6, class="3+"}, [19] = {mimiccharge=1, class="1"}, [2] = {mimiccharge=12, class="2+"}, [20] = {mimiccharge=12, class="2+"}, [21] = {mimiccharge=4, class="2"}, [22] = {mimiccharge=6, class="1-"}, [23] = {mimiccharge=4, class="2+"}, [24] = {mimiccharge=2, class="1+"}, [25] = {mimiccharge=6, class="2-"}, [26] = {mimiccharge=3, class="1+"}, [27] = {mimiccharge=6, class="1-"}, [28] = {mimiccharge=2, class="1+"}, [29] = {mimiccharge=6, class="1-"}, [3] = {mimiccharge=1, class="2"}, [30] = {mimiccharge=2, class="0"}, [31] = {mimiccharge=6, class="1-"}, [32] = {mimiccharge=6, class="1"}, [33] = {mimiccharge=6, class="1"}, [34] = {mimiccharge=2, class="1+"}, [35] = {mimiccharge=2, class="1+"}, [36] = {mimiccharge=3, class="1+"}, [37] = {mimiccharge=6, class="1-"}, [38] = {mimiccharge=1, class="1+"}, [39] = {mimiccharge=1, class="0-"}, [4] = {mimiccharge=3, class="1"}, [40] = {mimiccharge=1, class="0+"}, [41] = {mimiccharge=3, class="1"}, [42] = {mimiccharge=6, class="1"}, [43] = {mimiccharge=4, class="2+"}, [44] = {mimiccharge=1, class="0"}, [45] = {mimiccharge=1, class="1+"}, [46] = {mimiccharge=6, class="2+"}, [47] = {mimiccharge=4, class="1-"}, [48] = {mimiccharge=6, class="1+"}, [49] = {mimiccharge=3, class="3"}, [5] = {mimiccharge=12, class="2+"}, [6] = {mimiccharge=4, class="3-"}, [7] = {mimiccharge=6, class="3+"}, [8] = {mimiccharge=1, class="0"}, [9] = {mimiccharge=1, class="0"}, }
 
 -- locust colors for Abyss
 EID.XMLLocustColors = {["default"] = {0, 0, 0, 0, 0, 0}, ["fly_red"] = {255, 0, 0, 50, 0, 0}, ["fly_lightred"] = {215, 75, 75, 50, 10, 10}, ["fly_green"] = {0, 255, 0, 0, 0, 0}, ["fly_blue"] = {0, 0, 255, 0, 0, 10}, ["fly_brown"] = {80, 50, 30, 25, 12, 10}, ["fly_yellow"] = {241, 179, 12, 0, 0, 0}, ["fly_gold"] = {202, 178, 0, 150, 150, -255}, ["fly_magnet"] = {219, 204, 94, 0, 0, 0}, ["fly_orange"] = {255, 115, 0, 100, 60, 0}, ["fly_black"] = {1, 1, 1, 0, 0, 0}, ["fly_grey"] = {120, 120, 120, 10, 10, 10}, ["fly_darkred"] = {255, 0, 0, 0, 0, 0}, ["fly_purple"] = {126, 12, 174, 50, -255, 50}, ["fly_darkpurple"] = {126, 12, 174, 0, -150, 0}, ["fly_pink"] = {255, 84, 148, 50, -255, 10}, ["fly_cyan"] = {12, 217, 241, 0, 20, 50}, ["fly_lightblue"] = {122, 242, 238, 0, 20, 50}, ["fly_white"] = {255, 255, 255, 150, 150, 150}, ["fly_gas"] = {0, 155, 0, 0, 0, 0}, ["fly_fart"] = {184, 191, 134, 24, 24, 24}, }