From a6f59530d7509c16ea745c0bc6018f3155d66593 Mon Sep 17 00:00:00 2001 From: Wofsauge Date: Mon, 9 Sep 2024 00:08:40 +0200 Subject: [PATCH] Improved formatting of T-Cain Salvage description --- eid_config.lua | 9 ++++++--- features/eid_mcm.lua | 4 ++-- features/eid_modifiers.lua | 7 ++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/eid_config.lua b/eid_config.lua index ce0b8822..1166afc1 100644 --- a/eid_config.lua +++ b/eid_config.lua @@ -368,10 +368,13 @@ EID.UserConfig = { -- Some descriptions can be completely different depending on what character you are, here you can disable the most extreme ones -- Changes Health Ups and removes healing effect text when playing as a character that can't have red health + -- Default = true ["DynamicHealthUps"] = true, - -- As Tainted Cain, replaces pedestal descriptions with what they will turn into - ["DynamicSalvageResult"] = true, + -- As Tainted Cain, replaces pedestal descriptions with what they will turn + -- REPENTANCE ONLY!!! + -- Default = true + ["DisplayTCainSalvageResults"] = true, ---------- Bag of Crafting ------------ @@ -642,7 +645,7 @@ EID.DefaultConfig = { ["ItemReminderShowRNGCheats"] = false, ["DynamicHealthUps"] = true, - ["DynamicSalvageResult"] = true, + ["DisplayTCainSalvageResults"] = true, ["SpindownDiceResults"] = 3, ["SpindownDiceDisplayID"] = false, diff --git a/features/eid_mcm.lua b/features/eid_mcm.lua index bca16ee9..00e3ea25 100644 --- a/features/eid_mcm.lua +++ b/features/eid_mcm.lua @@ -475,8 +475,8 @@ if MCMLoaded then EID:AddBooleanSetting("Display", "DynamicHealthUps", "Dynamic Health Up Text", {infoText = "Changes Health Ups and removes healing effect text when playing as a character that can't have red health"}) - EID:AddBooleanSetting("Display", "DynamicSalvageResult", "Show Tainted Cain Salvage Result", - {repOnly = true, infoText = "As Tainted Cain, replaces pedestal descriptions with what they will turn into"}) + EID:AddBooleanSetting("Display", "DisplayTCainSalvageResults", "Show Tainted Cain Salvage Results", + {repOnly = true, infoText = "As Tainted Cain, replaces pedestal descriptions with what they will turn into on touch"}) --------Obstruction--------- diff --git a/features/eid_modifiers.lua b/features/eid_modifiers.lua index f2299cf5..00fe9e67 100644 --- a/features/eid_modifiers.lua +++ b/features/eid_modifiers.lua @@ -838,7 +838,7 @@ if EID.isRepentance then -- Handle Tainted Cain pedestals local function TaintedCainPedestalCallback(descObj) - if EID.isDeathCertRoom or not descObj.Entity or not EID.Config["DynamicSalvageResult"] then return descObj end + if EID.isDeathCertRoom or not descObj.Entity or not EID.Config["DisplayTCainSalvageResults"] then return descObj end local item = EID.itemConfig:GetCollectible(descObj.ObjSubType) if (item.Tags and item.Tags & ItemConfig.TAG_QUEST == ItemConfig.TAG_QUEST) then return descObj end @@ -850,6 +850,9 @@ if EID.isRepentance then local hasBirthright = closestPlayer:HasCollectible(619) local salvageDesc = hasBirthright and EID:getDescriptionEntry("TaintedCainPedestalBaseBirthright") or EID:getDescriptionEntry("TaintedCainPedestalBase") local pickupNames = EID:getDescriptionEntry("PickupNames") + + -- add T-Cain icon at start of line + salvageDesc = "{{Player23}} ".. salvageDesc -- Guaranteed items from room type local roomType = game:GetLevel():GetCurrentRoomDesc().Data.Type @@ -882,6 +885,8 @@ if EID.isRepentance then salvageDesc = salvageDesc .. "#" .. newLine end descObj.Description = salvageDesc + descObj.Transformation = nil -- remove transformation info. useless for T-Cain because item will not count towards transformations + for i = 1, #EID.coopAllPlayers do local t = EID.coopAllPlayers[i]:GetPlayerType() if t ~= PlayerType.PLAYER_CAIN_B then