isaacscript-common 21.6.4 → 21.6.5

package/dist/index.rollup.d.ts

@@ -1864,7 +1864,7 @@ declare class CustomRevive extends Feature {
     private runInNFrames;
     constructor(preCustomRevive: PreCustomRevive, postCustomRevive: PostCustomRevive, runInNFrames: RunInNFrames);
     private postRender;
-    private postFamiliarInit;
+    private postFamiliarInitOneUp;
     private postNewRoomReordered;
     private postPEffectUpdateReordered;
     private checkWaitingForItemAnimation;

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 21.6.4
+isaacscript-common 21.6.5
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -30162,6 +30162,9 @@ function PostPlayerFatalDamage.prototype.____constructor(self)
         if not inBossRoomOf(nil, BossID.SATAN) then
             return nil
         end
+        if willPlayerRevive(nil, player) then
+            return nil
+        end
         local shouldSustainDeath = self:fire(
             player,
             0,
@@ -32691,13 +32694,11 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         end
         sfxManager:Stop(SoundEffect.ONE_UP)
     end
-    self.postFamiliarInit = function(____, familiar)
+    self.postFamiliarInitOneUp = function(____, familiar)
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
             return
         end
-        if familiar.Variant == FamiliarVariant.ONE_UP then
-            familiar:Remove()
-        end
+        familiar:Remove()
     end
     self.postNewRoomReordered = function()
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
@@ -32717,7 +32718,7 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         self:playerIsAboutToDie(player)
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_FAMILIAR_INIT, self.postFamiliarInit}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_FAMILIAR_INIT, self.postFamiliarInitOneUp, {FamiliarVariant.ONE_UP}}}
     self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}, {ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, self.postPlayerFatalDamage}, {ModCallbackCustom.PRE_BERSERK_DEATH, self.preBerserkDeath}}
     self.preCustomRevive = preCustomRevive
     self.postCustomRevive = postCustomRevive

package/dist/src/classes/callbacks/PostPlayerFatalDamage.d.ts

@@ -11,6 +11,10 @@ export declare class PostPlayerFatalDamage extends CustomCallback<ModCallbackCus
     };
     constructor();
     protected shouldFire: typeof shouldFirePlayer;
+    /**
+     * Using The Bible on Satan is one of the few ways to die without taking damage, so we need to
+     * handle this case.
+     */
     private preUseItemBible;
     private entityTakeDmgPlayer;
 }

package/dist/src/classes/callbacks/PostPlayerFatalDamage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostPlayerFatalDamage.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAWlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IACnF,CAAC;;YAEb,oEAAoE;;;MAGtE;;IAeF,UAAmB,UAAU,0BAAoB;IAIjD,OAAO,CAAC,eAAe,CA4BrB;IAGF,OAAO,CAAC,mBAAmB,CAyCzB;CACH"}
+{"version":3,"file":"PostPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostPlayerFatalDamage.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAWlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IACnF,CAAC;;YAEb,oEAAoE;;;MAGtE;;IAeF,UAAmB,UAAU,0BAAoB;IAEjD;;;OAGG;IAGH,OAAO,CAAC,eAAe,CA8BrB;IAGF,OAAO,CAAC,mBAAmB,CAyCzB;CACH"}

package/dist/src/classes/callbacks/PostPlayerFatalDamage.lua

@@ -39,6 +39,9 @@ function PostPlayerFatalDamage.prototype.____constructor(self)
         if not inBossRoomOf(nil, BossID.SATAN) then
             return nil
         end
