isaacscript-common 1.2.55 → 1.2.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -28,14 +28,8 @@ function postPEffectUpdateReordered(self, player)
|
|
|
28
28
|
end
|
|
29
29
|
local pickingUpItem = getPickingUpItemForPlayer(nil, player)
|
|
30
30
|
if player:IsItemQueueEmpty() then
|
|
31
|
-
if player:GetPlayerType() == PlayerType.PLAYER_THESOUL then
|
|
32
|
-
Isaac.DebugString((("GETTING HERE - EMPTY - " .. tostring(pickingUpItem.itemType)) .. ", ") .. tostring(pickingUpItem.subType))
|
|
33
|
-
end
|
|
34
31
|
queueEmpty(nil, player, pickingUpItem)
|
|
35
32
|
else
|
|
36
|
-
if player:GetPlayerType() == PlayerType.PLAYER_THESOUL then
|
|
37
|
-
Isaac.DebugString((("GETTING HERE - NOT EMPTY - " .. tostring(pickingUpItem.itemType)) .. ", ") .. tostring(pickingUpItem.subType))
|
|
38
|
-
end
|
|
39
33
|
queueNotEmpty(nil, player, pickingUpItem)
|
|
40
34
|
end
|
|
41
35
|
end
|
|
@@ -54,22 +48,11 @@ function queueNotEmpty(self, player, pickingUpItem)
|
|
|
54
48
|
if queuedItem.Type ~= pickingUpItem.itemType or queuedItem.ID ~= pickingUpItem.subType then
|
|
55
49
|
pickingUpItem.itemType = queuedItem.Type
|
|
56
50
|
pickingUpItem.subType = queuedItem.ID
|
|
57
|
-
Isaac.DebugString((("GETTING HERE - SET: " .. tostring(pickingUpItem.itemType)) .. ", ") .. tostring(pickingUpItem.subType))
|
|
58
51
|
preItemPickupFire(nil, player, pickingUpItem)
|
|
59
52
|
end
|
|
60
53
|
end
|
|
61
54
|
function getPickingUpItemForPlayer(self, player)
|
|
62
|
-
local
|
|
63
|
-
local playerIndex
|
|
64
|
-
if character == PlayerType.PLAYER_THESOUL then
|
|
65
|
-
local forgotten = player:GetSubPlayer()
|
|
66
|
-
if forgotten == nil then
|
|
67
|
-
error("Failed")
|
|
68
|
-
end
|
|
69
|
-
playerIndex = getPlayerIndex(nil, forgotten)
|
|
70
|
-
else
|
|
71
|
-
playerIndex = getPlayerIndex(nil, player)
|
|
72
|
-
end
|
|
55
|
+
local playerIndex = getPlayerIndex(nil, player)
|
|
73
56
|
local pickingUpItem = v.run.pickingUpItem:get(playerIndex)
|
|
74
57
|
if pickingUpItem == nil then
|
|
75
58
|
pickingUpItem = newPickingUpItem(nil)
|
|
@@ -25,7 +25,7 @@ function postPEffectUpdateReordered(self, player)
|
|
|
25
25
|
if not hasSubscriptions(nil) then
|
|
26
26
|
return
|
|
27
27
|
end
|
|
28
|
-
local playerIndex = getPlayerIndex(nil, player)
|
|
28
|
+
local playerIndex = getPlayerIndex(nil, player, true)
|
|
29
29
|
local playerHealthMap = v.run.playersHealthMap:get(playerIndex)
|
|
30
30
|
if playerHealthMap == nil then
|
|
31
31
|
playerHealthMap = __TS__New(Map)
|