isaacscript-common 1.0.586 → 1.0.590

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -18,7 +18,7 @@ local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlay
 function hasSubscriptions(self)
     return postPlayerFatalDamageHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, damageSource, _damageCountdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
@@ -34,12 +34,16 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     end
     local game = Game()
     local gameFrameCount = game:GetFrameCount()
+    local character = player:GetPlayerType()
     local playerIndex = getPlayerIndex(nil, player)
     local lastDamageFrame = v.run.playerLastDamageFrame:get(playerIndex)
     v.run.playerLastDamageFrame:set(playerIndex, gameFrameCount)
     if willPlayerRevive(nil, player) then
         return nil
     end
+    if character == PlayerType.PLAYER_JACOB_B and damageSource.Type == EntityType.ENTITY_DARK_ESAU then
+        return nil
+    end
     if not damageIsFatal(nil, player, damageAmount, lastDamageFrame) and not hasLostCurse(nil, player) then
         return nil
     end

package/dist/functions/gridEntity.d.ts

@@ -100,14 +100,18 @@ export declare function setGridEntityInvisible(gridEntity: GridEntity): void;
 export declare function spawnGiantPoop(topLeftGridIndex: int): void;
 /**
  * Helper function to spawn a grid entity. This function assumes you want to give the grid entity a
- * variant of 0. Use this instead of the `Isaac.GridSpawn()` method since it handles giving pits
- * collision and it allows you to specify the grid index instead of the position.
+ * variant of 0. Use this instead of the `Isaac.GridSpawn()` method since it:
+ * - handles giving pits collision
+ * - removes existing grid entities on the same tile, if any
+ * - allows you to specify the grid index instead of the position
  */
 export declare function spawnGridEntity(gridEntityType: GridEntityType, gridIndex: int): GridEntity;
 /**
  * Helper function to spawn a grid entity with a specific variant. Use this instead of the
- * `Isaac.GridSpawn()` method since it handles giving pits collision and it allows you to specify
- * the grid index instead of the position.
+ * `Isaac.GridSpawn()` method since it:
+ * - handles giving pits collision
+ * - removes existing grid entities on the same tile, if any
+ * - allows you to specify the grid index instead of the position
  */
 export declare function spawnGridEntityWithVariant(gridEntityType: GridEntityType, variant: int, gridIndex: int): GridEntity;
 /**

package/dist/functions/gridEntity.lua

@@ -32,6 +32,10 @@ end
 function ____exports.spawnGridEntityWithVariant(self, gridEntityType, variant, gridIndex)
     local game = Game()
     local room = game:GetRoom()
+    local existingGridEntity = room:GetGridEntity(gridIndex)
+    if existingGridEntity ~= nil then
+        ____exports.removeGridEntity(nil, existingGridEntity)
+    end
     local position = room:GetGridPosition(gridIndex)
     local gridEntity = Isaac.GridSpawn(gridEntityType, variant, position, true)
     if gridEntityType == GridEntityType.GRID_PIT then
@@ -39,6 +43,8 @@ function ____exports.spawnGridEntityWithVariant(self, gridEntityType, variant, g
         if pit ~= nil then
             pit:UpdateCollision()
         end
+    elseif gridEntityType == GridEntityType.GRID_WALL then
+        gridEntity.CollisionClass = GridCollisionClass.COLLISION_WALL
     end
     return gridEntity
 end
@@ -185,6 +191,7 @@ function ____exports.spawnGridEntity(self, gridEntityType, gridIndex)
 end
 function ____exports.spawnVoidPortal(self, gridIndex)
     local voidPortal = ____exports.spawnGridEntityWithVariant(nil, GridEntityType.GRID_TRAPDOOR, 1, gridIndex)
+    voidPortal.VarData = 1
     local sprite = voidPortal:GetSprite()
     sprite:Load("gfx/grid/voidtrapdoor.anm2", true)
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.586",
+  "version": "1.0.590",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",