lzrdblzzrd/External-Item-Descriptions
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wofsauge:master' into master

Browse Source
This commit is contained in:
An-Annoying-Cat authored and GitHub committed 2024-09-15 22:27:33 -05:00
2 parents 229e5f8c59 83c801af72
commit 26f79fb705
2 files changed
+6 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

features/eid_data.lua
+5
View File
@@ -1063,6 +1063,11 @@ if EID.isRepentance then
EID.CharacterToHeartType[12] = "Black"; EID.CharacterToHeartType[24] = "Black"; EID.CharacterToHeartType[25] = "Soul"; EID.CharacterToHeartType[31] = "None"; EID.CharacterToHeartType[33] = "Coin"; EID.CharacterToHeartType[35] = "Soul"; EID.CharacterToHeartType[36] = "Soul"; EID.CharacterToHeartType[40] = "Soul"; EID.CharacterToHeartType[12] = "Black"; EID.CharacterToHeartType[24] = "Black"; EID.CharacterToHeartType[25] = "Soul"; EID.CharacterToHeartType[31] = "None"; EID.CharacterToHeartType[33] = "Coin"; EID.CharacterToHeartType[35] = "Soul"; EID.CharacterToHeartType[36] = "Soul"; EID.CharacterToHeartType[40] = "Soul";
end end
EID.HealthTypesWithoutHealing = {}
EID.HealthTypesWithoutHealing["Soul"] = true
EID.HealthTypesWithoutHealing["Black"] = true
EID.HealthTypesWithoutHealing["None"] = true
-- Character IDs that have a pocket active (0 = normal, 1 = timed, 2 = special) -- Character IDs that have a pocket active (0 = normal, 1 = timed, 2 = special)
EID.PocketActivePlayerIDs = { [22] = 0, [23] = 2, [24] = 1, [25] = 2, [26] = 1, [29] = 0, [34] = 0, [36] = 0, [37] = 1, [38] = 0, [39] = 1 } EID.PocketActivePlayerIDs = { [22] = 0, [23] = 2, [24] = 1, [25] = 2, [26] = 1, [29] = 0, [34] = 0, [36] = 0, [37] = 1, [38] = 0, [39] = 1 }
features/eid_modifiers.lua
+1 -1
View File
@@ -338,7 +338,7 @@ local function HealthUpCallback(descObj)
-- remove HealingRed lines entirely for Soul/Black/None health chars -- remove HealingRed lines entirely for Soul/Black/None health chars
descObj.Description = descObj.Description .. "#" -- gsub finds final lines better if the desc ends with a line break descObj.Description = descObj.Description .. "#" -- gsub finds final lines better if the desc ends with a line break
if heartType == "Soul" or heartType == "Black" or heartType == "None" then if EID.HealthTypesWithoutHealing[heartType] then
-- Find any lines containing {{HealingRed}} or {{HealingHalfRed}} and remove the line -- Find any lines containing {{HealingRed}} or {{HealingHalfRed}} and remove the line
descObj.Description = descObj.Description:gsub("{{HealingRed}}(.-)#", "") descObj.Description = descObj.Description:gsub("{{HealingRed}}(.-)#", "")
descObj.Description = descObj.Description:gsub("{{HealingHalfRed}}(.-)#", "") descObj.Description = descObj.Description:gsub("{{HealingHalfRed}}(.-)#", "")