Fixed Amnesia Horse pill not unidentifying all pills
This commit is contained in:
1 parent
b8523ed630
commit
7d61bf8ba3
2 files changed
+6
-1
No files matched your search
@@ -2623,7 +2623,6 @@ end
|
|||||||
---@param descObj EID_DescObj
|
---@param descObj EID_DescObj
|
||||||
---@return integer?
|
---@return integer?
|
||||||
function EID:getObjectItemPool(descObj)
|
function EID:getObjectItemPool(descObj)
|
||||||
local subType = tonumber(descObj.ObjSubType) ---@cast subType number
|
|
||||||
if EID.isRepentance and descObj.ObjType == 5 and descObj.ObjVariant == 100 then
|
if EID.isRepentance and descObj.ObjType == 5 and descObj.ObjVariant == 100 then
|
||||||
if EID.isRepentancePlus then
|
if EID.isRepentancePlus then
|
||||||
-- TODO (maybe will require REPENTOGON?)
|
-- TODO (maybe will require REPENTOGON?)
|
||||||
|
|||||||
@@ -1767,6 +1767,12 @@ function EID:OnUsePill(pillEffectID, player, useFlags)
|
|||||||
|
|
||||||
-- for tracking used pills, ignore gold pills and no animation pills, since those dont show what pull you used
|
-- for tracking used pills, ignore gold pills and no animation pills, since those dont show what pull you used
|
||||||
if EID.isRepentance and (pillColor % PillColor.PILL_GIANT_FLAG == PillColor.PILL_GOLD or useFlags & UseFlag.USE_NOANIM == UseFlag.USE_NOANIM) then return end
|
if EID.isRepentance and (pillColor % PillColor.PILL_GIANT_FLAG == PillColor.PILL_GOLD or useFlags & UseFlag.USE_NOANIM == UseFlag.USE_NOANIM) then return end
|
||||||
|
|
||||||
|
-- in Repentance+, Amnesia horse pill unidentifies all pills
|
||||||
|
if EID.isRepentancePlus and pillColor > PillColor.PILL_GIANT_FLAG and pillEffectID == PillEffect.PILLEFFECT_AMNESIA then
|
||||||
|
EID.UsedPillColors = {}
|
||||||
|
end
|
||||||
|
|
||||||
EID.UsedPillColors[tostring(pillColor)] = true
|
EID.UsedPillColors[tostring(pillColor)] = true
|
||||||
end
|
end
|
||||||
EID:AddCallback(ModCallbacks.MC_USE_PILL, EID.OnUsePill)
|
EID:AddCallback(ModCallbacks.MC_USE_PILL, EID.OnUsePill)
|
||||||
|
|||||||
Reference in new issue
Block a user