isaacscript-common 1.2.147 → 1.2.150

package/dist/callbacks/customRevive.lua

@@ -1,6 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local hasSubscriptions, postRender, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
+local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, logStateChanged, DEBUG, CustomReviveState, v
 local ____cachedClasses = require("cachedClasses")
 local sfxManager = ____cachedClasses.sfxManager
 local ____runInNFrames = require("features.runInNFrames")
@@ -11,6 +11,8 @@ local ____collectibles = require("functions.collectibles")
 local removeCollectibleFromItemTracker = ____collectibles.removeCollectibleFromItemTracker
 local ____familiars = require("functions.familiars")
 local removeAllFamiliars = ____familiars.removeAllFamiliars
+local ____log = require("functions.log")
+local log = ____log.log
 local ____player = require("functions.player")
 local getPlayerFromIndex = ____player.getPlayerFromIndex
 local getPlayerIndex = ____player.getPlayerIndex
@@ -31,6 +33,13 @@ function postRender(self)
     end
     sfxManager:Stop(SoundEffect.SOUND_1UP)
 end
+function postNewRoom(self)
+    if v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
+        return
+    end
+    v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
+    logStateChanged(nil)
+end
 function postPEffectUpdateReordered(self, player)
     checkWaitingForItemAnimation(nil, player)
 end
@@ -62,6 +71,7 @@ function checkWaitingForItemAnimation(self, player)
     v.run.state = CustomReviveState.DISABLED
     v.run.revivalType = nil
     v.run.dyingPlayerIndex = nil
+    logStateChanged(nil)
 end
 function postPlayerFatalDamage(self, player)
     if not hasSubscriptions(nil) then
@@ -80,9 +90,10 @@ function playerIsAboutToDie(self, player)
     if revivalType == nil then
         return
     end
-    v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
+    v.run.state = CustomReviveState.WAITING_FOR_ROOM_TRANSITION
     v.run.revivalType = revivalType
     v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
+    logStateChanged(nil)
     player:AddCollectible(CollectibleType.COLLECTIBLE_1UP, 0, false)
     removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
     removeCollectibleFromItemTracker(nil, CollectibleType.COLLECTIBLE_1UP)
@@ -108,15 +119,24 @@ function playerIsAboutToDie(self, player)
         end
     )
 end
+function logStateChanged(self)
+    if DEBUG then
+        log(((("Custom revive state changed: " .. CustomReviveState[v.run.state]) .. " (") .. tostring(v.run.state)) .. ")")
+    end
+end
+DEBUG = false
 CustomReviveState = CustomReviveState or ({})
 CustomReviveState.DISABLED = 0
 CustomReviveState[CustomReviveState.DISABLED] = "DISABLED"
-CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 1
+CustomReviveState.WAITING_FOR_ROOM_TRANSITION = 1
+CustomReviveState[CustomReviveState.WAITING_FOR_ROOM_TRANSITION] = "WAITING_FOR_ROOM_TRANSITION"
+CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 2
 CustomReviveState[CustomReviveState.WAITING_FOR_ITEM_ANIMATION] = "WAITING_FOR_ITEM_ANIMATION"
 v = {run = {state = CustomReviveState.DISABLED, revivalType = nil, dyingPlayerIndex = nil}}
 function ____exports.customReviveCallbacksInit(self, mod)
     saveDataManager(nil, "customRevive", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_RENDER, postRender)
+    mod:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, postNewRoom)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PEFFECT_UPDATE_REORDERED, postPEffectUpdateReordered)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE, postPlayerFatalDamage)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_PRE_BERSERK_DEATH, preBerserkDeath)

package/dist/functions/charge.d.ts

