From 1d4aa873005d90bb535c046db8c49014366d5e58 Mon Sep 17 00:00:00 2001 From: Wofsauge Date: Thu, 3 Feb 2022 21:57:19 +0100 Subject: [PATCH] Revert "Add full proof check for if achievements are enabled" This reverts commit 2f6b9872c79aec91199ffad8171ff57b8da0fa06. --- content/items.xml | 3 --- descriptions/rep/en_us.lua | 2 +- main.lua | 35 ++++++++++++++++------------------- 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 content/items.xml diff --git a/content/items.xml b/content/items.xml deleted file mode 100644 index 3ab41874..00000000 --- a/content/items.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/descriptions/rep/en_us.lua b/descriptions/rep/en_us.lua index f7a2fa19..a24d1062 100644 --- a/descriptions/rep/en_us.lua +++ b/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)" diff --git a/main.lua b/main.lua index 1bede250..36e44124 100644 --- a/main.lua +++ b/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)