Fix Knife Piece 1 + Flip, change pathfinder entity
This commit is contained in:
1 parent
4e7c3cc99e
commit
6617748ac1
1 file changed
+6
-14
@@ -290,12 +290,15 @@ if REPENTANCE then
|
|||||||
flipItemNext = false
|
flipItemNext = false
|
||||||
if entityType == 5 and (variant == 100 or variant == 150) then
|
if entityType == 5 and (variant == 100 or variant == 150) then
|
||||||
lastGetItemResult = {nil, Isaac.GetFrameCount(), gridIndex, nil}
|
lastGetItemResult = {nil, Isaac.GetFrameCount(), gridIndex, nil}
|
||||||
initialItemNext = true
|
-- Pedestals in need of a random item will call GET_COLLECTIBLE; fixed pedestals (Knife Piece 1) will not
|
||||||
|
if subtype == 0 then initialItemNext = true
|
||||||
|
else lastGetItemResult[1] = subtype end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
EID:AddCallback(ModCallbacks.MC_PRE_ROOM_ENTITY_SPAWN, EID.preRoomEntitySpawn)
|
EID:AddCallback(ModCallbacks.MC_PRE_ROOM_ENTITY_SPAWN, EID.preRoomEntitySpawn)
|
||||||
|
|
||||||
function EID:postPickupInit(entity)
|
function EID:postPickupInit(entity)
|
||||||
|
initialItemNext = false
|
||||||
flipItemNext = true
|
flipItemNext = true
|
||||||
lastGetItemResult[4] = entity.InitSeed
|
lastGetItemResult[4] = entity.InitSeed
|
||||||
|
|
||||||
@@ -787,16 +790,6 @@ function EID:setPlayer()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if REPENTANCE then
|
|
||||||
function EID:removeWrongGuppyEyeInfo(effectEntity)
|
|
||||||
if EID.pathCheckerEntity ~= nil and effectEntity.Parent ~= nil then
|
|
||||||
if GetPtrHash(effectEntity.Parent) == GetPtrHash(EID.pathCheckerEntity) then
|
|
||||||
effectEntity:Remove()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
EID:AddCallback(ModCallbacks.MC_POST_EFFECT_UPDATE, EID.removeWrongGuppyEyeInfo, EffectVariant.PICKUP_GHOST)
|
|
||||||
end
|
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
---------------------------On Update Function------------------------------
|
---------------------------On Update Function------------------------------
|
||||||
|
|
||||||
@@ -844,9 +837,8 @@ function EID:onGameUpdate()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
if EID.pathCheckerEntity == nil then
|
if EID.pathCheckerEntity == nil then
|
||||||
EID.pathCheckerEntity = game:Spawn(17, 3169, EID.player.Position, nullVector, EID.player ,0 , 4354) -- Spawns the EID Helper entity with seed that doesnt spawn rewards
|
-- Spawns an Ultra Greed Door and makes it invisible and intangible to act as a Pathfinding NPC that can't be rerolled and has no AI
|
||||||
-- Spawns an Ultra Greed Door and makes it invisible and intangible (not fully tested yet)
|
EID.pathCheckerEntity = game:Spawn(294, 0, EID.player.Position, nullVector, EID.player, 0, 0)
|
||||||
--EID.pathCheckerEntity = game:Spawn(294, 0, EID.player.Position, nullVector, EID.player, 0, 0)
|
|
||||||
EID.pathCheckerEntity:ClearEntityFlags(EntityFlag.FLAG_APPEAR)
|
EID.pathCheckerEntity:ClearEntityFlags(EntityFlag.FLAG_APPEAR)
|
||||||
EID.pathCheckerEntity:AddEntityFlags (EntityFlag.FLAG_PERSISTENT | EntityFlag.FLAG_NO_STATUS_EFFECTS | EntityFlag.FLAG_NO_SPRITE_UPDATE | EntityFlag.FLAG_HIDE_HP_BAR | EntityFlag.FLAG_NO_DEATH_TRIGGER | EntityFlag.FLAG_FRIENDLY)
|
EID.pathCheckerEntity:AddEntityFlags (EntityFlag.FLAG_PERSISTENT | EntityFlag.FLAG_NO_STATUS_EFFECTS | EntityFlag.FLAG_NO_SPRITE_UPDATE | EntityFlag.FLAG_HIDE_HP_BAR | EntityFlag.FLAG_NO_DEATH_TRIGGER | EntityFlag.FLAG_FRIENDLY)
|
||||||
if REPENTANCE then EID.pathCheckerEntity:AddEntityFlags(EntityFlag.FLAG_NO_QUERY) end
|
if REPENTANCE then EID.pathCheckerEntity:AddEntityFlags(EntityFlag.FLAG_NO_QUERY) end
|
||||||
|
|||||||
Reference in new issue
Block a user