isaacscript-common 1.0.582 → 1.0.586

package/dist/callbacks/customRevive.lua

@@ -1,12 +1,12 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, postPlayerFatalDamage, CustomReviveState, v
+local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, postPEffectUpdateReorderedWaitingForBerserkToEnd, postPEffectUpdateReorderedWaitingForItemAnimation, postPlayerFatalDamage, CustomReviveState, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____collectibles = require("functions.collectibles")
 local removeCollectibleFromItemTracker = ____collectibles.removeCollectibleFromItemTracker
 local ____entity = require("functions.entity")
-local removeAllMatchingEntities = ____entity.removeAllMatchingEntities
+local removeAllFamiliars = ____entity.removeAllFamiliars
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
@@ -37,6 +37,29 @@ function postNewRoom(self)
     end
 end
 function postPEffectUpdateReordered(self, player)
+    postPEffectUpdateReorderedWaitingForBerserkToEnd(nil, player)
+    postPEffectUpdateReorderedWaitingForItemAnimation(nil, player)
+end
+function postPEffectUpdateReorderedWaitingForBerserkToEnd(self, player)
+    if v.run.state ~= CustomReviveState.WAITING_FOR_BERSERK_TO_END then
+        return
+    end
+    if v.run.dyingPlayerIndex == nil then
+        return
+    end
+    local playerIndex = getPlayerIndex(nil, player)
+    local effects = player:GetEffects()
+    if playerIndex ~= v.run.dyingPlayerIndex then
+        return
+    end
+    removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
+    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
+    if isBerserk then
+        return
+    end
+    v.run.state = CustomReviveState.CHANGING_ROOMS
+end
+function postPEffectUpdateReorderedWaitingForItemAnimation(self, player)
     if v.run.state ~= CustomReviveState.WAITING_FOR_ITEM_ANIMATION then
         return
     end
@@ -73,19 +96,24 @@ function postPlayerFatalDamage(self, player)
     if revivalType == nil then
         return
     end
-    v.run.state = CustomReviveState.CHANGING_ROOMS
+    local effects = player:GetEffects()
+    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
+    local newState = isBerserk and CustomReviveState.WAITING_FOR_BERSERK_TO_END or CustomReviveState.CHANGING_ROOMS
+    v.run.state = newState
     v.run.revivalType = revivalType
     v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
     player:AddCollectible(CollectibleType.COLLECTIBLE_1UP, 0, false)
-    removeAllMatchingEntities(nil, EntityType.ENTITY_FAMILIAR, FamiliarVariant.ONE_UP)
+    removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
     removeCollectibleFromItemTracker(nil, CollectibleType.COLLECTIBLE_1UP)
 end
 CustomReviveState = CustomReviveState or ({})
 CustomReviveState.DISABLED = 0
 CustomReviveState[CustomReviveState.DISABLED] = "DISABLED"
-CustomReviveState.CHANGING_ROOMS = 1
+CustomReviveState.WAITING_FOR_BERSERK_TO_END = 1
+CustomReviveState[CustomReviveState.WAITING_FOR_BERSERK_TO_END] = "WAITING_FOR_BERSERK_TO_END"
+CustomReviveState.CHANGING_ROOMS = 2
 CustomReviveState[CustomReviveState.CHANGING_ROOMS] = "CHANGING_ROOMS"
-CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 2
+CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 3
 CustomReviveState[CustomReviveState.WAITING_FOR_ITEM_ANIMATION] = "WAITING_FOR_ITEM_ANIMATION"
 v = {run = {state = CustomReviveState.DISABLED, revivalType = nil, dyingPlayerIndex = nil}}
 function ____exports.customReviveCallbacksInit(self, mod)

package/dist/functions/gridEntity.d.ts