@@ -43,8 +43,9 @@ export declare function addRoomClearCharge(player: EntityPlayer, ignoreBigRoomDo
 export declare function addRoomClearChargeToSlot(player: EntityPlayer, activeSlot: ActiveSlot, ignoreBigRoomDoubleCharge?: boolean): void;
 /**
  * Helper function to get the combined normal charge and the battery charge for the player's active
- * item. Use this to avoid having to manually retrieve these two values and add them together.
+ * item. This is useful because you have to add these two values together when setting the active
+ * charge.
  */
-export declare function getActiveCharge(player: EntityPlayer): int;
+export declare function getTotalCharge(player: EntityPlayer, activeSlot: ActiveSlot): int;
 export declare function isActiveSlotDoubleCharged(player: EntityPlayer, activeSlot: ActiveSlot): boolean;
 export declare function playChargeSoundEffect(player: EntityPlayer, activeSlot: ActiveSlot): void;

package/dist/functions/charge.lua

@@ -8,7 +8,6 @@ local ____collectibles = require("functions.collectibles")
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
 local ____player = require("functions.player")
 local getPlayers = ____player.getPlayers
-local getTotalCharge = ____player.getTotalCharge
 function ____exports.addRoomClearCharge(self, player, ignoreBigRoomDoubleCharge)
     if ignoreBigRoomDoubleCharge == nil then
         ignoreBigRoomDoubleCharge = false
@@ -25,7 +24,7 @@ function ____exports.addRoomClearChargeToSlot(self, player, activeSlot, ignoreBi
         return
     end
     local hud = game:GetHUD()
-    local totalCharge = getTotalCharge(nil, player, activeSlot)
+    local totalCharge = ____exports.getTotalCharge(nil, player, activeSlot)
     local chargesToAdd = getNumChargesToAdd(nil, player, activeSlot, ignoreBigRoomDoubleCharge)
     local modifiedChargesToAdd = getNumChargesWithAAAModifier(nil, player, activeSlot, chargesToAdd)
     local newCharge = totalCharge + modifiedChargesToAdd
@@ -61,6 +60,11 @@ function getNumChargesToAdd(self, player, activeSlot, ignoreBigRoomDoubleCharge)
     end
     return 1
 end
+function ____exports.getTotalCharge(self, player, activeSlot)
+    local activeCharge = player:GetActiveCharge(activeSlot)
+    local batteryCharge = player:GetBatteryCharge(activeSlot)
+    return activeCharge + batteryCharge
+end
 function getNumChargesWithAAAModifier(self, player, activeSlot, chargesToAdd)
     local activeItem = player:GetActiveItem(activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
@@ -105,11 +109,6 @@ function ____exports.addRoomClearCharges(self, ignoreBigRoomDoubleCharge)
         ____exports.addRoomClearCharge(nil, player, ignoreBigRoomDoubleCharge)
     end
 end
-function ____exports.getActiveCharge(self, player)
-    local charge = player:GetActiveCharge()
-    local batteryCharge = player:GetBatteryCharge()
-    return charge + batteryCharge
-end
 function ____exports.isActiveSlotDoubleCharged(self, player, activeSlot)
     local collectibleType = player:GetActiveItem(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)

package/dist/functions/player.d.ts

@@ -239,11 +239,6 @@ export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPl
  * should be accomplished before invoking this function.
  */
 export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): int;
-/**
- * Helper function to return the active charge and the battery charge combined. This is useful
- * because you are not able to set the battery charge directly.
- */
-export declare function getTotalCharge(player: EntityPlayer, activeSlot: ActiveSlot): int;
 /**
  * Returns the total number of collectibles amongst all players. For example, if player 1 has 1 Sad
  * Onion and player 2 has 2 Sad Onions, then this function would return 3.
@@ -259,6 +254,7 @@ export declare function hasLostCurse(player: EntityPlayer): boolean;
  * items. (Only Tainted Forgotten can pick up items.)
  */
 export declare function hasOpenActiveItemSlot(player: EntityPlayer): boolean;
+export declare function isActiveSlotEmpty(player: EntityPlayer, activeSlot: ActiveSlot): boolean;
 /**
  * Helper function for detecting when a player is Bethany or Tainted Bethany. This is useful if you
  * need to adjust UI elements to account for Bethany's soul charges or Tainted Bethany's blood

package/dist/functions/player.lua

@@ -471,11 +471,6 @@ function ____exports.getTaintedMagdaleneNonTemporaryMaxHearts(self, player)
     local maxNonTemporaryMaxHearts = hasBirthright and 6 or 4
     return math.min(maxHearts, maxNonTemporaryMaxHearts)
 end
-function ____exports.getTotalCharge(self, player, activeSlot)
-    local activeCharge = player:GetActiveCharge(activeSlot)
-    local batteryCharge = player:GetBatteryCharge(activeSlot)
-    return activeCharge + batteryCharge
-end
 function ____exports.getTotalPlayerCollectibles(self, collectibleType)
     local players = ____exports.getPlayers(nil)
     local numCollectiblesArray = __TS__ArrayMap(
@@ -501,6 +496,10 @@ function ____exports.hasOpenActiveItemSlot(self, player)
     end
     return activeItemPrimary == CollectibleType.COLLECTIBLE_NULL
 end
+function ____exports.isActiveSlotEmpty(self, player, activeSlot)
+    local activeCollectibleType = player:GetActiveItem(activeSlot)
+    return activeCollectibleType == CollectibleType.COLLECTIBLE_NULL
+end
 function ____exports.isBethany(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_BETHANY or character == PlayerType.PLAYER_BETHANY_B

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.147",
+  "version": "1.2.150",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.2",
     "isaac-typescript-definitions": "^1.0.364",
-    "isaacscript-lint": "^1.0.88",
+    "isaacscript-lint": "^1.0.89",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",
     "typescript": "4.5.5"