From fef3bd5c82f8352d3113f5aa749e86ec0ff94c0c Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 01:07:19 -0500 Subject: [PATCH 01/13] new crafting icons --- resources/gfx/eid_inline_icons.png | Bin 29524 -> 12888 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/gfx/eid_inline_icons.png b/resources/gfx/eid_inline_icons.png index e89e78da9ddaad417d68346f3bb98aa6c734f3b2..b30a0e213946efee8ba8a0d51c8174d0f3b6bb32 100644 GIT binary patch delta 10187 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

W+A>}Do%G}{YpYZP$r)(DYeUbwHWj(c{ubyEA{ z4o|4^1o+{MNp-k#Cl6I#>*ReucuuMeB`<>o@phBYuE5J+lT9>fhWzs&73?vK3`+Lc zabuajwhzNpzBHw$&jbvbPdqSBUZNj=!FI;|J#^^ZF~Q-*wb)(S)0>ZJX$NhJ6Ybq@GDgvG_o2xRG;>>Z@8@W{hK;FcTIRjz4x01tFFgKu z@zF*erYU9OwM_E zuhujzZ(Y^(WNNNZEWH)~Zq+so2{>r8mfkgCMekxmi!@y=E`fP;8eM|cJsu= z>MTK0@DQ`t3&sHm4%kkeH#Q0YkMRlbQiJa1eR#}0uq<6AaSXLh`t&1*uZQt9Qh*se z*WU^o190?THZuDHfSE%Z3(=Ggd?%#H^4^r~z75!_om={l;vsw{qPrP7%b04?eCd?b z7gn%{mc=PsT3TLES657t^3HSaBbedwkMr|Scz;_xA)A(N0t;rdBlbE%Uv6tGU&gbv zo_>AOuR8j~#;nLoaDaV@nq1&H@ln>jS3MMigAV|c+XQe=+S=Ae4|1m%CExidN$1eV zLkXLzBB-(6LS?L9XpDAKZ%|gBUFu)J8C9Uy(Q3YMEBF}f{g4iKige!Laa7JM>$=fX zFKg7sZtFMmv9RSAeaTairzP(ys}c?YmvnR-RzLIx3n(9sWU|_{haB>j9{^9RQ>Pn> zbEekjFaW^p`B{?imZ2)J>`>?h4oO`KK;QnuVc^kJ-8kvM>fP`cSqM44+S+5V@ps<5 z`98c>EDx&9ANJ^wsx}sv7+%`#Ol(NDbH6Dx7iKKfQyixDeSNVMA{-Z2Ooa=xj+L&A znl(_$xbJs4=auoQ)(J;PL{w5z$a(Mu5BTmy(6EA)FY%J(FY4o>{A3E^Yh}2%aWBIvjfRj(^`SZ4fPS=9u8**~!L`lNL8_yt&<^ zA_ax^T=x@){ zbI0TgbUd2z-#n371KOCus+M-+o}GpG-1MNM=I9-EVk>Inwr_J#5Lm5rVYT!DPDigA zidBmx5@*pC=cU84d<74^Xd(LY^?!6jY`%3?%wJm-(CSDHi)=bxRPFT~>9=cmPjmjU z>T(;o+AJ@$uu;k-b((tIv{r{|Udp%us8#CByuf;!BMNQSIThJu^)>xY4#c07=Dx-2 zFlN|%R)Nqx;;8q?6gBKl+pSxQpPy!~>vVQKMHsz1#>V%I?n~;Yq3A6#fkVJZU`yVK zmCfSo`C8j?!9BW*L&cPojDq$_v<{yQ0Pvm3eGKZI;+XZf>q7ke@8A;sQD`&?h)Y-8B?E;DbiQyVsJSe zu0<%mQgRzTs!#^~`oO-dngyI%e`nvgUe) zP~h8Le?V{ZE&r^4&3x82+c9wnTiZ1ja*z7_s|HXziRE_{s>>v=bIyIzG{g~BzrBHf z@$MCVms{q9CRSxRix`Bmm9c{ch3gy7ay78{T+G^wF6(wVT}MO5IB3zHbM2i=zHjXD z`I{6%(8Z!h36qhtV$_vNZqYfdI$&r>sEMlH>}_OsZQbgKob5uz)8CoW~m<>I3w>;xmqUz+Bii77}&<&P&!x!&0K67Em zbR{g;&yQ9z$p_J(&i7=q*Jd&`T9V}!M74I9luMR!7!3{jX3m5)KgVAS|74XUcf5{g zTT1_Mg|+7eGS%m!Fa<{G1P{0_1AHNhX0OP2I38hx};vXWER1%76=+23+BR!gg`?IhELWl?<~D8LsyaS_4xVw^=4UI zdk5KbE2a>3aaT?#R5LM0@O#Izp24?dOh%cEyv5C z4?HR;c;(1g9F~-|<(#Q_AhEEB#bq$3Qj0nzz6kCsCoo<%O=4$@R6Vr2gTVefN1%VR}UPK>f;W zd>d8}JLvf(Z*vYLYDMTH z19Mnp8>?+TdB2<4?<*+huggA@W^?n>q_>LXblz+OUb$n>T<13G} zJiF5N((k*j`t#AhC)@k-@xSHef9B(Qews!fc4>iI?`JH7=AIAi{Wy_|qJ~0_oXPF~ E0UecfM*si- From d5f3f67126c5f4e9cf388f8b3617fc5329563d0d Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 01:41:29 -0500 Subject: [PATCH 02/13] new crafting icons --- resources/gfx/eid_inline_icons.anm2 | 728 ++++++++++++++-------------- 1 file changed, 366 insertions(+), 362 deletions(-) diff --git a/resources/gfx/eid_inline_icons.anm2 b/resources/gfx/eid_inline_icons.anm2 index 635e0558..0a1a1c79 100644 --- a/resources/gfx/eid_inline_icons.anm2 +++ b/resources/gfx/eid_inline_icons.anm2 @@ -1,362 +1,366 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3ecaaaca8beefd7a5ba8f0c5f90c69f4f33d3776 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 21:53:44 -0500 Subject: [PATCH 03/13] import xml data, re-enable achievement warning and Bag of Crafting --- main.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main.lua b/main.lua index ef8b190b..8dec08ad 100644 --- a/main.lua +++ b/main.lua @@ -66,6 +66,7 @@ for _,lang in ipairs(EID.Languages) do end require("eid_data") +require("eid_xmlData") require("eid_api") require("eid_modifiers") @@ -608,8 +609,8 @@ local function onRender(t) end EID:renderMCMDummyDescription() - -- Deactivated Achievement info, because it still doesnt work. propably because itempool data is outdated - --renderAchievementInfo() + + renderAchievementInfo() if EID.GameVersion == "ab+" then if EID.player:HasCollectible(CollectibleType.COLLECTIBLE_SCHOOLBAG) then @@ -624,12 +625,12 @@ local function onRender(t) EID:removeTextPosModifier("Tained HUD") end -- Disabling Bag of Crafting for now, since it doesnt work after patch - --[[if EID.player:HasCollectible(710) then + if EID.player:HasCollectible(710) then local success = EID:handleBagOfCraftingRendering() if success then return end - end]]-- + end end if EID.isHidden then From 68abaeacfd32786553c1ebee1a11ce48bb2cdfe3 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 21:54:23 -0500 Subject: [PATCH 04/13] use XML info, increase pickup table length --- eid_api.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eid_api.lua b/eid_api.lua index d234d176..82e01357 100644 --- a/eid_api.lua +++ b/eid_api.lua @@ -812,7 +812,7 @@ function EID:isCollectibleUnlockedAnyPool(collectibleID) return false end --iterate through the pools this item can be in - for k,itemPoolID in ipairs(EID.CollectiblesPools[collectibleID]) do + for k,itemPoolID in ipairs(EID.XMLItemIsInPools[collectibleID]) do if (itemPoolID < ItemPoolType.NUM_ITEMPOOLS and EID:isCollectibleUnlocked(collectibleID, itemPoolID)) then EID.itemUnlockStates[collectibleID] = true return true @@ -843,7 +843,7 @@ end -- Example input: {1,1,1,2,2,3,3,3} -- Result: "3{{Crafting3}}2{{Crafting2}}3{{Crafting1}}" local emptyPickupTable = {} -for i=1,25 do emptyPickupTable[i] = 0 end +for i=1,29 do emptyPickupTable[i] = 0 end function EID:tableToCraftingIconsMerged(craftTable) local sortedList = {table.unpack(craftTable)} table.sort(sortedList, function(a, b) return a > b end) From cfb638eeb0dda6520bdd82313cda22a8d575b3c4 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 21:56:28 -0500 Subject: [PATCH 05/13] more crafting icons, move collectiblespools to XML data --- eid_data.lua | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/eid_data.lua b/eid_data.lua index 8c7127d4..3085fd76 100644 --- a/eid_data.lua +++ b/eid_data.lua @@ -257,6 +257,10 @@ EID.InlineIcons = { ["Crafting24"] = {"Crafting", 24, 14, 16, -2, -3}, ["Crafting25"] = {"Crafting", 25, 14, 16, -2, -3}, ["Crafting26"] = {"Crafting", 26, 14, 16, -2, -3}, + ["Crafting27"] = {"Crafting", 27, 14, 16, -2, -3}, + ["Crafting28"] = {"Crafting", 28, 14, 16, -2, -3}, + ["Crafting29"] = {"Crafting", 29, 14, 16, -2, -3}, + ["Crafting30"] = {"Crafting", 30, 14, 16, -2, -3}, } -- Table that holds Colors used for markup objects. Example: "{{ColorRed}}" @@ -368,23 +372,3 @@ EID.InlineColors = { end, } - ---[[ -A list of all the item pools that an item is in -generated from itempools in bagOfCrafting.lua: -local items = {} -for i=1,800 do items[i] = {} end - -for k,v in ipairs(itempools) do - for k2,v2 in ipairs(v) do - local item = v2[1] - table.insert(items[item],k-1) - end -end -for k,v in ipairs(items) do - print("{" .. table.concat(v,",") .. "},") -end -]] -EID.CollectiblesPools = { - {0,16,23,24}, {0,16}, {0,16,23}, {0,16,23}, {0,16,23}, {0,16}, {0,4,16,21,29}, {0,3,16,28}, {7}, {0,13,16,28}, {5,18}, {0,16,17}, {0,11,16}, {0,2,11,17}, {0,17}, {5,17}, {0,5}, {}, {0}, {5}, {1,10,23}, {2,10,17}, {2,10,17}, {2,10,17}, {2,10,17}, {2,10,17,30}, {2,17,29}, {2,8,17}, {2,8,15,17,27}, {2,15,17,27}, {2,15,17,27}, {2,8,17,23}, {1,4,6}, {3,6,16,20}, {3,5,6,16,20}, {0,7}, {0,16,25}, {16,23}, {0,15,27}, {0}, {0,15,27}, {0,16,30}, {}, {0,23}, {0,16}, {0,10,18,23}, {0,16,23}, {0,16,23}, {0,23}, {16}, {2,3,11,12,20,23}, {0,16}, {0}, {1,10}, {0,15,16,27}, {0,16}, {0,13,16,28}, {0,6}, {}, {1,29}, {}, {0,16}, {1,14,18,23}, {1,16}, {0,6,16}, {0,23}, {0,3,16,20,28}, {0,16,20,23}, {0,16}, {2,11,17}, {0,17}, {0,4,21}, {16,17,18,19,20,21,22,28}, {3,8,20}, {0,1,18}, {0,18}, {0,16,23}, {0,6,16,21}, {3,11,12,20}, {3,11,12,20}, {3,9,12,19,20}, {3,11,20}, {3,11,20}, {3,5,18}, {0,1,16,23}, {0}, {0,11,16}, {0,16,28}, {0,16,23}, {23}, {0,18,23}, {0,2}, {0,16,23}, {0,16}, {0,16,23,28}, {0,16,28}, {0,3,6,16,20}, {0,4,16}, {0,16,28}, {0,16,28}, {0,4,16,17}, {0,1,10,11,15,16,23,27}, {0,16}, {0,16}, {0,18,23}, {0,16,25}, {0,16}, {0,4,16}, {0,3,20}, {0,15,16,27}, {0,10,16}, {4,21,28}, {0,3,20,28}, {0,3,15,16,20,27}, {0,3,16,20}, {1,14,18,23}, {0,16,20,28}, {3,20}, {}, {0,5,16,17}, {0,5}, {3,11,20}, {0,3,6,20}, {0,4,16}, {0,16,25}, {3,11}, {0,3,5,11}, {0,13,16,28}, {0}, {}, {0,16}, {16,17,20}, {3,9,12,19,20}, {3,9,12,19,20}, {}, {0,23}, {0,1,16,23,25}, {0,16,21,29}, {1,15,18,27}, {0,9,16,25,30}, {2}, {0,4,16}, {0,2,11,17}, {0,10,28}, {3,9,12,19,20}, {0,4,16}, {1,23}, {0,16}, {0,16}, {0,16}, {0,16}, {0,16,23}, {0,16,23}, {0,16}, {0,16,28}, {1,4,18}, {0,3,16,20}, {}, {3,11,20}, {0}, {0,16}, {0,4,16,21}, {0,3,16,28}, {1}, {2}, {0,18,23}, {0,16,28}, {5}, {0,16}, {0,16,28}, {0}, {0,3,16,20,28}, {0,4,21}, {0,16,28}, {0,13,16,27}, {0,2,17}, {1,10}, {0,4,21}, {8}, {0,10}, {}, {4,21}, {2,17,29}, {4,21}, {4,21}, {0,16}, {3,20}, {0,16,28}, {0,16,23}, {0,5,25}, {0,16}, {0,6,16}, {2,17}, {2,8,17,23}, {1,2,10,11,15,17,27}, {2,8,17,23}, {2,17,21}, {2,10,17}, {1,13,15,17,27}, {0,15,16,27}, {0,16}, {0}, {1}, {1,10,18}, {1,14}, {0,16}, {28}, {1,18,23}, {0,7,16,25}, {0,16}, {0}, {3,9,12,19,20,23}, {0,5,16}, {0,16}, {3,12}, {3,11,12,20}, {0,15,16,27}, {2}, {2}, {0,16,25}, {0,16}, {0,16}, {0,16}, {0,16}, {0,3,11,12,20}, {5,16}, {0,1,23}, {0,15,16,27}, {0,16}, {3,11,20}, {0,16}, {1,23}, {0,16}, {0,16}, {}, {0,16}, {0,3,16,20}, {}, {}, {0,2,11,17}, {3,11,12}, {0,5,16}, {4,21}, {0,16,23}, {0,16}, {1,10,18}, {1,18}, {1,18}, {1}, {1}, {1,18,23}, {1,18}, {2,17}, {2,16,17}, {2,8,17,23}, {0,16,25}, {0,16}, {5,16}, {3,11,20}, {1,12,18}, {0,16}, {3,5,11}, {5,23}, {0,13,16,28}, {0,16,28}, {0,16,28}, {0,16,23,28}, {0,3,16,20,28,30}, {0,3,16,20,28}, {0,20,28}, {0,5,10,16}, {0,13,28}, {0,16,28,30}, {0,16,28}, {0,3,28}, {0}, {0,16,28}, {0,3,11,28}, {0,13,16,28}, {0,16,28}, {0,16,28}, {0,6}, {0,18,23}, {0,18,23}, {0,18,23}, {1,5,18}, {0,5,6}, {0,16}, {1,18}, {1}, {0,16}, {0,3,6,20}, {}, {0,10}, {0,1}, {1}, {1,9,18}, {0}, {0,16}, {0,16}, {0,16}, {0,16}, {0,16}, {0}, {0,16}, {0,16}, {0,16}, {0,16}, {0,16}, {0,16}, {3,20}, {0,16}, {0,4,21}, {0,17}, {0,16}, {0,5,9,16}, {0,16}, {0,16}, {0,16}, {0,13,16,28}, {0,5,16}, {0,16,28}, {0}, {0}, {0,16}, {4}, {}, {}, {0,16}, {0,16}, {4,21}, {0,4,16}, {0,4,16,21}, {0,4,16,21}, {0,4,16,21}, {0,16,30}, {1,23}, {1,23}, {2,17}, {2,11,17}, {2,8,17,27}, {2,17}, {2,8,13,17}, {2,8,17}, {2,11,17}, {2,17}, {1}, {1,5,18}, {1,16,29}, {0}, {0,16}, {0,16,23}, {0,16,25}, {2,8,17}, {2,8,15,17,27}, {1,14,18}, {1,16,23}, {0,16}, {0,16}, {3,20,28}, {0,28}, {0,10,16,23,29}, {4,21,28}, {0,13,16,28}, {0,13,16,28}, {0,16,25}, {0,16,25}, {0,16}, {0,16}, {2,8,17,23}, {0,9,12,16}, {1,14,18,28}, {0,16}, {0,4,16}, {0,16}, {1,10}, {0,16}, {0,7,16}, {0,16}, {1,16,18}, {0}, {0,16,23}, {1,16,23}, {0,16,28}, {0,10,28}, {0,18,23}, {4,21}, {0,5,13,28}, {0,5,16}, {0,4,21,28}, {0,3,16,20}, {0,16}, {0,16}, {0,16}, {0,16,23}, {1}, {0,16,23}, {0,16}, {3,20}, {4,21}, {0,16}, {1,5,18}, {1,18,23,28}, {0,28}, {0,5,18}, {0,18,23}, {0,16,21}, {3,12,20}, {3,11,20}, {0,16}, {0,3,16,20}, {3,20}, {4,21}, {1}, {4,21}, {1,16,18}, {3,28}, {0}, {0,23}, {3,11,20}, {0,16}, {0,1,23}, {4,21}, {1,5}, {1,16,23}, {0,13,16,28}, {0,23}, {2,8,17}, {}, {0,13,16,28}, {0,3,16,20}, {0,16,25}, {3,20}, {1,16,18}, {0,28}, {0,16}, {0,23}, {2,8,17,23}, {1,15,18,23,27,29}, {0,16}, {3,20}, {3,12,20}, {0,16}, {0,8,16,23}, {0,16}, {0,16}, {0,10,16}, {0,16}, {0,16}, {5,16}, {1,12,18,20,23}, {0,16}, {0,16}, {0,16}, {2,8,10,17,27}, {2,8,10,17}, {0,16}, {0,16}, {0,16}, {0,16}, {0,16}, {3,20}, {0,16}, {4,21}, {0,16,23}, {0,16}, {0,16}, {3,12,20,28}, {0,16}, {0,16,28}, {0,16,28}, {1,18,28}, {0,16,28}, {}, {1,3,9,11,12,18}, {0,18,23}, {3,4,18}, {0,18,23}, {1}, {1,30}, {0,18}, {0,18}, {1,18,25}, {}, {0,1,10,18}, {1,18}, {1,11,18}, {0,18,23,29}, {5,18}, {4,21}, {0,28}, {0,13,28}, {0,11,16}, {0,14,16,23}, {0,16}, {0,11,12,16}, {0,16}, {3,4}, {4,21}, {5,18}, {5}, {0,16}, {11,12,16,20}, {0,7,16}, {1,18,23}, {0,16}, {0,16}, {0,12,15,16,27}, {0,16,28}, {4}, {0,16,28}, {0,16,18}, {0,16}, {1,16}, {1,16,18,23}, {0,16,18,23}, {0,16,25}, {1,16,18,23,28}, {3,4,20,28}, {1,14,16}, {1}, {0,16}, {1}, {0,16,23}, {0,16}, {3,4,20,21}, {1,13,18,23,29}, {4,21}, {0,16}, {3,20}, {0,16}, {0,16}, {4,21}, {1,8,18}, {1,18}, {3,12,20}, {0,16,28}, {2,17,23}, {0,16}, {0,16}, {2,17}, {0,16}, {0,4,16}, {0,16}, {0,3,6,16,20}, {5,27}, {2,17,27}, {0,16}, {0,16}, {}, {}, {}, {0,16}, {3,20}, {0,16}, {3,20}, {0,16}, {0,16}, {0,14,16}, {0,16}, {0,16}, {5}, {0,16,25}, {2,17}, {0,9,12,16}, {1,18}, {4,21}, {4,21}, {3,12,20}, {0,16}, {5,8}, {3,20}, {4,21}, {4,21}, {0,16,28}, {0,7,16}, {3,20}, {0,16}, {4,21}, {5,9,12,13,15}, {0,13,16,28}, {5}, {0,16,25}, {4,6,21}, {1,18}, {4,21}, {}, {26}, {26}, {26}, {26}, {26}, {26}, {26}, {26}, {26}, {26}, {26}, {1,23}, {2,17}, {4,21}, {1}, {1,14,18}, {1,18,23,27}, {0,16}, {3,20}, {0,16,28}, {0,16,28}, {0,5,16,23}, {0,16,28}, {0,16}, {0,5,16,28}, {}, {0,16,25}, {0,16,28}, {0,16}, {0,16,23}, {0,16,30}, {1,18}, {}, {1,18}, {4,21}, {1,18}, {1,2,17,18,23}, {0,5,16}, {}, {}, {5}, {0,13,16,23,28}, {}, {0,16}, {5}, {}, {3,4,20,21}, {0,16,28}, {5,18}, {0,16}, {1,18,23}, {0,16,30}, {4,21}, {0,16}, {1,9,12}, {4,21}, {2,8,17,23}, {0,16,28}, {3,20,25}, {1,14,18}, {}, {0,13,16,23,28}, {0,16}, {4,21}, {0,16}, {4,21}, {3,9,12,20}, {0,16,23}, {}, {0,16}, {0,16}, {2,17}, {1}, {0,16,28}, {}, {0,16}, {5}, {3,9,20}, {}, {5,18}, {}, {5}, {1}, {0,16}, {3,11}, {}, {5,18}, {0,5,16}, {0,11,16}, {0,5,16}, {}, {3,20,28}, {0,16}, {0,16}, {0,16,28}, {0,16}, {3,20}, {4,21}, {4,21}, {0,16,23}, {5,18}, {5,18}, {0,16}, {4,5,18,21}, {3,12,18,20}, {0,13,16}, {3,12,20}, {0,3,16,20}, {4,21}, {5,12}, {3,20,28}, {3,20}, {5,18}, {5,18}, {3,12,20}, {0,5,16,18}, {3,20}, {3,20}, {3,20}, {2,10,17}, {2,8,17}, {0,16,23}, {}, {}, {3,6,20}, {}, {}, {}, {1,5,16}, {0,5,16}, {}, {1,5,16,29}, {0,16,23}, {5,16,18}, {0,16,18}, {0,5,16,18,23}, {0,16}, {0,16}, {0,16}, {0,16,25}, {0,3,16,20}, {0,16}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} -} From 10734a46ca20a052d915357581ad4e2928922b8b Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 21:56:51 -0500 Subject: [PATCH 06/13] new auto-generated file for data ripped from game XMLs --- eid_xmlData.lua | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 eid_xmlData.lua diff --git a/eid_xmlData.lua b/eid_xmlData.lua new file mode 100644 index 00000000..372cdbd4 --- /dev/null +++ b/eid_xmlData.lua @@ -0,0 +1,44 @@ +--This file was autogenerated using https://github.com/Buurazu/IsaacXMLToLua +--It will have to be updated whenever the game's item XML files are updated + +--The highest item ID found +EID.XMLMaxItemID = 732 +--The fixed recipes, for use in Bag of Crafting +EID.XMLRecipes = {["29,29,29,29,29,29,29,29"] = 36,["8,8,8,8,8,8,8,8"] = 177,["1,1,1,1,1,1,1,1"] = 45,["2,2,2,2,2,2,2,2"] = 686,["3,3,3,3,3,3,3,3"] = 118,["12,12,12,12,12,12,12,12"] = 343,["15,15,15,15,15,15,15,15"] = 37,["21,21,21,21,21,21,21,21"] = 85,["1,2,4,4,4,4,4,5"] = 331,["4,4,4,4,4,4,4,4"] = 182,["22,22,22,22,22,22,22,22"] = 75,["3,22,22,22,22,22,22,22"] = 654,["1,1,1,1,1,1,7,7"] = 639,["12,12,12,12,12,12,13,13"] = 175,["17,17,17,17,17,17,17,17"] = 483,["15,15,15,15,15,15,16,16"] = 483,["6,6,6,6,6,6,6,6"] = 628,["24,24,24,24,24,24,24,24"] = 489,["25,25,25,25,25,25,25,25"] = 580,} +--The contents of each item pool, and the item's weight, for use in Bag of Crafting +EID.XMLItemPools = {{{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{10,1},{12,0.5},{13,1},{14,1},{15,1},{17,0.1},{19,1},{36,1},{37,1},{38,1},{39,1},{40,1},{41,1},{42,1},{44,1},{45,1},{46,1},{47,1},{48,1},{49,1},{52,1},{53,1},{55,1},{56,1},{57,1},{58,1},{62,1},{65,1},{66,1},{67,1},{68,1},{69,1},{71,1},{72,1},{75,1},{76,1},{77,1},{78,1},{85,1},{86,1},{87,1},{88,1},{89,1},{91,1},{92,1},{93,1},{94,1},{95,1},{96,1},{97,1},{98,0.2},{99,1},{100,1},{101,0.5},{102,1},{103,1},{104,1},{105,1},{106,1},{107,1},{108,1},{109,1},{110,1},{111,1},{113,1},{114,0.2},{115,1},{117,1},{120,1},{121,1},{123,1},{124,1},{125,1},{127,1},{128,1},{129,1},{131,1},{136,1},{137,1},{138,1},{140,1},{142,1},{143,1},{144,1},{146,1},{148,1},{149,1},{150,1},{151,1},{152,1},{153,1},{154,1},{155,1},{157,1},{160,1},{161,1},{162,1},{163,1},{166,1},{167,1},{169,1},{170,1},{171,1},{172,1},{173,1},{174,1},{175,1},{176,1},{178,1},{180,1},{186,1},{188,1},{189,1},{190,0.1},{191,1},{192,1},{200,1},{201,1},{202,1},{206,1},{209,1},{210,1},{211,1},{213,1},{214,1},{217,1},{220,1},{221,1},{222,1},{223,0.5},{224,1},{225,1},{227,1},{228,1},{229,1},{231,1},{233,1},{234,1},{236,1},{237,0.2},{240,1},{242,1},{244,1},{245,1},{256,1},{257,1},{261,1},{264,1},{265,1},{266,1},{267,1},{268,1},{269,1},{270,1},{271,1},{272,1},{273,1},{274,1},{275,1},{276,1},{277,1},{278,1},{279,1},{280,1},{281,1},{282,1},{283,1},{284,1},{285,1},{287,1},{288,1},{291,1},{292,1},{294,1},{295,1},{298,1},{299,1},{300,1},{301,1},{302,1},{303,1},{304,1},{305,1},{306,1},{307,1},{308,1},{309,1},{310,1},{312,1},{313,0.2},{314,1},{315,1},{316,1},{317,1},{318,1},{319,1},{320,1},{321,1},{322,1},{323,1},{324,1},{325,1},{329,1},{330,1},{332,1},{333,0.2},{334,0.2},{335,0.2},{336,1},{350,1},{351,1},{352,1},{353,1},{358,1},{359,1},{361,1},{362,1},{364,1},{365,1},{366,1},{367,1},{368,1},{369,1},{371,1},{373,1},{374,0.2},{375,1},{377,1},{378,1},{379,1},{381,1},{382,1},{384,1},{385,1},{386,1},{388,1},{389,1},{390,1},{391,1},{392,1},{393,1},{394,1},{395,1},{397,1},{398,1},{401,1},{404,1},{405,1},{406,1},{407,1},{410,1},{411,1},{418,1},{419,1},{421,1},{422,1},{426,1},{427,1},{430,1},{431,1},{432,1},{435,1},{436,1},{437,1},{440,1},{443,1},{444,1},{445,1},{446,1},{447,1},{448,1},{449,1},{452,1},{453,1},{454,1},{457,1},{458,1},{459,1},{460,1},{461,1},{463,1},{465,1},{466,1},{467,1},{469,1},{470,1},{471,1},{473,1},{476,1},{478,1},{481,1},{482,1},{485,1},{488,1},{491,1},{492,1},{493,1},{494,1},{495,1},{496,1},{497,1},{502,1},{504,1},{506,1},{507,1},{508,1},{509,1},{511,1},{512,1},{513,1},{516,1},{517,1},{522,1},{524,1},{525,1},{529,1},{531,1},{532,1},{537,1},{539,1},{540,1},{542,1},{543,1},{544,1},{545,1},{548,1},{549,1},{553,1},{555,1},{557,1},{558,1},{559,1},{560,1},{561,1},{563,1},{565,1},{570,1},{575,1},{576,1},{578,1},{581,1},{583,1},{605,1},{607,1},{608,1},{609,0.5},{610,1},{611,1},{612,1},{614,1},{615,1},{616,1},{617,1},{618,1},{625,0.1},{629,1},{631,1},{635,1},{637,1},{639,1},{641,1},{645,1},{649,1},{650,0.5},{652,1},{655,1},{657,1},{658,1},{661,1},{663,1},{671,1},{675,1},{676,1},{677,0.2},{678,1},{680,1},{681,1},{682,1},{683,1},{687,1},{690,1},{693,1},{695,1},{703,0.5},{709,1},{710,1},{713,1},{717,1},{720,1},{722,1},{723,0.1},{724,1},{725,1},{726,1},{727,1},{728,0.5},{729,1},}, -- treasure +{{21,1},{33,1},{54,1},{60,1},{63,1},{64,1},{75,1},{85,1},{102,1},{116,1},{137,1},{139,1},{147,1},{156,1},{164,1},{177,1},{195,1},{199,1},{203,1},{204,1},{205,1},{208,1},{227,1},{232,1},{246,1},{247,1},{248,1},{249,1},{250,1},{251,1},{252,1},{260,1},{286,0.2},{289,1},{290,1},{295,1},{296,1},{297,1},{337,1},{338,1},{347,1},{348,1},{349,1},{356,1},{357,1},{372,1},{376,1},{380,1},{383,1},{396,1},{402,0.5},{403,1},{414,1},{416,1},{422,1},{424,0.5},{425,1},{434,1},{439,1},{451,1},{472,1},{475,0.2},{479,1},{480,1},{483,0.5},{485,0.5},{486,1},{487,1},{505,1},{514,1},{515,1},{518,1},{520,1},{521,1},{523,1},{527,1},{534,1},{535,1},{566,1},{585,1},{599,1},{602,1},{603,1},{604,1},{619,1},{621,1},{623,1},{624,1},{638,1},{642,0.1},{647,1},{660,0.5},{670,1},{716,1},{719,0.5},}, -- shop +{{14,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},{29,1},{30,1},{31,1},{32,1},{51,1},{70,1},{92,0.5},{141,1},{143,1},{165,1},{176,1},{183,1},{193,1},{194,1},{195,1},{196,1},{197,1},{198,1},{218,1},{219,1},{240,1},{253,1},{254,1},{255,1},{339,1},{340,1},{341,1},{342,1},{343,1},{344,1},{345,1},{346,1},{354,1},{355,1},{370,1},{428,0.5},{438,1},{455,1},{456,1},{538,1},{541,1},{547,1},{564,1},{600,1},{624,1},{644,1},{659,1},{707,1},{708,1},{730,1},{731,1},}, -- boss +{{8,1},{34,1},{35,1},{51,1},{67,1},{74,1},{79,1},{80,1},{81,1},{82,1},{83,1},{84,1},{97,1},{109,1},{113,1},{114,1},{115,1},{118,1},{122,1},{123,1},{126,1},{127,0.2},{133,1},{134,1},{145,1},{157,1},{159,1},{163,1},{172,1},{187,1},{212,1},{215,1},{216,1},{225,1},{230,1},{237,1},{241,1},{259,1},{262,1},{268,1},{269,1},{275,1},{278,1},{292,1},{311,1},{360,1},{391,1},{399,1},{408,1},{409,1},{411,1},{412,1},{417,1},{420,1},{431,1},{433,1},{441,0.2},{442,1},{462,1},{468,1},{475,0.2},{477,0.5},{498,1},{519,1},{526,1},{530,1},{536,1},{545,1},{554,1},{556,1},{569,1},{572,1},{577,1},{606,1},{634,1},{646,1},{654,1},{665,1},{672,1},{679,1},{684,1},{692,1},{694,0.5},{695,1},{698,1},{699,1},{702,1},{704,0.5},{705,0.5},{706,0.5},{712,0.5},{728,1},}, -- devil +{{7,1},{33,1},{72,1},{98,1},{101,1},{108,1},{112,1},{124,1},{142,1},{146,1},{156,1},{162,1},{173,1},{178,1},{182,1},{184,1},{185,1},{243,1},{313,1},{326,1},{331,1},{332,1},{333,1},{334,1},{335,1},{363,1},{374,1},{387,1},{390,1},{400,1},{413,1},{415,1},{423,1},{464,1},{477,0.5},{490,1},{498,1},{499,1},{510,0.4},{519,1},{526,1},{528,1},{533,1},{543,1},{567,1},{568,1},{573,1},{574,1},{579,1},{584,0.5},{586,1},{601,1},{622,1},{634,1},{640,1},{643,1},{651,1},{653,1},{685,1},{686,1},{691,0.5},{696,1},}, -- angel +{{11,1},{16,1},{17,1},{20,1},{35,1},{84,1},{120,1},{121,1},{127,1},{168,1},{190,1},{213,1},{226,1},{242,1},{258,1},{262,1},{263,1},{271,1},{286,1},{287,1},{316,1},{321,1},{348,1},{388,1},{389,1},{402,1},{405,1},{424,1},{450,1},{489,1},{500,1},{501,1},{546,1},{562,1},{571,1},{580,1},{582,1},{609,1},{612,1},{625,1},{628,1},{632,1},{636,1},{664,1},{667,1},{669,1},{674,1},{675,1},{677,1},{688,1},{689,1},{691,0.5},{697,0.5},{700,1},{701,1},{703,1},{711,1},{716,1},{717,1},{719,1},{721,1},{723,1},}, -- secret +{{33,1},{34,1},{35,1},{58,1},{65,1},{78,1},{97,1},{123,1},{192,1},{282,1},{287,1},{292,1},{545,1},{584,0.2},{712,0.2},}, -- library +{{9,1},{36,1},{209,1},{378,1},{504,1},{576,1},}, -- shellGame +{{28,1},{29,1},{32,1},{74,1},{179,0.5},{194,1},{196,1},{255,1},{341,1},{343,1},{344,1},{354,1},{355,1},{370,1},{428,0.5},{438,1},{444,0.1},{455,1},{456,1},{534,0.5},{571,0.1},{644,1},{708,1},{730,1},{732,1},}, -- goldenChest +{{81,1},{133,1},{134,1},{140,1},{145,1},{212,1},{297,1},{316,1},{371,1},{475,0.1},{565,0.5},{580,0.1},{642,1},{654,0.2},{665,1},}, -- redChest +{{21,1},{22,1},{23,1},{24,1},{25,1},{26,1},{46,1},{54,1},{102,1},{111,1},{144,1},{177,1},{180,1},{195,1},{198,1},{204,1},{246,1},{271,1},{294,1},{362,1},{376,1},{385,1},{447,1},{455,1},{456,1},{485,1},{707,1},}, -- beggar +{{13,1},{14,1},{51,1},{70,1},{79,1},{80,1},{82,0.2},{83,1},{87,1},{102,1},{122,1},{126,1},{127,0.5},{143,1},{159,0.2},{195,1},{216,1},{225,1},{230,0.2},{240,1},{241,1},{259,1},{262,1},{278,1},{340,1},{345,1},{409,1},{420,1},{475,0.2},{487,1},{493,1},{496,1},{503,1},{672,0.5},{676,1},}, -- demonBeggar +{{51,1},{79,1},{80,1},{81,1},{133,1},{134,1},{145,1},{212,1},{215,1},{216,1},{225,1},{241,1},{260,1},{371,1},{408,1},{442,1},{451,1},{468,1},{475,0.2},{496,1},{503,1},{508,1},{536,1},{565,1},{569,1},{580,1},{642,1},{654,0.5},{692,1},{694,0.5},{697,0.5},{702,1},{711,1},}, -- curse +{{10,1},{57,1},{128,1},{175,1},{199,1},{264,1},{272,1},{279,1},{320,1},{343,1},{364,1},{365,1},{388,1},{426,1},{430,1},{492,1},{527,1},{580,1},{581,1},{629,1},{649,1},{693,1},}, -- keyMaster +{{63,1},{116,1},{205,1},{356,1},{372,1},{494,0.1},{520,1},{559,0.1},{603,1},{647,1},}, -- batteryBum +{{29,1},{30,1},{31,1},{39,1},{41,1},{55,1},{102,1},{110,1},{114,0.1},{139,1},{195,1},{199,1},{200,1},{217,1},{228,1},{355,1},{439,1},{508,1},{580,0.5},{732,1},}, -- momsChest +{{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{10,1},{12,0.5},{13,1},{34,1},{35,1},{37,1},{38,1},{42,1},{45,1},{47,1},{48,1},{50,1},{52,1},{55,1},{56,1},{57,1},{62,1},{64,1},{65,1},{67,1},{68,1},{69,1},{73,1},{77,1},{78,1},{85,1},{87,1},{88,1},{89,1},{93,1},{94,1},{95,1},{96,1},{97,1},{98,0.2},{99,1},{100,1},{101,0.5},{102,1},{103,1},{104,1},{106,1},{107,1},{108,1},{110,1},{111,1},{114,0.2},{115,1},{117,1},{120,1},{124,1},{125,1},{128,1},{131,1},{132,1},{137,1},{138,1},{140,1},{142,1},{146,1},{148,1},{149,1},{150,1},{151,1},{152,1},{153,1},{154,1},{155,1},{157,1},{161,1},{162,1},{163,1},{167,1},{169,1},{170,1},{172,1},{174,1},{175,1},{186,1},{188,1},{189,1},{191,1},{192,1},{200,1},{201,1},{206,1},{209,1},{210,1},{213,1},{214,1},{217,1},{220,1},{221,1},{222,1},{223,0.5},{224,1},{226,1},{228,1},{229,1},{231,1},{233,1},{234,1},{236,1},{237,0.2},{242,1},{244,1},{245,1},{254,1},{256,1},{257,1},{258,0.1},{261,1},{264,1},{265,1},{266,1},{267,1},{268,1},{269,1},{271,1},{273,1},{274,1},{277,1},{279,1},{280,1},{281,1},{288,1},{291,1},{299,1},{300,1},{301,1},{302,1},{303,1},{305,1},{306,1},{307,1},{308,1},{309,1},{310,1},{312,1},{315,1},{316,1},{317,1},{318,1},{319,1},{320,1},{321,1},{322,1},{325,1},{329,1},{330,1},{332,1},{333,0.2},{334,0.2},{335,0.2},{336,1},{349,1},{351,1},{352,1},{353,1},{357,1},{358,1},{359,1},{362,1},{364,1},{365,1},{366,1},{367,1},{368,1},{369,1},{371,1},{373,1},{374,0.2},{375,1},{377,1},{378,1},{379,1},{380,1},{382,1},{383,1},{384,1},{389,1},{391,1},{392,1},{393,1},{394,1},{395,1},{397,1},{398,1},{401,1},{407,1},{410,1},{411,1},{416,1},{421,1},{425,1},{426,1},{430,1},{431,1},{432,1},{434,1},{436,1},{440,1},{443,1},{444,1},{445,1},{446,1},{447,1},{448,1},{449,1},{450,1},{452,1},{453,1},{454,1},{457,1},{458,1},{459,1},{460,1},{461,1},{463,1},{465,1},{466,1},{467,1},{469,1},{470,1},{471,1},{473,1},{493,1},{494,1},{495,1},{496,1},{497,1},{502,1},{503,1},{504,1},{506,1},{507,1},{508,1},{509,1},{511,1},{512,1},{513,1},{514,1},{515,1},{516,1},{517,1},{518,1},{520,1},{522,1},{524,1},{525,1},{529,1},{531,1},{532,1},{537,1},{539,1},{540,1},{542,1},{543,1},{544,1},{545,1},{548,1},{549,1},{553,1},{555,1},{557,1},{558,1},{559,1},{560,1},{561,1},{563,1},{565,1},{570,1},{575,1},{576,1},{578,1},{581,1},{583,1},{605,1},{607,1},{608,1},{609,0.5},{610,1},{611,1},{612,1},{614,1},{615,1},{616,1},{617,1},{618,1},{625,0.5},{629,1},{631,1},{635,1},{637,1},{639,1},{641,1},{645,1},{649,1},{650,0.5},{652,1},{655,1},{657,1},{658,1},{661,1},{663,1},{671,1},{675,1},{676,1},{677,0.5},{678,1},{680,1},{681,1},{682,1},{683,1},{687,1},{690,1},{693,1},{695,1},{703,0.5},{709,1},{710,1},{713,1},{716,0.2},{717,0.2},{719,0.2},{720,1},{721,0.1},{722,0.1},{723,0.1},{724,1},{725,1},{726,1},{727,1},{728,0.5},{729,1},}, -- greedTreasure +{{12,0.2},{14,1},{15,1},{16,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},{29,1},{30,1},{31,1},{32,1},{70,1},{71,1},{73,1},{101,0.5},{120,1},{132,1},{143,1},{176,1},{183,1},{193,1},{194,1},{195,1},{196,1},{197,1},{198,1},{199,1},{240,1},{253,1},{254,1},{255,1},{314,1},{339,1},{340,1},{341,1},{342,1},{343,1},{344,1},{345,1},{346,1},{354,1},{355,1},{370,1},{428,0.5},{438,1},{455,1},{456,1},{538,1},{541,1},{547,1},{564,1},{600,1},{624,1},{644,1},{659,1},{707,1},{708,1},{730,1},{731,1},}, -- greedBoss +{{11,0.1},{46,1},{63,1},{73,1},{75,1},{76,1},{84,1},{91,1},{105,1},{116,1},{139,1},{156,1},{166,1},{204,1},{208,1},{246,1},{247,1},{248,1},{251,1},{252,1},{260,1},{283,1},{284,1},{285,1},{286,0.2},{289,1},{297,1},{348,1},{356,1},{372,1},{380,1},{386,1},{402,0.5},{403,1},{405,1},{406,1},{416,1},{434,1},{439,1},{451,1},{472,1},{475,0.2},{476,1},{477,1},{478,1},{481,1},{482,1},{483,0.5},{485,0.5},{486,1},{487,1},{488,1},{489,1},{500,1},{505,1},{512,1},{515,1},{516,1},{518,1},{527,1},{534,1},{535,1},{566,1},{585,1},{603,1},{604,1},{619,1},{621,1},{623,1},{624,1},{636,0.1},{638,1},{647,1},{667,0.1},{674,0.1},{688,0.1},{689,0.1},{691,0.1},{692,1},{700,0.1},{701,0.1},{703,0.1},{711,0.1},{721,0.1},{722,0.1},{723,0.1},{732,1},}, -- greedShop +{{51,1},{73,1},{79,1},{80,1},{81,1},{133,1},{134,1},{145,1},{212,1},{216,1},{225,1},{260,1},{371,1},{408,1},{442,1},{451,1},{468,1},{475,0.2},{496,1},{503,1},{508,1},{536,1},{565,1},{569,1},{642,1},{654,0.5},{692,1},{694,0.5},{702,1},{711,1},}, -- greedCurse +{{34,1},{35,1},{51,1},{67,1},{68,0.2},{73,1},{74,1},{79,1},{80,1},{81,1},{82,1},{83,1},{97,1},{109,1},{113,1},{114,1},{115,1},{117,1},{118,1},{122,1},{123,1},{132,1},{133,1},{134,1},{145,1},{157,1},{159,1},{172,1},{187,1},{212,1},{216,1},{225,1},{230,1},{237,1},{259,1},{268,1},{269,1},{270,1},{292,1},{311,1},{360,1},{391,1},{399,1},{408,1},{409,1},{411,1},{412,1},{420,1},{431,1},{433,1},{441,0.2},{442,1},{451,1},{462,1},{468,1},{503,1},{519,1},{526,1},{530,1},{536,1},{545,1},{554,1},{556,1},{569,1},{572,1},{577,1},{606,1},{634,1},{646,1},{654,1},{665,1},{679,1},{684,1},{692,1},{694,0.5},{695,1},{698,1},{699,1},{702,1},{704,0.5},{705,0.5},{706,0.5},{712,0.5},{728,1},}, -- greedDevil +{{7,1},{72,1},{73,1},{78,1},{112,1},{138,1},{162,1},{178,1},{182,1},{184,1},{185,1},{197,1},{243,1},{313,1},{331,1},{333,1},{334,1},{335,1},{363,1},{387,1},{390,1},{400,1},{407,1},{413,1},{415,1},{423,1},{464,1},{490,1},{499,1},{526,1},{528,1},{533,1},{543,1},{567,1},{568,1},{573,1},{574,1},{579,1},{584,0.5},{586,1},{601,1},{622,1},{634,1},{640,1},{643,1},{651,1},{653,1},{685,1},{686,1},{691,0.5},{696,1},}, -- greedAngel +{{11,1},{16,1},{17,1},{20,1},{35,1},{73,1},{84,1},{120,1},{121,1},{127,1},{168,1},{190,1},{213,1},{226,1},{242,1},{258,1},{262,1},{263,1},{271,1},{286,1},{316,1},{321,1},{348,1},{389,1},{402,1},{405,1},{424,1},{450,1},{489,1},{500,1},{501,1},{546,1},{562,1},{571,1},{582,1},{609,1},{612,1},{625,1},{628,1},{632,1},{636,1},{664,1},{667,1},{669,1},{674,1},{677,1},{688,1},{689,1},{691,0.5},{700,1},{701,1},{703,1},{711,1},{716,1},{717,1},{719,1},{721,1},{723,1},}, -- greedSecret +{{1,1},{3,1},{4,1},{5,1},{21,1},{32,1},{38,1},{44,1},{46,1},{47,1},{48,1},{49,1},{51,1},{63,1},{66,1},{68,1},{77,1},{85,1},{89,1},{90,1},{91,1},{93,1},{95,1},{102,1},{105,1},{116,1},{136,1},{137,1},{147,1},{152,1},{153,1},{166,1},{189,1},{194,1},{196,1},{208,1},{212,1},{227,1},{232,1},{244,1},{251,1},{255,1},{263,1},{267,1},{283,1},{284,1},{285,1},{337,1},{338,1},{352,1},{357,1},{362,1},{370,1},{382,1},{383,1},{386,1},{395,1},{397,1},{403,1},{406,1},{419,1},{422,1},{425,1},{427,1},{437,1},{438,1},{439,1},{444,1},{451,1},{465,1},{476,1},{478,1},{488,1},{494,1},{505,1},{515,1},{516,1},{518,1},{524,1},{527,1},{538,1},{599,1},{604,1},{609,1},{617,1},{624,1},{629,1},{638,1},{644,1},{649,1},{655,1},{687,1},{709,1},{720,1},{723,1},{730,1},}, -- craneGame +{{12,1},{13,1},{15,1},{30,1},{31,1},{40,1},{45,1},{49,1},{51,1},{53,1},{67,1},{72,1},{73,1},{79,1},{80,1},{82,1},{96,1},{105,1},{109,1},{110,1},{118,1},{119,1},{122,1},{135,1},{137,1},{157,1},{159,1},{166,1},{167,1},{176,1},{177,1},{182,1},{193,1},{208,1},{214,1},{230,1},{247,1},{253,1},{254,1},{261,1},{276,1},{289,1},{334,1},{373,1},{394,1},{399,1},{411,1},{412,1},{421,1},{435,1},{443,1},{452,1},{462,1},{466,1},{475,1},{481,1},{506,1},{511,1},{531,1},{541,1},{554,1},{556,1},{565,1},{572,1},{573,1},{580,1},{606,1},{607,1},{614,1},{616,1},{618,1},{637,1},{650,1},{654,1},{657,1},{671,1},{682,1},{684,1},{692,1},{694,1},{695,1},{700,1},{702,1},{703,1},{704,1},{705,1},{706,1},{711,1},{724,1},{726,1},{728,1},}, -- ultraSecret +{{37,1},{106,1},{125,1},{137,1},{140,1},{190,0.2},{209,1},{220,1},{256,1},{353,0.2},{366,1},{367,1},{432,1},{483,1},{517,1},{563,1},{583,1},{614,1},{646,0.2},{727,1},}, -- bombBum +{{588,1},{589,1},{590,1},{591,1},{592,1},{593,1},{594,1},{595,1},{596,1},{597,1},{598,1},}, -- planetarium +{{29,1},{30,1},{31,1},{39,1},{41,1},{55,1},{102,1},{110,1},{114,0.2},{139,1},{175,1},{195,1},{199,1},{200,1},{217,1},{228,1},{341,1},{355,1},{439,1},{455,1},{508,1},{546,0.2},{547,1},{604,1},}, -- oldChest +{{8,1},{10,1},{57,1},{67,1},{73,1},{88,1},{95,1},{96,1},{99,1},{100,1},{112,1},{113,1},{117,1},{128,1},{144,1},{155,1},{163,1},{167,1},{170,1},{172,1},{174,1},{188,1},{207,1},{264,1},{265,1},{266,1},{267,1},{268,1},{269,1},{270,1},{272,1},{273,1},{274,1},{275,1},{277,1},{278,1},{279,1},{280,1},{281,1},{320,1},{322,1},{360,1},{361,1},{363,1},{364,1},{365,1},{372,1},{384,1},{385,1},{388,1},{390,1},{403,1},{404,1},{417,1},{426,1},{430,1},{435,1},{468,1},{470,1},{471,1},{472,1},{473,1},{491,1},{492,1},{509,1},{511,1},{518,1},{519,1},{537,1},{575,1},{581,1},{607,1},{608,1},{610,1},{612,1},{615,1},{629,1},{635,1},{645,1},{649,1},{661,1},{679,1},{682,1},{698,1},}, -- babyShop +{{7,1},{27,1},{60,1},{138,1},{183,1},{349,1},{362,1},{439,1},{488,1},{527,1},{719,1},}, -- woodenChest +{{26,1},{42,1},{140,1},{268,1},{273,1},{336,0.5},{480,1},{618,0.5},{639,1},}, -- rottenBeggar +} +--The quality of each item, for use in Bag of Crafting +EID.XMLItemQualities = {[1]=3,[2]=2,[3]=3,[4]=4,[5]=0,[6]=2,[7]=3,[8]=1,[9]=0,[10]=3,[11]=2,[12]=4,[13]=2,[14]=2,[15]=2,[16]=2,[17]=3,[18]=3,[19]=0,[20]=3,[21]=2,[22]=1,[23]=1,[24]=1,[25]=1,[26]=1,[27]=1,[28]=1,[29]=1,[30]=1,[31]=1,[32]=3,[33]=1,[34]=2,[35]=1,[36]=0,[37]=1,[38]=2,[39]=1,[40]=0,[41]=0,[42]=1,[44]=0,[45]=1,[46]=2,[47]=1,[48]=3,[49]=2,[50]=3,[51]=3,[52]=4,[53]=1,[54]=2,[55]=1,[56]=1,[57]=2,[58]=3,[59]=0,[60]=1,[62]=1,[63]=2,[64]=2,[65]=1,[66]=1,[67]=1,[68]=3,[69]=3,[70]=3,[71]=2,[72]=2,[73]=2,[74]=1,[75]=2,[76]=2,[77]=1,[78]=3,[79]=3,[80]=3,[81]=3,[82]=3,[83]=3,[84]=0,[85]=2,[86]=1,[87]=1,[88]=1,[89]=2,[90]=3,[91]=2,[92]=2,[93]=2,[94]=1,[95]=1,[96]=2,[97]=2,[98]=4,[99]=2,[100]=1,[101]=2,[102]=1,[103]=1,[104]=3,[105]=4,[106]=2,[107]=2,[108]=4,[109]=3,[110]=3,[111]=0,[112]=2,[113]=2,[114]=4,[115]=2,[116]=2,[117]=0,[118]=4,[119]=2,[120]=2,[121]=2,[122]=2,[123]=1,[124]=1,[125]=2,[126]=0,[127]=3,[128]=1,[129]=1,[130]=2,[131]=2,[132]=3,[133]=3,[134]=2,[135]=1,[136]=1,[137]=1,[138]=2,[139]=3,[140]=1,[141]=0,[142]=2,[143]=2,[144]=0,[145]=3,[146]=3,[147]=1,[148]=0,[149]=4,[150]=3,[151]=3,[152]=2,[153]=3,[154]=2,[155]=2,[156]=2,[157]=3,[158]=3,[159]=3,[160]=2,[161]=1,[162]=1,[163]=1,[164]=2,[165]=3,[166]=2,[167]=1,[168]=4,[169]=4,[170]=3,[171]=1,[172]=2,[173]=3,[174]=1,[175]=1,[176]=1,[177]=0,[178]=3,[179]=3,[180]=0,[181]=2,[182]=4,[183]=3,[184]=3,[185]=3,[186]=0,[187]=1,[188]=0,[189]=3,[190]=3,[191]=2,[192]=0,[193]=2,[194]=1,[195]=1,[196]=3,[197]=2,[198]=1,[199]=3,[200]=1,[201]=3,[202]=2,[203]=3,[204]=1,[205]=1,[206]=2,[207]=2,[208]=3,[209]=2,[210]=1,[211]=1,[212]=2,[213]=2,[214]=0,[215]=3,[216]=3,[217]=3,[218]=2,[219]=2,[220]=2,[221]=3,[222]=2,[223]=4,[224]=3,[225]=2,[226]=2,[227]=1,[228]=2,[229]=2,[230]=4,[231]=2,[232]=4,[233]=0,[234]=4,[236]=1,[237]=3,[238]=0,[239]=0,[240]=1,[241]=3,[242]=2,[243]=3,[244]=3,[245]=4,[246]=2,[247]=2,[248]=2,[249]=3,[250]=1,[251]=2,[252]=1,[253]=2,[254]=2,[255]=3,[256]=1,[257]=2,[258]=2,[259]=3,[260]=3,[261]=4,[262]=0,[263]=2,[264]=2,[265]=3,[266]=2,[267]=1,[268]=3,[269]=1,[270]=1,[271]=2,[272]=1,[273]=1,[274]=0,[275]=3,[276]=0,[277]=1,[278]=4,[279]=2,[280]=1,[281]=1,[282]=1,[283]=3,[284]=3,[285]=0,[286]=2,[287]=0,[288]=1,[289]=2,[290]=0,[291]=1,[292]=4,[293]=2,[294]=1,[295]=1,[296]=2,[297]=2,[298]=1,[299]=1,[300]=2,[301]=3,[302]=1,[303]=2,[304]=1,[305]=3,[306]=3,[307]=3,[308]=1,[309]=2,[310]=2,[311]=4,[312]=2,[313]=4,[314]=1,[315]=0,[316]=0,[317]=3,[318]=1,[319]=0,[320]=2,[321]=1,[322]=2,[323]=0,[324]=2,[325]=1,[326]=0,[327]=2,[328]=2,[329]=2,[330]=2,[331]=4,[332]=1,[333]=3,[334]=3,[335]=3,[336]=3,[337]=1,[338]=2,[339]=1,[340]=1,[341]=3,[342]=3,[343]=2,[344]=1,[345]=3,[346]=1,[347]=3,[348]=2,[349]=1,[350]=3,[351]=1,[352]=1,[353]=2,[354]=2,[355]=2,[356]=3,[357]=1,[358]=1,[359]=3,[360]=4,[361]=2,[362]=2,[363]=3,[364]=1,[365]=1,[366]=1,[367]=1,[368]=1,[369]=2,[370]=3,[371]=1,[372]=3,[373]=3,[374]=3,[375]=3,[376]=2,[377]=1,[378]=2,[379]=2,[380]=2,[381]=3,[382]=2,[383]=1,[384]=2,[385]=1,[386]=0,[387]=3,[388]=0,[389]=3,[390]=3,[391]=0,[392]=1,[393]=2,[394]=1,[395]=4,[396]=1,[397]=3,[398]=1,[399]=4,[400]=1,[401]=2,[402]=3,[403]=1,[404]=1,[405]=1,[406]=2,[407]=2,[408]=1,[409]=2,[410]=2,[411]=3,[412]=2,[413]=1,[414]=3,[415]=4,[416]=2,[417]=3,[418]=2,[419]=3,[420]=1,[421]=1,[422]=3,[423]=1,[424]=3,[425]=2,[426]=0,[427]=1,[428]=2,[429]=2,[430]=1,[431]=2,[432]=2,[433]=0,[434]=2,[435]=1,[436]=1,[437]=1,[438]=3,[439]=3,[440]=2,[441]=4,[442]=1,[443]=3,[444]=3,[445]=1,[446]=1,[447]=0,[448]=1,[449]=1,[450]=2,[451]=3,[452]=2,[453]=2,[454]=2,[455]=2,[456]=1,[457]=2,[458]=3,[459]=3,[460]=2,[461]=3,[462]=3,[463]=2,[464]=2,[465]=2,[466]=2,[467]=1,[468]=0,[469]=1,[470]=0,[471]=2,[472]=1,[473]=1,[474]=0,[475]=0,[476]=4,[477]=4,[478]=1,[479]=3,[480]=2,[481]=0,[482]=0,[483]=3,[484]=1,[485]=1,[486]=1,[487]=2,[488]=1,[489]=4,[490]=3,[491]=2,[492]=2,[493]=1,[494]=3,[495]=3,[496]=3,[497]=0,[498]=1,[499]=3,[500]=3,[501]=1,[502]=1,[503]=3,[504]=0,[505]=1,[506]=1,[507]=2,[508]=1,[509]=1,[510]=1,[511]=1,[512]=1,[513]=2,[514]=2,[515]=3,[516]=2,[517]=1,[518]=2,[519]=2,[520]=3,[521]=2,[522]=1,[523]=1,[524]=3,[525]=1,[526]=2,[527]=3,[528]=3,[529]=2,[530]=2,[531]=3,[532]=2,[533]=2,[534]=3,[535]=2,[536]=2,[537]=1,[538]=2,[539]=1,[540]=2,[541]=1,[542]=2,[543]=1,[544]=2,[545]=3,[546]=3,[547]=3,[548]=1,[549]=3,[550]=4,[551]=4,[552]=4,[553]=3,[554]=2,[555]=2,[556]=3,[557]=2,[558]=2,[559]=2,[560]=1,[561]=1,[562]=3,[563]=1,[564]=3,[565]=1,[566]=2,[567]=3,[568]=2,[569]=2,[570]=3,[571]=2,[572]=3,[573]=3,[574]=2,[575]=3,[576]=2,[577]=2,[578]=1,[579]=3,[580]=3,[581]=4,[582]=1,[583]=2,[584]=3,[585]=2,[586]=3,[588]=2,[589]=2,[590]=3,[591]=2,[592]=3,[593]=2,[594]=2,[595]=2,[596]=3,[597]=3,[598]=3,[599]=1,[600]=3,[601]=3,[602]=1,[603]=1,[604]=2,[605]=0,[606]=3,[607]=1,[608]=2,[609]=3,[610]=1,[611]=2,[612]=2,[614]=1,[615]=0,[616]=3,[617]=3,[618]=2,[619]=3,[621]=2,[622]=2,[623]=1,[624]=1,[625]=4,[626]=0,[627]=0,[628]=4,[629]=3,[631]=1,[632]=2,[633]=0,[634]=2,[635]=1,[636]=4,[637]=3,[638]=2,[639]=2,[640]=3,[641]=2,[642]=2,[643]=4,[644]=1,[645]=1,[646]=3,[647]=2,[649]=1,[650]=2,[651]=2,[652]=1,[653]=3,[654]=2,[655]=1,[656]=2,[657]=2,[658]=1,[659]=1,[660]=3,[661]=2,[663]=2,[664]=4,[665]=2,[667]=2,[668]=0,[669]=3,[670]=2,[671]=2,[672]=1,[673]=2,[674]=2,[675]=1,[676]=2,[677]=2,[678]=4,[679]=3,[680]=3,[681]=1,[682]=3,[683]=2,[684]=3,[685]=2,[686]=2,[687]=3,[688]=2,[689]=4,[690]=3,[691]=4,[692]=1,[693]=2,[694]=3,[695]=3,[696]=3,[697]=3,[698]=4,[699]=3,[700]=2,[701]=3,[702]=2,[703]=2,[704]=3,[705]=3,[706]=4,[707]=1,[708]=3,[709]=3,[710]=4,[711]=4,[712]=3,[713]=3,[714]=0,[715]=0,[716]=3,[717]=2,[719]=2,[720]=2,[721]=2,[722]=3,[723]=4,[724]=3,[725]=2,[726]=3,[727]=2,[728]=2,[729]=2,[730]=3,[731]=2,[732]=3,} +--The pools that each item is in, for roughly checking if a given item is unlocked +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,22,},[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,},[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]={16,17,18,19,20,21,22,24,28,},[74]={3,8,20,},[75]={0,1,18,},[76]={0,18,},[77]={0,16,23,},[78]={0,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,20,28,},[118]={3,20,24,},[119]={24,},[120]={0,5,16,17,22,},[121]={0,5,22,},[122]={3,11,20,24,},[123]={0,3,6,20,},[124]={0,4,16,},[125]={0,16,25,},[126]={3,11,},[127]={0,3,5,11,22,},[128]={0,13,16,28,},[129]={0,},[131]={0,16,},[132]={16,17,20,},[133]={3,9,12,19,20,},[134]={3,9,12,19,20,},[135]={24,},[136]={0,23,},[137]={0,1,16,23,24,25,},[138]={0,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,},[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]={5,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,},[182]={4,21,24,},[183]={2,17,29,},[184]={4,21,},[185]={4,21,},[186]={0,16,},[187]={3,20,},[188]={0,16,28,},[189]={0,16,23,},[190]={0,5,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,17,21,},[198]={2,10,17,},[199]={1,13,15,17,27,},[200]={0,15,16,27,},[201]={0,16,},[202]={0,},[203]={1,},[204]={1,10,18,},[205]={1,14,},[206]={0,16,},[207]={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,},[240]={0,2,11,17,},[241]={3,11,12,},[242]={0,5,16,22,},[243]={4,21,},[244]={0,16,23,},[245]={0,16,},[246]={1,10,18,},[247]={1,18,24,},[248]={1,18,},[249]={1,},[250]={1,},[251]={1,18,23,},[252]={1,18,},[253]={2,17,24,},[254]={2,16,17,24,},[255]={2,8,17,23,},[256]={0,16,25,},[257]={0,16,},[258]={5,16,22,},[259]={3,11,20,},[260]={1,12,18,19,},[261]={0,16,24,},[262]={3,5,11,22,},[263]={5,22,23,},[264]={0,13,16,28,},[265]={0,16,28,},[266]={0,16,28,},[267]={0,16,23,28,},[268]={0,3,16,20,28,30,},[269]={0,3,16,20,28,},[270]={0,20,28,},[271]={0,5,10,16,22,},[272]={0,13,28,},[273]={0,16,28,30,},[274]={0,16,28,},[275]={0,3,28,},[276]={0,24,},[277]={0,16,28,},[278]={0,3,11,28,},[279]={0,13,16,28,},[280]={0,16,28,},[281]={0,16,28,},[282]={0,6,},[283]={0,18,23,},[284]={0,18,23,},[285]={0,18,23,},[286]={1,5,18,22,},[287]={0,5,6,},[288]={0,16,},[289]={1,18,24,},[290]={1,},[291]={0,16,},[292]={0,3,6,20,},[294]={0,10,},[295]={0,1,},[296]={1,},[297]={1,9,18,},[298]={0,},[299]={0,16,},[300]={0,16,},[301]={0,16,},[302]={0,16,},[303]={0,16,},[304]={0,},[305]={0,16,},[306]={0,16,},[307]={0,16,},[308]={0,16,},[309]={0,16,},[310]={0,16,},[311]={3,20,},[312]={0,16,},[313]={0,4,21,},[314]={0,17,},[315]={0,16,},[316]={0,5,9,16,22,},[317]={0,16,},[318]={0,16,},[319]={0,16,},[320]={0,13,16,28,},[321]={0,5,16,22,},[322]={0,16,28,},[323]={0,},[324]={0,},[325]={0,16,},[326]={4,},[329]={0,16,},[330]={0,16,},[331]={4,21,},[332]={0,4,16,},[333]={0,4,16,21,},[334]={0,4,16,21,24,},[335]={0,4,16,21,},[336]={0,16,30,},[337]={1,23,},[338]={1,23,},[339]={2,17,},[340]={2,11,17,},[341]={2,8,17,27,},[342]={2,17,},[343]={2,8,13,17,},[344]={2,8,17,},[345]={2,11,17,},[346]={2,17,},[347]={1,},[348]={1,5,18,22,},[349]={1,16,29,},[350]={0,},[351]={0,16,},[352]={0,16,23,},[353]={0,16,25,},[354]={2,8,17,},[355]={2,8,15,17,27,},[356]={1,14,18,},[357]={1,16,23,},[358]={0,16,},[359]={0,16,},[360]={3,20,28,},[361]={0,28,},[362]={0,10,16,23,29,},[363]={4,21,28,},[364]={0,13,16,28,},[365]={0,13,16,28,},[366]={0,16,25,},[367]={0,16,25,},[368]={0,16,},[369]={0,16,},[370]={2,8,17,23,},[371]={0,9,12,16,19,},[372]={1,14,18,28,},[373]={0,16,24,},[374]={0,4,16,},[375]={0,16,},[376]={1,10,},[377]={0,16,},[378]={0,7,16,},[379]={0,16,},[380]={1,16,18,},[381]={0,},[382]={0,16,23,},[383]={1,16,23,},[384]={0,16,28,},[385]={0,10,28,},[386]={0,18,23,},[387]={4,21,},[388]={0,5,13,28,},[389]={0,5,16,22,},[390]={0,4,21,28,},[391]={0,3,16,20,},[392]={0,16,},[393]={0,16,},[394]={0,16,24,},[395]={0,16,23,},[396]={1,},[397]={0,16,23,},[398]={0,16,},[399]={3,20,24,},[400]={4,21,},[401]={0,16,},[402]={1,5,18,22,},[403]={1,18,23,28,},[404]={0,28,},[405]={0,5,18,22,},[406]={0,18,23,},[407]={0,16,21,},[408]={3,12,19,20,},[409]={3,11,20,},[410]={0,16,},[411]={0,3,16,20,24,},[412]={3,20,24,},[413]={4,21,},[414]={1,},[415]={4,21,},[416]={1,16,18,},[417]={3,28,},[418]={0,},[419]={0,23,},[420]={3,11,20,},[421]={0,16,24,},[422]={0,1,23,},[423]={4,21,},[424]={1,5,22,},[425]={1,16,23,},[426]={0,13,16,28,},[427]={0,23,},[428]={2,8,17,},[430]={0,13,16,28,},[431]={0,3,16,20,},[432]={0,16,25,},[433]={3,20,},[434]={1,16,18,},[435]={0,24,28,},[436]={0,16,},[437]={0,23,},[438]={2,8,17,23,},[439]={1,15,18,23,27,29,},[440]={0,16,},[441]={3,20,},[442]={3,12,19,20,},[443]={0,16,24,},[444]={0,8,16,23,},[445]={0,16,},[446]={0,16,},[447]={0,10,16,},[448]={0,16,},[449]={0,16,},[450]={5,16,22,},[451]={1,12,18,19,20,23,},[452]={0,16,24,},[453]={0,16,},[454]={0,16,},[455]={2,8,10,17,27,},[456]={2,8,10,17,},[457]={0,16,},[458]={0,16,},[459]={0,16,},[460]={0,16,},[461]={0,16,},[462]={3,20,24,},[463]={0,16,},[464]={4,21,},[465]={0,16,23,},[466]={0,16,24,},[467]={0,16,},[468]={3,12,19,20,28,},[469]={0,16,},[470]={0,16,28,},[471]={0,16,28,},[472]={1,18,28,},[473]={0,16,28,},[475]={1,3,9,11,12,18,19,24,},[476]={0,18,23,},[477]={3,4,18,},[478]={0,18,23,},[479]={1,},[480]={1,30,},[481]={0,18,24,},[482]={0,18,},[483]={1,18,25,},[485]={0,1,10,18,},[486]={1,18,},[487]={1,11,18,},[488]={0,18,23,29,},[489]={5,18,22,},[490]={4,21,},[491]={0,28,},[492]={0,13,28,},[493]={0,11,16,},[494]={0,14,16,23,},[495]={0,16,},[496]={0,11,12,16,19,},[497]={0,16,},[498]={3,4,},[499]={4,21,},[500]={5,18,22,},[501]={5,22,},[502]={0,16,},[503]={11,12,16,19,20,},[504]={0,7,16,},[505]={1,18,23,},[506]={0,16,24,},[507]={0,16,},[508]={0,12,15,16,19,27,},[509]={0,16,28,},[510]={4,},[511]={0,16,24,28,},[512]={0,16,18,},[513]={0,16,},[514]={1,16,},[515]={1,16,18,23,},[516]={0,16,18,23,},[517]={0,16,25,},[518]={1,16,18,23,28,},[519]={3,4,20,28,},[520]={1,14,16,},[521]={1,},[522]={0,16,},[523]={1,},[524]={0,16,23,},[525]={0,16,},[526]={3,4,20,21,},[527]={1,13,18,23,29,},[528]={4,21,},[529]={0,16,},[530]={3,20,},[531]={0,16,24,},[532]={0,16,},[533]={4,21,},[534]={1,8,18,},[535]={1,18,},[536]={3,12,19,20,},[537]={0,16,28,},[538]={2,17,23,},[539]={0,16,},[540]={0,16,},[541]={2,17,24,},[542]={0,16,},[543]={0,4,16,21,},[544]={0,16,},[545]={0,3,6,16,20,},[546]={5,22,27,},[547]={2,17,27,},[548]={0,16,},[549]={0,16,},[553]={0,16,},[554]={3,20,24,},[555]={0,16,},[556]={3,20,24,},[557]={0,16,},[558]={0,16,},[559]={0,14,16,},[560]={0,16,},[561]={0,16,},[562]={5,22,},[563]={0,16,25,},[564]={2,17,},[565]={0,9,12,16,19,24,},[566]={1,18,},[567]={4,21,},[568]={4,21,},[569]={3,12,19,20,},[570]={0,16,},[571]={5,8,22,},[572]={3,20,24,},[573]={4,21,24,},[574]={4,21,},[575]={0,16,28,},[576]={0,7,16,},[577]={3,20,},[578]={0,16,},[579]={4,21,},[580]={5,9,12,13,15,24,},[581]={0,13,16,28,},[582]={5,22,},[583]={0,16,25,},[584]={4,6,21,},[585]={1,18,},[586]={4,21,},[588]={26,},[589]={26,},[590]={26,},[591]={26,},[592]={26,},[593]={26,},[594]={26,},[595]={26,},[596]={26,},[597]={26,},[598]={26,},[599]={1,23,},[600]={2,17,},[601]={4,21,},[602]={1,},[603]={1,14,18,},[604]={1,18,23,27,},[605]={0,16,},[606]={3,20,24,},[607]={0,16,24,28,},[608]={0,16,28,},[609]={0,5,16,22,23,},[610]={0,16,28,},[611]={0,16,},[612]={0,5,16,22,28,},[614]={0,16,24,25,},[615]={0,16,28,},[616]={0,16,24,},[617]={0,16,23,},[618]={0,16,24,30,},[619]={1,18,},[621]={1,18,},[622]={4,21,},[623]={1,18,},[624]={1,2,17,18,23,},[625]={0,5,16,22,},[628]={5,22,},[629]={0,13,16,23,28,},[631]={0,16,},[632]={5,22,},[634]={3,4,20,21,},[635]={0,16,28,},[636]={5,18,22,},[637]={0,16,24,},[638]={1,18,23,},[639]={0,16,30,},[640]={4,21,},[641]={0,16,},[642]={1,9,12,19,},[643]={4,21,},[644]={2,8,17,23,},[645]={0,16,28,},[646]={3,20,25,},[647]={1,14,18,},[649]={0,13,16,23,28,},[650]={0,16,24,},[651]={4,21,},[652]={0,16,},[653]={4,21,},[654]={3,9,12,19,20,24,},[655]={0,16,23,},[657]={0,16,24,},[658]={0,16,},[659]={2,17,},[660]={1,},[661]={0,16,28,},[663]={0,16,},[664]={5,22,},[665]={3,9,20,},[667]={5,18,22,},[669]={5,22,},[670]={1,},[671]={0,16,24,},[672]={3,11,},[674]={5,18,22,},[675]={0,5,16,},[676]={0,11,16,},[677]={0,5,16,22,},[678]={0,16,},[679]={3,20,28,},[680]={0,16,},[681]={0,16,},[682]={0,16,24,28,},[683]={0,16,},[684]={3,20,24,},[685]={4,21,},[686]={4,21,},[687]={0,16,23,},[688]={5,18,22,},[689]={5,18,22,},[690]={0,16,},[691]={4,5,18,21,22,},[692]={3,12,18,19,20,24,},[693]={0,13,16,},[694]={3,12,19,20,24,},[695]={0,3,16,20,24,},[696]={4,21,},[697]={5,12,},[698]={3,20,28,},[699]={3,20,},[700]={5,18,22,24,},[701]={5,18,22,},[702]={3,12,19,20,24,},[703]={0,5,16,18,22,24,},[704]={3,20,24,},[705]={3,20,24,},[706]={3,20,24,},[707]={2,10,17,},[708]={2,8,17,},[709]={0,16,23,},[710]={0,16,},[711]={5,12,18,19,22,24,},[712]={3,6,20,},[713]={0,16,},[716]={1,5,16,22,},[717]={0,5,16,22,},[719]={1,5,16,22,29,},[720]={0,16,23,},[721]={5,16,18,22,},[722]={0,16,18,},[723]={0,5,16,18,22,23,},[724]={0,16,24,},[725]={0,16,},[726]={0,16,24,},[727]={0,16,25,},[728]={0,3,16,20,24,},[729]={0,16,},[730]={2,8,17,23,},[731]={2,17,},[732]={8,15,18,},} From c62d9b8c4d48fea06f7e021d9027cda29a535159 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 21:57:25 -0500 Subject: [PATCH 07/13] remove Breakfast option, add Bag hide in battle option --- mod_config_menu.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mod_config_menu.lua b/mod_config_menu.lua index cdd542cd..b276d6ad 100644 --- a/mod_config_menu.lua +++ b/mod_config_menu.lua @@ -1080,26 +1080,26 @@ if MCMLoaded then Info = {"If on, each result takes two lines; lower your displayed results accordingly"} } ) - -- Bag of Crafting Breakfast recipes + -- Bag of Crafting Hide in Battle MCM.AddSetting( "EID", "Crafting", { Type = ModConfigMenu.OptionType.BOOLEAN, CurrentSetting = function() - return EID.Config["BagOfCraftingDisplayBreakfast"] + return EID.Config["BagOfCraftingHideInBattle"] end, Display = function() local onOff = "False" - if EID.Config["BagOfCraftingDisplayBreakfast"] then + if EID.Config["BagOfCraftingHideInBattle"] then onOff = "True" end - return "Show Locked Recipes: " .. onOff + return "Show Item Names: " .. onOff end, OnChange = function(currentBool) - EID.Config["BagOfCraftingDisplayBreakfast"] = currentBool + EID.Config["BagOfCraftingHideInBattle"] = currentBool end, - Info = {"Recipes for locked items turn into Breakfast, cluttering the list; the method to check for unlock status is not perfect, though"} + Info = {"Hides the recipe list when in a fight"} } ) From 12c8ff8bee4b01b8b5a9060b5744a81cf5bd61f5 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 21:57:48 -0500 Subject: [PATCH 08/13] remove Breakfast option, add Bag hide in battle option --- eid_config.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eid_config.lua b/eid_config.lua index 95968f69..c1134a97 100644 --- a/eid_config.lua +++ b/eid_config.lua @@ -189,10 +189,9 @@ EID.UserConfig = { -- Display craftable item names, moving the recipe to a new line -- Default = false ["BagOfCraftingDisplayNames"] = false, - -- Display locked item recipes, which will all turn into Breakfast - -- However, there are false positives with this, as the current state of item pools is checked to determine an item's locked status + -- Hide the recipe list when in battle -- Default = true - ["BagOfCraftingDisplayBreakfast"] = true, + ["BagOfCraftingHideInBattle"] = true, ---------Mouse Controls----------- @@ -298,7 +297,7 @@ EID.DefaultConfig = { ["BagOfCraftingRandomResults"] = 400, ["BagOfCraftingToggleKey"] = ButtonAction.ACTION_MAP, ["BagOfCraftingDisplayNames"] = false, - ["BagOfCraftingDisplayBreakfast"] = true, + ["BagOfCraftingHideInBattle"] = true, ["SpindownDiceResults"] = 3, ["SpindownDiceSkipLocked"] = false, ["EnableMouseControls"] = false, From d25a779b7d55eb884d12cec91e64ee44cdadbc52 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Mon, 15 Nov 2021 22:06:01 -0500 Subject: [PATCH 09/13] Bag of Crafting works again --- eid_bagOfCrafting.lua | 250 ++++++++++++++++++------------------------ 1 file changed, 109 insertions(+), 141 deletions(-) diff --git a/eid_bagOfCrafting.lua b/eid_bagOfCrafting.lua index 950d5b4b..d27d22e3 100644 --- a/eid_bagOfCrafting.lua +++ b/eid_bagOfCrafting.lua @@ -1,7 +1,7 @@ local pickupValues = { 0x00000000, -- 0 None -- Hearts - 0x00000001, -- 1 Red heart + 0x00000001, -- 1 Red Heart 0x00000004, -- 2 Soul Heart 0x00000005, -- 3 Black Heart 0x00000005, -- 4 Eternal Heart @@ -15,11 +15,11 @@ local pickupValues = { 0x00000008, -- 11 Lucky Penny -- Keys 0x00000002, -- 12 Key - 0x00000005, -- 13 Golden Key + 0x00000007, -- 13 Golden Key 0x00000005, -- 14 Charged Key -- Bombs 0x00000002, -- 15 Bomb - 0x00000006, -- 16 Golden Bomb + 0x00000007, -- 16 Golden Bomb 0x0000000a, -- 17 Giga Bomb -- Batteries 0x00000002, -- 18 Micro Battery @@ -31,6 +31,12 @@ local pickupValues = { 0x00000004, -- 23 Rune 0x00000004, -- 24 Dice Shard 0x00000002, -- 25 Cracked Key + -- Added in Update + 0x00000007, -- 26 Golden Penny + 0x00000007, -- 27 Golden Pill + 0x00000007, -- 28 Golden Battery + 0x00000000, -- 29 Tainted ??? Poop + 0x00000001, } local pickupIDLookup = { @@ -52,7 +58,7 @@ local pickupIDLookup = { ["20.4"] = {8, 8}, -- Double penny ["20.5"] = {11}, -- Lucky Penny ["20.6"] = {9}, -- Sticky Nickel - ["20.7"] = {8}, -- Golden Penny + ["20.7"] = {26}, -- Golden Penny ["30.1"] = {12}, -- Key ["30.2"] = {13}, -- golden Key ["30.3"] = {12,12}, -- Key Ring @@ -60,16 +66,26 @@ local pickupIDLookup = { ["40.1"] = {15}, -- bomb ["40.2"] = {15,15}, -- double bomb ["40.4"] = {16}, -- golden bomb - ["40.7"] = {15}, -- giga bomb + ["40.7"] = {17}, -- giga bomb + ["42.0"] = {29}, -- poop nugget + ["42.1"] = {29}, -- big poop nugget + ["70.14"] = {27}, -- golden pill + ["70.2062"] = {27}, -- golden horse pill ["90.1"] = {19}, -- Lil Battery ["90.2"] = {18}, -- Micro Battery ["90.3"] = {20}, -- Mega Battery - ["90.4"] = {18}, -- Golden Battery + ["90.4"] = {28}, -- Golden Battery ["300.49"] = {24}, -- Dice shard ["300.50"] = {21}, -- Emergency Contact ["300.78"] = {25}, -- Cracked key } +local function IsTaintedCain() + --no clue how the display works for co-op, as far as I can tell we're only caring about player 1 + --this check is necessary for some ingredient tracking now that Bag of Crafting is usable by everyone + return Game():GetPlayer(0):GetPlayerType() == 23 +end + local componentShifts = { {0x00000001, 0x00000005, 0x00000010}, {0x00000001, 0x00000005, 0x00000013}, @@ -153,107 +169,12 @@ local componentShifts = { {0x00000011, 0x0000000F, 0x0000001A} } ---These are recipes that are precalculated to improve performance -local calculatedRecipes = { - ["1,2,3,6,13,18,24,24"] = 161, - ["7,8,13,17,21,22,23,24"] = 218, - ["1,1,5,7,11,14,19,19"] = 225, - ["1,2,5,10,10,12,12,15"] = 237, - ["1,2,2,9,14,14,22,25"] = 248, - ["5,7,8,13,13,15,18,23"] = 266, - ["1,4,4,6,8,9,16,25"] = 283, - ["1,2,2,6,7,7,12,23"] = 295, - ["1,1,1,2,7,7,8,22"] = 312, - ["2,2,4,6,9,9,12,24"] = 321, - ["9,10,10,15,18,18,21,25"] = 378, - ["8,9,10,12,15,16,22,23"] = 395, - ["5,8,9,14,14,18,22,24"] = 491, - ["2,3,7,7,8,10,17,22"] = 498, - ["7,7,7,16,17,18,25,25"] = 536, - ["1,1,2,9,13,15,18,19"] = 541, - ["1,16,20,20,21,21,22,25"] = 559, - ["4,8,8,9,15,19,23,24"] = 559, - ["4,4,8,13,23,23,23,23"] = 581, - ["2,6,7,7,7,10,14,16"] = 583, - ["2,2,6,9,14,21,21,24"] = 604, - ["1,2,7,7,23,25,25,25"] = 608, - ["4,5,10,14,18,18,22,22"] = 657, - ["6,7,8,10,10,10,19,24"] = 663 -} - -local itempools ={ - {{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{10,1},{12,0.5},{13,1},{14,1},{15,1},{17,0.1},{19,1},{36,1},{37,1},{39,1},{40,1},{41,1},{42,1},{44,1},{45,1},{46,1},{47,1},{48,1},{49,1},{52,1},{53,1},{55,1},{56,1},{57,1},{58,1},{62,1},{65,1},{66,1},{67,1},{68,1},{69,1},{71,1},{72,1},{75,1},{76,1},{77,1},{78,1},{85,1},{86,1},{87,1},{88,1},{89,1},{91,1},{92,1},{93,1},{94,1},{95,1},{96,1},{97,1},{98,0.2},{99,1},{100,1},{101,0.5},{102,1},{103,1},{104,1},{105,1},{106,1},{107,1},{108,1},{109,1},{110,1},{111,1},{113,1},{114,0.2},{115,1},{117,1},{120,1},{121,1},{123,1},{124,1},{125,1},{127,1},{128,1},{129,1},{131,1},{136,1},{137,1},{138,1},{140,1},{142,1},{143,1},{144,1},{146,1},{148,1},{149,1},{150,1},{151,1},{152,1},{153,1},{154,1},{155,1},{157,1},{160,1},{161,1},{162,1},{163,1},{166,1},{167,1},{169,1},{170,1},{171,1},{172,1},{173,1},{174,1},{175,1},{176,1},{178,1},{180,1},{186,1},{188,1},{189,1},{190,0.1},{191,1},{192,1},{200,1},{201,1},{202,1},{206,1},{209,1},{210,1},{211,1},{213,1},{214,1},{217,1},{220,1},{221,1},{222,1},{223,0.1},{224,1},{225,1},{227,1},{228,1},{229,1},{231,1},{233,1},{234,1},{236,1},{237,0.2},{240,1},{242,1},{244,1},{245,1},{256,1},{257,1},{261,1},{264,1},{265,1},{266,1},{267,1},{268,1},{269,1},{270,1},{271,1},{272,1},{273,1},{274,1},{275,1},{276,1},{277,1},{278,1},{279,1},{280,1},{281,1},{282,1},{283,1},{284,1},{285,1},{287,1},{288,1},{291,1},{292,1},{294,1},{295,1},{298,1},{299,1},{300,1},{301,1},{302,1},{303,1},{304,1},{305,1},{306,1},{307,1},{308,1},{309,1},{310,1},{312,1},{313,0.2},{314,1},{315,1},{316,1},{317,1},{318,1},{319,1},{320,1},{321,1},{322,1},{323,1},{324,1},{325,1},{329,1},{330,1},{332,1},{333,0.2},{334,0.2},{335,0.2},{336,1},{350,1},{351,1},{352,1},{353,1},{358,1},{359,1},{361,1},{362,1},{364,1},{365,1},{366,1},{367,1},{368,1},{369,1},{371,1},{373,1},{374,0.2},{375,1},{377,1},{378,1},{379,1},{381,1},{382,1},{384,1},{385,1},{386,1},{388,1},{389,1},{390,1},{391,1},{392,1},{393,1},{394,1},{395,1},{397,1},{398,1},{401,1},{404,1},{405,1},{406,1},{407,1},{410,1},{411,1},{418,1},{419,1},{421,1},{422,1},{426,1},{427,1},{430,1},{431,1},{432,1},{435,1},{436,1},{437,1},{440,1},{443,1},{444,1},{445,1},{446,1},{447,1},{448,1},{449,1},{452,1},{453,1},{454,1},{457,1},{458,1},{459,1},{460,1},{461,1},{463,1},{465,1},{466,1},{467,1},{469,1},{470,1},{471,1},{473,1},{476,1},{478,1},{481,1},{482,1},{485,1},{488,1},{491,1},{492,1},{493,1},{494,1},{495,1},{496,1},{497,1},{502,1},{504,1},{506,1},{507,1},{508,1},{509,1},{511,1},{512,1},{513,1},{516,1},{517,1},{522,1},{524,1},{525,1},{529,1},{531,1},{532,1},{537,1},{539,1},{540,1},{542,1},{543,1},{544,1},{545,1},{548,1},{549,1},{553,1},{555,1},{557,1},{558,1},{559,1},{560,1},{561,1},{563,1},{565,1},{570,1},{575,1},{576,1},{578,1},{581,1},{583,1},{605,1},{607,1},{608,1},{609,0.5},{610,1},{611,1},{612,1},{614,1},{615,1},{616,1},{617,1},{618,1},{625,0.1},{629,1},{631,1},{635,1},{637,1},{639,1},{641,1},{645,1},{649,1},{650,0.5},{652,1},{655,1},{657,1},{658,1},{661,1},{663,1},{671,1},{675,1},{676,1},{677,0.2},{680,1},{681,1},{682,1},{683,1},{687,1},{690,1},{693,1},{695,1},{703,0.5},{709,1},{717,1},{720,1},{722,1},{723,0.1},{724,1},{725,1},{726,1},{727,1},{728,0.5},{729,1},}, -- treasure - {{21,1},{33,1},{54,1},{60,1},{63,1},{64,1},{75,1},{85,1},{102,1},{116,1},{137,1},{139,1},{147,1},{156,1},{164,1},{177,1},{195,1},{199,1},{203,1},{204,1},{205,1},{208,1},{227,1},{232,1},{246,1},{247,1},{248,1},{249,1},{250,1},{251,1},{252,1},{260,1},{286,0.2},{289,1},{290,1},{295,1},{296,1},{297,1},{337,1},{338,1},{347,1},{348,1},{349,1},{356,1},{357,1},{372,1},{376,1},{380,1},{383,1},{396,1},{402,0.5},{403,1},{414,1},{416,1},{422,1},{424,0.5},{425,1},{434,1},{439,1},{451,1},{472,1},{475,0.2},{479,1},{480,1},{483,0.5},{485,0.5},{486,1},{487,1},{505,1},{514,1},{515,1},{518,1},{520,1},{521,1},{523,1},{527,1},{534,1},{535,1},{566,1},{585,1},{599,1},{602,1},{603,1},{604,1},{619,1},{621,1},{623,1},{624,1},{638,1},{642,0.1},{647,1},{660,0.5},{670,1},{716,1},{719,0.5},}, -- shop - {{14,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},{29,1},{30,1},{31,1},{32,1},{51,1},{70,1},{92,0.5},{141,1},{143,1},{165,1},{176,1},{183,1},{193,1},{194,1},{195,1},{196,1},{197,1},{198,1},{218,1},{219,1},{240,1},{253,1},{254,1},{255,1},{339,1},{340,1},{341,1},{342,1},{343,1},{344,1},{345,1},{346,1},{354,1},{355,1},{370,1},{428,0.5},{438,1},{455,1},{456,1},{538,1},{541,1},{547,1},{564,1},{600,1},{624,1},{644,1},{659,1},{707,1},{708,1},}, -- boss - {{8,1},{34,1},{35,1},{51,1},{67,1},{74,1},{79,1},{80,1},{81,1},{82,1},{83,1},{84,1},{97,1},{109,1},{113,1},{114,1},{115,1},{118,1},{122,1},{123,1},{126,1},{127,0.2},{133,1},{134,1},{145,1},{157,1},{159,1},{163,1},{172,1},{187,1},{212,1},{215,1},{216,1},{225,1},{230,1},{237,1},{241,1},{259,1},{262,1},{268,1},{269,1},{275,1},{278,1},{292,1},{311,1},{360,1},{391,1},{399,1},{408,1},{409,1},{411,1},{412,1},{417,1},{420,1},{431,1},{433,1},{441,0.2},{442,1},{462,1},{468,1},{475,0.2},{477,0.5},{498,1},{519,1},{526,1},{530,1},{536,1},{545,1},{554,1},{556,1},{569,1},{572,1},{577,1},{606,1},{634,1},{646,1},{654,1},{665,1},{672,1},{679,1},{684,1},{692,1},{694,0.5},{695,1},{698,1},{699,1},{702,1},{704,0.5},{705,0.5},{706,0.5},{712,0.5},{728,1},}, -- devil - {{7,1},{33,1},{72,1},{98,1},{101,1},{108,1},{112,1},{124,1},{142,1},{146,1},{156,1},{162,1},{173,1},{178,1},{182,1},{184,1},{185,1},{243,1},{313,1},{326,1},{331,1},{332,1},{333,1},{334,1},{335,1},{363,1},{374,1},{387,1},{390,1},{400,1},{413,1},{415,1},{423,1},{464,1},{477,0.5},{490,1},{498,1},{499,1},{510,0.4},{519,1},{526,1},{528,1},{533,1},{543,1},{567,1},{568,1},{573,1},{574,1},{579,1},{584,0.5},{586,1},{601,1},{622,1},{634,1},{640,1},{643,1},{651,1},{653,1},{685,1},{686,1},{691,0.5},{696,1},}, -- angel - {{11,1},{16,1},{17,1},{20,1},{35,1},{84,1},{120,1},{121,1},{127,1},{168,1},{190,1},{213,1},{226,1},{242,1},{258,1},{262,1},{263,1},{271,1},{286,1},{287,1},{316,1},{321,1},{348,1},{388,1},{389,1},{402,1},{405,1},{424,1},{450,1},{489,1},{500,1},{501,1},{546,1},{562,1},{571,1},{580,1},{582,1},{609,1},{612,1},{625,1},{628,1},{632,1},{636,1},{664,1},{667,1},{669,1},{674,1},{675,1},{677,1},{688,1},{689,1},{691,0.5},{697,0.5},{700,1},{701,1},{703,1},{716,1},{717,1},{719,1},{721,1},{723,1},}, -- secret - {{33,1},{34,1},{35,1},{58,1},{65,1},{78,1},{97,1},{123,1},{192,1},{282,1},{287,1},{292,1},{545,1},{584,0.2},{712,0.2},}, -- library - {{9,1},{36,1},{209,1},{378,1},{504,1},{576,1},}, -- shellGame - {{28,1},{29,1},{32,1},{74,1},{179,0.5},{194,1},{196,1},{255,1},{341,1},{343,1},{344,1},{354,1},{355,1},{370,1},{428,0.5},{438,1},{444,0.1},{455,1},{456,1},{534,0.5},{571,0.1},{644,1},{708,1},}, -- goldenChest - {{81,1},{133,1},{134,1},{140,1},{145,1},{212,1},{297,1},{316,1},{371,1},{475,0.1},{565,0.5},{580,0.1},{642,1},{654,0.2},{665,1},}, -- redChest - {{21,1},{22,1},{23,1},{24,1},{25,1},{26,1},{46,1},{54,1},{102,1},{111,1},{144,1},{177,1},{180,1},{195,1},{198,1},{204,1},{246,1},{271,1},{294,1},{362,1},{376,1},{385,1},{447,1},{455,1},{456,1},{485,1},{707,1},}, -- beggar - {{13,1},{14,1},{51,1},{70,1},{79,1},{80,1},{82,0.2},{83,1},{87,1},{102,1},{122,1},{126,1},{127,0.5},{143,1},{159,0.2},{195,1},{216,1},{225,1},{230,0.2},{240,1},{241,1},{259,1},{262,1},{278,1},{340,1},{345,1},{409,1},{420,1},{475,0.2},{487,1},{493,1},{496,1},{503,1},{672,0.5},{676,1},}, -- demonBeggar - {{51,1},{79,1},{80,1},{81,1},{133,1},{134,1},{145,1},{212,1},{215,1},{216,1},{225,1},{241,1},{260,1},{371,1},{408,1},{442,1},{451,1},{468,1},{475,0.2},{496,1},{503,1},{508,1},{536,1},{565,1},{569,1},{580,1},{642,1},{654,0.5},{692,1},{694,0.5},{697,0.5},{702,1},}, -- curse - {{10,1},{57,1},{128,1},{175,1},{199,1},{264,1},{272,1},{279,1},{320,1},{343,1},{364,1},{365,1},{388,1},{426,1},{430,1},{492,1},{527,1},{580,1},{581,1},{629,1},{649,1},{693,1},}, -- keyMaster - {{63,1},{116,1},{205,1},{356,1},{372,1},{494,0.1},{520,1},{559,0.1},{603,1},{647,1},}, -- batteryBum - {{29,1},{30,1},{31,1},{39,1},{41,1},{55,1},{102,1},{110,1},{114,0.1},{139,1},{195,1},{199,1},{200,1},{217,1},{228,1},{355,1},{439,1},{508,1},{580,0.5},}, -- momsChest - {{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{10,1},{12,0.5},{13,1},{34,1},{35,1},{37,1},{38,1},{42,1},{45,1},{47,1},{48,1},{50,1},{52,1},{55,1},{56,1},{57,1},{62,1},{64,1},{65,1},{67,1},{68,1},{69,1},{73,1},{77,1},{78,1},{85,1},{87,1},{88,1},{89,1},{93,1},{94,1},{95,1},{96,1},{97,1},{98,0.2},{99,1},{100,1},{101,0.5},{102,1},{103,1},{104,1},{106,1},{107,1},{108,1},{110,1},{111,1},{114,0.2},{115,1},{117,1},{120,1},{124,1},{125,1},{128,1},{131,1},{132,1},{137,1},{138,1},{140,1},{142,1},{146,1},{148,1},{149,1},{150,1},{151,1},{152,1},{153,1},{154,1},{155,1},{157,1},{161,1},{162,1},{163,1},{167,1},{169,1},{170,1},{172,1},{174,1},{175,1},{186,1},{188,1},{189,1},{191,1},{192,1},{200,1},{201,1},{206,1},{209,1},{210,1},{213,1},{214,1},{217,1},{220,1},{221,1},{222,1},{223,1},{224,1},{226,1},{228,1},{229,1},{231,1},{233,1},{234,1},{236,1},{237,0.2},{242,1},{244,1},{245,1},{254,1},{256,1},{257,1},{258,0.1},{261,1},{264,1},{265,1},{266,1},{267,1},{268,1},{269,1},{271,1},{273,1},{274,1},{277,1},{279,1},{280,1},{281,1},{288,1},{291,1},{299,1},{300,1},{301,1},{302,1},{303,1},{305,1},{306,1},{307,1},{308,1},{309,1},{310,1},{312,1},{315,1},{316,1},{317,1},{318,1},{319,1},{320,1},{321,1},{322,1},{325,1},{329,1},{330,1},{332,1},{333,0.2},{334,0.2},{335,0.2},{336,1},{349,1},{351,1},{352,1},{353,1},{357,1},{358,1},{359,1},{362,1},{364,1},{365,1},{366,1},{367,1},{368,1},{369,1},{371,1},{373,1},{374,0.2},{375,1},{377,1},{378,1},{379,1},{380,1},{382,1},{383,1},{384,1},{389,1},{391,1},{392,1},{393,1},{394,1},{395,1},{397,1},{398,1},{401,1},{407,1},{410,1},{411,1},{416,1},{421,1},{425,1},{426,1},{430,1},{431,1},{432,1},{434,1},{436,1},{440,1},{443,1},{444,1},{445,1},{446,1},{447,1},{448,1},{449,1},{450,1},{452,1},{453,1},{454,1},{457,1},{458,1},{459,1},{460,1},{461,1},{463,1},{465,1},{466,1},{467,1},{469,1},{470,1},{471,1},{473,1},{493,1},{494,1},{495,1},{496,1},{497,1},{502,1},{503,1},{504,1},{506,1},{507,1},{508,1},{509,1},{511,1},{512,1},{513,1},{514,1},{515,1},{516,1},{517,1},{518,1},{520,1},{522,1},{524,1},{525,1},{529,1},{531,1},{532,1},{537,1},{539,1},{540,1},{542,1},{543,1},{544,1},{545,1},{548,1},{549,1},{553,1},{555,1},{557,1},{558,1},{559,1},{560,1},{561,1},{563,1},{565,1},{570,1},{575,1},{576,1},{578,1},{581,1},{583,1},{605,1},{607,1},{608,1},{609,0.5},{610,1},{611,1},{612,1},{614,1},{615,1},{616,1},{617,1},{618,1},{625,0.5},{629,1},{631,1},{635,1},{637,1},{639,1},{641,1},{645,1},{649,1},{650,0.5},{652,1},{655,1},{657,1},{658,1},{661,1},{663,1},{671,1},{675,1},{676,1},{677,0.5},{680,1},{681,1},{682,1},{683,1},{687,1},{690,1},{693,1},{695,1},{703,0.5},{709,1},{716,0.2},{717,0.2},{719,0.2},{720,1},{721,0.1},{722,0.1},{723,0.1},{724,1},{725,1},{726,1},{727,1},{728,0.5},{729,1},}, -- greedTreasure - {{12,0.2},{14,1},{15,1},{16,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},{29,1},{30,1},{31,1},{32,1},{70,1},{71,1},{73,1},{101,0.5},{120,1},{132,1},{143,1},{176,1},{183,1},{193,1},{194,1},{195,1},{196,1},{197,1},{198,1},{199,1},{240,1},{253,1},{254,1},{255,1},{314,1},{339,1},{340,1},{341,1},{342,1},{343,1},{344,1},{345,1},{346,1},{354,1},{355,1},{370,1},{428,0.5},{438,1},{455,1},{456,1},{538,1},{541,1},{547,1},{564,1},{600,1},{624,1},{644,1},{659,1},{707,1},{708,1},}, -- greedBoss - {{11,0.1},{46,1},{63,1},{73,1},{75,1},{76,1},{84,1},{91,1},{105,1},{116,1},{139,1},{156,1},{166,1},{204,1},{208,1},{246,1},{247,1},{248,1},{251,1},{252,1},{260,1},{283,1},{284,1},{285,1},{286,0.2},{289,1},{297,1},{348,1},{356,1},{372,1},{380,1},{386,1},{402,0.5},{403,1},{405,1},{406,1},{416,1},{434,1},{439,1},{451,1},{472,1},{475,0.2},{476,1},{477,1},{478,1},{481,1},{482,1},{483,0.5},{485,0.5},{486,1},{487,1},{488,1},{489,1},{500,1},{505,1},{512,1},{515,1},{516,1},{518,1},{527,1},{534,1},{535,1},{566,1},{585,1},{603,1},{604,1},{619,1},{621,1},{623,1},{624,1},{636,0.1},{638,1},{647,1},{667,0.1},{674,0.1},{688,0.1},{689,0.1},{691,0.1},{692,1},{700,0.1},{701,0.1},{703,0.1},{721,0.1},{722,0.1},{723,0.1},}, -- greedShop - {{73,1},{81,1},{133,1},{134,1},{145,1},{212,1},}, -- greedCurse - {{34,1},{35,1},{51,1},{67,1},{68,0.2},{73,1},{74,1},{79,1},{80,1},{81,1},{82,1},{83,1},{97,1},{109,1},{113,1},{114,1},{115,1},{117,1},{118,1},{122,1},{123,1},{132,1},{133,1},{134,1},{145,1},{157,1},{159,1},{172,1},{187,1},{212,1},{216,1},{225,1},{230,1},{237,1},{259,1},{268,1},{269,1},{270,1},{292,1},{311,1},{360,1},{391,1},{399,1},{408,1},{409,1},{411,1},{412,1},{420,1},{431,1},{433,1},{441,0.2},{442,1},{451,1},{462,1},{468,1},{503,1},{519,1},{526,1},{530,1},{536,1},{545,1},{554,1},{556,1},{569,1},{572,1},{577,1},{606,1},{634,1},{646,1},{654,1},{665,1},{679,1},{684,1},{692,1},{694,0.5},{695,1},{698,1},{699,1},{702,1},{704,0.5},{705,0.5},{706,0.5},{712,0.5},{728,1},}, -- greedDevil - {{7,1},{72,1},{73,1},{78,1},{112,1},{138,1},{162,1},{173,1},{178,1},{182,1},{184,1},{185,1},{197,1},{243,1},{313,1},{331,1},{333,1},{334,1},{335,1},{363,1},{387,1},{390,1},{400,1},{407,1},{413,1},{415,1},{423,1},{464,1},{490,1},{499,1},{526,1},{528,1},{533,1},{567,1},{568,1},{573,1},{574,1},{579,1},{584,0.5},{586,1},{601,1},{622,1},{634,1},{640,1},{643,1},{651,1},{653,1},{685,1},{686,1},{691,0.5},{696,1},}, -- greedAngel - {{73,1},}, -- greedSecret - {{1,1},{3,1},{4,1},{5,1},{21,1},{32,1},{38,1},{44,1},{46,1},{47,1},{48,1},{49,1},{51,1},{63,1},{66,1},{68,1},{77,1},{85,1},{89,1},{90,1},{91,1},{93,1},{95,1},{102,1},{105,1},{116,1},{136,1},{137,1},{147,1},{152,1},{153,1},{166,1},{189,1},{194,1},{196,1},{208,1},{212,1},{227,1},{232,1},{244,1},{251,1},{255,1},{263,1},{267,1},{283,1},{284,1},{285,1},{337,1},{338,1},{352,1},{357,1},{362,1},{370,1},{382,1},{383,1},{386,1},{395,1},{397,1},{403,1},{406,1},{419,1},{422,1},{425,1},{427,1},{437,1},{438,1},{439,1},{444,1},{451,1},{465,1},{476,1},{478,1},{488,1},{494,1},{505,1},{515,1},{516,1},{518,1},{524,1},{527,1},{538,1},{599,1},{604,1},{609,1},{617,1},{624,1},{629,1},{638,1},{644,1},{649,1},{655,1},{687,1},{709,1},{720,1},{723,1},}, -- craneGame - {{1,1},}, -- unused24 - {{37,1},{106,1},{125,1},{137,1},{140,1},{190,0.2},{209,1},{220,1},{256,1},{353,0.2},{366,1},{367,1},{432,1},{483,1},{517,1},{563,1},{583,1},{614,1},{646,0.2},{727,1},}, -- bombBum - {{588,1},{589,1},{590,1},{591,1},{592,1},{593,1},{594,1},{595,1},{596,1},{597,1},{598,1},}, -- planetarium - {{29,1},{30,1},{31,1},{39,1},{41,1},{55,1},{102,1},{110,1},{114,0.2},{139,1},{175,1},{195,1},{199,1},{200,1},{217,1},{228,1},{341,1},{355,1},{439,1},{455,1},{508,1},{546,0.2},{547,1},{604,1},}, -- oldChest - {{8,1},{10,1},{57,1},{67,1},{73,1},{88,1},{95,1},{96,1},{99,1},{100,1},{112,1},{113,1},{117,1},{128,1},{144,1},{155,1},{163,1},{167,1},{170,1},{172,1},{174,1},{188,1},{207,1},{264,1},{265,1},{266,1},{267,1},{268,1},{269,1},{270,1},{272,1},{273,1},{274,1},{275,1},{277,1},{278,1},{279,1},{280,1},{281,1},{320,1},{322,1},{360,1},{361,1},{363,1},{364,1},{365,1},{372,1},{384,1},{385,1},{388,1},{390,1},{403,1},{404,1},{417,1},{426,1},{430,1},{435,1},{468,1},{470,1},{471,1},{472,1},{473,1},{491,1},{492,1},{509,1},{511,1},{518,1},{519,1},{537,1},{575,1},{581,1},{607,1},{608,1},{610,1},{612,1},{615,1},{629,1},{635,1},{645,1},{649,1},{661,1},{679,1},{682,1},{698,1},}, -- babyShop - {{7,1},{27,1},{60,1},{138,1},{183,1},{349,1},{362,1},{439,1},{488,1},{527,1},{719,1},}, -- woodenChest - {{26,1},{42,1},{140,1},{268,1},{273,1},{336,0.5},{480,1},{618,0.5},{639,1},}, -- rottenBeggar -} - -EID.itemWeightsLookup= { - [1]=3, [2]=2, [3]=3, [4]=4, [5]=0, [6]=2, [7]=3, [8]=0, [9]=0, [10]=3, [11]=2, [12]=4, [13]=0, [14]=2, [15]=2, [16]=2, [17]=3, [18]=2, [19]=0, [20]=3, [21]=2, [22]=1, [23]=1, - [24]=1, [25]=1, [26]=1, [27]=1, [28]=2, [29]=1, [30]=1, [31]=1, [32]=3, [33]=1, [34]=3, [35]=1, [36]=0, [37]=1, [38]=3, [39]=1, [40]=0, [41]=0, [42]=1, [44]=0, [45]=1, [46]=2, - [47]=1, [48]=3, [49]=1, [50]=3, [51]=3, [52]=4, [53]=1, [54]=2, [55]=1, [56]=1, [57]=2, [58]=2, [60]=1, [62]=0, [63]=2, [64]=2, [65]=1, [66]=1, [67]=0, [68]=3, [69]=3, [70]=3, - [71]=2, [72]=1, [73]=2, [74]=2, [75]=2, [76]=2, [77]=1, [78]=3, [79]=3, [80]=3, [81]=3, [82]=3, [83]=3, [84]=0, [85]=1, [86]=1, [87]=1, [88]=1, [89]=2, [90]=3, [91]=2, [92]=2, - [93]=2, [94]=1, [95]=1, [96]=2, [97]=2, [98]=4, [99]=2, [100]=1, [101]=2, [102]=1, [103]=1, [104]=2, [105]=4, [106]=2, [107]=3, [108]=4, [109]=3, [110]=3, [111]=0, [112]=2, - [113]=2, [114]=4, [115]=2, [116]=2, [117]=0, [118]=4, [119]=2, [120]=3, [121]=2, [122]=2, [123]=0, [124]=1, [125]=2, [126]=0, [127]=3, [128]=1, [129]=1, [130]=2, [131]=2, - [132]=3, [133]=3, [134]=2, [135]=1, [136]=1, [137]=1, [138]=2, [139]=3, [140]=1, [141]=0, [142]=2, [143]=2, [144]=0, [145]=3, [146]=3, [147]=0, [148]=0, [149]=4, [150]=3, - [151]=3, [152]=2, [153]=3, [154]=1, [155]=0, [156]=3, [157]=3, [158]=2, [159]=3, [160]=2, [161]=2, [162]=1, [163]=1, [164]=2, [165]=3, [166]=2, [167]=1, [168]=4, [169]=4, - [170]=3, [171]=1, [172]=3, [173]=3, [174]=1, [175]=1, [176]=1, [177]=0, [178]=0, [179]=3, [180]=0, [181]=2, [182]=4, [183]=3, [184]=3, [185]=3, [186]=0, [187]=1, [188]=0, - [189]=3, [190]=3, [191]=2, [192]=0, [193]=2, [194]=1, [195]=1, [196]=3, [197]=2, [198]=1, [199]=3, [200]=1, [201]=3, [202]=2, [203]=3, [204]=1, [205]=1, [206]=3, [207]=2, - [208]=3, [209]=2, [210]=1, [211]=1, [212]=2, [213]=2, [214]=0, [215]=3, [216]=3, [217]=3, [218]=2, [219]=2, [220]=3, [221]=3, [222]=3, [223]=4, [224]=3, [225]=2, [226]=2, - [227]=1, [228]=2, [229]=2, [230]=4, [231]=2, [232]=4, [233]=0, [234]=4, [236]=1, [237]=3, [238]=0, [239]=0, [240]=1, [241]=3, [242]=2, [243]=3, [244]=3, [245]=4, [246]=2, - [247]=2, [248]=2, [249]=3, [250]=1, [251]=2, [252]=1, [253]=2, [254]=2, [255]=3, [256]=1, [257]=2, [258]=2, [259]=3, [260]=3, [261]=4, [262]=0, [263]=2, [264]=3, [265]=3, - [266]=2, [267]=0, [268]=3, [269]=1, [270]=1, [271]=2, [272]=1, [273]=1, [274]=0, [275]=3, [276]=0, [277]=1, [278]=4, [279]=2, [280]=1, [281]=1, [282]=1, [283]=3, [284]=3, - [285]=0, [286]=2, [287]=0, [288]=1, [289]=2, [290]=0, [291]=1, [292]=4, [293]=2, [294]=0, [295]=1, [296]=1, [297]=2, [298]=1, [299]=1, [300]=1, [301]=3, [302]=1, [303]=2, - [304]=1, [305]=2, [306]=3, [307]=3, [308]=0, [309]=2, [310]=1, [311]=4, [312]=2, [313]=4, [314]=1, [315]=0, [316]=0, [317]=1, [318]=1, [319]=0, [320]=2, [321]=1, [322]=2, - [323]=0, [324]=2, [325]=0, [326]=0, [327]=2, [328]=1, [329]=3, [330]=2, [331]=4, [332]=1, [333]=3, [334]=3, [335]=3, [336]=3, [337]=1, [338]=1, [339]=1, [340]=1, [341]=3, - [342]=3, [343]=2, [344]=1, [345]=3, [346]=1, [347]=3, [348]=2, [349]=1, [350]=3, [351]=1, [352]=1, [353]=2, [354]=2, [355]=2, [356]=3, [357]=1, [358]=1, [359]=3, [360]=4, - [361]=2, [362]=2, [363]=3, [364]=1, [365]=0, [366]=1, [367]=1, [368]=1, [369]=2, [370]=3, [371]=1, [372]=3, [373]=3, [374]=3, [375]=3, [376]=3, [377]=1, [378]=2, [379]=2, - [380]=2, [381]=3, [382]=1, [383]=1, [384]=1, [385]=1, [386]=0, [387]=3, [388]=0, [389]=3, [390]=3, [391]=0, [392]=1, [393]=4, [394]=0, [395]=4, [396]=1, [397]=2, [398]=1, - [399]=4, [400]=1, [401]=1, [402]=3, [403]=1, [404]=1, [405]=0, [406]=2, [407]=2, [408]=2, [409]=2, [410]=2, [411]=3, [412]=2, [413]=1, [414]=3, [415]=4, [416]=2, [417]=3, - [418]=2, [419]=2, [420]=1, [421]=0, [422]=1, [423]=1, [424]=3, [425]=2, [426]=0, [427]=1, [428]=2, [429]=2, [430]=1, [431]=1, [432]=2, [433]=0, [434]=2, [435]=1, [436]=1, - [437]=1, [438]=3, [439]=3, [440]=1, [441]=4, [442]=1, [443]=3, [444]=3, [445]=1, [446]=1, [447]=0, [448]=0, [449]=1, [450]=2, [451]=3, [452]=2, [453]=2, [454]=2, [455]=2, - [456]=1, [457]=2, [458]=3, [459]=3, [460]=2, [461]=3, [462]=3, [463]=2, [464]=1, [465]=2, [466]=2, [467]=1, [468]=0, [469]=1, [470]=0, [471]=2, [472]=0, [473]=1, [474]=0, - [475]=0, [476]=2, [477]=4, [478]=1, [479]=3, [480]=2, [481]=0, [482]=0, [483]=3, [484]=0, [485]=1, [486]=1, [487]=3, [488]=0, [489]=1, [490]=3, [491]=2, [492]=2, [493]=1, - [494]=2, [495]=2, [496]=3, [497]=0, [498]=1, [499]=3, [500]=3, [501]=1, [502]=1, [503]=3, [504]=0, [505]=0, [506]=1, [507]=2, [508]=1, [509]=1, [510]=1, [511]=1, [512]=1, - [513]=2, [514]=1, [515]=3, [516]=2, [517]=1, [518]=2, [519]=2, [520]=3, [521]=2, [522]=1, [523]=1, [524]=3, [525]=1, [526]=2, [527]=3, [528]=3, [529]=2, [530]=2, [531]=2, - [532]=2, [533]=2, [534]=3, [535]=1, [536]=2, [537]=1, [538]=2, [539]=1, [540]=2, [541]=1, [542]=2, [543]=1, [544]=2, [545]=2, [546]=3, [547]=2, [548]=1, [549]=3, [550]=4, - [551]=4, [552]=4, [553]=3, [554]=2, [555]=2, [556]=2, [557]=2, [558]=2, [559]=3, [560]=1, [561]=1, [562]=2, [563]=1, [564]=3, [565]=2, [566]=2, [567]=3, [568]=2, [569]=2, - [570]=3, [571]=1, [572]=3, [573]=3, [574]=2, [575]=3, [576]=2, [577]=2, [578]=2, [579]=3, [580]=3, [581]=3, [582]=1, [583]=2, [584]=3, [585]=2, [586]=3, [588]=2, [589]=2, - [590]=3, [591]=1, [592]=3, [593]=2, [594]=3, [595]=1, [596]=3, [597]=3, [598]=3, [599]=1, [600]=3, [601]=3, [602]=1, [603]=1, [604]=2, [605]=0, [606]=3, [607]=1, [608]=2, - [609]=2, [610]=1, [611]=2, [612]=2, [614]=1, [615]=0, [616]=2, [617]=3, [618]=1, [619]=2, [621]=0, [622]=2, [623]=1, [624]=1, [625]=4, [626]=0, [627]=0, [628]=4, [629]=3, - [631]=1, [632]=1, [633]=0, [634]=2, [635]=1, [636]=4, [637]=3, [638]=2, [639]=3, [640]=3, [641]=2, [642]=2, [643]=4, [644]=1, [645]=1, [646]=3, [647]=2, [649]=1, [650]=2, - [651]=2, [652]=1, [653]=3, [654]=2, [655]=1, [656]=2, [657]=2, [658]=1, [659]=1, [660]=3, [661]=1, [663]=2, [664]=3, [665]=2, [667]=2, [668]=0, [669]=3, [670]=2, [671]=2, - [672]=1, [673]=2, [674]=3, [675]=1, [676]=2, [677]=2, [678]=4, [679]=3, [680]=3, [681]=1, [682]=2, [683]=2, [684]=3, [685]=2, [686]=2, [687]=3, [688]=3, [689]=4, [690]=2, - [691]=4, [692]=1, [693]=2, [694]=3, [695]=3, [696]=2, [697]=3, [698]=4, [699]=3, [700]=2, [701]=3, [702]=2, [703]=2, [704]=3, [705]=2, [706]=4, [707]=1, [708]=3, [709]=3, - [710]=3, [711]=3, [712]=3, [713]=3, [714]=0, [715]=0, [716]=3, [717]=2, [719]=3, [720]=2, [721]=2, [722]=2, [723]=4, [724]=3, [725]=2, [726]=3, [727]=2, [728]=2, [729]=2, -} +--These are recipes that have already been calculated, plus the contents of recipes.xml +local calculatedRecipes = {} +--Backup recipes in case of potential achievement lock +local lockedRecipes = {} +--If the seed changes, the above two tables will be wiped +local lastSeedUsed = 0 local customRNGSeed = 0x77777770 local customRNGShift = {0,0,0} @@ -293,12 +214,21 @@ function EID:calculateBagOfCrafting(componentsTable) if components == nil or #components ~= 8 then return 0 end - customRNGSeed = 0x77777770 + + customRNGSeed = Game():GetSeeds():GetStartSeed() table.sort(components) - local cacheResult = calculatedRecipes[table.concat(components, ",")] + --Check the fixed recipes. Currently, the fixed recipes ignore item unlock status + local cacheResult = EID.XMLRecipes[table.concat(components, ",")] if cacheResult ~= nil then - return cacheResult + return cacheResult, cacheResult + end + + cacheResult = calculatedRecipes[table.concat(components, ",")] + local lockedResult = lockedRecipes[table.concat(components, ",")] + + if cacheResult ~= nil then + return cacheResult, lockedResult end local compTotalWeight = 0 local compCounts = {} @@ -319,6 +249,7 @@ function EID:calculateBagOfCrafting(componentsTable) {idx = 3, weight = compCounts[4] * 10}, {idx = 4, weight = compCounts[5] * 10}, {idx = 5, weight = compCounts[7] * 5}, + {idx = 7, weight = compCounts[30] * 10}, {idx = 8, weight = compCounts[6] * 10}, {idx = 9, weight = compCounts[26] * 10}, {idx = 12, weight = compCounts[8] * 10}, @@ -331,7 +262,7 @@ function EID:calculateBagOfCrafting(componentsTable) local itemWeights = {} - local maxItemID = 729 + local maxItemID = EID.XMLMaxItemID for i = 1, maxItemID do itemWeights[i] = 0 end @@ -351,13 +282,13 @@ function EID:calculateBagOfCrafting(componentsTable) qualityMin = 3 qualityMax = 4 elseif n > 26 then - qualityMin = 2 + qualityMin = 3 qualityMax = 4 elseif n > 22 then - qualityMin = 1 + qualityMin = 2 qualityMax = 4 elseif n > 18 then - qualityMin = 1 + qualityMin = 2 qualityMax = 3 elseif n > 14 then qualityMin = 1 @@ -366,10 +297,10 @@ function EID:calculateBagOfCrafting(componentsTable) qualityMin = 0 qualityMax = 2 end - local pool = itempools[poolWeight.idx + 1] + local pool = EID.XMLItemPools[poolWeight.idx + 1] for _, item in ipairs(pool) do - local quality = EID.itemWeightsLookup[item[1]] + local quality = EID.XMLItemQualities[item[1]] if quality >= qualityMin and quality <= qualityMax then local w = item[2] * poolWeight.weight itemWeights[item[1]] = itemWeights[item[1]] + w @@ -379,18 +310,33 @@ function EID:calculateBagOfCrafting(componentsTable) end end if totalWeight <= 0 then - return 25 + return 25, 25 end - local t = nextFloat() - local target = t * totalWeight - for k,v in pairs(itemWeights) do - target = target - v - if target < 0 then - calculatedRecipes[table.concat(components, ",")] = k - return k + --When the first crafting result is an achievement locked item, this process gets repeated a second time to choose a new result + --That 2nd pick could also be achievement locked but we're ignoring that... + local firstOption = nil + while true do + local t = nextFloat() + local target = t * totalWeight + for k,v in pairs(itemWeights) do + target = target - v + if target < 0 then + if firstOption then + calculatedRecipes[table.concat(components, ",")] = firstOption + lockedRecipes[table.concat(components, ",")] = k + return firstOption, k + else + --Don't do the 2nd pass if this item is definitely unlocked + if EID:isCollectibleUnlockedAnyPool(k) then + return k, k + else + firstOption = k + break + end + end + end end end - return 25 end ------------------------------------------ @@ -458,8 +404,10 @@ EID:AddCallback(ModCallbacks.MC_POST_ENTITY_REMOVE, function(_, bag) end end, EntityType.ENTITY_KNIFE) +--Tainted Cain "hold to craft" check local holdCounter = 0 local function trackBagHolding() + if not IsTaintedCain() then return end local isCardHold = Input.IsActionPressed(ButtonAction.ACTION_PILLCARD, EID.player.ControllerIndex) local animationName = EID.player:GetSprite():GetAnimation() if isCardHold and string.match(animationName, "PickupWalk") and #EID.BagItems>=8 then @@ -476,6 +424,15 @@ local function trackBagHolding() end end +local function trackBagActivated() + if IsTaintedCain() then return end + if Input.IsActionTriggered(ButtonAction.ACTION_ITEM, EID.player.ControllerIndex) and #EID.BagItems >= 8 then + EID.BagItems = {} + -- SCHOOLBAG BREAKS THIS!!! but it's better than nothing + -- and, technically, if the active item bag has 8 items, it's impossible to fill it without first emptying it, and then we're synced again + end +end + local function shiftBagContent() local newContent = {} for i=2,#EID.BagItems do @@ -485,8 +442,9 @@ local function shiftBagContent() EID.BagItems = newContent end +-- only Tainted Cain's consumable slot bag can have its ingredients shifted local function detectBagContentShift() - if Input.IsActionTriggered(ButtonAction.ACTION_DROP, EID.player.ControllerIndex) then + if Input.IsActionTriggered(ButtonAction.ACTION_DROP, EID.player.ControllerIndex) and IsTaintedCain() then shiftBagContent() end end @@ -520,7 +478,7 @@ local function detectModdedItems() if maxItemID == nil then maxItemID = EID:GetMaxCollectibleID() end - if maxItemID > CollectibleType.NUM_COLLECTIBLES then + if maxItemID > EID.XMLMaxItemID then local customDescObj = EID:getDescriptionObj(5, 100, 710) customDescObj.Description = EID.descriptions["en_us"].CraftingBagModError EID:printDescription(customDescObj) @@ -540,11 +498,12 @@ end function EID:handleBagOfCraftingRendering() trackBagHolding() + trackBagActivated() detectBagContentShift() if EID.isHidden then return - elseif EID.Config["HideInBattle"] then + elseif EID.Config["BagOfCraftingHideInBattle"] then if Isaac.CountBosses() > 0 or Isaac.CountEnemies() > 0 then return end @@ -559,6 +518,17 @@ function EID:handleBagOfCraftingRendering() if detectModdedItems() or Game():GetRoom():GetFrameCount ()<2 then return false end + + local curSeed = Game():GetSeeds():GetStartSeed() + --reset our calculated recipes when the game seed changes + if (curSeed ~= lastSeedUsed) then + calculatedRecipes = {} + lockedRecipes = {} + calcResultCache = {} + randResultCache = {} + end + lastSeedUsed = curSeed + local curRoomIndex = Game():GetLevel():GetCurrentRoomDesc().SafeGridIndex local results = {} @@ -682,12 +652,10 @@ function EID:handleBagOfCraftingRendering() local calcResults = {} for k, v in pairs(randResults) do - local resultID = EID:calculateBagOfCrafting(v) + local resultID, lockedAchievementID = EID:calculateBagOfCrafting(v) if resultID > 0 then - if (not EID:isCollectibleUnlockedAnyPool(resultID)) then - if (EID.Config["BagOfCraftingDisplayBreakfast"]) then - table.insert(calcResults, {v, resultID, 25}) - end + if (not EID:isCollectibleUnlockedAnyPool(resultID) and resultID ~= lockedAchievementID) then + table.insert(calcResults, {v, resultID, lockedAchievementID}) else table.insert(calcResults, {v, resultID}) end @@ -698,10 +666,10 @@ function EID:handleBagOfCraftingRendering() results = calcResults --sort our final results by quality, then alphabetical item name table.sort(results, function(a, b) - if EID.itemWeightsLookup[a[2]] == EID.itemWeightsLookup[b[2]] then + if EID.XMLItemQualities[a[2]] == EID.XMLItemQualities[b[2]] then return (EID:getObjectName(5, 100, a[2]) < EID:getObjectName(5, 100, b[2])) else - return (EID.itemWeightsLookup[a[2]] > EID.itemWeightsLookup[b[2]]) + return (EID.XMLItemQualities[a[2]] > EID.XMLItemQualities[b[2]]) end end) @@ -806,21 +774,21 @@ function EID:handleBagOfCraftingRendering() if not EID.Config["BagOfCraftingDisplayNames"] then customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} " - --tack on Breakfast image to locked recipes - if v[3] then customDescObj.Description = customDescObj.Description.."({{Collectible25}})" end + --tack on the secondary recipe image to achievement-locked recipes + if v[3] then customDescObj.Description = customDescObj.Description.."({{Collectible" .. v[3] .. "}})" end --color the equals sign with the item quality, so the order of the list can make sense - customDescObj.Description = customDescObj.Description.. qualities[EID.itemWeightsLookup[v[2]]] .. "={{CR}}" + customDescObj.Description = customDescObj.Description.. qualities[EID.XMLItemQualities[v[2]]] .. "={{CR}}" --only display the item name if it's the first occurrence else if prevItem ~= v[2] then --substring the first 18 characters of the item name so it fits on one line; is there a way to get around desc line length limits? - customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} ".. qualities[EID.itemWeightsLookup[v[2]]] .. + customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} ".. qualities[EID.XMLItemQualities[v[2]]] .. string.sub(EID:getObjectName(5, 100, v[2]),1,18).."#" else customDescObj.Description = customDescObj.Description.."#" end - --replace recipe bulletpoint with Breakfast on locked recipes - if v[3] then customDescObj.Description = customDescObj.Description.." {{Collectible25}} " end + --replace recipe bulletpoint with the secondary recipe on achievement-locked recipes + if v[3] then customDescObj.Description = customDescObj.Description.." {{Collectible" .. v[3] .. "}} " end end customDescObj.Description = customDescObj.Description..EID:tableToCraftingIconsMerged(v[1]) From b1b4c53d9eac9c4549c09081ad8aea6ca42141e8 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Tue, 16 Nov 2021 11:22:55 -0500 Subject: [PATCH 10/13] remove redundant checks --- eid_bagOfCrafting.lua | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/eid_bagOfCrafting.lua b/eid_bagOfCrafting.lua index d27d22e3..9b264338 100644 --- a/eid_bagOfCrafting.lua +++ b/eid_bagOfCrafting.lua @@ -442,7 +442,7 @@ local function shiftBagContent() EID.BagItems = newContent end --- only Tainted Cain's consumable slot bag can have its ingredients shifted +-- only Tainted Cain's consumable slot bag can have its ingredients shifted... probably? local function detectBagContentShift() if Input.IsActionTriggered(ButtonAction.ACTION_DROP, EID.player.ControllerIndex) and IsTaintedCain() then shiftBagContent() @@ -653,12 +653,10 @@ function EID:handleBagOfCraftingRendering() local calcResults = {} for k, v in pairs(randResults) do local resultID, lockedAchievementID = EID:calculateBagOfCrafting(v) - if resultID > 0 then - if (not EID:isCollectibleUnlockedAnyPool(resultID) and resultID ~= lockedAchievementID) then - table.insert(calcResults, {v, resultID, lockedAchievementID}) - else - table.insert(calcResults, {v, resultID}) - end + if resultID ~= lockedAchievementID then + table.insert(calcResults, {v, resultID, lockedAchievementID}) + else + table.insert(calcResults, {v, resultID}) end end calcResultCache[queryString] = calcResults From 0d8126640b9a72450499dfbb33bff89fc7af2afa Mon Sep 17 00:00:00 2001 From: Buurazu Date: Tue, 16 Nov 2021 22:27:21 -0500 Subject: [PATCH 11/13] red stew / quality update --- eid_xmlData.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eid_xmlData.lua b/eid_xmlData.lua index 372cdbd4..65d1ec90 100644 --- a/eid_xmlData.lua +++ b/eid_xmlData.lua @@ -1,5 +1,5 @@ --This file was autogenerated using https://github.com/Buurazu/IsaacXMLToLua ---It will have to be updated whenever the game's item XML files are updated +--It will have to be updated whenever the game's item XML files are updated --The highest item ID found EID.XMLMaxItemID = 732 @@ -30,7 +30,7 @@ EID.XMLItemPools = {{{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{10,1},{12, {{7,1},{72,1},{73,1},{78,1},{112,1},{138,1},{162,1},{178,1},{182,1},{184,1},{185,1},{197,1},{243,1},{313,1},{331,1},{333,1},{334,1},{335,1},{363,1},{387,1},{390,1},{400,1},{407,1},{413,1},{415,1},{423,1},{464,1},{490,1},{499,1},{526,1},{528,1},{533,1},{543,1},{567,1},{568,1},{573,1},{574,1},{579,1},{584,0.5},{586,1},{601,1},{622,1},{634,1},{640,1},{643,1},{651,1},{653,1},{685,1},{686,1},{691,0.5},{696,1},}, -- greedAngel {{11,1},{16,1},{17,1},{20,1},{35,1},{73,1},{84,1},{120,1},{121,1},{127,1},{168,1},{190,1},{213,1},{226,1},{242,1},{258,1},{262,1},{263,1},{271,1},{286,1},{316,1},{321,1},{348,1},{389,1},{402,1},{405,1},{424,1},{450,1},{489,1},{500,1},{501,1},{546,1},{562,1},{571,1},{582,1},{609,1},{612,1},{625,1},{628,1},{632,1},{636,1},{664,1},{667,1},{669,1},{674,1},{677,1},{688,1},{689,1},{691,0.5},{700,1},{701,1},{703,1},{711,1},{716,1},{717,1},{719,1},{721,1},{723,1},}, -- greedSecret {{1,1},{3,1},{4,1},{5,1},{21,1},{32,1},{38,1},{44,1},{46,1},{47,1},{48,1},{49,1},{51,1},{63,1},{66,1},{68,1},{77,1},{85,1},{89,1},{90,1},{91,1},{93,1},{95,1},{102,1},{105,1},{116,1},{136,1},{137,1},{147,1},{152,1},{153,1},{166,1},{189,1},{194,1},{196,1},{208,1},{212,1},{227,1},{232,1},{244,1},{251,1},{255,1},{263,1},{267,1},{283,1},{284,1},{285,1},{337,1},{338,1},{352,1},{357,1},{362,1},{370,1},{382,1},{383,1},{386,1},{395,1},{397,1},{403,1},{406,1},{419,1},{422,1},{425,1},{427,1},{437,1},{438,1},{439,1},{444,1},{451,1},{465,1},{476,1},{478,1},{488,1},{494,1},{505,1},{515,1},{516,1},{518,1},{524,1},{527,1},{538,1},{599,1},{604,1},{609,1},{617,1},{624,1},{629,1},{638,1},{644,1},{649,1},{655,1},{687,1},{709,1},{720,1},{723,1},{730,1},}, -- craneGame -{{12,1},{13,1},{15,1},{30,1},{31,1},{40,1},{45,1},{49,1},{51,1},{53,1},{67,1},{72,1},{73,1},{79,1},{80,1},{82,1},{96,1},{105,1},{109,1},{110,1},{118,1},{119,1},{122,1},{135,1},{137,1},{157,1},{159,1},{166,1},{167,1},{176,1},{177,1},{182,1},{193,1},{208,1},{214,1},{230,1},{247,1},{253,1},{254,1},{261,1},{276,1},{289,1},{334,1},{373,1},{394,1},{399,1},{411,1},{412,1},{421,1},{435,1},{443,1},{452,1},{462,1},{466,1},{475,1},{481,1},{506,1},{511,1},{531,1},{541,1},{554,1},{556,1},{565,1},{572,1},{573,1},{580,1},{606,1},{607,1},{614,1},{616,1},{618,1},{637,1},{650,1},{654,1},{657,1},{671,1},{682,1},{684,1},{692,1},{694,1},{695,1},{700,1},{702,1},{703,1},{704,1},{705,1},{706,1},{711,1},{724,1},{726,1},{728,1},}, -- ultraSecret +{{12,1},{13,1},{15,1},{30,1},{31,1},{40,1},{45,1},{49,1},{51,1},{53,1},{67,1},{72,1},{73,1},{79,1},{80,1},{82,1},{96,1},{105,1},{109,1},{110,1},{118,1},{119,1},{122,1},{135,1},{137,1},{157,1},{159,1},{166,1},{167,1},{176,1},{177,1},{182,1},{193,1},{208,1},{214,1},{230,1},{247,1},{253,1},{254,1},{261,1},{276,1},{289,1},{334,1},{373,1},{394,1},{399,1},{411,1},{412,1},{421,1},{435,1},{443,1},{452,1},{462,1},{466,1},{475,1},{481,1},{506,1},{511,1},{531,1},{541,1},{554,1},{556,1},{565,1},{572,1},{573,1},{580,1},{606,1},{607,1},{614,1},{616,1},{618,1},{621,1},{637,1},{650,1},{654,1},{657,1},{671,1},{682,1},{684,1},{692,1},{694,1},{695,1},{700,1},{702,1},{703,1},{704,1},{705,1},{706,1},{711,1},{724,1},{726,1},{728,1},}, -- ultraSecret {{37,1},{106,1},{125,1},{137,1},{140,1},{190,0.2},{209,1},{220,1},{256,1},{353,0.2},{366,1},{367,1},{432,1},{483,1},{517,1},{563,1},{583,1},{614,1},{646,0.2},{727,1},}, -- bombBum {{588,1},{589,1},{590,1},{591,1},{592,1},{593,1},{594,1},{595,1},{596,1},{597,1},{598,1},}, -- planetarium {{29,1},{30,1},{31,1},{39,1},{41,1},{55,1},{102,1},{110,1},{114,0.2},{139,1},{175,1},{195,1},{199,1},{200,1},{217,1},{228,1},{341,1},{355,1},{439,1},{455,1},{508,1},{546,0.2},{547,1},{604,1},}, -- oldChest @@ -39,6 +39,6 @@ EID.XMLItemPools = {{{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{10,1},{12, {{26,1},{42,1},{140,1},{268,1},{273,1},{336,0.5},{480,1},{618,0.5},{639,1},}, -- rottenBeggar } --The quality of each item, for use in Bag of Crafting -EID.XMLItemQualities = {[1]=3,[2]=2,[3]=3,[4]=4,[5]=0,[6]=2,[7]=3,[8]=1,[9]=0,[10]=3,[11]=2,[12]=4,[13]=2,[14]=2,[15]=2,[16]=2,[17]=3,[18]=3,[19]=0,[20]=3,[21]=2,[22]=1,[23]=1,[24]=1,[25]=1,[26]=1,[27]=1,[28]=1,[29]=1,[30]=1,[31]=1,[32]=3,[33]=1,[34]=2,[35]=1,[36]=0,[37]=1,[38]=2,[39]=1,[40]=0,[41]=0,[42]=1,[44]=0,[45]=1,[46]=2,[47]=1,[48]=3,[49]=2,[50]=3,[51]=3,[52]=4,[53]=1,[54]=2,[55]=1,[56]=1,[57]=2,[58]=3,[59]=0,[60]=1,[62]=1,[63]=2,[64]=2,[65]=1,[66]=1,[67]=1,[68]=3,[69]=3,[70]=3,[71]=2,[72]=2,[73]=2,[74]=1,[75]=2,[76]=2,[77]=1,[78]=3,[79]=3,[80]=3,[81]=3,[82]=3,[83]=3,[84]=0,[85]=2,[86]=1,[87]=1,[88]=1,[89]=2,[90]=3,[91]=2,[92]=2,[93]=2,[94]=1,[95]=1,[96]=2,[97]=2,[98]=4,[99]=2,[100]=1,[101]=2,[102]=1,[103]=1,[104]=3,[105]=4,[106]=2,[107]=2,[108]=4,[109]=3,[110]=3,[111]=0,[112]=2,[113]=2,[114]=4,[115]=2,[116]=2,[117]=0,[118]=4,[119]=2,[120]=2,[121]=2,[122]=2,[123]=1,[124]=1,[125]=2,[126]=0,[127]=3,[128]=1,[129]=1,[130]=2,[131]=2,[132]=3,[133]=3,[134]=2,[135]=1,[136]=1,[137]=1,[138]=2,[139]=3,[140]=1,[141]=0,[142]=2,[143]=2,[144]=0,[145]=3,[146]=3,[147]=1,[148]=0,[149]=4,[150]=3,[151]=3,[152]=2,[153]=3,[154]=2,[155]=2,[156]=2,[157]=3,[158]=3,[159]=3,[160]=2,[161]=1,[162]=1,[163]=1,[164]=2,[165]=3,[166]=2,[167]=1,[168]=4,[169]=4,[170]=3,[171]=1,[172]=2,[173]=3,[174]=1,[175]=1,[176]=1,[177]=0,[178]=3,[179]=3,[180]=0,[181]=2,[182]=4,[183]=3,[184]=3,[185]=3,[186]=0,[187]=1,[188]=0,[189]=3,[190]=3,[191]=2,[192]=0,[193]=2,[194]=1,[195]=1,[196]=3,[197]=2,[198]=1,[199]=3,[200]=1,[201]=3,[202]=2,[203]=3,[204]=1,[205]=1,[206]=2,[207]=2,[208]=3,[209]=2,[210]=1,[211]=1,[212]=2,[213]=2,[214]=0,[215]=3,[216]=3,[217]=3,[218]=2,[219]=2,[220]=2,[221]=3,[222]=2,[223]=4,[224]=3,[225]=2,[226]=2,[227]=1,[228]=2,[229]=2,[230]=4,[231]=2,[232]=4,[233]=0,[234]=4,[236]=1,[237]=3,[238]=0,[239]=0,[240]=1,[241]=3,[242]=2,[243]=3,[244]=3,[245]=4,[246]=2,[247]=2,[248]=2,[249]=3,[250]=1,[251]=2,[252]=1,[253]=2,[254]=2,[255]=3,[256]=1,[257]=2,[258]=2,[259]=3,[260]=3,[261]=4,[262]=0,[263]=2,[264]=2,[265]=3,[266]=2,[267]=1,[268]=3,[269]=1,[270]=1,[271]=2,[272]=1,[273]=1,[274]=0,[275]=3,[276]=0,[277]=1,[278]=4,[279]=2,[280]=1,[281]=1,[282]=1,[283]=3,[284]=3,[285]=0,[286]=2,[287]=0,[288]=1,[289]=2,[290]=0,[291]=1,[292]=4,[293]=2,[294]=1,[295]=1,[296]=2,[297]=2,[298]=1,[299]=1,[300]=2,[301]=3,[302]=1,[303]=2,[304]=1,[305]=3,[306]=3,[307]=3,[308]=1,[309]=2,[310]=2,[311]=4,[312]=2,[313]=4,[314]=1,[315]=0,[316]=0,[317]=3,[318]=1,[319]=0,[320]=2,[321]=1,[322]=2,[323]=0,[324]=2,[325]=1,[326]=0,[327]=2,[328]=2,[329]=2,[330]=2,[331]=4,[332]=1,[333]=3,[334]=3,[335]=3,[336]=3,[337]=1,[338]=2,[339]=1,[340]=1,[341]=3,[342]=3,[343]=2,[344]=1,[345]=3,[346]=1,[347]=3,[348]=2,[349]=1,[350]=3,[351]=1,[352]=1,[353]=2,[354]=2,[355]=2,[356]=3,[357]=1,[358]=1,[359]=3,[360]=4,[361]=2,[362]=2,[363]=3,[364]=1,[365]=1,[366]=1,[367]=1,[368]=1,[369]=2,[370]=3,[371]=1,[372]=3,[373]=3,[374]=3,[375]=3,[376]=2,[377]=1,[378]=2,[379]=2,[380]=2,[381]=3,[382]=2,[383]=1,[384]=2,[385]=1,[386]=0,[387]=3,[388]=0,[389]=3,[390]=3,[391]=0,[392]=1,[393]=2,[394]=1,[395]=4,[396]=1,[397]=3,[398]=1,[399]=4,[400]=1,[401]=2,[402]=3,[403]=1,[404]=1,[405]=1,[406]=2,[407]=2,[408]=1,[409]=2,[410]=2,[411]=3,[412]=2,[413]=1,[414]=3,[415]=4,[416]=2,[417]=3,[418]=2,[419]=3,[420]=1,[421]=1,[422]=3,[423]=1,[424]=3,[425]=2,[426]=0,[427]=1,[428]=2,[429]=2,[430]=1,[431]=2,[432]=2,[433]=0,[434]=2,[435]=1,[436]=1,[437]=1,[438]=3,[439]=3,[440]=2,[441]=4,[442]=1,[443]=3,[444]=3,[445]=1,[446]=1,[447]=0,[448]=1,[449]=1,[450]=2,[451]=3,[452]=2,[453]=2,[454]=2,[455]=2,[456]=1,[457]=2,[458]=3,[459]=3,[460]=2,[461]=3,[462]=3,[463]=2,[464]=2,[465]=2,[466]=2,[467]=1,[468]=0,[469]=1,[470]=0,[471]=2,[472]=1,[473]=1,[474]=0,[475]=0,[476]=4,[477]=4,[478]=1,[479]=3,[480]=2,[481]=0,[482]=0,[483]=3,[484]=1,[485]=1,[486]=1,[487]=2,[488]=1,[489]=4,[490]=3,[491]=2,[492]=2,[493]=1,[494]=3,[495]=3,[496]=3,[497]=0,[498]=1,[499]=3,[500]=3,[501]=1,[502]=1,[503]=3,[504]=0,[505]=1,[506]=1,[507]=2,[508]=1,[509]=1,[510]=1,[511]=1,[512]=1,[513]=2,[514]=2,[515]=3,[516]=2,[517]=1,[518]=2,[519]=2,[520]=3,[521]=2,[522]=1,[523]=1,[524]=3,[525]=1,[526]=2,[527]=3,[528]=3,[529]=2,[530]=2,[531]=3,[532]=2,[533]=2,[534]=3,[535]=2,[536]=2,[537]=1,[538]=2,[539]=1,[540]=2,[541]=1,[542]=2,[543]=1,[544]=2,[545]=3,[546]=3,[547]=3,[548]=1,[549]=3,[550]=4,[551]=4,[552]=4,[553]=3,[554]=2,[555]=2,[556]=3,[557]=2,[558]=2,[559]=2,[560]=1,[561]=1,[562]=3,[563]=1,[564]=3,[565]=1,[566]=2,[567]=3,[568]=2,[569]=2,[570]=3,[571]=2,[572]=3,[573]=3,[574]=2,[575]=3,[576]=2,[577]=2,[578]=1,[579]=3,[580]=3,[581]=4,[582]=1,[583]=2,[584]=3,[585]=2,[586]=3,[588]=2,[589]=2,[590]=3,[591]=2,[592]=3,[593]=2,[594]=2,[595]=2,[596]=3,[597]=3,[598]=3,[599]=1,[600]=3,[601]=3,[602]=1,[603]=1,[604]=2,[605]=0,[606]=3,[607]=1,[608]=2,[609]=3,[610]=1,[611]=2,[612]=2,[614]=1,[615]=0,[616]=3,[617]=3,[618]=2,[619]=3,[621]=2,[622]=2,[623]=1,[624]=1,[625]=4,[626]=0,[627]=0,[628]=4,[629]=3,[631]=1,[632]=2,[633]=0,[634]=2,[635]=1,[636]=4,[637]=3,[638]=2,[639]=2,[640]=3,[641]=2,[642]=2,[643]=4,[644]=1,[645]=1,[646]=3,[647]=2,[649]=1,[650]=2,[651]=2,[652]=1,[653]=3,[654]=2,[655]=1,[656]=2,[657]=2,[658]=1,[659]=1,[660]=3,[661]=2,[663]=2,[664]=4,[665]=2,[667]=2,[668]=0,[669]=3,[670]=2,[671]=2,[672]=1,[673]=2,[674]=2,[675]=1,[676]=2,[677]=2,[678]=4,[679]=3,[680]=3,[681]=1,[682]=3,[683]=2,[684]=3,[685]=2,[686]=2,[687]=3,[688]=2,[689]=4,[690]=3,[691]=4,[692]=1,[693]=2,[694]=3,[695]=3,[696]=3,[697]=3,[698]=4,[699]=3,[700]=2,[701]=3,[702]=2,[703]=2,[704]=3,[705]=3,[706]=4,[707]=1,[708]=3,[709]=3,[710]=4,[711]=4,[712]=3,[713]=3,[714]=0,[715]=0,[716]=3,[717]=2,[719]=2,[720]=2,[721]=2,[722]=3,[723]=4,[724]=3,[725]=2,[726]=3,[727]=2,[728]=2,[729]=2,[730]=3,[731]=2,[732]=3,} +EID.XMLItemQualities = {[1]=3,[2]=2,[3]=3,[4]=4,[5]=0,[6]=2,[7]=3,[8]=1,[9]=0,[10]=2,[11]=2,[12]=4,[13]=2,[14]=2,[15]=2,[16]=2,[17]=3,[18]=3,[19]=0,[20]=3,[21]=2,[22]=1,[23]=1,[24]=1,[25]=1,[26]=1,[27]=1,[28]=1,[29]=1,[30]=1,[31]=1,[32]=3,[33]=1,[34]=2,[35]=1,[36]=0,[37]=1,[38]=2,[39]=1,[40]=0,[41]=0,[42]=1,[44]=0,[45]=1,[46]=2,[47]=1,[48]=3,[49]=2,[50]=3,[51]=3,[52]=4,[53]=1,[54]=2,[55]=1,[56]=1,[57]=2,[58]=3,[59]=0,[60]=1,[62]=1,[63]=2,[64]=2,[65]=1,[66]=1,[67]=1,[68]=3,[69]=3,[70]=3,[71]=2,[72]=2,[73]=2,[74]=1,[75]=2,[76]=2,[77]=1,[78]=3,[79]=3,[80]=3,[81]=3,[82]=3,[83]=3,[84]=0,[85]=2,[86]=1,[87]=1,[88]=1,[89]=2,[90]=3,[91]=2,[92]=2,[93]=2,[94]=1,[95]=1,[96]=2,[97]=2,[98]=4,[99]=2,[100]=1,[101]=2,[102]=1,[103]=1,[104]=3,[105]=4,[106]=2,[107]=2,[108]=4,[109]=3,[110]=3,[111]=0,[112]=2,[113]=2,[114]=4,[115]=2,[116]=2,[117]=0,[118]=4,[119]=2,[120]=2,[121]=2,[122]=2,[123]=1,[124]=1,[125]=2,[126]=0,[127]=3,[128]=1,[129]=1,[130]=2,[131]=2,[132]=3,[133]=3,[134]=2,[135]=1,[136]=1,[137]=1,[138]=2,[139]=3,[140]=1,[141]=0,[142]=2,[143]=2,[144]=0,[145]=3,[146]=3,[147]=1,[148]=0,[149]=4,[150]=3,[151]=3,[152]=2,[153]=3,[154]=2,[155]=2,[156]=2,[157]=3,[158]=3,[159]=3,[160]=2,[161]=1,[162]=1,[163]=1,[164]=2,[165]=3,[166]=2,[167]=1,[168]=4,[169]=4,[170]=3,[171]=1,[172]=2,[173]=3,[174]=1,[175]=1,[176]=1,[177]=0,[178]=3,[179]=3,[180]=0,[181]=2,[182]=4,[183]=3,[184]=3,[185]=3,[186]=0,[187]=1,[188]=0,[189]=3,[190]=3,[191]=2,[192]=0,[193]=2,[194]=1,[195]=1,[196]=3,[197]=2,[198]=1,[199]=3,[200]=1,[201]=3,[202]=2,[203]=3,[204]=1,[205]=1,[206]=2,[207]=2,[208]=3,[209]=2,[210]=1,[211]=1,[212]=2,[213]=2,[214]=0,[215]=3,[216]=3,[217]=3,[218]=2,[219]=2,[220]=2,[221]=3,[222]=2,[223]=4,[224]=3,[225]=2,[226]=2,[227]=1,[228]=2,[229]=2,[230]=3,[231]=2,[232]=4,[233]=0,[234]=4,[236]=1,[237]=3,[238]=0,[239]=0,[240]=1,[241]=3,[242]=2,[243]=3,[244]=3,[245]=4,[246]=2,[247]=2,[248]=2,[249]=3,[250]=1,[251]=2,[252]=1,[253]=2,[254]=2,[255]=3,[256]=1,[257]=2,[258]=2,[259]=3,[260]=3,[261]=4,[262]=0,[263]=2,[264]=2,[265]=3,[266]=2,[267]=1,[268]=3,[269]=1,[270]=1,[271]=2,[272]=1,[273]=1,[274]=0,[275]=3,[276]=0,[277]=1,[278]=3,[279]=2,[280]=1,[281]=1,[282]=1,[283]=3,[284]=3,[285]=0,[286]=2,[287]=0,[288]=1,[289]=2,[290]=0,[291]=1,[292]=4,[293]=2,[294]=1,[295]=1,[296]=2,[297]=2,[298]=1,[299]=1,[300]=2,[301]=3,[302]=1,[303]=2,[304]=1,[305]=3,[306]=3,[307]=3,[308]=1,[309]=2,[310]=2,[311]=3,[312]=2,[313]=4,[314]=1,[315]=0,[316]=0,[317]=3,[318]=1,[319]=0,[320]=2,[321]=1,[322]=2,[323]=0,[324]=2,[325]=1,[326]=0,[327]=2,[328]=2,[329]=2,[330]=2,[331]=4,[332]=1,[333]=3,[334]=3,[335]=3,[336]=3,[337]=1,[338]=2,[339]=1,[340]=1,[341]=3,[342]=3,[343]=2,[344]=1,[345]=3,[346]=1,[347]=3,[348]=2,[349]=1,[350]=3,[351]=1,[352]=1,[353]=2,[354]=2,[355]=2,[356]=3,[357]=1,[358]=1,[359]=3,[360]=4,[361]=2,[362]=2,[363]=3,[364]=1,[365]=1,[366]=1,[367]=1,[368]=1,[369]=2,[370]=3,[371]=1,[372]=3,[373]=3,[374]=3,[375]=3,[376]=2,[377]=1,[378]=2,[379]=2,[380]=2,[381]=3,[382]=2,[383]=1,[384]=2,[385]=1,[386]=0,[387]=3,[388]=0,[389]=3,[390]=3,[391]=0,[392]=1,[393]=2,[394]=1,[395]=4,[396]=1,[397]=3,[398]=1,[399]=4,[400]=1,[401]=2,[402]=3,[403]=1,[404]=1,[405]=1,[406]=2,[407]=2,[408]=1,[409]=2,[410]=2,[411]=3,[412]=2,[413]=1,[414]=3,[415]=4,[416]=2,[417]=3,[418]=2,[419]=3,[420]=1,[421]=1,[422]=3,[423]=1,[424]=3,[425]=2,[426]=0,[427]=1,[428]=2,[429]=2,[430]=1,[431]=2,[432]=2,[433]=0,[434]=2,[435]=1,[436]=1,[437]=1,[438]=3,[439]=3,[440]=2,[441]=4,[442]=1,[443]=3,[444]=3,[445]=1,[446]=1,[447]=0,[448]=1,[449]=1,[450]=2,[451]=3,[452]=2,[453]=2,[454]=2,[455]=2,[456]=1,[457]=2,[458]=3,[459]=3,[460]=2,[461]=3,[462]=3,[463]=2,[464]=2,[465]=2,[466]=2,[467]=1,[468]=0,[469]=1,[470]=0,[471]=2,[472]=1,[473]=1,[474]=0,[475]=0,[476]=4,[477]=4,[478]=1,[479]=3,[480]=2,[481]=0,[482]=0,[483]=3,[484]=1,[485]=1,[486]=1,[487]=2,[488]=1,[489]=4,[490]=3,[491]=2,[492]=2,[493]=1,[494]=3,[495]=3,[496]=3,[497]=0,[498]=1,[499]=3,[500]=3,[501]=1,[502]=1,[503]=3,[504]=0,[505]=1,[506]=1,[507]=2,[508]=1,[509]=1,[510]=1,[511]=1,[512]=1,[513]=2,[514]=2,[515]=3,[516]=2,[517]=1,[518]=2,[519]=2,[520]=3,[521]=2,[522]=1,[523]=1,[524]=3,[525]=1,[526]=2,[527]=3,[528]=3,[529]=2,[530]=2,[531]=3,[532]=2,[533]=2,[534]=3,[535]=2,[536]=2,[537]=1,[538]=2,[539]=1,[540]=2,[541]=1,[542]=2,[543]=1,[544]=2,[545]=3,[546]=3,[547]=3,[548]=1,[549]=3,[550]=4,[551]=4,[552]=4,[553]=3,[554]=2,[555]=2,[556]=3,[557]=2,[558]=2,[559]=2,[560]=1,[561]=1,[562]=3,[563]=1,[564]=3,[565]=1,[566]=2,[567]=3,[568]=2,[569]=2,[570]=3,[571]=2,[572]=3,[573]=3,[574]=2,[575]=3,[576]=2,[577]=2,[578]=1,[579]=3,[580]=3,[581]=4,[582]=1,[583]=2,[584]=3,[585]=2,[586]=3,[588]=2,[589]=2,[590]=3,[591]=2,[592]=3,[593]=2,[594]=2,[595]=2,[596]=3,[597]=3,[598]=3,[599]=1,[600]=3,[601]=3,[602]=1,[603]=1,[604]=2,[605]=0,[606]=3,[607]=1,[608]=2,[609]=3,[610]=1,[611]=2,[612]=2,[614]=1,[615]=0,[616]=3,[617]=3,[618]=2,[619]=3,[621]=2,[622]=2,[623]=1,[624]=1,[625]=4,[626]=0,[627]=0,[628]=4,[629]=3,[631]=1,[632]=2,[633]=0,[634]=2,[635]=1,[636]=4,[637]=3,[638]=2,[639]=2,[640]=3,[641]=2,[642]=2,[643]=4,[644]=1,[645]=1,[646]=3,[647]=2,[649]=1,[650]=2,[651]=2,[652]=1,[653]=3,[654]=2,[655]=1,[656]=2,[657]=2,[658]=1,[659]=1,[660]=3,[661]=2,[663]=2,[664]=4,[665]=2,[667]=2,[668]=0,[669]=3,[670]=2,[671]=2,[672]=1,[673]=2,[674]=2,[675]=1,[676]=2,[677]=2,[678]=4,[679]=3,[680]=3,[681]=1,[682]=3,[683]=2,[684]=3,[685]=2,[686]=2,[687]=3,[688]=2,[689]=4,[690]=3,[691]=4,[692]=1,[693]=2,[694]=3,[695]=3,[696]=3,[697]=3,[698]=4,[699]=3,[700]=2,[701]=3,[702]=2,[703]=2,[704]=3,[705]=3,[706]=4,[707]=1,[708]=3,[709]=3,[710]=4,[711]=4,[712]=3,[713]=3,[714]=0,[715]=0,[716]=3,[717]=2,[719]=2,[720]=2,[721]=2,[722]=3,[723]=4,[724]=3,[725]=2,[726]=3,[727]=2,[728]=3,[729]=2,[730]=3,[731]=2,[732]=3,} --The pools that each item is in, for roughly checking if a given item is unlocked -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,22,},[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,},[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]={16,17,18,19,20,21,22,24,28,},[74]={3,8,20,},[75]={0,1,18,},[76]={0,18,},[77]={0,16,23,},[78]={0,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,20,28,},[118]={3,20,24,},[119]={24,},[120]={0,5,16,17,22,},[121]={0,5,22,},[122]={3,11,20,24,},[123]={0,3,6,20,},[124]={0,4,16,},[125]={0,16,25,},[126]={3,11,},[127]={0,3,5,11,22,},[128]={0,13,16,28,},[129]={0,},[131]={0,16,},[132]={16,17,20,},[133]={3,9,12,19,20,},[134]={3,9,12,19,20,},[135]={24,},[136]={0,23,},[137]={0,1,16,23,24,25,},[138]={0,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,},[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]={5,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,},[182]={4,21,24,},[183]={2,17,29,},[184]={4,21,},[185]={4,21,},[186]={0,16,},[187]={3,20,},[188]={0,16,28,},[189]={0,16,23,},[190]={0,5,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,17,21,},[198]={2,10,17,},[199]={1,13,15,17,27,},[200]={0,15,16,27,},[201]={0,16,},[202]={0,},[203]={1,},[204]={1,10,18,},[205]={1,14,},[206]={0,16,},[207]={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,},[240]={0,2,11,17,},[241]={3,11,12,},[242]={0,5,16,22,},[243]={4,21,},[244]={0,16,23,},[245]={0,16,},[246]={1,10,18,},[247]={1,18,24,},[248]={1,18,},[249]={1,},[250]={1,},[251]={1,18,23,},[252]={1,18,},[253]={2,17,24,},[254]={2,16,17,24,},[255]={2,8,17,23,},[256]={0,16,25,},[257]={0,16,},[258]={5,16,22,},[259]={3,11,20,},[260]={1,12,18,19,},[261]={0,16,24,},[262]={3,5,11,22,},[263]={5,22,23,},[264]={0,13,16,28,},[265]={0,16,28,},[266]={0,16,28,},[267]={0,16,23,28,},[268]={0,3,16,20,28,30,},[269]={0,3,16,20,28,},[270]={0,20,28,},[271]={0,5,10,16,22,},[272]={0,13,28,},[273]={0,16,28,30,},[274]={0,16,28,},[275]={0,3,28,},[276]={0,24,},[277]={0,16,28,},[278]={0,3,11,28,},[279]={0,13,16,28,},[280]={0,16,28,},[281]={0,16,28,},[282]={0,6,},[283]={0,18,23,},[284]={0,18,23,},[285]={0,18,23,},[286]={1,5,18,22,},[287]={0,5,6,},[288]={0,16,},[289]={1,18,24,},[290]={1,},[291]={0,16,},[292]={0,3,6,20,},[294]={0,10,},[295]={0,1,},[296]={1,},[297]={1,9,18,},[298]={0,},[299]={0,16,},[300]={0,16,},[301]={0,16,},[302]={0,16,},[303]={0,16,},[304]={0,},[305]={0,16,},[306]={0,16,},[307]={0,16,},[308]={0,16,},[309]={0,16,},[310]={0,16,},[311]={3,20,},[312]={0,16,},[313]={0,4,21,},[314]={0,17,},[315]={0,16,},[316]={0,5,9,16,22,},[317]={0,16,},[318]={0,16,},[319]={0,16,},[320]={0,13,16,28,},[321]={0,5,16,22,},[322]={0,16,28,},[323]={0,},[324]={0,},[325]={0,16,},[326]={4,},[329]={0,16,},[330]={0,16,},[331]={4,21,},[332]={0,4,16,},[333]={0,4,16,21,},[334]={0,4,16,21,24,},[335]={0,4,16,21,},[336]={0,16,30,},[337]={1,23,},[338]={1,23,},[339]={2,17,},[340]={2,11,17,},[341]={2,8,17,27,},[342]={2,17,},[343]={2,8,13,17,},[344]={2,8,17,},[345]={2,11,17,},[346]={2,17,},[347]={1,},[348]={1,5,18,22,},[349]={1,16,29,},[350]={0,},[351]={0,16,},[352]={0,16,23,},[353]={0,16,25,},[354]={2,8,17,},[355]={2,8,15,17,27,},[356]={1,14,18,},[357]={1,16,23,},[358]={0,16,},[359]={0,16,},[360]={3,20,28,},[361]={0,28,},[362]={0,10,16,23,29,},[363]={4,21,28,},[364]={0,13,16,28,},[365]={0,13,16,28,},[366]={0,16,25,},[367]={0,16,25,},[368]={0,16,},[369]={0,16,},[370]={2,8,17,23,},[371]={0,9,12,16,19,},[372]={1,14,18,28,},[373]={0,16,24,},[374]={0,4,16,},[375]={0,16,},[376]={1,10,},[377]={0,16,},[378]={0,7,16,},[379]={0,16,},[380]={1,16,18,},[381]={0,},[382]={0,16,23,},[383]={1,16,23,},[384]={0,16,28,},[385]={0,10,28,},[386]={0,18,23,},[387]={4,21,},[388]={0,5,13,28,},[389]={0,5,16,22,},[390]={0,4,21,28,},[391]={0,3,16,20,},[392]={0,16,},[393]={0,16,},[394]={0,16,24,},[395]={0,16,23,},[396]={1,},[397]={0,16,23,},[398]={0,16,},[399]={3,20,24,},[400]={4,21,},[401]={0,16,},[402]={1,5,18,22,},[403]={1,18,23,28,},[404]={0,28,},[405]={0,5,18,22,},[406]={0,18,23,},[407]={0,16,21,},[408]={3,12,19,20,},[409]={3,11,20,},[410]={0,16,},[411]={0,3,16,20,24,},[412]={3,20,24,},[413]={4,21,},[414]={1,},[415]={4,21,},[416]={1,16,18,},[417]={3,28,},[418]={0,},[419]={0,23,},[420]={3,11,20,},[421]={0,16,24,},[422]={0,1,23,},[423]={4,21,},[424]={1,5,22,},[425]={1,16,23,},[426]={0,13,16,28,},[427]={0,23,},[428]={2,8,17,},[430]={0,13,16,28,},[431]={0,3,16,20,},[432]={0,16,25,},[433]={3,20,},[434]={1,16,18,},[435]={0,24,28,},[436]={0,16,},[437]={0,23,},[438]={2,8,17,23,},[439]={1,15,18,23,27,29,},[440]={0,16,},[441]={3,20,},[442]={3,12,19,20,},[443]={0,16,24,},[444]={0,8,16,23,},[445]={0,16,},[446]={0,16,},[447]={0,10,16,},[448]={0,16,},[449]={0,16,},[450]={5,16,22,},[451]={1,12,18,19,20,23,},[452]={0,16,24,},[453]={0,16,},[454]={0,16,},[455]={2,8,10,17,27,},[456]={2,8,10,17,},[457]={0,16,},[458]={0,16,},[459]={0,16,},[460]={0,16,},[461]={0,16,},[462]={3,20,24,},[463]={0,16,},[464]={4,21,},[465]={0,16,23,},[466]={0,16,24,},[467]={0,16,},[468]={3,12,19,20,28,},[469]={0,16,},[470]={0,16,28,},[471]={0,16,28,},[472]={1,18,28,},[473]={0,16,28,},[475]={1,3,9,11,12,18,19,24,},[476]={0,18,23,},[477]={3,4,18,},[478]={0,18,23,},[479]={1,},[480]={1,30,},[481]={0,18,24,},[482]={0,18,},[483]={1,18,25,},[485]={0,1,10,18,},[486]={1,18,},[487]={1,11,18,},[488]={0,18,23,29,},[489]={5,18,22,},[490]={4,21,},[491]={0,28,},[492]={0,13,28,},[493]={0,11,16,},[494]={0,14,16,23,},[495]={0,16,},[496]={0,11,12,16,19,},[497]={0,16,},[498]={3,4,},[499]={4,21,},[500]={5,18,22,},[501]={5,22,},[502]={0,16,},[503]={11,12,16,19,20,},[504]={0,7,16,},[505]={1,18,23,},[506]={0,16,24,},[507]={0,16,},[508]={0,12,15,16,19,27,},[509]={0,16,28,},[510]={4,},[511]={0,16,24,28,},[512]={0,16,18,},[513]={0,16,},[514]={1,16,},[515]={1,16,18,23,},[516]={0,16,18,23,},[517]={0,16,25,},[518]={1,16,18,23,28,},[519]={3,4,20,28,},[520]={1,14,16,},[521]={1,},[522]={0,16,},[523]={1,},[524]={0,16,23,},[525]={0,16,},[526]={3,4,20,21,},[527]={1,13,18,23,29,},[528]={4,21,},[529]={0,16,},[530]={3,20,},[531]={0,16,24,},[532]={0,16,},[533]={4,21,},[534]={1,8,18,},[535]={1,18,},[536]={3,12,19,20,},[537]={0,16,28,},[538]={2,17,23,},[539]={0,16,},[540]={0,16,},[541]={2,17,24,},[542]={0,16,},[543]={0,4,16,21,},[544]={0,16,},[545]={0,3,6,16,20,},[546]={5,22,27,},[547]={2,17,27,},[548]={0,16,},[549]={0,16,},[553]={0,16,},[554]={3,20,24,},[555]={0,16,},[556]={3,20,24,},[557]={0,16,},[558]={0,16,},[559]={0,14,16,},[560]={0,16,},[561]={0,16,},[562]={5,22,},[563]={0,16,25,},[564]={2,17,},[565]={0,9,12,16,19,24,},[566]={1,18,},[567]={4,21,},[568]={4,21,},[569]={3,12,19,20,},[570]={0,16,},[571]={5,8,22,},[572]={3,20,24,},[573]={4,21,24,},[574]={4,21,},[575]={0,16,28,},[576]={0,7,16,},[577]={3,20,},[578]={0,16,},[579]={4,21,},[580]={5,9,12,13,15,24,},[581]={0,13,16,28,},[582]={5,22,},[583]={0,16,25,},[584]={4,6,21,},[585]={1,18,},[586]={4,21,},[588]={26,},[589]={26,},[590]={26,},[591]={26,},[592]={26,},[593]={26,},[594]={26,},[595]={26,},[596]={26,},[597]={26,},[598]={26,},[599]={1,23,},[600]={2,17,},[601]={4,21,},[602]={1,},[603]={1,14,18,},[604]={1,18,23,27,},[605]={0,16,},[606]={3,20,24,},[607]={0,16,24,28,},[608]={0,16,28,},[609]={0,5,16,22,23,},[610]={0,16,28,},[611]={0,16,},[612]={0,5,16,22,28,},[614]={0,16,24,25,},[615]={0,16,28,},[616]={0,16,24,},[617]={0,16,23,},[618]={0,16,24,30,},[619]={1,18,},[621]={1,18,},[622]={4,21,},[623]={1,18,},[624]={1,2,17,18,23,},[625]={0,5,16,22,},[628]={5,22,},[629]={0,13,16,23,28,},[631]={0,16,},[632]={5,22,},[634]={3,4,20,21,},[635]={0,16,28,},[636]={5,18,22,},[637]={0,16,24,},[638]={1,18,23,},[639]={0,16,30,},[640]={4,21,},[641]={0,16,},[642]={1,9,12,19,},[643]={4,21,},[644]={2,8,17,23,},[645]={0,16,28,},[646]={3,20,25,},[647]={1,14,18,},[649]={0,13,16,23,28,},[650]={0,16,24,},[651]={4,21,},[652]={0,16,},[653]={4,21,},[654]={3,9,12,19,20,24,},[655]={0,16,23,},[657]={0,16,24,},[658]={0,16,},[659]={2,17,},[660]={1,},[661]={0,16,28,},[663]={0,16,},[664]={5,22,},[665]={3,9,20,},[667]={5,18,22,},[669]={5,22,},[670]={1,},[671]={0,16,24,},[672]={3,11,},[674]={5,18,22,},[675]={0,5,16,},[676]={0,11,16,},[677]={0,5,16,22,},[678]={0,16,},[679]={3,20,28,},[680]={0,16,},[681]={0,16,},[682]={0,16,24,28,},[683]={0,16,},[684]={3,20,24,},[685]={4,21,},[686]={4,21,},[687]={0,16,23,},[688]={5,18,22,},[689]={5,18,22,},[690]={0,16,},[691]={4,5,18,21,22,},[692]={3,12,18,19,20,24,},[693]={0,13,16,},[694]={3,12,19,20,24,},[695]={0,3,16,20,24,},[696]={4,21,},[697]={5,12,},[698]={3,20,28,},[699]={3,20,},[700]={5,18,22,24,},[701]={5,18,22,},[702]={3,12,19,20,24,},[703]={0,5,16,18,22,24,},[704]={3,20,24,},[705]={3,20,24,},[706]={3,20,24,},[707]={2,10,17,},[708]={2,8,17,},[709]={0,16,23,},[710]={0,16,},[711]={5,12,18,19,22,24,},[712]={3,6,20,},[713]={0,16,},[716]={1,5,16,22,},[717]={0,5,16,22,},[719]={1,5,16,22,29,},[720]={0,16,23,},[721]={5,16,18,22,},[722]={0,16,18,},[723]={0,5,16,18,22,23,},[724]={0,16,24,},[725]={0,16,},[726]={0,16,24,},[727]={0,16,25,},[728]={0,3,16,20,24,},[729]={0,16,},[730]={2,8,17,23,},[731]={2,17,},[732]={8,15,18,},} +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,22,},[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,},[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]={16,17,18,19,20,21,22,24,28,},[74]={3,8,20,},[75]={0,1,18,},[76]={0,18,},[77]={0,16,23,},[78]={0,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,20,28,},[118]={3,20,24,},[119]={24,},[120]={0,5,16,17,22,},[121]={0,5,22,},[122]={3,11,20,24,},[123]={0,3,6,20,},[124]={0,4,16,},[125]={0,16,25,},[126]={3,11,},[127]={0,3,5,11,22,},[128]={0,13,16,28,},[129]={0,},[131]={0,16,},[132]={16,17,20,},[133]={3,9,12,19,20,},[134]={3,9,12,19,20,},[135]={24,},[136]={0,23,},[137]={0,1,16,23,24,25,},[138]={0,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,},[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]={5,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,},[182]={4,21,24,},[183]={2,17,29,},[184]={4,21,},[185]={4,21,},[186]={0,16,},[187]={3,20,},[188]={0,16,28,},[189]={0,16,23,},[190]={0,5,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,17,21,},[198]={2,10,17,},[199]={1,13,15,17,27,},[200]={0,15,16,27,},[201]={0,16,},[202]={0,},[203]={1,},[204]={1,10,18,},[205]={1,14,},[206]={0,16,},[207]={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,},[240]={0,2,11,17,},[241]={3,11,12,},[242]={0,5,16,22,},[243]={4,21,},[244]={0,16,23,},[245]={0,16,},[246]={1,10,18,},[247]={1,18,24,},[248]={1,18,},[249]={1,},[250]={1,},[251]={1,18,23,},[252]={1,18,},[253]={2,17,24,},[254]={2,16,17,24,},[255]={2,8,17,23,},[256]={0,16,25,},[257]={0,16,},[258]={5,16,22,},[259]={3,11,20,},[260]={1,12,18,19,},[261]={0,16,24,},[262]={3,5,11,22,},[263]={5,22,23,},[264]={0,13,16,28,},[265]={0,16,28,},[266]={0,16,28,},[267]={0,16,23,28,},[268]={0,3,16,20,28,30,},[269]={0,3,16,20,28,},[270]={0,20,28,},[271]={0,5,10,16,22,},[272]={0,13,28,},[273]={0,16,28,30,},[274]={0,16,28,},[275]={0,3,28,},[276]={0,24,},[277]={0,16,28,},[278]={0,3,11,28,},[279]={0,13,16,28,},[280]={0,16,28,},[281]={0,16,28,},[282]={0,6,},[283]={0,18,23,},[284]={0,18,23,},[285]={0,18,23,},[286]={1,5,18,22,},[287]={0,5,6,},[288]={0,16,},[289]={1,18,24,},[290]={1,},[291]={0,16,},[292]={0,3,6,20,},[294]={0,10,},[295]={0,1,},[296]={1,},[297]={1,9,18,},[298]={0,},[299]={0,16,},[300]={0,16,},[301]={0,16,},[302]={0,16,},[303]={0,16,},[304]={0,},[305]={0,16,},[306]={0,16,},[307]={0,16,},[308]={0,16,},[309]={0,16,},[310]={0,16,},[311]={3,20,},[312]={0,16,},[313]={0,4,21,},[314]={0,17,},[315]={0,16,},[316]={0,5,9,16,22,},[317]={0,16,},[318]={0,16,},[319]={0,16,},[320]={0,13,16,28,},[321]={0,5,16,22,},[322]={0,16,28,},[323]={0,},[324]={0,},[325]={0,16,},[326]={4,},[329]={0,16,},[330]={0,16,},[331]={4,21,},[332]={0,4,16,},[333]={0,4,16,21,},[334]={0,4,16,21,24,},[335]={0,4,16,21,},[336]={0,16,30,},[337]={1,23,},[338]={1,23,},[339]={2,17,},[340]={2,11,17,},[341]={2,8,17,27,},[342]={2,17,},[343]={2,8,13,17,},[344]={2,8,17,},[345]={2,11,17,},[346]={2,17,},[347]={1,},[348]={1,5,18,22,},[349]={1,16,29,},[350]={0,},[351]={0,16,},[352]={0,16,23,},[353]={0,16,25,},[354]={2,8,17,},[355]={2,8,15,17,27,},[356]={1,14,18,},[357]={1,16,23,},[358]={0,16,},[359]={0,16,},[360]={3,20,28,},[361]={0,28,},[362]={0,10,16,23,29,},[363]={4,21,28,},[364]={0,13,16,28,},[365]={0,13,16,28,},[366]={0,16,25,},[367]={0,16,25,},[368]={0,16,},[369]={0,16,},[370]={2,8,17,23,},[371]={0,9,12,16,19,},[372]={1,14,18,28,},[373]={0,16,24,},[374]={0,4,16,},[375]={0,16,},[376]={1,10,},[377]={0,16,},[378]={0,7,16,},[379]={0,16,},[380]={1,16,18,},[381]={0,},[382]={0,16,23,},[383]={1,16,23,},[384]={0,16,28,},[385]={0,10,28,},[386]={0,18,23,},[387]={4,21,},[388]={0,5,13,28,},[389]={0,5,16,22,},[390]={0,4,21,28,},[391]={0,3,16,20,},[392]={0,16,},[393]={0,16,},[394]={0,16,24,},[395]={0,16,23,},[396]={1,},[397]={0,16,23,},[398]={0,16,},[399]={3,20,24,},[400]={4,21,},[401]={0,16,},[402]={1,5,18,22,},[403]={1,18,23,28,},[404]={0,28,},[405]={0,5,18,22,},[406]={0,18,23,},[407]={0,16,21,},[408]={3,12,19,20,},[409]={3,11,20,},[410]={0,16,},[411]={0,3,16,20,24,},[412]={3,20,24,},[413]={4,21,},[414]={1,},[415]={4,21,},[416]={1,16,18,},[417]={3,28,},[418]={0,},[419]={0,23,},[420]={3,11,20,},[421]={0,16,24,},[422]={0,1,23,},[423]={4,21,},[424]={1,5,22,},[425]={1,16,23,},[426]={0,13,16,28,},[427]={0,23,},[428]={2,8,17,},[430]={0,13,16,28,},[431]={0,3,16,20,},[432]={0,16,25,},[433]={3,20,},[434]={1,16,18,},[435]={0,24,28,},[436]={0,16,},[437]={0,23,},[438]={2,8,17,23,},[439]={1,15,18,23,27,29,},[440]={0,16,},[441]={3,20,},[442]={3,12,19,20,},[443]={0,16,24,},[444]={0,8,16,23,},[445]={0,16,},[446]={0,16,},[447]={0,10,16,},[448]={0,16,},[449]={0,16,},[450]={5,16,22,},[451]={1,12,18,19,20,23,},[452]={0,16,24,},[453]={0,16,},[454]={0,16,},[455]={2,8,10,17,27,},[456]={2,8,10,17,},[457]={0,16,},[458]={0,16,},[459]={0,16,},[460]={0,16,},[461]={0,16,},[462]={3,20,24,},[463]={0,16,},[464]={4,21,},[465]={0,16,23,},[466]={0,16,24,},[467]={0,16,},[468]={3,12,19,20,28,},[469]={0,16,},[470]={0,16,28,},[471]={0,16,28,},[472]={1,18,28,},[473]={0,16,28,},[475]={1,3,9,11,12,18,19,24,},[476]={0,18,23,},[477]={3,4,18,},[478]={0,18,23,},[479]={1,},[480]={1,30,},[481]={0,18,24,},[482]={0,18,},[483]={1,18,25,},[485]={0,1,10,18,},[486]={1,18,},[487]={1,11,18,},[488]={0,18,23,29,},[489]={5,18,22,},[490]={4,21,},[491]={0,28,},[492]={0,13,28,},[493]={0,11,16,},[494]={0,14,16,23,},[495]={0,16,},[496]={0,11,12,16,19,},[497]={0,16,},[498]={3,4,},[499]={4,21,},[500]={5,18,22,},[501]={5,22,},[502]={0,16,},[503]={11,12,16,19,20,},[504]={0,7,16,},[505]={1,18,23,},[506]={0,16,24,},[507]={0,16,},[508]={0,12,15,16,19,27,},[509]={0,16,28,},[510]={4,},[511]={0,16,24,28,},[512]={0,16,18,},[513]={0,16,},[514]={1,16,},[515]={1,16,18,23,},[516]={0,16,18,23,},[517]={0,16,25,},[518]={1,16,18,23,28,},[519]={3,4,20,28,},[520]={1,14,16,},[521]={1,},[522]={0,16,},[523]={1,},[524]={0,16,23,},[525]={0,16,},[526]={3,4,20,21,},[527]={1,13,18,23,29,},[528]={4,21,},[529]={0,16,},[530]={3,20,},[531]={0,16,24,},[532]={0,16,},[533]={4,21,},[534]={1,8,18,},[535]={1,18,},[536]={3,12,19,20,},[537]={0,16,28,},[538]={2,17,23,},[539]={0,16,},[540]={0,16,},[541]={2,17,24,},[542]={0,16,},[543]={0,4,16,21,},[544]={0,16,},[545]={0,3,6,16,20,},[546]={5,22,27,},[547]={2,17,27,},[548]={0,16,},[549]={0,16,},[553]={0,16,},[554]={3,20,24,},[555]={0,16,},[556]={3,20,24,},[557]={0,16,},[558]={0,16,},[559]={0,14,16,},[560]={0,16,},[561]={0,16,},[562]={5,22,},[563]={0,16,25,},[564]={2,17,},[565]={0,9,12,16,19,24,},[566]={1,18,},[567]={4,21,},[568]={4,21,},[569]={3,12,19,20,},[570]={0,16,},[571]={5,8,22,},[572]={3,20,24,},[573]={4,21,24,},[574]={4,21,},[575]={0,16,28,},[576]={0,7,16,},[577]={3,20,},[578]={0,16,},[579]={4,21,},[580]={5,9,12,13,15,24,},[581]={0,13,16,28,},[582]={5,22,},[583]={0,16,25,},[584]={4,6,21,},[585]={1,18,},[586]={4,21,},[588]={26,},[589]={26,},[590]={26,},[591]={26,},[592]={26,},[593]={26,},[594]={26,},[595]={26,},[596]={26,},[597]={26,},[598]={26,},[599]={1,23,},[600]={2,17,},[601]={4,21,},[602]={1,},[603]={1,14,18,},[604]={1,18,23,27,},[605]={0,16,},[606]={3,20,24,},[607]={0,16,24,28,},[608]={0,16,28,},[609]={0,5,16,22,23,},[610]={0,16,28,},[611]={0,16,},[612]={0,5,16,22,28,},[614]={0,16,24,25,},[615]={0,16,28,},[616]={0,16,24,},[617]={0,16,23,},[618]={0,16,24,30,},[619]={1,18,},[621]={1,18,24,},[622]={4,21,},[623]={1,18,},[624]={1,2,17,18,23,},[625]={0,5,16,22,},[628]={5,22,},[629]={0,13,16,23,28,},[631]={0,16,},[632]={5,22,},[634]={3,4,20,21,},[635]={0,16,28,},[636]={5,18,22,},[637]={0,16,24,},[638]={1,18,23,},[639]={0,16,30,},[640]={4,21,},[641]={0,16,},[642]={1,9,12,19,},[643]={4,21,},[644]={2,8,17,23,},[645]={0,16,28,},[646]={3,20,25,},[647]={1,14,18,},[649]={0,13,16,23,28,},[650]={0,16,24,},[651]={4,21,},[652]={0,16,},[653]={4,21,},[654]={3,9,12,19,20,24,},[655]={0,16,23,},[657]={0,16,24,},[658]={0,16,},[659]={2,17,},[660]={1,},[661]={0,16,28,},[663]={0,16,},[664]={5,22,},[665]={3,9,20,},[667]={5,18,22,},[669]={5,22,},[670]={1,},[671]={0,16,24,},[672]={3,11,},[674]={5,18,22,},[675]={0,5,16,},[676]={0,11,16,},[677]={0,5,16,22,},[678]={0,16,},[679]={3,20,28,},[680]={0,16,},[681]={0,16,},[682]={0,16,24,28,},[683]={0,16,},[684]={3,20,24,},[685]={4,21,},[686]={4,21,},[687]={0,16,23,},[688]={5,18,22,},[689]={5,18,22,},[690]={0,16,},[691]={4,5,18,21,22,},[692]={3,12,18,19,20,24,},[693]={0,13,16,},[694]={3,12,19,20,24,},[695]={0,3,16,20,24,},[696]={4,21,},[697]={5,12,},[698]={3,20,28,},[699]={3,20,},[700]={5,18,22,24,},[701]={5,18,22,},[702]={3,12,19,20,24,},[703]={0,5,16,18,22,24,},[704]={3,20,24,},[705]={3,20,24,},[706]={3,20,24,},[707]={2,10,17,},[708]={2,8,17,},[709]={0,16,23,},[710]={0,16,},[711]={5,12,18,19,22,24,},[712]={3,6,20,},[713]={0,16,},[716]={1,5,16,22,},[717]={0,5,16,22,},[719]={1,5,16,22,29,},[720]={0,16,23,},[721]={5,16,18,22,},[722]={0,16,18,},[723]={0,5,16,18,22,23,},[724]={0,16,24,},[725]={0,16,},[726]={0,16,24,},[727]={0,16,25,},[728]={0,3,16,20,24,},[729]={0,16,},[730]={2,8,17,23,},[731]={2,17,},[732]={8,15,18,},} From fcdfbe33f4b76455e6219c06fcbf5f59964d55d4 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Wed, 17 Nov 2021 02:07:15 -0500 Subject: [PATCH 12/13] forgot to change the option name --- mod_config_menu.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_config_menu.lua b/mod_config_menu.lua index b276d6ad..7d2f8ff8 100644 --- a/mod_config_menu.lua +++ b/mod_config_menu.lua @@ -1094,7 +1094,7 @@ if MCMLoaded then if EID.Config["BagOfCraftingHideInBattle"] then onOff = "True" end - return "Show Item Names: " .. onOff + return "Hide in Battle: " .. onOff end, OnChange = function(currentBool) EID.Config["BagOfCraftingHideInBattle"] = currentBool From f50cffcf8d5288e51402463fa5a8813a19b89711 Mon Sep 17 00:00:00 2001 From: Buurazu Date: Wed, 17 Nov 2021 12:21:18 -0500 Subject: [PATCH 13/13] Immensely reduce lag on sorting large recipe lists --- eid_bagOfCrafting.lua | 144 ++++++++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 54 deletions(-) diff --git a/eid_bagOfCrafting.lua b/eid_bagOfCrafting.lua index 9b264338..f42bfff3 100644 --- a/eid_bagOfCrafting.lua +++ b/eid_bagOfCrafting.lua @@ -176,6 +176,22 @@ local lockedRecipes = {} --If the seed changes, the above two tables will be wiped local lastSeedUsed = 0 +--A list of item IDs, sorted by quality, then by name, to help with sorting our recipe list faster +local sortedIDs = {} +for i = 1, EID.XMLMaxItemID do + if EID.XMLItemQualities[i] ~= nil then + table.insert(sortedIDs, i) + end +end + +table.sort(sortedIDs, function(a, b) + if EID.XMLItemQualities[a] == EID.XMLItemQualities[b] then + return (EID:getObjectName(5, 100, a) < EID:getObjectName(5, 100, b)) + else + return (EID.XMLItemQualities[a] > EID.XMLItemQualities[b]) + end +end) + local customRNGSeed = 0x77777770 local customRNGShift = {0,0,0} @@ -457,6 +473,7 @@ end local randResultCache = {} local calcResultCache = {} +local numResults = 0 EID.bagOfCraftingOffset = 0 EID.bagOfCraftingCurPickupCount = -1 @@ -593,6 +610,7 @@ function EID:handleBagOfCraftingRendering() elseif calcResultCache[queryString] == nil or EID.refreshNextTick then --build on top of our previous recipe lists, if possible local randResults = randResultCache[queryString] or {} + local newResults = {} local skipRandom = false --check every single possible recipe for our highest value pickups --limit it in the options, since the number of total combinations quickly grows (nCr): @@ -625,7 +643,11 @@ function EID:handleBagOfCraftingRendering() local startPos = startPos or 1 local tempResult = tempResult or {} if (length == 0) then - randResults[table.concat(tempResult,",")] = {table.unpack(tempResult)} + local resultString = table.concat(tempResult,",") + if (randResults[resultString] == nil) then + randResults[resultString] = {table.unpack(tempResult)} + newResults[resultString] = {table.unpack(tempResult)} + end return end for i = startPos, #arr-length+1 do @@ -646,49 +668,54 @@ function EID:handleBagOfCraftingRendering() table.remove(tableCopy, pos) end table.sort(newTable, qualitySort) - randResults[table.concat(newTable,",")] = newTable + local resultString = table.concat(newTable,",") + if (randResults[resultString] == nil) then + randResults[resultString] = {table.unpack(newTable)} + newResults[resultString] = {table.unpack(newTable)} + end end end - - local calcResults = {} - for k, v in pairs(randResults) do + + local sortedResults = {} + if (calcResultCache[queryString]) then + sortedResults = calcResultCache[queryString] + else + for k, v in ipairs(sortedIDs) do + sortedResults[v] = {} + end + end + + for k, v in pairs(newResults) do local resultID, lockedAchievementID = EID:calculateBagOfCrafting(v) if resultID ~= lockedAchievementID then - table.insert(calcResults, {v, resultID, lockedAchievementID}) + table.insert(sortedResults[resultID], {v, resultID, lockedAchievementID}) else - table.insert(calcResults, {v, resultID}) + table.insert(sortedResults[resultID], {v, resultID}) end end - calcResultCache[queryString] = calcResults + calcResultCache[queryString] = sortedResults randResultCache[queryString] = randResults - results = calcResults - --sort our final results by quality, then alphabetical item name - table.sort(results, function(a, b) - if EID.XMLItemQualities[a[2]] == EID.XMLItemQualities[b[2]] then - return (EID:getObjectName(5, 100, a[2]) < EID:getObjectName(5, 100, b[2])) - else - return (EID.XMLItemQualities[a[2]] > EID.XMLItemQualities[b[2]]) + results = sortedResults + + numResults = 0 + for k,v in ipairs(sortedIDs) do + if (EID.refreshNextTick and EID.bagOfCraftingOffset > 0 and v == EID.refreshPosition) then + --jump to the item we were looking at before, so you can more easily refresh for variants of recipes + EID.bagOfCraftingOffset = numResults end - end) + numResults = numResults + #results[v] + end if not EID.refreshNextTick then EID.bagOfCraftingOffset = 0 EID.bagOfCraftingRefreshes = 0 - --jump to the item we were looking at before, so you can more easily refresh for variants of recipes - elseif EID.bagOfCraftingOffset > 0 then - for k,v in ipairs(results) do - if (v[2] == EID.refreshPosition) then - EID.bagOfCraftingOffset = k-1 - break - end - end end EID.refreshNextTick = false else results = calcResultCache[queryString] end - if #results == 0 then + if numResults == 0 then EID.bagOfCraftingOffset = 0 return false end @@ -726,7 +753,7 @@ function EID:handleBagOfCraftingRendering() if Input.IsActionPressed(EID.Config["BagOfCraftingToggleKey"], EID.player.ControllerIndex) then EID.player:SetShootingCooldown(2) if Input.IsActionTriggered(ButtonAction.ACTION_SHOOTDOWN, EID.player.ControllerIndex) then - EID.bagOfCraftingOffset = math.min(#results-(#results%EID.Config["BagOfCraftingResults"]), EID.bagOfCraftingOffset + EID.Config["BagOfCraftingResults"]) + EID.bagOfCraftingOffset = math.min(numResults-(numResults%EID.Config["BagOfCraftingResults"]), EID.bagOfCraftingOffset + EID.Config["BagOfCraftingResults"]) EID.downHeld = Isaac.GetTime() elseif Input.IsActionTriggered(ButtonAction.ACTION_SHOOTUP, EID.player.ControllerIndex) then EID.bagOfCraftingOffset = math.max(0, EID.bagOfCraftingOffset - EID.Config["BagOfCraftingResults"]) @@ -739,12 +766,11 @@ function EID:handleBagOfCraftingRendering() elseif Input.IsActionTriggered(ButtonAction.ACTION_SHOOTRIGHT, EID.player.ControllerIndex) then if (EID.lockedResults == nil) then EID.refreshNextTick = true - if (results[EID.bagOfCraftingOffset+1]) then EID.refreshPosition = results[EID.bagOfCraftingOffset+1][2] end end end --scroll pages quickly if the button is held if Input.IsActionPressed(ButtonAction.ACTION_SHOOTDOWN, EID.player.ControllerIndex) and Isaac.GetTime() - EID.downHeld > 750 then - EID.bagOfCraftingOffset = math.min(#results-(#results%EID.Config["BagOfCraftingResults"]), EID.bagOfCraftingOffset + EID.Config["BagOfCraftingResults"]) + EID.bagOfCraftingOffset = math.min(numResults-(numResults%EID.Config["BagOfCraftingResults"]), EID.bagOfCraftingOffset + EID.Config["BagOfCraftingResults"]) EID.downHeld = Isaac.GetTime() - 700 elseif Input.IsActionPressed(ButtonAction.ACTION_SHOOTUP, EID.player.ControllerIndex) and Isaac.GetTime() - EID.upHeld > 750 then EID.bagOfCraftingOffset = math.max(0, EID.bagOfCraftingOffset - EID.Config["BagOfCraftingResults"]) @@ -752,7 +778,7 @@ function EID:handleBagOfCraftingRendering() end end --fix bug with being allowed to go to an empty page if recipe count = multiple of page size (or if we refresh on last page) - if (EID.bagOfCraftingOffset >= #results) then EID.bagOfCraftingOffset = EID.bagOfCraftingOffset - EID.Config["BagOfCraftingResults"] end + if (EID.bagOfCraftingOffset >= numResults) then EID.bagOfCraftingOffset = EID.bagOfCraftingOffset - EID.Config["BagOfCraftingResults"] end local prevItem = 0 @@ -762,38 +788,48 @@ function EID:handleBagOfCraftingRendering() prefix = "#{{Trinket159}} " end - --results is now sorted by quality and item name, and doesn't iterate over the entire table, instead starting at the page offset + --results is now a table of tables for each item, so we have to iterate over the table using sortedIDs if (EID.bagOfCraftingOffset > 0) then customDescObj.Description = customDescObj.Description.. prefix .. "...+"..EID.bagOfCraftingOffset.." more" end - for i=EID.bagOfCraftingOffset+1,EID.bagOfCraftingOffset+EID.Config["BagOfCraftingResults"] do - local v = results[i] - if not v then break end - - if not EID.Config["BagOfCraftingDisplayNames"] then - customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} " - --tack on the secondary recipe image to achievement-locked recipes - if v[3] then customDescObj.Description = customDescObj.Description.."({{Collectible" .. v[3] .. "}})" end - --color the equals sign with the item quality, so the order of the list can make sense - customDescObj.Description = customDescObj.Description.. qualities[EID.XMLItemQualities[v[2]]] .. "={{CR}}" - --only display the item name if it's the first occurrence + local curOffset = 0 + EID.refreshPosition = -1 + for k,id in ipairs(sortedIDs) do + if (curOffset + #results[id] <= EID.bagOfCraftingOffset) then curOffset = curOffset + #results[id] else - if prevItem ~= v[2] then - --substring the first 18 characters of the item name so it fits on one line; is there a way to get around desc line length limits? - customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} ".. qualities[EID.XMLItemQualities[v[2]]] .. - string.sub(EID:getObjectName(5, 100, v[2]),1,18).."#" - else - customDescObj.Description = customDescObj.Description.."#" + if (EID.refreshPosition == -1) then EID.refreshPosition = id end + for k2, v in ipairs(results[id]) do + curOffset = curOffset + 1 + if (curOffset > EID.bagOfCraftingOffset+EID.Config["BagOfCraftingResults"]) then break end + if not v then break end + if (curOffset > EID.bagOfCraftingOffset) then + if not EID.Config["BagOfCraftingDisplayNames"] then + customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} " + --tack on the secondary recipe image to achievement-locked recipes + if v[3] then customDescObj.Description = customDescObj.Description.."({{Collectible" .. v[3] .. "}})" end + --color the equals sign with the item quality, so the order of the list can make sense + customDescObj.Description = customDescObj.Description.. qualities[EID.XMLItemQualities[v[2]]] .. "={{CR}}" + --only display the item name if it's the first occurrence + else + if prevItem ~= v[2] then + --substring the first 18 characters of the item name so it fits on one line; is there a way to get around desc line length limits? + customDescObj.Description = customDescObj.Description.."# {{Collectible"..v[2].."}} ".. qualities[EID.XMLItemQualities[v[2]]] .. + string.sub(EID:getObjectName(5, 100, v[2]),1,18).."#" + else + customDescObj.Description = customDescObj.Description.."#" + end + --replace recipe bulletpoint with the secondary recipe on achievement-locked recipes + if v[3] then customDescObj.Description = customDescObj.Description.." {{Collectible" .. v[3] .. "}} " end + end + + customDescObj.Description = customDescObj.Description..EID:tableToCraftingIconsMerged(v[1]) + prevItem = v[2] + end end - --replace recipe bulletpoint with the secondary recipe on achievement-locked recipes - if v[3] then customDescObj.Description = customDescObj.Description.." {{Collectible" .. v[3] .. "}} " end end - - customDescObj.Description = customDescObj.Description..EID:tableToCraftingIconsMerged(v[1]) - prevItem = v[2] end - if (EID.bagOfCraftingOffset + EID.Config["BagOfCraftingResults"] < #results) then - customDescObj.Description = customDescObj.Description.. prefix .. "...+"..(#results-EID.Config["BagOfCraftingResults"]-EID.bagOfCraftingOffset).." more" + if (EID.bagOfCraftingOffset + EID.Config["BagOfCraftingResults"] < numResults) then + customDescObj.Description = customDescObj.Description.. prefix .. "...+"..(numResults-EID.Config["BagOfCraftingResults"]-EID.bagOfCraftingOffset).." more" end EID:printDescription(customDescObj)