@@ -93,6 +93,25 @@ export declare function removeGridEntity(gridEntity: GridEntity, updateRoom?: bo
  * For more information, see the documentation for the `clearSprite()` helper function.
  */
 export declare function setGridEntityInvisible(gridEntity: GridEntity): void;
+/**
+ * Helper function to spawn a giant poop. This is performed by spawning each of the four quadrant
+ * grid entities in the appropriate positions.
+ */
 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.
+ */
 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.
+ */
 export declare function spawnGridEntityWithVariant(gridEntityType: GridEntityType, variant: int, gridIndex: int): GridEntity;
+/**
+ * Helper function to spawn a Void Portal. This is more complicated than simply spawning a trapdoor
+ * with the appropriate variant, as the game does not give it the correct sprite automatically.
+ */
+export declare function spawnVoidPortal(gridIndex: int): void;

package/dist/functions/gridEntity.lua

@@ -183,4 +183,9 @@ end
 function ____exports.spawnGridEntity(self, gridEntityType, gridIndex)
     return ____exports.spawnGridEntityWithVariant(nil, gridEntityType, 0, gridIndex)
 end
+function ____exports.spawnVoidPortal(self, gridIndex)
+    local voidPortal = ____exports.spawnGridEntityWithVariant(nil, GridEntityType.GRID_TRAPDOOR, 1, gridIndex)
+    local sprite = voidPortal:GetSprite()
+    sprite:Load("gfx/grid/voidtrapdoor.anm2", true)
+end
 return ____exports

package/dist/functions/playerHealth.lua

@@ -27,6 +27,8 @@ function ____exports.getPlayerHealth(self, player)
     local rottenHearts = player:GetRottenHearts()
     local brokenHearts = player:GetBrokenHearts()
     local subPlayer = player:GetSubPlayer()
+    local soulCharges = player:GetEffectiveSoulCharge()
+    local bloodCharges = player:GetEffectiveBloodCharge()
     if character == PlayerType.PLAYER_THEFORGOTTEN and subPlayer ~= nil then
         maxHearts = boneHearts * 2
         boneHearts = 0
@@ -71,7 +73,9 @@ function ____exports.getPlayerHealth(self, player)
         boneHearts = boneHearts,
         goldenHearts = goldenHearts,
         rottenHearts = rottenHearts,
-        brokenHearts = brokenHearts
+        brokenHearts = brokenHearts,
+        soulCharges = soulCharges,
+        bloodCharges = bloodCharges
     }
 end
 function ____exports.setPlayerHealth(self, player, playerHealth)
@@ -110,5 +114,10 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
     player:AddHearts(playerHealth.hearts)
     player:AddGoldenHearts(playerHealth.goldenHearts)
     player:AddBrokenHearts(playerHealth.brokenHearts)
+    if character == PlayerType.PLAYER_BETHANY then
+        player:SetSoulCharge(playerHealth.soulCharges)
+    elseif character == PlayerType.PLAYER_BETHANY_B then
+        player:SetBloodCharge(playerHealth.bloodCharges)
+    end
 end
 return ____exports

package/dist/functions/position.d.ts

@@ -5,5 +5,9 @@
  * with heaven doors and partially overlap with players, if the thing being spawned is bigger than a
  * tile (like a Blood Donation Machine). Use this function instead if you want to account for those
  * specific situations.
+ *
+ * @param startingPosition The position to start searching from. If this position is not overlapping
+ * with anything, then it will be returned.
+ * @param avoidActiveEntities Optional. False by default.
  */
-export declare function findFreePosition(startingPosition: Vector): Vector;
+export declare function findFreePosition(startingPosition: Vector, avoidActiveEntities?: boolean): Vector;

package/dist/functions/position.lua

@@ -7,7 +7,10 @@ local anyEntityCloserThan = ____entity.anyEntityCloserThan
 local getEffects = ____entity.getEffects
 local ____player = require("functions.player")
 local getPlayerCloserThan = ____player.getPlayerCloserThan
-function ____exports.findFreePosition(self, startingPosition)
+function ____exports.findFreePosition(self, startingPosition, avoidActiveEntities)
+    if avoidActiveEntities == nil then
+        avoidActiveEntities = false
+    end
     local game = Game()
     local room = game:GetRoom()
     local heavenDoors = getEffects(nil, EffectVariant.HEAVEN_LIGHT_DOOR, 0)
@@ -15,7 +18,7 @@ function ____exports.findFreePosition(self, startingPosition)
         local i = 0
         while i < 100 do
             do
-                local position = room:FindFreePickupSpawnPosition(startingPosition, i)
+                local position = room:FindFreePickupSpawnPosition(startingPosition, i, avoidActiveEntities)
                 local closePlayer = getPlayerCloserThan(nil, position, DISTANCE_OF_GRID_TILE)
                 if closePlayer ~= nil then
                     goto __continue3

package/dist/types/PlayerHealth.d.ts

@@ -9,4 +9,6 @@ export interface PlayerHealth {
     goldenHearts: int;
     rottenHearts: int;
     brokenHearts: int;
+    soulCharges: int;
+    bloodCharges: int;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.582",
+  "version": "1.0.586",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.323",
+    "isaac-typescript-definitions": "^1.0.329",
     "isaacscript-lint": "^1.0.77",
     "typedoc": "^0.22.10",
     "typescript": "^4.5.4",