diff --git a/content/entities2.xml b/content/entities2.xml deleted file mode 100644 index c6d93d77..00000000 --- a/content/entities2.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/main.lua b/main.lua index 36e44124..541e53a6 100644 --- a/main.lua +++ b/main.lua @@ -893,16 +893,9 @@ local function attemptPathfind(entity) -- Don't reattempt pathfinding more than 3 times a second, unless this is a new entity if pathsChecked[entity.InitSeed] == false and EID.GameUpdateCount - lastPathfindFrame < 10 then return false end - -- Spawn a custom NPC entity to attempt a pathfind to the target pickup, then remove it afterwards - pathCheckerEntity = game:Spawn(17, 3169, EID.player.Position, nullVector, EID.player, 0, 4354) - pathCheckerEntity:ClearEntityFlags(EntityFlag.FLAG_APPEAR) - -- Not sure how much of this flagging is needed now that the entity is immediately removed afterwards - 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 pathCheckerEntity:AddEntityFlags(EntityFlag.FLAG_NO_QUERY) end -- can it even be queried in this brief time? - pathCheckerEntity.EntityCollisionClass = EntityCollisionClass.ENTCOLL_NONE - pathCheckerEntity.Visible = false -- it's invisible anyway? - pathCheckerEntity.Position = EID.player.Position -- not needed, it spawned at our position? - + -- Spawn a Shopkeeper entity to attempt a pathfind to the target pickup, then remove it afterwards + pathCheckerEntity = game:Spawn(17, 0, EID.player.Position, nullVector, EID.player, 0, 4354) + local success = pathCheckerEntity:ToNPC().Pathfinder:HasPathToPos(entity.Position, false) pathsChecked[entity.InitSeed] = success pathCheckerEntity:Remove() diff --git a/resources/gfx/eid_blank.anm2 b/resources/gfx/eid_blank.anm2 deleted file mode 100644 index 22ac7f41..00000000 --- a/resources/gfx/eid_blank.anm2 +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/gfx/eid_blank.png b/resources/gfx/eid_blank.png deleted file mode 100644 index e3dabb80..00000000 Binary files a/resources/gfx/eid_blank.png and /dev/null differ