isaacscript-common 71.1.0 → 71.2.1

package/dist/index.rollup.d.ts

@@ -3749,8 +3749,8 @@ declare class DisableInputs extends Feature {
     /**
      * Helper function to disable specific inputs, like opening the console.
      *
-     * This function is variadic, meaning that you can pass as many inputs as you want to disable. (To
-     * disable all inputs, see the `disableAllInputs` function.
+     * This function is variadic, meaning that you can specify as many inputs as you want to disable.
+     * (To disable all inputs, see the `disableAllInputs` function.
      *
      * Use the `enableAllInputs` helper function to set things back to normal.
      *
@@ -8082,7 +8082,15 @@ export declare function hasCollectible(player: EntityPlayer, ...collectibleTypes
  */
 export declare function hasCollectibleInActiveSlot(player: EntityPlayer, collectibleType: CollectibleType, ...activeSlots: ActiveSlot[]): boolean;
 
-export declare function hasCurse(curse: LevelCurse): boolean;
+/**
+ * Helper function to check if the current floor has a particular curse.
+ *
+ * This function is variadic, meaning that you can specify as many curses as you want. The function
+ * will return true if the level has one or more of the curses.
+ *
+ * Under the hood, this function uses the `Level.GetCurses` method.
+ */
+export declare function hasCurse(...curses: LevelCurse[]): boolean;
 
 /**
  * Helper function to check if the current room has one or more doors that lead to the given room

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 71.1.0
+isaacscript-common 71.2.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -42173,6 +42173,32 @@ function RunNextRoom.prototype.runNextRoom(self, func)
     ____v_run_queuedFunctions_0[#____v_run_queuedFunctions_0 + 1] = func
 end
 __TS__DecorateLegacy({Exported}, RunNextRoom.prototype, "runNextRoom", true)
+return ____exports
+ end,
+["src.functions.curses"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__ArraySome = ____lualib.__TS__ArraySome
+local ____exports = {}
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
+local ____flag = require("src.functions.flag")
+local hasFlag = ____flag.hasFlag
+function ____exports.getCurseIDByName(self, name)
+    local curseID = Isaac.GetCurseIdByName(name)
+    if curseID == -1 then
+        error(("Failed to get the curse ID corresponding to the curse name of \"" .. tostring(curseID)) .. "\". Does this name match what you put in the \"content/curses.xml\" file?")
+    end
+    return 1 << curseID - 1
+end
+function ____exports.hasCurse(self, ...)
+    local curses = {...}
+    local level = game:GetLevel()
+    local levelCurses = level:GetCurses()
+    return __TS__ArraySome(
+        curses,
+        function(____, curse) return hasFlag(nil, levelCurses, curse) end
+    )
+end
 return ____exports
  end,
 ["src.functions.nextStage"] = function(...) 
@@ -42180,10 +42206,13 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local GameStateFlag = ____isaac_2Dtypescript_2Ddefinitions.GameStateFlag
 local GridRoom = ____isaac_2Dtypescript_2Ddefinitions.GridRoom
+local LevelCurse = ____isaac_2Dtypescript_2Ddefinitions.LevelCurse
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local StageType = ____isaac_2Dtypescript_2Ddefinitions.StageType
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
+local ____curses = require("src.functions.curses")
+local hasCurse = ____curses.hasCurse
 local ____roomData = require("src.functions.roomData")
 local getRoomGridIndex = ____roomData.getRoomGridIndex
 local ____stage = require("src.functions.stage")
@@ -42223,7 +42252,7 @@ function ____exports.getNextStage(self)
                 if repentanceStage then
                     return asNumber(nil, stage) + 1
                 end
-                if stage == LevelStage.DEPTHS_2 then
+                if stage == LevelStage.DEPTHS_2 or stage == LevelStage.DEPTHS_1 and hasCurse(nil, LevelCurse.LABYRINTH) then
                     return LevelStage.DEPTHS_2
                 end
                 return stage
@@ -55083,26 +55112,6 @@ function ____exports.renderChargeBar(self, sprites, position, normalCharges, bat
     sprites.meterBattery:Render(position, batteryChargesClamp)
     sprites.lines:Render(position)
 end
-return ____exports
- end,
-["src.functions.curses"] = function(...) 
-local ____exports = {}
-local ____cachedClasses = require("src.core.cachedClasses")
-local game = ____cachedClasses.game
-local ____flag = require("src.functions.flag")
-local hasFlag = ____flag.hasFlag
-function ____exports.getCurseIDByName(self, name)
-    local curseID = Isaac.GetCurseIdByName(name)
-    if curseID == -1 then
-        error(("Failed to get the curse ID corresponding to the curse name of \"" .. tostring(curseID)) .. "\". Does this name match what you put in the \"content/curses.xml\" file?")
-    end
-    return 1 << curseID - 1
-end
-function ____exports.hasCurse(self, curse)
-    local level = game:GetLevel()
-    local curses = level:GetCurses()
-    return hasFlag(nil, curses, curse)
-end
 return ____exports
  end,
 ["src.functions.decorators"] = function(...) 

package/dist/src/classes/features/other/DisableInputs.d.ts

@@ -27,8 +27,8 @@ export declare class DisableInputs extends Feature {
     /**
      * Helper function to disable specific inputs, like opening the console.
      *
-     * This function is variadic, meaning that you can pass as many inputs as you want to disable. (To
-     * disable all inputs, see the `disableAllInputs` function.
+     * This function is variadic, meaning that you can specify as many inputs as you want to disable.
+     * (To disable all inputs, see the `disableAllInputs` function.
      *
      * Use the `enableAllInputs` helper function to set things back to normal.
      *

package/dist/src/functions/curses.d.ts

@@ -8,5 +8,13 @@ import type { LevelCurse } from "isaac-typescript-definitions";
  * a bit flag.
  */
 export declare function getCurseIDByName(name: string): LevelCurse;
-export declare function hasCurse(curse: LevelCurse): boolean;
+/**
+ * Helper function to check if the current floor has a particular curse.
+ *
+ * This function is variadic, meaning that you can specify as many curses as you want. The function
+ * will return true if the level has one or more of the curses.
+ *
+ * Under the hood, this function uses the `Level.GetCurses` method.
+ */
+export declare function hasCurse(...curses: LevelCurse[]): boolean;
 //# sourceMappingURL=curses.d.ts.map

package/dist/src/functions/curses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"curses.d.ts","sourceRoot":"","sources":["../../../src/functions/curses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI/D;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAWzD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAInD"}
+{"version":3,"file":"curses.d.ts","sourceRoot":"","sources":["../../../src/functions/curses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI/D;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAWzD;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAKzD"}

package/dist/src/functions/curses.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ArraySome = ____lualib.__TS__ArraySome
 local ____exports = {}
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
@@ -16,9 +18,19 @@ function ____exports.getCurseIDByName(self, name)
     end
     return 1 << curseID - 1
 end
-function ____exports.hasCurse(self, curse)
+--- Helper function to check if the current floor has a particular curse.
+-- 
+-- This function is variadic, meaning that you can specify as many curses as you want. The function
+-- will return true if the level has one or more of the curses.
+-- 
+-- Under the hood, this function uses the `Level.GetCurses` method.
+function ____exports.hasCurse(self, ...)
+    local curses = {...}
     local level = game:GetLevel()
-    local curses = level:GetCurses()
-    return hasFlag(nil, curses, curse)
+    local levelCurses = level:GetCurses()
+    return __TS__ArraySome(
+        curses,
+        function(____, curse) return hasFlag(nil, levelCurses, curse) end
+    )
 end
 return ____exports

package/dist/src/functions/nextStage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextStage.d.ts","sourceRoot":"","sources":["../../../src/functions/nextStage.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAUtC;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,UAAU,CAyFzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,UAAQ,GAAG,SAAS,CAiF3D"}
+{"version":3,"file":"nextStage.d.ts","sourceRoot":"","sources":["../../../src/functions/nextStage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EACV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAWtC;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,UAAU,CA4FzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,UAAQ,GAAG,SAAS,CAiF3D"}

package/dist/src/functions/nextStage.lua

@@ -2,10 +2,13 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local GameStateFlag = ____isaac_2Dtypescript_2Ddefinitions.GameStateFlag
 local GridRoom = ____isaac_2Dtypescript_2Ddefinitions.GridRoom
+local LevelCurse = ____isaac_2Dtypescript_2Ddefinitions.LevelCurse
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local StageType = ____isaac_2Dtypescript_2Ddefinitions.StageType
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
+local ____curses = require("src.functions.curses")
+local hasCurse = ____curses.hasCurse
 local ____roomData = require("src.functions.roomData")
 local getRoomGridIndex = ____roomData.getRoomGridIndex
 local ____stage = require("src.functions.stage")
@@ -51,7 +54,7 @@ function ____exports.getNextStage(self)
                 if repentanceStage then
                     return asNumber(nil, stage) + 1
                 end
-                if stage == LevelStage.DEPTHS_2 then
+                if stage == LevelStage.DEPTHS_2 or stage == LevelStage.DEPTHS_1 and hasCurse(nil, LevelCurse.LABYRINTH) then
                     return LevelStage.DEPTHS_2
                 end
                 return stage

package/package.json

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

package/src/classes/features/other/DisableInputs.ts

@@ -146,8 +146,8 @@ export class DisableInputs extends Feature {
   /**
    * Helper function to disable specific inputs, like opening the console.
    *
-   * This function is variadic, meaning that you can pass as many inputs as you want to disable. (To
-   * disable all inputs, see the `disableAllInputs` function.
+   * This function is variadic, meaning that you can specify as many inputs as you want to disable.
+   * (To disable all inputs, see the `disableAllInputs` function.
    *
    * Use the `enableAllInputs` helper function to set things back to normal.
    *

package/src/functions/curses.ts

@@ -23,8 +23,17 @@ export function getCurseIDByName(name: string): LevelCurse {
   return (1 << (curseID - 1)) as LevelCurse;
 }
 
-export function hasCurse(curse: LevelCurse): boolean {
+/**
+ * Helper function to check if the current floor has a particular curse.
+ *
+ * This function is variadic, meaning that you can specify as many curses as you want. The function
+ * will return true if the level has one or more of the curses.
+ *
+ * Under the hood, this function uses the `Level.GetCurses` method.
+ */
+export function hasCurse(...curses: LevelCurse[]): boolean {
   const level = game.GetLevel();
-  const curses = level.GetCurses();
-  return hasFlag(curses, curse);
+  const levelCurses = level.GetCurses();
+
+  return curses.some((curse) => hasFlag(levelCurses, curse));
 }

package/src/functions/nextStage.ts

@@ -1,10 +1,12 @@
 import {
   GameStateFlag,
   GridRoom,
+  LevelCurse,
   LevelStage,
   StageType,
 } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
+import { hasCurse } from "./curses";
 import { getRoomGridIndex } from "./roomData";
 import {
   calculateStageType,
@@ -56,7 +58,10 @@ export function getNextStage(): LevelStage {
         return asNumber(stage) + 1;
       }
 
-      if (stage === LevelStage.DEPTHS_2) {
+      if (
+        stage === LevelStage.DEPTHS_2 ||
+        (stage === LevelStage.DEPTHS_1 && hasCurse(LevelCurse.LABYRINTH))
+      ) {
         // From Depths 2 to Mausoleum 2 through the strange door.
         return LevelStage.DEPTHS_2;
       }