Added EID:IsItemHidden() and fixed alt path item descriptions not visible despite it being enabled in the config
This commit is contained in:
1 parent
bc2aa2c6e8
commit
c233a723d5
2 files changed
+24
-16
No files matched your search
@@ -2493,3 +2493,23 @@ function EID:CreateDescriptionTableIfMissing(tableName, language)
|
|||||||
EID.descriptions[language][tableName] = {}
|
EID.descriptions[language][tableName] = {}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- returns true if the given pedestal-entity is hidden (questionmark sprite)
|
||||||
|
function EID:IsItemHidden(entity)
|
||||||
|
if EID:getEntityData(entity, "EID_DontHide") == true then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
-- Repentogon check (does not account for curse of blind),
|
||||||
|
-- with expection for alt path item descriptions when config option is enabled
|
||||||
|
if REPENTOGON and entity:ToPickup():IsBlind() and not (not EID.Config["DisableOnAltPath"] and EID:IsAltChoice(entity)) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
if (EID.Config["DisableOnCurse"] and EID:hasCurseBlind() and not entity:ToPickup().Touched and not EID.isDeathCertRoom)
|
||||||
|
or (EID.Config["HideUncollectedItemDescriptions"] and EID:requiredForCollectionPage(entity.SubType))
|
||||||
|
or (EID.Config["DisableOnAltPath"] and not entity:ToPickup().Touched and EID:IsAltChoice(entity))
|
||||||
|
or (EID.Config["DisableOnAprilFoolsChallenge"] and game.Challenge == Challenge.CHALLENGE_APRILS_FOOL) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
@@ -1440,15 +1440,9 @@ function EID:OnRender()
|
|||||||
|
|
||||||
-- Handle Glitched Items
|
-- Handle Glitched Items
|
||||||
elseif closest.Type == 5 and closest.Variant == 100 and closest.SubType > 4294960000 then
|
elseif closest.Type == 5 and closest.Variant == 100 and closest.SubType > 4294960000 then
|
||||||
if EID:getEntityData(closest, "EID_DontHide") ~= true then
|
if EID:IsItemHidden(closest) then
|
||||||
if (REPENTOGON and closest:ToPickup():IsBlind())
|
|
||||||
or (EID:hasCurseBlind() and not closest:ToPickup().Touched and EID.Config["DisableOnCurse"] and not EID.isDeathCertRoom)
|
|
||||||
or (EID.Config["DisableOnAltPath"] and not closest:ToPickup().Touched and EID:IsAltChoice(closest))
|
|
||||||
or (game.Challenge == Challenge.CHALLENGE_APRILS_FOOL and EID.Config["DisableOnAprilFoolsChallenge"]) then
|
|
||||||
EID:addQuestionMarkDescription(closest)
|
EID:addQuestionMarkDescription(closest)
|
||||||
end
|
else
|
||||||
end
|
|
||||||
|
|
||||||
local glitchedObj = EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType, closest)
|
local glitchedObj = EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType, closest)
|
||||||
local glitchedName = EID.itemConfig:GetCollectible(closest.SubType).Name
|
local glitchedName = EID.itemConfig:GetCollectible(closest.SubType).Name
|
||||||
local glitchedDesc = EID:getXMLDescription(closest.Type, closest.Variant, closest.SubType)
|
local glitchedDesc = EID:getXMLDescription(closest.Type, closest.Variant, closest.SubType)
|
||||||
@@ -1461,8 +1455,8 @@ function EID:OnRender()
|
|||||||
EID:addCollectible(closest.SubType, EID:CheckGlitchedItemConfig(closest.SubType), glitchedName)
|
EID:addCollectible(closest.SubType, EID:CheckGlitchedItemConfig(closest.SubType), glitchedName)
|
||||||
glitchedObj = EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType, closest)
|
glitchedObj = EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType, closest)
|
||||||
end
|
end
|
||||||
|
|
||||||
EID:addDescriptionToPrint(glitchedObj)
|
EID:addDescriptionToPrint(glitchedObj)
|
||||||
|
end
|
||||||
-- Handle Dice Room Floor
|
-- Handle Dice Room Floor
|
||||||
elseif closest.Type == 1000 and closest.Variant == 76 then
|
elseif closest.Type == 1000 and closest.Variant == 76 then
|
||||||
EID:addDescriptionToPrint(EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType+1, closest))
|
EID:addDescriptionToPrint(EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType+1, closest))
|
||||||
@@ -1501,17 +1495,11 @@ function EID:OnRender()
|
|||||||
|
|
||||||
elseif closest.Variant == PickupVariant.PICKUP_COLLECTIBLE then
|
elseif closest.Variant == PickupVariant.PICKUP_COLLECTIBLE then
|
||||||
--Handle Collectibles
|
--Handle Collectibles
|
||||||
if EID:getEntityData(closest, "EID_DontHide") ~= true then
|
if EID:IsItemHidden(closest) then
|
||||||
local isHideUncollected = EID.Config["HideUncollectedItemDescriptions"] and EID:requiredForCollectionPage(closest.SubType)
|
local isHideUncollected = EID.Config["HideUncollectedItemDescriptions"] and EID:requiredForCollectionPage(closest.SubType)
|
||||||
if (REPENTOGON and closest:ToPickup():IsBlind())
|
|
||||||
or isHideUncollected
|
|
||||||
or (EID:hasCurseBlind() and not closest:ToPickup().Touched and EID.Config["DisableOnCurse"] and not EID.isDeathCertRoom)
|
|
||||||
or (EID.Config["DisableOnAltPath"] and not closest:ToPickup().Touched and EID:IsAltChoice(closest))
|
|
||||||
or (game.Challenge == Challenge.CHALLENGE_APRILS_FOOL and EID.Config["DisableOnAprilFoolsChallenge"]) then
|
|
||||||
local description = isHideUncollected and EID:getDescriptionEntry("CollectionPageInfo") or nil
|
local description = isHideUncollected and EID:getDescriptionEntry("CollectionPageInfo") or nil
|
||||||
EID:addQuestionMarkDescription(closest, description)
|
EID:addQuestionMarkDescription(closest, description)
|
||||||
end
|
end
|
||||||
end
|
|
||||||
local descriptionObj = EID:getDescriptionObjByEntity(closest)
|
local descriptionObj = EID:getDescriptionObjByEntity(closest)
|
||||||
EID:addDescriptionToPrint(descriptionObj)
|
EID:addDescriptionToPrint(descriptionObj)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user