move stuff around and add showhiddeninfo check
This commit is contained in:
1 parent
a6cec3d3b5
commit
2fa48e8ecb
1 file changed
+40
-36
+40
-36
@@ -63,6 +63,20 @@ function EID:getHoldMapDescription(player, checkingTwin)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Recently Acquired Item Descriptions
|
||||||
|
if EID.Config["ItemReminderShowRecentItem"] > 0 then
|
||||||
|
local printedItems = 0
|
||||||
|
local playerNum = EID:getPlayerID(player)
|
||||||
|
if EID.RecentlyTouchedItems[playerNum] then
|
||||||
|
for i = #EID.RecentlyTouchedItems[playerNum], 1, -1 do
|
||||||
|
if printedItems >= EID.Config["ItemReminderShowRecentItem"] then break end
|
||||||
|
printedItems = printedItems + 1
|
||||||
|
local recentID = EID.RecentlyTouchedItems[playerNum][i] % 4294967296
|
||||||
|
addObjectDesc(5, 100, recentID)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- Echo Chamber Description
|
-- Echo Chamber Description
|
||||||
if REPENTANCE and player:HasCollectible(700) then
|
if REPENTANCE and player:HasCollectible(700) then
|
||||||
local playerID = EID:getPlayerID(player)
|
local playerID = EID:getPlayerID(player)
|
||||||
@@ -90,27 +104,6 @@ function EID:getHoldMapDescription(player, checkingTwin)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Modeling Clay
|
|
||||||
if REPENTANCE and (player:HasTrinket(166) or player:GetEffects():HasTrinketEffect(166)) then
|
|
||||||
local modelingClayItem = player:GetModelingClayEffect()
|
|
||||||
if modelingClayItem > 0 then
|
|
||||||
append("{{Trinket166}}", EID:getObjectName(5, 350, 166),
|
|
||||||
"{{Collectible" .. modelingClayItem .. "}} " .. EID:getObjectName(5, 100, modelingClayItem))
|
|
||||||
blacklist["5.350.166"] = true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Zodiac
|
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_ZODIAC) then
|
|
||||||
local zodiacItem = player:GetZodiacEffect()
|
|
||||||
if zodiacItem > 0 then
|
|
||||||
local descObj = EID:getDescriptionObj(5,100,CollectibleType.COLLECTIBLE_ZODIAC)
|
|
||||||
append("{{Collectible392}}", EID:getObjectName(5, 100, 392),
|
|
||||||
descObj.Description.."#{{Collectible" .. zodiacItem .. "}} {{ColorYellow}}" .. EID:getObjectName(5, 100, zodiacItem))
|
|
||||||
blacklist["5.100.392"] = true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Bag of Crafting
|
-- Bag of Crafting
|
||||||
if REPENTANCE and player:HasCollectible(710) then
|
if REPENTANCE and player:HasCollectible(710) then
|
||||||
local floorQuery = EID.BoC.FloorOverride or EID.BoC.FloorQuery
|
local floorQuery = EID.BoC.FloorOverride or EID.BoC.FloorQuery
|
||||||
@@ -123,20 +116,6 @@ function EID:getHoldMapDescription(player, checkingTwin)
|
|||||||
append("{{Collectible710}}", EID:getObjectName(5,100,710), text)
|
append("{{Collectible710}}", EID:getObjectName(5,100,710), text)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Recently Acquired Item Descriptions
|
|
||||||
if EID.Config["ItemReminderShowRecentItem"] > 0 then
|
|
||||||
local printedItems = 0
|
|
||||||
local playerNum = EID:getPlayerID(player)
|
|
||||||
if EID.RecentlyTouchedItems[playerNum] then
|
|
||||||
for i = #EID.RecentlyTouchedItems[playerNum], 1, -1 do
|
|
||||||
if printedItems >= EID.Config["ItemReminderShowRecentItem"] then break end
|
|
||||||
printedItems = printedItems + 1
|
|
||||||
local recentID = EID.RecentlyTouchedItems[playerNum][i] % 4294967296
|
|
||||||
addObjectDesc(5, 100, recentID)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Active Item Descriptions
|
-- Active Item Descriptions
|
||||||
if EID.Config["ItemReminderShowActiveDesc"] > 0 then
|
if EID.Config["ItemReminderShowActiveDesc"] > 0 then
|
||||||
for i = 0, EID.Config["ItemReminderShowActiveDesc"]-1 do
|
for i = 0, EID.Config["ItemReminderShowActiveDesc"]-1 do
|
||||||
@@ -256,15 +235,40 @@ function EID:getHoldMapDescription(player, checkingTwin)
|
|||||||
addObjectDesc(5, 350, i, "{{Trinket75}}")
|
addObjectDesc(5, 350, i, "{{Trinket75}}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
-- Modeling Clay
|
||||||
|
elseif heldTrinket == 166 then
|
||||||
|
local modelingClayItem = player:GetModelingClayEffect()
|
||||||
|
if modelingClayItem > 0 then
|
||||||
|
addObjectDesc(5, 100, modelingClayItem, "{{Trinket166}}")
|
||||||
|
blacklist["5.350.166"] = true
|
||||||
|
else
|
||||||
|
addObjectDesc(5, 350, heldTrinket)
|
||||||
|
end
|
||||||
else
|
else
|
||||||
addObjectDesc(5, 350, heldTrinket)
|
addObjectDesc(5, 350, heldTrinket)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
-- Gulped/unslotted Modeling Clay
|
||||||
|
-- (Hidden information, because Modeling Clay does not visually show its item when gulped)
|
||||||
|
if REPENTANCE and EID.Config["ItemReminderShowHiddenInfo"] and not blacklist["5.350.166"] and player:GetModelingClayEffect() > 0 then
|
||||||
|
local modelingClayItem = player:GetModelingClayEffect()
|
||||||
|
if modelingClayItem > 0 then
|
||||||
|
addObjectDesc(5, 100, modelingClayItem, "{{Trinket166}}")
|
||||||
|
blacklist["5.350.166"] = true
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--
|
-- Zodiac's effect for the current floor
|
||||||
|
if EID.Config["ItemReminderShowHiddenInfo"] and player:HasCollectible(CollectibleType.COLLECTIBLE_ZODIAC) then
|
||||||
|
local zodiacItem = player:GetZodiacEffect()
|
||||||
|
if zodiacItem > 0 then
|
||||||
|
addObjectDesc(5, 100, zodiacItem, "{{Collectible392}}")
|
||||||
|
blacklist["5.100.392"] = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- Finally, check the twin player of this controller
|
-- Finally, check the twin player of this controller
|
||||||
-- If both twins have a desc, show their player icon / name to separate the two descs
|
-- If both twins have a desc, show their player icon / name to separate the two descs
|
||||||
|
|||||||
Reference in new issue
Block a user