+        if willPlayerRevive(nil, player) then
+            return nil
+        end
         local shouldSustainDeath = self:fire(
             player,
             0,

package/dist/src/classes/features/callbackLogic/CustomRevive.d.ts

@@ -25,7 +25,7 @@ export declare class CustomRevive extends Feature {
     private runInNFrames;
     constructor(preCustomRevive: PreCustomRevive, postCustomRevive: PostCustomRevive, runInNFrames: RunInNFrames);
     private postRender;
-    private postFamiliarInit;
+    private postFamiliarInitOneUp;
     private postNewRoomReordered;
     private postPEffectUpdateReordered;
     private checkWaitingForItemAnimation;

package/dist/src/classes/features/callbackLogic/CustomRevive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomRevive.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/CustomRevive.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,aAAK,iBAAiB;IACpB,QAAQ,IAAA;IAER;;;OAGG;IACH,2BAA2B,IAAA;IAE3B,0BAA0B,IAAA;CAC3B;AAED,qBAAa,YAAa,SAAQ,OAAO;IACvB,CAAC;;;;;;MAMf;IAEF,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAe;gBAGjC,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY;IA8B5B,OAAO,CAAC,UAAU,CAQhB;IAGF,OAAO,CAAC,gBAAgB,CAQtB;IAGF,OAAO,CAAC,oBAAoB,CAO1B;IAGF,OAAO,CAAC,0BAA0B,CAEhC;IAEF,OAAO,CAAC,4BAA4B;IA6CpC,OAAO,CAAC,qBAAqB,CAK3B;IAGF,OAAO,CAAC,eAAe,CAErB;IAEF;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,eAAe;CASxB"}
+{"version":3,"file":"CustomRevive.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/CustomRevive.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,aAAK,iBAAiB;IACpB,QAAQ,IAAA;IAER;;;OAGG;IACH,2BAA2B,IAAA;IAE3B,0BAA0B,IAAA;CAC3B;AAED,qBAAa,YAAa,SAAQ,OAAO;IACvB,CAAC;;;;;;MAMf;IAEF,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAe;gBAGjC,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY;IAkC5B,OAAO,CAAC,UAAU,CAQhB;IAIF,OAAO,CAAC,qBAAqB,CAM3B;IAGF,OAAO,CAAC,oBAAoB,CAO1B;IAGF,OAAO,CAAC,0BAA0B,CAEhC;IAEF,OAAO,CAAC,4BAA4B;IA6CpC,OAAO,CAAC,qBAAqB,CAK3B;IAGF,OAAO,CAAC,eAAe,CAErB;IAEF;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,eAAe;CASxB"}

package/dist/src/classes/features/callbackLogic/CustomRevive.lua

@@ -48,13 +48,11 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         end
         sfxManager:Stop(SoundEffect.ONE_UP)
     end
-    self.postFamiliarInit = function(____, familiar)
+    self.postFamiliarInitOneUp = function(____, familiar)
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
             return
         end
-        if familiar.Variant == FamiliarVariant.ONE_UP then
-            familiar:Remove()
-        end
+        familiar:Remove()
     end
     self.postNewRoomReordered = function()
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
@@ -74,7 +72,7 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         self:playerIsAboutToDie(player)
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_FAMILIAR_INIT, self.postFamiliarInit}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_FAMILIAR_INIT, self.postFamiliarInitOneUp, {FamiliarVariant.ONE_UP}}}
     self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}, {ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, self.postPlayerFatalDamage}, {ModCallbackCustom.PRE_BERSERK_DEATH, self.preBerserkDeath}}
     self.preCustomRevive = preCustomRevive
     self.postCustomRevive = postCustomRevive

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "21.6.4",
+  "version": "21.6.5",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/callbacks/PostPlayerFatalDamage.ts

@@ -46,6 +46,10 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
 
   protected override shouldFire = shouldFirePlayer;
 
+  /**
+   * Using The Bible on Satan is one of the few ways to die without taking damage, so we need to
+   * handle this case.
+   */
   // ModCallback.PRE_USE_ITEM (23)
   // CollectibleType.BIBLE (33)
   private preUseItemBible = (
@@ -56,12 +60,14 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
     _activeSlot: ActiveSlot,
     _customVarData: int,
   ): boolean | undefined => {
-    // Using The Bible on Satan is one of the few ways to die without taking damage, so we need to
-    // handle this case.
     if (!inBossRoomOf(BossID.SATAN)) {
       return undefined;
     }
 
+    if (willPlayerRevive(player)) {
+      return undefined;
+    }
+
     const shouldSustainDeath = this.fire(
       player,
       0,

package/src/classes/features/callbackLogic/CustomRevive.ts

@@ -63,7 +63,11 @@ export class CustomRevive extends Feature {
       [ModCallback.POST_RENDER, this.postRender],
 
       // 7
-      [ModCallback.POST_FAMILIAR_INIT, this.postFamiliarInit],
+      [
+        ModCallback.POST_FAMILIAR_INIT,
+        this.postFamiliarInitOneUp,
+        [FamiliarVariant.ONE_UP],
+      ],
     ];
 
     this.customCallbacksUsed = [
@@ -93,14 +97,13 @@ export class CustomRevive extends Feature {
   };
 
   // ModCallback.POST_FAMILIAR_INIT (7)
-  private postFamiliarInit = (familiar: EntityFamiliar): void => {
+  // FamiliarVariant.ONE_UP (41)
+  private postFamiliarInitOneUp = (familiar: EntityFamiliar): void => {
     if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
       return;
     }
 
-    if (familiar.Variant === FamiliarVariant.ONE_UP) {
-      familiar.Remove();
-    }
+    familiar.Remove();
   };
 
   // ModCallbackCustom.POST_NEW_ROOM_REORDERED