isaacscript-common 19.0.0 → 19.0.2

package/dist/index.d.ts

@@ -4563,7 +4563,7 @@ export declare function getDoorsToRoomIndex(...roomGridIndex: int[]): GridEntity
  * the third level of the run, but the game considers it to have a stage of 2. This function will
  * consider Downpour 2 to have a stage of 3.
  */
-export declare function getEffectiveStage(): int;
+export declare function getEffectiveStage(): LevelStage;
 
 /**
  * Helper function to get all of the effects in the room.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 19.0.0
+isaacscript-common 19.0.2
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -25540,7 +25540,7 @@ end
 function ____exports.onFirstFloor(self)
     local effectiveStage = ____exports.getEffectiveStage(nil)
     local isOnAscent = ____exports.onAscent(nil)
-    return effectiveStage == 1 and not isOnAscent
+    return effectiveStage == LevelStage.BASEMENT_1 and not isOnAscent
 end
 function ____exports.onSheol(self)
     local level = game:GetLevel()
@@ -25550,7 +25550,7 @@ function ____exports.onSheol(self)
 end
 function ____exports.onStageWithNaturalDevilRoom(self)
     local effectiveStage = ____exports.getEffectiveStage(nil)
-    return inRange(nil, effectiveStage, 2, 8)
+    return inRange(nil, effectiveStage, 2, 8) and effectiveStage ~= LevelStage.BLUE_WOMB
 end
 function ____exports.setStage(self, stage, stageType, reseed)
     if reseed == nil then

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

@@ -14,7 +14,7 @@ export declare function calculateStageTypeRepentance(stage: LevelStage): StageTy
  * the third level of the run, but the game considers it to have a stage of 2. This function will
  * consider Downpour 2 to have a stage of 3.
  */
-export declare function getEffectiveStage(): int;
+export declare function getEffectiveStage(): LevelStage;
 /**
  * Helper function to get the English name of the level. For example, "Caves 1".
  *

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

@@ -1 +1 @@
-{"version":3,"file":"stage.d.ts","sourceRoot":"","sources":["../../../src/functions/stage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,QAAQ,EACR,SAAS,EACV,MAAM,8BAA8B,CAAC;AAStC;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CA6B/D;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CAmBzE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,GAAG,CASvC;AAGD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,CAAC,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,CAaR;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAG3E;AAED,6CAA6C;AAC7C,wBAAgB,QAAQ,IAAI,UAAU,CAIrC;AAED,iDAAiD;AACjD,wBAAgB,YAAY,IAAI,SAAS,CAIxC;AAED,8FAA8F;AAC9F,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAIvE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAI/D;AAED,wBAAgB,QAAQ,IAAI,OAAO,CAElC;AAED,wBAAgB,WAAW,IAAI,OAAO,CASrC;AAED,wBAAgB,OAAO,IAAI,OAAO,CASjC;AAED,wBAAgB,UAAU,IAAI,OAAO,CAQpC;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAUtC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAKtC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAK3C;AAED,wBAAgB,OAAO,IAAI,OAAO,CAQjC;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAGrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,UAAQ,GACb,IAAI,CAUN;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAE9D"}
+{"version":3,"file":"stage.d.ts","sourceRoot":"","sources":["../../../src/functions/stage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,QAAQ,EACR,SAAS,EACV,MAAM,8BAA8B,CAAC;AAStC;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CA6B/D;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CAmBzE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,UAAU,CAS9C;AAGD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,CAAC,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,CAaR;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAG3E;AAED,6CAA6C;AAC7C,wBAAgB,QAAQ,IAAI,UAAU,CAIrC;AAED,iDAAiD;AACjD,wBAAgB,YAAY,IAAI,SAAS,CAIxC;AAED,8FAA8F;AAC9F,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAIvE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAI/D;AAED,wBAAgB,QAAQ,IAAI,OAAO,CAElC;AAED,wBAAgB,WAAW,IAAI,OAAO,CASrC;AAED,wBAAgB,OAAO,IAAI,OAAO,CASjC;AAED,wBAAgB,UAAU,IAAI,OAAO,CAQpC;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAUtC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAKtC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAK3C;AAED,wBAAgB,OAAO,IAAI,OAAO,CAQjC;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAKrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,UAAQ,GACb,IAAI,CAUN;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAE9D"}

package/dist/src/functions/stage.lua

@@ -160,7 +160,7 @@ end
 function ____exports.onFirstFloor(self)
     local effectiveStage = ____exports.getEffectiveStage(nil)
     local isOnAscent = ____exports.onAscent(nil)
-    return effectiveStage == 1 and not isOnAscent
+    return effectiveStage == LevelStage.BASEMENT_1 and not isOnAscent
 end
 function ____exports.onSheol(self)
     local level = game:GetLevel()
@@ -172,7 +172,7 @@ end
 -- Devil Room or Angel Room after killing the boss.
 function ____exports.onStageWithNaturalDevilRoom(self)
     local effectiveStage = ____exports.getEffectiveStage(nil)
-    return inRange(nil, effectiveStage, 2, 8)
+    return inRange(nil, effectiveStage, 2, 8) and effectiveStage ~= LevelStage.BLUE_WOMB
 end
 --- Helper function to warp to a new stage/level.
 -- 

package/package.json

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

package/src/functions/stage.ts

@@ -77,7 +77,7 @@ export function calculateStageTypeRepentance(stage: LevelStage): StageType {
  * the third level of the run, but the game considers it to have a stage of 2. This function will
  * consider Downpour 2 to have a stage of 3.
  */
-export function getEffectiveStage(): int {
+export function getEffectiveStage(): LevelStage {
   const level = game.GetLevel();
   const stage = level.GetStage();
 
@@ -224,7 +224,7 @@ export function onFirstFloor(): boolean {
   const effectiveStage = getEffectiveStage();
   const isOnAscent = onAscent();
 
-  return effectiveStage === 1 && !isOnAscent;
+  return effectiveStage === LevelStage.BASEMENT_1 && !isOnAscent;
 }
 
 /**
@@ -254,7 +254,9 @@ export function onSheol(): boolean {
  */
 export function onStageWithNaturalDevilRoom(): boolean {
   const effectiveStage = getEffectiveStage();
-  return inRange(effectiveStage, 2, 8);
+  return (
+    inRange(effectiveStage, 2, 8) && effectiveStage !== LevelStage.BLUE_WOMB
+  );
 }
 
 /**