Salvage modifier + misc (#717)
* Add a Tainted Cain pedestal salvage modifier * Add more Tainted Bethany conditionals for outliers like Isaac's Fork * Prevent learning recipes before making them when Curse of the Blind is active * Fix Dice Room co-op conditionals (forgot to test them, subtype needed offsetting by 1) * Fix the health up modifier not saying when item has different effect for non-red players * Fix a couple MCM demo desc bugs, and irrelevant spaces/text on AB+ * Fix French's textbox width not being applied by default * Add some Azazel Brimstone conditionals * Improve Glitched Crown co-op / salvage interactions * Fix more cases of recipes being previewed when they shouldn't in Learned Recipe List
This commit is contained in:
1 parent
b1efbb0ca4
commit
af0c95b8bb
9 files changed
+253
-82
No files matched your search
@@ -422,7 +422,8 @@ function EID:getDescriptionObj(Type, Variant, SubType, entity, checkModifiers)
|
||||
description.Quality = EID:getObjectQuality(description)
|
||||
description.Icon = EID:getObjectIcon(description)
|
||||
EID:getObjectItemTypeAndCharge(description)
|
||||
|
||||
|
||||
EID.DifferentEffectPlayers = {}
|
||||
if checkModifiers ~= false then
|
||||
description = EID:applyConditionals(description)
|
||||
description = EID:applyDescriptionModifier(description, SubType)
|
||||
@@ -1655,6 +1656,12 @@ end
|
||||
function EID:fixDefinedFont(forceRefresh)
|
||||
local curLang = EID:getLanguage()
|
||||
local curFont = EID.Config["FontType"]
|
||||
|
||||
-- If the textbox width is set to the default, make it match the selected language's default
|
||||
-- Fixes language selection not respecting the language's textbox width, although it also prevents 130 from being used as the width with those languages
|
||||
if EID.Config["TextboxWidth"] == EID.DefaultConfig["TextboxWidth"] then
|
||||
EID.Config["TextboxWidth"] = EID.descriptions[curLang].fonts[1].textboxWidth or EID.DefaultConfig["TextboxWidth"]
|
||||
end
|
||||
|
||||
-- If our currently loaded font is still valid, we don't need to reset values
|
||||
for _, v in ipairs(EID.descriptions[curLang].fonts) do
|
||||
|
||||
Reference in new issue
Block a user