Revert "Add full proof check for if achievements are enabled"

This reverts commit 2f6b9872c7.

content/items.xml

@@ -1,3 +0,0 @@
-<items gfxroot="gfx/items/" version="1">
-	<trinket achievement="4" name="EID Achievements Locked Check" description="" gfx="" />
-</items>

descriptions/rep/en_us.lua

@@ -1042,7 +1042,7 @@ EID.descriptions[languageCode].FalsePHDDamage = "+0.6 Damage up"
 EID.descriptions[languageCode].FalsePHDHorseDamage = "+1.2 Damage up"
 
 EID.descriptions[languageCode].AchievementWarningTitle = "{{ColorYellow}}!!! WARNING !!!"
-EID.descriptions[languageCode].AchievementWarningText = "Achievements are disabled!#In order to enable progression and achievements, you first need to kill Mom (Depths II) without any mods enabled.#(This warning can be disabled in the config)"
+EID.descriptions[languageCode].AchievementWarningText = "Achievements are disabled!#In order to enable progression and achievements, you first need to kill Mom (Depths II) without any mods enabled.#(If you've defeated Mom, this message is a bug and can be ignored)#(This warning can be disabled in the config)"
 
 EID.descriptions[languageCode].OldGameVersionWarningText = "Your version of Repentance is not up-to-date!#Only the newest version is officially supported#(This warning can be disabled in the config)"
 

main.lua

@@ -21,7 +21,6 @@ EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"])
 EID.Scale = EID.Config["Size"]
 EID.isDisplaying = false
 EID.isDisplayingPermanent = false
-EID.achievementsEnabled = false
 EID.permanentDisplayTextObj = nil
 EID.lastDescriptionEntity = nil
 EID.lineHeight = 11
@@ -912,15 +911,6 @@ local function attemptPathfind(entity)
 	return success
 end
 
-local achievementTrinket = Isaac.GetTrinketIdByName("EID Achievements Locked Check")
--- hide helper trinket in Encyclopedia mod
-if Encyclopedia then
-	Encyclopedia.AddTrinket({
-		ID = achievementTrinket,
-		Hide = true,
-	})
-end
-
 local hasShownAchievementWarning = false
 local function renderAchievementInfo()
 	if REPENTANCE and not EID.Config.DisableAchievementCheck and game:GetFrameCount() < 10*30 then
@@ -940,12 +930,22 @@ local function renderAchievementInfo()
 			EID:displayPermanentText(demoDescObj)
 			hasShownAchievementWarning = true
 		-- Achievements Locked Check (do we have Cube of Meat or Book of Revelations unlocked?)
-		elseif not EID.achievementsEnabled then
-			local demoDescObj = EID:getDescriptionObj(-999, -1, 1)
-			demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or ""
-			demoDescObj.Description = EID:getDescriptionEntry("AchievementWarningText") or ""
-			EID:displayPermanentText(demoDescObj)
-			hasShownAchievementWarning = true
+		else
+			local characterID = EID.player:GetPlayerType()
+			--ID 21 = Tainted Isaac. Tainted characters have definitely beaten Mom! (Fixes Tainted Lost's item pools ruining this check)
+			if characterID < 21 and game.Challenge == 0 and not EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_TMTRAINER) then
+				local hasBookOfRevelationsUnlocked = EID:isCollectibleUnlockedAnyPool(CollectibleType.COLLECTIBLE_BOOK_OF_REVELATIONS or CollectibleType.COLLECTIBLE_BOOK_REVELATIONS)
+				if not hasBookOfRevelationsUnlocked then
+					local hasCubeOfMeatUnlocked = EID:isCollectibleUnlockedAnyPool(CollectibleType.COLLECTIBLE_CUBE_OF_MEAT)
+					if not hasCubeOfMeatUnlocked then
+						local demoDescObj = EID:getDescriptionObj(-999, -1, 1)
+						demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or ""
+						demoDescObj.Description = EID:getDescriptionEntry("AchievementWarningText") or ""
+						EID:displayPermanentText(demoDescObj)
+						hasShownAchievementWarning = true
+					end
+				end
+			end
 		end
 	elseif hasShownAchievementWarning then
 		EID:hidePermanentText()
@@ -1313,9 +1313,6 @@ if EID.MCMLoaded or REPENTANCE then
 				end
 			end
 		end
-		
-		-- Check and set if achievements are enabled
-		EID.achievementsEnabled = game:GetItemPool():RemoveTrinket(achievementTrinket)
 	end
 	EID:AddCallback(ModCallbacks.MC_POST_GAME_STARTED, OnGameStart)