isaacscript-common 1.2.115 → 1.2.118

package/dist/callbacks/customRevive.lua

@@ -1,6 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
+local hasSubscriptions, postRender, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____collectibles = require("functions.collectibles")
@@ -27,15 +27,6 @@ function postRender(self)
     local sfx = SFXManager()
     sfx:Stop(SoundEffect.SOUND_1UP)
 end
-function postNewRoom(self)
-    if v.run.state == CustomReviveState.CHANGING_ROOMS then
-        v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
-    elseif v.run.state == CustomReviveState.WAITING_FOR_ITEM_ANIMATION then
-        v.run.state = CustomReviveState.DISABLED
-        v.run.revivalType = nil
-        v.run.dyingPlayerIndex = nil
-    end
-end
 function postPEffectUpdateReordered(self, player)
     checkWaitingForItemAnimation(nil, player)
 end
@@ -85,7 +76,7 @@ function playerIsAboutToDie(self, player)
     if revivalType == nil then
         return
     end
-    v.run.state = CustomReviveState.CHANGING_ROOMS
+    v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
     v.run.revivalType = revivalType
     v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
     player:AddCollectible(CollectibleType.COLLECTIBLE_1UP, 0, false)
@@ -95,15 +86,12 @@ end
 CustomReviveState = CustomReviveState or ({})
 CustomReviveState.DISABLED = 0
 CustomReviveState[CustomReviveState.DISABLED] = "DISABLED"
-CustomReviveState.CHANGING_ROOMS = 1
-CustomReviveState[CustomReviveState.CHANGING_ROOMS] = "CHANGING_ROOMS"
-CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 2
+CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 1
 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/features/disableSound.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Helper function to stop muting all sound effects and music.
+ *
+ * Use this function to set things back to normal after having used [[`disableAllSounds`]].
+ *
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
+ */
+export declare function enableAllSound(key: string): void;
+/**
+ * Helper function to disable all sound effects and music (by constantly musting them).
+ *
+ * Use the [[`enableAllSounds`]] helper function to set things back to normal.
+ *
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
+ */
+export declare function disableAllSound(key: string): void;

package/dist/features/disableSound.lua

@@ -0,0 +1,53 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local postRender, v
+local ____errors = require("errors")
+local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
+local ____sound = require("functions.sound")
+local stopAllSoundEffects = ____sound.stopAllSoundEffects
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+function postRender(self)
+    if v.run.disableSoundSet.size == 0 then
+        return
+    end
+    stopAllSoundEffects(nil)
+end
+local FEATURE_NAME = "sound disabler"
+local initialized = false
+local musicWasEnabled = false
+v = {run = {disableSoundSet = __TS__New(Set)}}
+function ____exports.disableSoundsInit(self, mod)
+    initialized = true
+    saveDataManager(nil, "disableInputs", v)
+    mod:AddCallback(ModCallbacks.MC_POST_RENDER, postRender)
+end
+function ____exports.enableAllSound(self, key)
+    if not initialized then
+        local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
+        error(msg)
+    end
+    if not v.run.disableSoundSet:has(key) then
+        return
+    end
+    v.run.disableSoundSet:delete(key)
+    if v.run.disableSoundSet.size == 0 and musicWasEnabled then
+        local musicManager = MusicManager()
+        musicManager:Enable()
+    end
+end
+function ____exports.disableAllSound(self, key)
+    if not initialized then
+        local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
+        error(msg)
+    end
+    if v.run.disableSoundSet.size == 0 then
+        local musicManager = MusicManager()
+        musicWasEnabled = musicManager:IsEnabled()
+    end
+    v.run.disableSoundSet:add(key)
+end
+return ____exports

package/dist/functions/player.d.ts

@@ -218,7 +218,7 @@ export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPl
  * This function does not validate whether or not the provided player is Tainted Magdalene; that
  * should be accomplished before invoking this function.
  */
-export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): 4 | 6;
+export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): number;
 /**
  * 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.

package/dist/functions/player.lua

@@ -504,8 +504,10 @@ function ____exports.getSoulHearts(self, player)
     return soulHearts - blackHearts
 end
 function ____exports.getTaintedMagdaleneNonTemporaryMaxHearts(self, player)
+    local maxHearts = player:GetMaxHearts()
     local hasBirthright = player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT)
-    return hasBirthright and 6 or 4
+    local maxNonTemporaryMaxHearts = hasBirthright and 6 or 4
+    return math.min(maxHearts, maxNonTemporaryMaxHearts)
 end
 function ____exports.getTotalCharge(self, player, activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export { forceNewLevelCallback, forceNewRoomCallback, } from "./callbacks/reorde
 export * from "./constants";
 export { deployJSONRoom, deployRandomJSONRoom, emptyRoom, } from "./features/deployJSONRoom";
 export { disableAllInputs, disableAllInputsExceptFor, disableMovementInputs, disableShootingInputs, enableAllInputs, enableAllInputsExceptFor, } from "./features/disableInputs";
+export { disableAllSound, enableAllSound } from "./features/disableSound";
 export { forgottenSwitch } from "./features/forgottenSwitch";
 export { getCollectibleItemPoolType } from "./features/getCollectibleItemPoolType";
 export * from "./features/isPonyActive";

package/dist/index.lua

@@ -39,6 +39,13 @@ do
     ____exports.enableAllInputs = enableAllInputs
     ____exports.enableAllInputsExceptFor = enableAllInputsExceptFor
 end
+do
+    local ____disableSound = require("features.disableSound")
+    local disableAllSound = ____disableSound.disableAllSound
+    local enableAllSound = ____disableSound.enableAllSound
+    ____exports.disableAllSound = disableAllSound
+    ____exports.enableAllSound = enableAllSound
+end
 do
     local ____forgottenSwitch = require("features.forgottenSwitch")
     local forgottenSwitch = ____forgottenSwitch.forgottenSwitch

package/dist/upgradeMod.lua

@@ -75,6 +75,8 @@ local ____deployJSONRoom = require("features.deployJSONRoom")
 local deployJSONRoomInit = ____deployJSONRoom.deployJSONRoomInit
 local ____disableInputs = require("features.disableInputs")
 local disableInputsInit = ____disableInputs.disableInputsInit
+local ____disableSound = require("features.disableSound")
+local disableSoundsInit = ____disableSound.disableSoundsInit
 local ____forgottenSwitch = require("features.forgottenSwitch")
 local forgottenSwitchInit = ____forgottenSwitch.forgottenSwitchInit
 local ____getCollectibleItemPoolType = require("features.getCollectibleItemPoolType")
@@ -134,6 +136,7 @@ end
 function initFeatures(self, mod)
     deployJSONRoomInit(nil, mod)
     disableInputsInit(nil, mod)
+    disableSoundsInit(nil, mod)
     forgottenSwitchInit(nil, mod)
     getCollectibleItemPoolTypeInit(nil, mod)
     preventCollectibleRotateInit(nil, mod)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.115",
+  "version": "1.2.118",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.2",
-    "isaac-typescript-definitions": "^1.0.358",
+    "isaac-typescript-definitions": "^1.0.359",
     "isaacscript-lint": "^1.0.84",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",