RGON: Donation machine achievement now also takes achievements into account for calculation

README.md

@@ -10,6 +10,7 @@ This version is designed to be used with the Afterbirth+ and Repentance DLCs.
 - Displays information for all collectibles, trinkets, cards, runes, pills, horsepills and some rooms
 - Displays **additional information** like item type, charges, transformations, Spindown Dice results, Bag of Crafting recipes, TMTRAINER item effects (Detailed informations require --luadebug flag!), and much much more!
 - Mod support for nearly all mods!
+- Extended features available with [Repentogon](https://repentogon.com/)
 - Easy to use API ([Documentation here](https://github.com/wofsauge/External-Item-Descriptions/wiki))
 - A huge amount of custom options like:
 	- Indicators

descriptions/rep/en_us.lua

@@ -1198,6 +1198,6 @@ if EID.enableDebug then
 end
 
 if REPENTOGON then
-	EID.descriptions[languageCode].custom["6.8.0"] = {"0", "Donation Machine", "{1} of {2} coins remaining until next achievement#{{Luck}} 2% chance for +1 Luck when donating#{{AngelRoom}} Donating 10 coins increases Angel Room chance"}
-	EID.descriptions[languageCode].custom["6.11.0"] = {"0", "Greed Donation Machine", "{{ColorGold}}{1} of {2}{{CR}} coins remaining until next achievement"}
+	EID.descriptions[languageCode].custom["6.8.0"] = {"0", "Donation Machine", "Next achievement at {1} coins, {2} coins remaining#{{Luck}} 2% chance for +1 Luck when donating#{{AngelRoom}} Donating 10 coins increases Angel Room chance"}
+	EID.descriptions[languageCode].custom["6.11.0"] = {"0", "Greed Donation Machine", "Next achievement at {1} coins, {2} coins remaining"}
 end

eid_data.lua

@@ -899,5 +899,5 @@ EID.ItemPoolTypeToMarkup = { [0] = "{{ItemPoolTreasure}}", "{{ItemPoolShop}}", "
 -- If a function returns a value, it will be used as the offset
 EID.LocalModePositionOffset = {
 	Default = Vector(0, 20),
-	Shop = function(entity) if entity:ToPickup() and entity:ToPickup():IsShopItem() then return Vector(0, 35) end end,
+	Shop = function(entity) if entity and not EID:IsGridEntity(entity) and entity:ToPickup() and entity:ToPickup():IsShopItem() then return Vector(0, 35) end end,
 } 

eid_repentogon.lua

@@ -43,7 +43,7 @@ EID:AddCallback(ModCallbacks.MC_HUD_RENDER, EID.OnRender)
 
 local oldPosInitFunc = EID.PositionLocalMode
 function EID:PositionLocalMode(entity)
-	oldPosInitFunc(entity)
+	oldPosInitFunc(_, entity)
 	-- custom description position when describing collectionpage entries
 	if not Isaac.IsInGame() and MenuManager:GetActiveMenu() == MainMenuType.COLLECTION then
 		EID.CurrentScaleType = "MainMenu"
@@ -66,12 +66,12 @@ function EID:OnMenuRender()
 		local selectedPage = CollectionMenu.GetSelectedPage()
 		local CollectibleId = selectedPage * (20 * 6) + CollectionMenu.GetSelectedElement() + 1
 		for _, id in ipairs(skipItemIDs) do -- some items dont exist, so we need to "skip" those when counting
-			if id < CollectibleId then
+			if id <= CollectibleId then
 				CollectibleId = CollectibleId + 1
 			end
 		end
-		local demoDescObj = EID:getDescriptionObj(5, 100, CollectibleId)
-		if not Isaac.GetPersistentGameData():IsItemInCollection(CollectibleId) then
+		local demoDescObj = EID:getDescriptionObj(5, 100, CollectibleId, nil, false)
+		if CollectibleId < CollectibleType.NUM_COLLECTIBLES and not Isaac.GetPersistentGameData():IsItemInCollection(CollectibleId) then
 			EID:renderQuestionMark(nil)
 			return
 		end
@@ -117,8 +117,34 @@ function EID:hasDescription(entity)
 end
 
 
-local requirementsDonationMachine = { 10, 20, 50, 100, 150, 200, 400, 600, 900, 999 }
-local requirementsGreedDonationMachine = { 2, 14, 33, 68, 111, 234, 439, 500, 666, 879, 999, 1000 }
+local requirementsDonationMachine = {
+	{ 10,  Achievement.BLUE_MAP },
+	{ 20,  Achievement.STORE_UPGRADE_LV1 },
+	{ 50,  Achievement.THERES_OPTIONS },
+	{ 100, Achievement.STORE_UPGRADE_LV2 },
+	{ 150, Achievement.BLACK_CANDLE },
+	{ 200, Achievement.STORE_UPGRADE_LV3 },
+	{ 400, Achievement.RED_CANDLE },
+	{ 600, Achievement.STORE_UPGRADE_LV4 },
+	{ 900, Achievement.BLUE_CANDLE },
+	{ 999, Achievement.STOP_WATCH }
+}
+
+local requirementsGreedDonationMachine = {
+	{ 2,    Achievement.LUCKY_PENNIES },
+	{ 14,   Achievement.SPECIAL_HANGING_SHOPKEEPERS },
+	{ 33,   Achievement.WOODEN_NICKEL },
+	{ 68,   Achievement.CAIN_HOLDS_PAPERCLIP },
+	{ 111,  Achievement.EVERYTHING_IS_TERRIBLE_2 },
+	{ 234,  Achievement.SPECIAL_SHOPKEEPERS },
+	{ 439,  Achievement.EVE_HOLDS_RAZOR_BLADE },
+	{ 500,  Achievement.GREEDIER },
+	{ 666,  Achievement.STORE_KEY },
+	{ 879,  Achievement.THE_LOST_HOLDS_HOLY_MANTLE },
+	{ 999,  Achievement.GENEROSITY },
+	{ 1000, Achievement.KEEPER }
+}
+
 local function DonationMachineCallback(descObj)
 	local isGreed = descObj.ObjVariant == 11
 	local eventCounter = isGreed and EventCounter.GREED_DONATION_MACHINE_COUNTER or
@@ -128,13 +154,14 @@ local function DonationMachineCallback(descObj)
 
 	local coinsNeeded = 0
 	for _, value in ipairs(rewardsTable) do
-		if totalDonations < value then
-			coinsNeeded = value
+		if totalDonations < value[1] and not Isaac.GetPersistentGameData():Unlocked(value[2]) then
+			coinsNeeded = value[1]
 			break
 		end
 	end
-	descObj.Description = string.gsub(descObj.Description, "{1}", coinsNeeded - totalDonations)
-	descObj.Description = string.gsub(descObj.Description, "{2}", coinsNeeded)
+	
+	descObj.Description = string.gsub(descObj.Description, "{1}", coinsNeeded)
+	descObj.Description = string.gsub(descObj.Description, "{2}", coinsNeeded - totalDonations)
 	descObj.Icon = EID.InlineIcons["DonationMachine"]
 	return descObj
 end

main.lua

@@ -10,8 +10,8 @@ EID.isRepentance = REPENTANCE -- REPENTANCE variable can be altered by any mod,
 require("eid_config")
 EID.Config = EID.UserConfig
 EID.Config.Version = "3.2" -- note: changing this will reset everyone's settings to default!
-EID.ModVersion = 4.65
-EID.ModVersionCommit = "fbcd637"
+EID.ModVersion = 4.66
+EID.ModVersionCommit = "4400ac7"
 EID.DefaultConfig.Version = EID.Config.Version
 EID.isHidden = false
 EID.player = nil -- The primary Player Entity of Player 1

metadata.xml

@@ -11,10 +11,11 @@ This mod displays detailed information about all items, trinkets, cards, runes a
 
 [img]https://i.imgur.com/QmqdAmr.png[/img]
 [list]
-[*] [b]Compatible with Afterbirth+ and Repentance[/b]
+[*] [b]Compatible with Afterbirth+, Repentance and Repentogon[/b]
 [*] Displays information for all collectibles, trinkets, cards, runes, pills, horsepills and some rooms
 [*] Displays [b]additional information[/b] like item type, charges, transformations, Spindown Dice results, Bag of Crafting recipes, TMTRAINER item effects (Detailed informations require --luadebug flag!), and much much more!
 [*] Mod support for nearly all mods!
+[*] Extended features available with [url=https://repentogon.com/]Repentogon[/url]
 [*] Easy to use API ([url=https://github.com/wofsauge/External-Item-Descriptions/wiki]Documentation here[/url])
 [*] A huge amount of custom options like:
 [list]
@@ -50,7 +51,7 @@ You are currently looking at the version for Afterbirth+ and Repentance.
 [img]https://i.imgur.com/jrdGbna.png[/img]
 [url=https://github.com/wofsauge/External-Item-Descriptions/blob/master/CREDITS.md]Check out the credits here[/url]
 </description>
-    <version>4.65</version>
+    <version>4.66</version>
     <visibility>Public</visibility>
     <tag id="Lua"/>
     <tag id="Items"/>