From fe4cf6f747077f4b6d7335c3209c7bc2c0fe0184 Mon Sep 17 00:00:00 2001 From: Wofsauge Date: Mon, 21 Apr 2025 15:15:05 +0200 Subject: [PATCH] Fixed Disable Dynamic Health text for The Lost not working closes #798 --- descriptions/ab+/cs_cz.lua | 1 - descriptions/ab+/en_us.lua | 1 - descriptions/ab+/fr.lua | 1 - descriptions/ab+/it.lua | 1 - descriptions/ab+/ja_jp.lua | 1 - descriptions/ab+/ko_kr.lua | 1 - descriptions/ab+/ro_ro.lua | 1 - descriptions/ab+/spa.lua | 1 - descriptions/ab+/vi.lua | 1 - descriptions/ab+/zh_cn.lua | 1 - features/eid_conditionals.lua | 2 +- features/eid_conditionals_funcs.lua | 5 ++++- features/eid_modifiers.lua | 3 ++- 13 files changed, 7 insertions(+), 13 deletions(-) diff --git a/descriptions/ab+/cs_cz.lua b/descriptions/ab+/cs_cz.lua index d89873fb..7b152ba7 100644 --- a/descriptions/ab+/cs_cz.lua +++ b/descriptions/ab+/cs_cz.lua @@ -1218,7 +1218,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} Žádný efekt v Greed Módu", ["No Effect (Copies)"] = "Žádný další efekt z více kopií", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "Žádný další vliv na spojence", -- probably just for Hive Mind + BFFS! - ["No Red"] = "Žádný efekt pro postavy, které nemohou mít červené srdce", ["Different Effect"] = "{{ColorSilver}}Rozdílný efekt pro {1}{{CR}}", ["Dies on Use"] = "{{Warning}} {1} zemře při použití", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/en_us.lua b/descriptions/ab+/en_us.lua index eaff3242..4c8a72ad 100644 --- a/descriptions/ab+/en_us.lua +++ b/descriptions/ab+/en_us.lua @@ -1223,7 +1223,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} No effect in Greed Mode", ["No Effect (Copies)"] = "No additional effect from multiple copies", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "No additional effect on familiars", -- probably just for Hive Mind + BFFS! - ["No Red"] = "No effect for characters that can't have Red Hearts", ["Different Effect"] = "{{ColorSilver}}Different effect for {1}{{CR}}", ["Dies on Use"] = "{{Warning}} {1} dies on use", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/fr.lua b/descriptions/ab+/fr.lua index fdf67b88..d123f907 100644 --- a/descriptions/ab+/fr.lua +++ b/descriptions/ab+/fr.lua @@ -1094,7 +1094,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedModeSmall}} Aucun effet en mode Avarice", ["No Effect (Copies)"] = "Avoir plusieurs exemplaires ne cumule pas les effets", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "Aucun effet bonus pour les familiers", -- probably just for Hive Mind + BFFS! - ["No Red"] = "Aucun effet pour les personnages sans cœurs rouges", ["Different Effect"] = "{{ColorSilver}}(Effet différent avec {1}{{ColorSilver}})", ["Dies on Use"] = "{{Warning}} Tue {1} si utilisé", diff --git a/descriptions/ab+/it.lua b/descriptions/ab+/it.lua index 6ec249e8..90cb758b 100644 --- a/descriptions/ab+/it.lua +++ b/descriptions/ab+/it.lua @@ -1222,7 +1222,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} Effetto nullo in Modalità Avido", ["No Effect (Copies)"] = "Nessun effetto extra da più copie", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "Nessun effetto extra da famigli", -- probably just for Hive Mind + BFFS! - ["No Red"] = "Effetto nullo per personaggi che non hanno Cuori Rossi", ["Different Effect"] = "Effetto diverso per {1}", ["Dies on Use"] = "{{Warning}} Se usato {1} muore", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/ja_jp.lua b/descriptions/ab+/ja_jp.lua index 008e9a9c..7f8dc3a5 100644 --- a/descriptions/ab+/ja_jp.lua +++ b/descriptions/ab+/ja_jp.lua @@ -1222,7 +1222,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} グリードモードでは効果なし", ["No Effect (Copies)"] = "複数所持でも効果なし", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "追加の効果なし", -- probably just for Hive Mind + BFFS! - ["No Red"] = "赤ハートを持てない キャラに効果なし", ["Different Effect"] = "{{ColorSilver}}{1}では効果が変化{{CR}}", ["Dies on Use"] = "{{Warning}} {1}で使うと死ぬ", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/ko_kr.lua b/descriptions/ab+/ko_kr.lua index 019f713c..ac62d2f5 100644 --- a/descriptions/ab+/ko_kr.lua +++ b/descriptions/ab+/ko_kr.lua @@ -1129,7 +1129,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} Greed Mode: 무효과", ["No Effect (Copies)"] = "중첩 효과 없음", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "추가 효과 없음", -- probably just for Hive Mind + BFFS! - ["No Red"] = "최대 체력이 소울하트인 캐릭터에는 무효과", ["Different Effect"] = "{{ColorSilver}}{1}에 다른 효과 존재{{CR}}", ["Dies on Use"] = "!!! {1}: 사용 시 사망", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/ro_ro.lua b/descriptions/ab+/ro_ro.lua index b44a5be6..6cba8d80 100644 --- a/descriptions/ab+/ro_ro.lua +++ b/descriptions/ab+/ro_ro.lua @@ -1219,7 +1219,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} No effect in Greed Mode", ["No Effect (Copies)"] = "No additional effect from multiple copies", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "No additional effect on familiars", -- probably just for Hive Mind + BFFS! - ["No Red"] = "No effect for characters that can't have Red Hearts", ["Different Effect"] = "{{ColorSilver}}Different effect for {1}{{CR}}", ["Dies on Use"] = "{{Warning}} {1} dies on use", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/spa.lua b/descriptions/ab+/spa.lua index b4383ec5..37878d14 100644 --- a/descriptions/ab+/spa.lua +++ b/descriptions/ab+/spa.lua @@ -1238,7 +1238,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} Sin efecto en el Modo Codicia", ["No Effect (Copies)"] = "Tener multiples copias no otorga efectos adicionales", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "Sin efecto adicional en familiares", -- probably just for Hive Mind + BFFS! - ["No Red"] = "Ningún efecto en personajes que no pueden tener Corazones rojos", ["Different Effect"] = "{{ColorSilver}}Efecto diferente para {1}{{CR}}", ["Dies on Use"] = "{{Warning}} {1} morirá al usarlo", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/vi.lua b/descriptions/ab+/vi.lua index 8342339d..7f7fcc92 100644 --- a/descriptions/ab+/vi.lua +++ b/descriptions/ab+/vi.lua @@ -1218,7 +1218,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} Không có hiệu ứng trong Chế độ Tham Lam", ["No Effect (Copies)"] = "Không có hiệu ứng bổ sung từ nhiều bản sao", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "Không có hiệu ứng bổ sung lên bạn đồng hành", -- probably just for Hive Mind + BFFS! - ["No Red"] = "Không có hiệu ứng với nhân vật không thể có Trái Tim Đỏ", ["Different Effect"] = "{{ColorSilver}}Hiệu ứng khác với {1}{{CR}}", ["Dies on Use"] = "{{Warning}} {1} chết khi sử dụng", -- for Razor Blade and such as The Lost diff --git a/descriptions/ab+/zh_cn.lua b/descriptions/ab+/zh_cn.lua index 88b4133d..9867e6e5 100644 --- a/descriptions/ab+/zh_cn.lua +++ b/descriptions/ab+/zh_cn.lua @@ -1216,7 +1216,6 @@ EID.descriptions[languageCode].ConditionalDescs = { ["No Effect (Greed)"] = "{{GreedMode}} 贪婪模式中无效果", ["No Effect (Copies)"] = "多个重复品无额外效果", -- Having the item already, or having Diplopia while looking at a pedestal ["No Effect (Familiars)"] = "对跟班没有额外效果", -- probably just for Hive Mind + BFFS! - ["No Red"] = "对不能拥有红心的角色无效果", ["Different Effect"] = "{{ColorSilver}}对{1}有不同效果{{CR}}", ["Dies on Use"] = "{{Warning}} 使用时{1}死亡", -- for Razor Blade and such as The Lost diff --git a/features/eid_conditionals.lua b/features/eid_conditionals.lua index 3b68ee46..d0f56e4e 100644 --- a/features/eid_conditionals.lua +++ b/features/eid_conditionals.lua @@ -119,7 +119,7 @@ EID:AddPlayerConditional(230, 14, "Keeper") -- Keeper + Abaddon EID:AddPlayerConditional(152, 2, "Technology 2 One Eye") -- Cain + Technology 2 EID:AddPlayerConditional(122, 5, nil, nil, false) -- Eve + Whore of Babylon -EID:AddClosestPlayerConditional({15, 16, 20, 22, 23, 24, 25, 26, 45, 60, 92, 108, 133, 142, 146, 159, 173, 179, 184, 185, 205, 218, 226, 296, 301, 312, 334, 346, 428, 442, 448, 456, 487, 493, 501, "5.350.14", "5.350.46", "5.350.55", "5.350.56", "5.350.107", "5.350.128"}, 10, "No Effect Replace", {layer = 10000}) -- Useless Lost items replace +EID:AddClosestPlayerConditional({20, 45, 60, 92, 108, 133, 142, 146, 159, 173, 179, 184, 185, 205, 226, 296, 301, 312, 428, 442, 448, 487, 493, 501, "5.350.14", "5.350.46", "5.350.55", "5.350.56", "5.350.107", "5.350.128"}, 10, "No Effect Replace", {layer = 10000}) -- Useless Lost items replace EID:AddPlayerConditional({126, 135, 186}, 10, "Dies on Use", {layer = 10000}) -- Lethal Lost items warning EID:AddClosestPlayerConditional({108, 122, 296}, 14, "No Effect Replace") -- Useless Keeper items (The Wafer, Converter, Whore) replace if EID.isRepentance then diff --git a/features/eid_conditionals_funcs.lua b/features/eid_conditionals_funcs.lua index 638c3944..92f21311 100644 --- a/features/eid_conditionals_funcs.lua +++ b/features/eid_conditionals_funcs.lua @@ -609,7 +609,10 @@ function EID:applyConditionals(descObj) -- Table with 1 entry = replace elseif #text == 1 then - descObj.Description = EID:ReplaceVariableStr(text[1], variableText) + local iconStr = "" + if bulletpoint then iconStr = iconStr .. "{{" .. bulletpoint .. "}} " end + if cond.lineColor then iconStr = iconStr .. "{{" .. cond.lineColor .. "}}" end + descObj.Description = iconStr.. EID:ReplaceVariableStr(text[1], variableText) -- Table with 2+ entries = find and replace pairs -- Entry 1 is replaced with entry 2, entry 3 is replaced with entry 4, etc. diff --git a/features/eid_modifiers.lua b/features/eid_modifiers.lua index a4c2688b..8e699e6d 100644 --- a/features/eid_modifiers.lua +++ b/features/eid_modifiers.lua @@ -351,7 +351,8 @@ local function HealthUpCallback(descObj) -- check if we just made the description blank if descObj.Description:gsub("#", "") == "" then local noEffectStr = EID:getDescriptionEntry("ConditionalDescs", "No Effect") - descObj.Description = EID:GetPlayerIcon(playerType) .. " " .. EID:ReplaceVariableStr(noEffectStr, EID:getPlayerName(playerType)) + local playerName = "{{ColorIsaac}}"..EID:getPlayerName(playerType) .. "{{CR}}" + descObj.Description = EID:GetPlayerIcon(playerType) .. " " .. EID:ReplaceVariableStr(noEffectStr, playerName) end end