isaacscript-common 21.6.2 → 21.6.4

package/dist/index.rollup.d.ts

@@ -1864,6 +1864,7 @@ declare class CustomRevive extends Feature {
     private runInNFrames;
     constructor(preCustomRevive: PreCustomRevive, postCustomRevive: PostCustomRevive, runInNFrames: RunInNFrames);
     private postRender;
+    private postFamiliarInit;
     private postNewRoomReordered;
     private postPEffectUpdateReordered;
     private checkWaitingForItemAnimation;
@@ -4968,9 +4969,8 @@ export declare function getGoldenTrinketType(trinketType: TrinketType): TrinketT
  * @param roomType The `RoomType` of the destination room.
  * @param roomVariant The variant of the destination room.
  * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
- *                                 the `goto` command (instead of `d`). False by default. Set this
- *                                 to true if you want to go to a special room of `RoomType.DEFAULT`
- *                                 (1).
+ *                                 the `goto` command (instead of `d`) if the room type is
+ *                                 `RoomType.DEFAULT` (1). False by default.
  */
 export declare function getGotoCommand(roomType: RoomType, roomVariant: int, useSpecialRoomsForRoomTypeDefault?: boolean): string;
 
@@ -6104,17 +6104,16 @@ export declare function getRoomData(roomGridIndex?: int): RoomConfig | undefined
  * @param roomType The type of room to retrieve.
  * @param roomVariant The room variant to retrieve. (The room variant is the "ID" of the room in
  *                    Basement Renovator.)
- * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
- *                                 the `goto` command (instead of `d`). False by default. Set this
- *                                 to true if you want to go to a special room of `RoomType.DEFAULT`
- *                                 (1).
  * @param cancelRoomTransition Optional. Whether to cancel the room transition by using the
  *                             `Game.StartRoomTransition` method to travel to the same room. Default
  *                             is true. Set this to false if you are getting the data for many rooms
  *                             at the same time, and then use the `teleport` helper function when
  *                             you are finished.
+ * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
+ *                                 the `goto` command (instead of `d`) if the room type is
+ *                                 `RoomType.DEFAULT` (1). False by default.
  */
-export declare function getRoomDataForTypeVariant(roomType: RoomType, roomVariant: int, useSpecialRoomsForRoomTypeDefault?: boolean, cancelRoomTransition?: boolean): Readonly<RoomConfig> | undefined;
+export declare function getRoomDataForTypeVariant(roomType: RoomType, roomVariant: int, cancelRoomTransition?: boolean, useSpecialRoomsForRoomTypeDefault?: boolean): Readonly<RoomConfig> | undefined;
 
 /**
  * Helper function to get the descriptor for a room.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 21.6.2
+isaacscript-common 21.6.4
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -26079,40 +26079,40 @@ ____exports.ENGLISH_LEVEL_NAMES = {
 }
 return ____exports
  end,
-["src.objects.roomTypeGotoPrefixes"] = function(...) 
+["src.objects.roomTypeSpecialGotoPrefixes"] = function(...) 
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
-____exports.ROOM_TYPE_GOTO_PREFIXES = {
-    [RoomType.DEFAULT] = "d",
-    [RoomType.SHOP] = "s.shop",
-    [RoomType.ERROR] = "s.error",
-    [RoomType.TREASURE] = "s.treasure",
-    [RoomType.BOSS] = "s.boss",
-    [RoomType.MINI_BOSS] = "s.miniboss",
-    [RoomType.SECRET] = "s.secret",
-    [RoomType.SUPER_SECRET] = "s.supersecret",
-    [RoomType.ARCADE] = "s.arcade",
-    [RoomType.CURSE] = "s.curse",
-    [RoomType.CHALLENGE] = "s.challenge",
-    [RoomType.LIBRARY] = "s.library",
-    [RoomType.SACRIFICE] = "s.sacrifice",
-    [RoomType.DEVIL] = "s.devil",
-    [RoomType.ANGEL] = "s.angel",
-    [RoomType.DUNGEON] = "s.itemdungeon",
-    [RoomType.BOSS_RUSH] = "s.bossrush",
-    [RoomType.CLEAN_BEDROOM] = "s.isaacs",
-    [RoomType.DIRTY_BEDROOM] = "s.barren",
-    [RoomType.CHEST] = "s.chest",
-    [RoomType.DICE] = "s.dice",
-    [RoomType.BLACK_MARKET] = "s.blackmarket",
-    [RoomType.GREED_EXIT] = "s.greedexit",
-    [RoomType.PLANETARIUM] = "s.planetarium",
-    [RoomType.TELEPORTER] = "s.teleporter",
-    [RoomType.TELEPORTER_EXIT] = "s.teleporterexit",
-    [RoomType.SECRET_EXIT] = "s.secretexit",
-    [RoomType.BLUE] = "s.blue",
-    [RoomType.ULTRA_SECRET] = "s.ultrasecret"
+____exports.ROOM_TYPE_SPECIAL_GOTO_PREFIXES = {
+    [RoomType.DEFAULT] = "default",
+    [RoomType.SHOP] = "shop",
+    [RoomType.ERROR] = "error",
+    [RoomType.TREASURE] = "treasure",
+    [RoomType.BOSS] = "boss",
+    [RoomType.MINI_BOSS] = "miniboss",
+    [RoomType.SECRET] = "secret",
+    [RoomType.SUPER_SECRET] = "supersecret",
+    [RoomType.ARCADE] = "arcade",
+    [RoomType.CURSE] = "curse",
+    [RoomType.CHALLENGE] = "challenge",
+    [RoomType.LIBRARY] = "library",
+    [RoomType.SACRIFICE] = "sacrifice",
+    [RoomType.DEVIL] = "devil",
+    [RoomType.ANGEL] = "angel",
+    [RoomType.DUNGEON] = "itemdungeon",
+    [RoomType.BOSS_RUSH] = "bossrush",
+    [RoomType.CLEAN_BEDROOM] = "isaacs",
+    [RoomType.DIRTY_BEDROOM] = "barren",
+    [RoomType.CHEST] = "chest",
+    [RoomType.DICE] = "dice",
+    [RoomType.BLACK_MARKET] = "blackmarket",
+    [RoomType.GREED_EXIT] = "greedexit",
+    [RoomType.PLANETARIUM] = "planetarium",
+    [RoomType.TELEPORTER] = "teleporter",
+    [RoomType.TELEPORTER_EXIT] = "teleporterexit",
+    [RoomType.SECRET_EXIT] = "secretexit",
+    [RoomType.BLUE] = "blue",
+    [RoomType.ULTRA_SECRET] = "ultrasecret"
 }
 return ____exports
  end,
@@ -26250,8 +26250,8 @@ local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____englishLevelNames = require("src.objects.englishLevelNames")
 local ENGLISH_LEVEL_NAMES = ____englishLevelNames.ENGLISH_LEVEL_NAMES
-local ____roomTypeGotoPrefixes = require("src.objects.roomTypeGotoPrefixes")
-local ROOM_TYPE_GOTO_PREFIXES = ____roomTypeGotoPrefixes.ROOM_TYPE_GOTO_PREFIXES
+local ____roomTypeSpecialGotoPrefixes = require("src.objects.roomTypeSpecialGotoPrefixes")
+local ROOM_TYPE_SPECIAL_GOTO_PREFIXES = ____roomTypeSpecialGotoPrefixes.ROOM_TYPE_SPECIAL_GOTO_PREFIXES
 local ____stageToStageID = require("src.objects.stageToStageID")
 local STAGE_TO_STAGE_ID = ____stageToStageID.STAGE_TO_STAGE_ID
 local ____stageTypeSuffixes = require("src.objects.stageTypeSuffixes")
@@ -26324,7 +26324,9 @@ function ____exports.getGotoCommand(self, roomType, roomVariant, useSpecialRooms
     if useSpecialRoomsForRoomTypeDefault == nil then
         useSpecialRoomsForRoomTypeDefault = false
     end
-    local prefix = roomType == RoomType.DEFAULT and useSpecialRoomsForRoomTypeDefault and "s.default" or ROOM_TYPE_GOTO_PREFIXES[roomType]
+    local isNormalRoom = roomType == RoomType.DEFAULT and not useSpecialRoomsForRoomTypeDefault
+    local roomTypeSpecialGotoPrefix = ROOM_TYPE_SPECIAL_GOTO_PREFIXES[roomType]
+    local prefix = isNormalRoom and "d" or "s." .. roomTypeSpecialGotoPrefix
     return (("goto " .. prefix) .. ".") .. tostring(roomVariant)
 end
 function ____exports.getStage(self)
@@ -26534,13 +26536,13 @@ function ____exports.getNumRooms(self)
     local rooms = ____exports.getRoomsInsideGrid(nil)
     return #rooms
 end
-function ____exports.getRoomDataForTypeVariant(self, roomType, roomVariant, useSpecialRoomsForRoomTypeDefault, cancelRoomTransition)
-    if useSpecialRoomsForRoomTypeDefault == nil then
-        useSpecialRoomsForRoomTypeDefault = false
-    end
+function ____exports.getRoomDataForTypeVariant(self, roomType, roomVariant, cancelRoomTransition, useSpecialRoomsForRoomTypeDefault)
     if cancelRoomTransition == nil then
         cancelRoomTransition = true
     end
+    if useSpecialRoomsForRoomTypeDefault == nil then
+        useSpecialRoomsForRoomTypeDefault = false
+    end
     local command = getGotoCommand(nil, roomType, roomVariant, useSpecialRoomsForRoomTypeDefault)
     Isaac.ExecuteCommand(command)
     local newRoomData = getRoomData(nil, GridRoom.DEBUG)
@@ -32657,8 +32659,6 @@ local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____collectibles = require("src.functions.collectibles")
 local removeCollectibleFromItemTracker = ____collectibles.removeCollectibleFromItemTracker
-local ____entitiesSpecific = require("src.functions.entitiesSpecific")
-local removeAllFamiliars = ____entitiesSpecific.removeAllFamiliars
 local ____log = require("src.functions.log")
 local log = ____log.log
 local ____logMisc = require("src.functions.logMisc")
@@ -32691,6 +32691,14 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         end
         sfxManager:Stop(SoundEffect.ONE_UP)
     end
+    self.postFamiliarInit = 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
+    end
     self.postNewRoomReordered = function()
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
             return
@@ -32709,7 +32717,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}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_FAMILIAR_INIT, self.postFamiliarInit}}
     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
@@ -32754,7 +32762,6 @@ function CustomRevive.prototype.playerIsAboutToDie(self, player)
     self.v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
     self:logStateChanged()
     player:AddCollectible(CollectibleType.ONE_UP, 0, false)
-    removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
     removeCollectibleFromItemTracker(nil, CollectibleType.ONE_UP)
     local playerIndex = getPlayerIndex(nil, player)
     self.runInNFrames:runNextGameFrame(function()
@@ -42833,8 +42840,8 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                     nil,
                     roomType,
                     randomRoom.variant,
-                    true,
-                    false
+                    false,
+                    true
                 )
                 if newRoomData == nil then
                     logError((("Failed to get the room data for room variant " .. tostring(randomRoom.variant)) .. " for custom stage: ") .. customStage.name)

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

@@ -25,6 +25,7 @@ export declare class CustomRevive extends Feature {
     private runInNFrames;
     constructor(preCustomRevive: PreCustomRevive, postCustomRevive: PostCustomRevive, runInNFrames: RunInNFrames);
     private postRender;
+    private postFamiliarInit;
     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":"AAmBA,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;IA2B5B,OAAO,CAAC,UAAU,CAQhB;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;IAoC1B,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;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"}

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

@@ -16,8 +16,6 @@ local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____collectibles = require("src.functions.collectibles")
 local removeCollectibleFromItemTracker = ____collectibles.removeCollectibleFromItemTracker
-local ____entitiesSpecific = require("src.functions.entitiesSpecific")
-local removeAllFamiliars = ____entitiesSpecific.removeAllFamiliars
 local ____log = require("src.functions.log")
 local log = ____log.log
 local ____logMisc = require("src.functions.logMisc")
@@ -50,6 +48,14 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         end
         sfxManager:Stop(SoundEffect.ONE_UP)
     end
+    self.postFamiliarInit = 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
+    end
     self.postNewRoomReordered = function()
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
             return
@@ -68,7 +74,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}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_FAMILIAR_INIT, self.postFamiliarInit}}
     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
@@ -113,7 +119,6 @@ function CustomRevive.prototype.playerIsAboutToDie(self, player)
     self.v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
     self:logStateChanged()
     player:AddCollectible(CollectibleType.ONE_UP, 0, false)
-    removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
     removeCollectibleFromItemTracker(nil, CollectibleType.ONE_UP)
     local playerIndex = getPlayerIndex(nil, player)
     self.runInNFrames:runNextGameFrame(function()

package/dist/src/classes/features/other/CustomStages.lua

@@ -294,8 +294,8 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                     nil,
                     roomType,
                     randomRoom.variant,
-                    true,
-                    false
+                    false,
+                    true
                 )
                 if newRoomData == nil then
                     logError((("Failed to get the room data for room variant " .. tostring(randomRoom.variant)) .. " for custom stage: ") .. customStage.name)

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

@@ -37,17 +37,16 @@ export declare function getReadOnlyRooms(): Array<Readonly<RoomDescriptor>>;
  * @param roomType The type of room to retrieve.
  * @param roomVariant The room variant to retrieve. (The room variant is the "ID" of the room in
  *                    Basement Renovator.)
- * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
- *                                 the `goto` command (instead of `d`). False by default. Set this
- *                                 to true if you want to go to a special room of `RoomType.DEFAULT`
- *                                 (1).
  * @param cancelRoomTransition Optional. Whether to cancel the room transition by using the
  *                             `Game.StartRoomTransition` method to travel to the same room. Default
  *                             is true. Set this to false if you are getting the data for many rooms
  *                             at the same time, and then use the `teleport` helper function when
  *                             you are finished.
+ * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
+ *                                 the `goto` command (instead of `d`) if the room type is
+ *                                 `RoomType.DEFAULT` (1). False by default.
  */
-export declare function getRoomDataForTypeVariant(roomType: RoomType, roomVariant: int, useSpecialRoomsForRoomTypeDefault?: boolean, cancelRoomTransition?: boolean): Readonly<RoomConfig> | undefined;
+export declare function getRoomDataForTypeVariant(roomType: RoomType, roomVariant: int, cancelRoomTransition?: boolean, useSpecialRoomsForRoomTypeDefault?: boolean): Readonly<RoomConfig> | undefined;
 /**
  * Helper function to get the item pool type for the current room. For example, this returns
  * `ItemPoolType.ItemPoolType.POOL_ANGEL` if you are in an Angel Room.

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

@@ -1 +1 @@
-{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../../src/functions/rooms.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../../src/functions/rooms.ts"],"names":[],"mappings":"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"}

package/dist/src/functions/rooms.lua

@@ -167,22 +167,21 @@ end
 -- @param roomType The type of room to retrieve.
 -- @param roomVariant The room variant to retrieve. (The room variant is the "ID" of the room in
 -- Basement Renovator.)
--- @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
--- the `goto` command (instead of `d`). False by default. Set this
--- to true if you want to go to a special room of `RoomType.DEFAULT`
--- (1).
 -- @param cancelRoomTransition Optional. Whether to cancel the room transition by using the
 -- `Game.StartRoomTransition` method to travel to the same room. Default
 -- is true. Set this to false if you are getting the data for many rooms
 -- at the same time, and then use the `teleport` helper function when
 -- you are finished.
-function ____exports.getRoomDataForTypeVariant(self, roomType, roomVariant, useSpecialRoomsForRoomTypeDefault, cancelRoomTransition)
-    if useSpecialRoomsForRoomTypeDefault == nil then
-        useSpecialRoomsForRoomTypeDefault = false
-    end
+-- @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
+-- the `goto` command (instead of `d`) if the room type is
+-- `RoomType.DEFAULT` (1). False by default.
+function ____exports.getRoomDataForTypeVariant(self, roomType, roomVariant, cancelRoomTransition, useSpecialRoomsForRoomTypeDefault)
     if cancelRoomTransition == nil then
         cancelRoomTransition = true
     end
+    if useSpecialRoomsForRoomTypeDefault == nil then
+        useSpecialRoomsForRoomTypeDefault = false
+    end
     local command = getGotoCommand(nil, roomType, roomVariant, useSpecialRoomsForRoomTypeDefault)
     Isaac.ExecuteCommand(command)
     local newRoomData = getRoomData(nil, GridRoom.DEBUG)

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

@@ -34,9 +34,8 @@ export declare function getEnglishLevelName(stage?: LevelStage, stageType?: Stag
  * @param roomType The `RoomType` of the destination room.
  * @param roomVariant The variant of the destination room.
  * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
- *                                 the `goto` command (instead of `d`). False by default. Set this
- *                                 to true if you want to go to a special room of `RoomType.DEFAULT`
- *                                 (1).
+ *                                 the `goto` command (instead of `d`) if the room type is
+ *                                 `RoomType.DEFAULT` (1). False by default.
  */
 export declare function getGotoCommand(roomType: RoomType, roomVariant: int, useSpecialRoomsForRoomTypeDefault?: boolean): string;
 /** Alias for the `Level.GetStage` method. */

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,OAAO,EACP,SAAS,EACV,MAAM,8BAA8B,CAAC;AAUtC;;;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;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,CAAC,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,CAaR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,GAAG,EAChB,iCAAiC,UAAQ,GACxC,MAAM,CAOR;AAED,6CAA6C;AAC7C,wBAAgB,QAAQ,IAAI,UAAU,CAIrC;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAa7E;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,CAMrD;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,OAAO,EACP,SAAS,EACV,MAAM,8BAA8B,CAAC;AAUtC;;;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;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,CAAC,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,CAaR;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,GAAG,EAChB,iCAAiC,UAAQ,GACxC,MAAM,CAOR;AAED,6CAA6C;AAC7C,wBAAgB,QAAQ,IAAI,UAAU,CAIrC;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAa7E;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,CAMrD;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

@@ -8,8 +8,8 @@ local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____englishLevelNames = require("src.objects.englishLevelNames")
 local ENGLISH_LEVEL_NAMES = ____englishLevelNames.ENGLISH_LEVEL_NAMES
-local ____roomTypeGotoPrefixes = require("src.objects.roomTypeGotoPrefixes")
-local ROOM_TYPE_GOTO_PREFIXES = ____roomTypeGotoPrefixes.ROOM_TYPE_GOTO_PREFIXES
+local ____roomTypeSpecialGotoPrefixes = require("src.objects.roomTypeSpecialGotoPrefixes")
+local ROOM_TYPE_SPECIAL_GOTO_PREFIXES = ____roomTypeSpecialGotoPrefixes.ROOM_TYPE_SPECIAL_GOTO_PREFIXES
 local ____stageToStageID = require("src.objects.stageToStageID")
 local STAGE_TO_STAGE_ID = ____stageToStageID.STAGE_TO_STAGE_ID
 local ____stageTypeSuffixes = require("src.objects.stageTypeSuffixes")
@@ -108,14 +108,15 @@ end
 -- @param roomType The `RoomType` of the destination room.
 -- @param roomVariant The variant of the destination room.
 -- @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
--- the `goto` command (instead of `d`). False by default. Set this
--- to true if you want to go to a special room of `RoomType.DEFAULT`
--- (1).
+-- the `goto` command (instead of `d`) if the room type is
+-- `RoomType.DEFAULT` (1). False by default.
 function ____exports.getGotoCommand(self, roomType, roomVariant, useSpecialRoomsForRoomTypeDefault)
     if useSpecialRoomsForRoomTypeDefault == nil then
         useSpecialRoomsForRoomTypeDefault = false
     end
-    local prefix = roomType == RoomType.DEFAULT and useSpecialRoomsForRoomTypeDefault and "s.default" or ROOM_TYPE_GOTO_PREFIXES[roomType]
+    local isNormalRoom = roomType == RoomType.DEFAULT and not useSpecialRoomsForRoomTypeDefault
+    local roomTypeSpecialGotoPrefix = ROOM_TYPE_SPECIAL_GOTO_PREFIXES[roomType]
+    local prefix = isNormalRoom and "d" or "s." .. roomTypeSpecialGotoPrefix
     return (("goto " .. prefix) .. ".") .. tostring(roomVariant)
 end
 --- Alias for the `Level.GetStage` method.

package/dist/src/objects/roomTypeSpecialGotoPrefixes.d.ts

@@ -0,0 +1,32 @@
+export declare const ROOM_TYPE_SPECIAL_GOTO_PREFIXES: {
+    readonly 1: "default";
+    readonly 2: "shop";
+    readonly 3: "error";
+    readonly 4: "treasure";
+    readonly 5: "boss";
+    readonly 6: "miniboss";
+    readonly 7: "secret";
+    readonly 8: "supersecret";
+    readonly 9: "arcade";
+    readonly 10: "curse";
+    readonly 11: "challenge";
+    readonly 12: "library";
+    readonly 13: "sacrifice";
+    readonly 14: "devil";
+    readonly 15: "angel";
+    readonly 16: "itemdungeon";
+    readonly 17: "bossrush";
+    readonly 18: "isaacs";
+    readonly 19: "barren";
+    readonly 20: "chest";
+    readonly 21: "dice";
+    readonly 22: "blackmarket";
+    readonly 23: "greedexit";
+    readonly 24: "planetarium";
+    readonly 25: "teleporter";
+    readonly 26: "teleporterexit";
+    readonly 27: "secretexit";
+    readonly 28: "blue";
+    readonly 29: "ultrasecret";
+};
+//# sourceMappingURL=roomTypeSpecialGotoPrefixes.d.ts.map

package/dist/src/objects/roomTypeSpecialGotoPrefixes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"roomTypeSpecialGotoPrefixes.d.ts","sourceRoot":"","sources":["../../../src/objects/roomTypeSpecialGotoPrefixes.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BC,CAAC"}

package/dist/src/objects/roomTypeSpecialGotoPrefixes.lua

@@ -0,0 +1,35 @@
+local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
+____exports.ROOM_TYPE_SPECIAL_GOTO_PREFIXES = {
+    [RoomType.DEFAULT] = "default",
+    [RoomType.SHOP] = "shop",
+    [RoomType.ERROR] = "error",
+    [RoomType.TREASURE] = "treasure",
+    [RoomType.BOSS] = "boss",
+    [RoomType.MINI_BOSS] = "miniboss",
+    [RoomType.SECRET] = "secret",
+    [RoomType.SUPER_SECRET] = "supersecret",
+    [RoomType.ARCADE] = "arcade",
+    [RoomType.CURSE] = "curse",
+    [RoomType.CHALLENGE] = "challenge",
+    [RoomType.LIBRARY] = "library",
+    [RoomType.SACRIFICE] = "sacrifice",
+    [RoomType.DEVIL] = "devil",
+    [RoomType.ANGEL] = "angel",
+    [RoomType.DUNGEON] = "itemdungeon",
+    [RoomType.BOSS_RUSH] = "bossrush",
+    [RoomType.CLEAN_BEDROOM] = "isaacs",
+    [RoomType.DIRTY_BEDROOM] = "barren",
+    [RoomType.CHEST] = "chest",
+    [RoomType.DICE] = "dice",
+    [RoomType.BLACK_MARKET] = "blackmarket",
+    [RoomType.GREED_EXIT] = "greedexit",
+    [RoomType.PLANETARIUM] = "planetarium",
+    [RoomType.TELEPORTER] = "teleporter",
+    [RoomType.TELEPORTER_EXIT] = "teleporterexit",
+    [RoomType.SECRET_EXIT] = "secretexit",
+    [RoomType.BLUE] = "blue",
+    [RoomType.ULTRA_SECRET] = "ultrasecret"
+}
+return ____exports

package/package.json

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

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

@@ -9,7 +9,6 @@ import { sfxManager } from "../../../core/cachedClasses";
 import { ISCFeature } from "../../../enums/ISCFeature";
 import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { removeCollectibleFromItemTracker } from "../../../functions/collectibles";
-import { removeAllFamiliars } from "../../../functions/entitiesSpecific";
 import { log } from "../../../functions/log";
 import { logError } from "../../../functions/logMisc";
 import {
@@ -62,6 +61,9 @@ export class CustomRevive extends Feature {
     this.callbacksUsed = [
       // 2
       [ModCallback.POST_RENDER, this.postRender],
+
+      // 7
+      [ModCallback.POST_FAMILIAR_INIT, this.postFamiliarInit],
     ];
 
     this.customCallbacksUsed = [
@@ -90,6 +92,17 @@ export class CustomRevive extends Feature {
     sfxManager.Stop(SoundEffect.ONE_UP);
   };
 
+  // ModCallback.POST_FAMILIAR_INIT (7)
+  private postFamiliarInit = (familiar: EntityFamiliar): void => {
+    if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
+      return;
+    }
+
+    if (familiar.Variant === FamiliarVariant.ONE_UP) {
+      familiar.Remove();
+    }
+  };
+
   // ModCallbackCustom.POST_NEW_ROOM_REORDERED
   private postNewRoomReordered = (): void => {
     if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
@@ -178,7 +191,6 @@ export class CustomRevive extends Feature {
     this.logStateChanged();
 
     player.AddCollectible(CollectibleType.ONE_UP, 0, false);
-    removeAllFamiliars(FamiliarVariant.ONE_UP);
     removeCollectibleFromItemTracker(CollectibleType.ONE_UP);
 
     // The player should always be dead one frame from now. If they are not, then something has gone

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

@@ -402,8 +402,8 @@ export class CustomStages extends Feature {
         newRoomData = getRoomDataForTypeVariant(
           roomType,
           randomRoom.variant,
-          true, // The custom stage rooms are loaded inside of the "00.special rooms.stb" file.
           false, // Since we are going to multiple rooms, we cancel the transition.
+          true, // The custom stage rooms are loaded inside of the "00.special rooms.stb" file.
         );
         if (newRoomData === undefined) {
           logError(

package/src/functions/rooms.ts

@@ -126,21 +126,20 @@ export function getReadOnlyRooms(): Array<Readonly<RoomDescriptor>> {
  * @param roomType The type of room to retrieve.
  * @param roomVariant The room variant to retrieve. (The room variant is the "ID" of the room in
  *                    Basement Renovator.)
- * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
- *                                 the `goto` command (instead of `d`). False by default. Set this
- *                                 to true if you want to go to a special room of `RoomType.DEFAULT`
- *                                 (1).
  * @param cancelRoomTransition Optional. Whether to cancel the room transition by using the
  *                             `Game.StartRoomTransition` method to travel to the same room. Default
  *                             is true. Set this to false if you are getting the data for many rooms
  *                             at the same time, and then use the `teleport` helper function when
  *                             you are finished.
+ * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
+ *                                 the `goto` command (instead of `d`) if the room type is
+ *                                 `RoomType.DEFAULT` (1). False by default.
  */
 export function getRoomDataForTypeVariant(
   roomType: RoomType,
   roomVariant: int,
-  useSpecialRoomsForRoomTypeDefault = false,
   cancelRoomTransition = true,
+  useSpecialRoomsForRoomTypeDefault = false,
 ): Readonly<RoomConfig> | undefined {
   const command = getGotoCommand(
     roomType,

package/src/functions/stage.ts

@@ -7,7 +7,7 @@ import {
 } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { ENGLISH_LEVEL_NAMES } from "../objects/englishLevelNames";
-import { ROOM_TYPE_GOTO_PREFIXES } from "../objects/roomTypeGotoPrefixes";
+import { ROOM_TYPE_SPECIAL_GOTO_PREFIXES } from "../objects/roomTypeSpecialGotoPrefixes";
 import { STAGE_TO_STAGE_ID } from "../objects/stageToStageID";
 import { STAGE_TYPE_SUFFIXES } from "../objects/stageTypeSuffixes";
 import { STAGE_TYPE_TO_LETTER } from "../objects/stageTypeToLetter";
@@ -126,19 +126,18 @@ export function getEnglishLevelName(
  * @param roomType The `RoomType` of the destination room.
  * @param roomVariant The variant of the destination room.
  * @param useSpecialRoomsForRoomTypeDefault Optional. Whether to use `s.default` as the prefix for
- *                                 the `goto` command (instead of `d`). False by default. Set this
- *                                 to true if you want to go to a special room of `RoomType.DEFAULT`
- *                                 (1).
+ *                                 the `goto` command (instead of `d`) if the room type is
+ *                                 `RoomType.DEFAULT` (1). False by default.
  */
 export function getGotoCommand(
   roomType: RoomType,
   roomVariant: int,
   useSpecialRoomsForRoomTypeDefault = false,
 ): string {
-  const prefix =
-    roomType === RoomType.DEFAULT && useSpecialRoomsForRoomTypeDefault
-      ? `s.default`
-      : ROOM_TYPE_GOTO_PREFIXES[roomType];
+  const isNormalRoom =
+    roomType === RoomType.DEFAULT && !useSpecialRoomsForRoomTypeDefault;
+  const roomTypeSpecialGotoPrefix = ROOM_TYPE_SPECIAL_GOTO_PREFIXES[roomType];
+  const prefix = isNormalRoom ? `d` : `s.${roomTypeSpecialGotoPrefix}`;
 
   return `goto ${prefix}.${roomVariant}`;
 }

package/src/objects/roomTypeSpecialGotoPrefixes.ts

@@ -0,0 +1,33 @@
+import { RoomType } from "isaac-typescript-definitions";
+
+export const ROOM_TYPE_SPECIAL_GOTO_PREFIXES = {
+  [RoomType.DEFAULT]: "default", // 1
+  [RoomType.SHOP]: "shop", // 2
+  [RoomType.ERROR]: "error", // 3
+  [RoomType.TREASURE]: "treasure", // 4
+  [RoomType.BOSS]: "boss", // 5
+  [RoomType.MINI_BOSS]: "miniboss", // 6
+  [RoomType.SECRET]: "secret", // 7
+  [RoomType.SUPER_SECRET]: "supersecret", // 8
+  [RoomType.ARCADE]: "arcade", // 9
+  [RoomType.CURSE]: "curse", // 10
+  [RoomType.CHALLENGE]: "challenge", // 11
+  [RoomType.LIBRARY]: "library", // 12
+  [RoomType.SACRIFICE]: "sacrifice", // 13
+  [RoomType.DEVIL]: "devil", // 14
+  [RoomType.ANGEL]: "angel", // 15
+  [RoomType.DUNGEON]: "itemdungeon", // 16
+  [RoomType.BOSS_RUSH]: "bossrush", // 17
+  [RoomType.CLEAN_BEDROOM]: "isaacs", // 18
+  [RoomType.DIRTY_BEDROOM]: "barren", // 19
+  [RoomType.CHEST]: "chest", // 20
+  [RoomType.DICE]: "dice", // 21
+  [RoomType.BLACK_MARKET]: "blackmarket", // 22
+  [RoomType.GREED_EXIT]: "greedexit", // 23
+  [RoomType.PLANETARIUM]: "planetarium", // 24
+  [RoomType.TELEPORTER]: "teleporter", // 25
+  [RoomType.TELEPORTER_EXIT]: "teleporterexit", // 26
+  [RoomType.SECRET_EXIT]: "secretexit", // 27
+  [RoomType.BLUE]: "blue", // 28
+  [RoomType.ULTRA_SECRET]: "ultrasecret", // 29
+} as const satisfies Record<RoomType, string>;

package/dist/src/objects/roomTypeGotoPrefixes.d.ts

@@ -1,32 +0,0 @@
-export declare const ROOM_TYPE_GOTO_PREFIXES: {
-    readonly 1: "d";
-    readonly 2: "s.shop";
-    readonly 3: "s.error";
-    readonly 4: "s.treasure";
-    readonly 5: "s.boss";
-    readonly 6: "s.miniboss";
-    readonly 7: "s.secret";
-    readonly 8: "s.supersecret";
-    readonly 9: "s.arcade";
-    readonly 10: "s.curse";
-    readonly 11: "s.challenge";
-    readonly 12: "s.library";
-    readonly 13: "s.sacrifice";
-    readonly 14: "s.devil";
-    readonly 15: "s.angel";
-    readonly 16: "s.itemdungeon";
-    readonly 17: "s.bossrush";
-    readonly 18: "s.isaacs";
-    readonly 19: "s.barren";
-    readonly 20: "s.chest";
-    readonly 21: "s.dice";
-    readonly 22: "s.blackmarket";
-    readonly 23: "s.greedexit";
-    readonly 24: "s.planetarium";
-    readonly 25: "s.teleporter";
-    readonly 26: "s.teleporterexit";
-    readonly 27: "s.secretexit";
-    readonly 28: "s.blue";
-    readonly 29: "s.ultrasecret";
-};
-//# sourceMappingURL=roomTypeGotoPrefixes.d.ts.map

package/dist/src/objects/roomTypeGotoPrefixes.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"roomTypeGotoPrefixes.d.ts","sourceRoot":"","sources":["../../../src/objects/roomTypeGotoPrefixes.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BS,CAAC"}

package/dist/src/objects/roomTypeGotoPrefixes.lua

@@ -1,35 +0,0 @@
-local ____exports = {}
-local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
-____exports.ROOM_TYPE_GOTO_PREFIXES = {
-    [RoomType.DEFAULT] = "d",
-    [RoomType.SHOP] = "s.shop",
-    [RoomType.ERROR] = "s.error",
-    [RoomType.TREASURE] = "s.treasure",
-    [RoomType.BOSS] = "s.boss",
-    [RoomType.MINI_BOSS] = "s.miniboss",
-    [RoomType.SECRET] = "s.secret",
-    [RoomType.SUPER_SECRET] = "s.supersecret",
-    [RoomType.ARCADE] = "s.arcade",
-    [RoomType.CURSE] = "s.curse",
-    [RoomType.CHALLENGE] = "s.challenge",
-    [RoomType.LIBRARY] = "s.library",
-    [RoomType.SACRIFICE] = "s.sacrifice",
-    [RoomType.DEVIL] = "s.devil",
-    [RoomType.ANGEL] = "s.angel",
-    [RoomType.DUNGEON] = "s.itemdungeon",
-    [RoomType.BOSS_RUSH] = "s.bossrush",
-    [RoomType.CLEAN_BEDROOM] = "s.isaacs",
-    [RoomType.DIRTY_BEDROOM] = "s.barren",
-    [RoomType.CHEST] = "s.chest",
-    [RoomType.DICE] = "s.dice",
-    [RoomType.BLACK_MARKET] = "s.blackmarket",
-    [RoomType.GREED_EXIT] = "s.greedexit",
-    [RoomType.PLANETARIUM] = "s.planetarium",
-    [RoomType.TELEPORTER] = "s.teleporter",
-    [RoomType.TELEPORTER_EXIT] = "s.teleporterexit",
-    [RoomType.SECRET_EXIT] = "s.secretexit",
-    [RoomType.BLUE] = "s.blue",
-    [RoomType.ULTRA_SECRET] = "s.ultrasecret"
-}
-return ____exports

package/src/objects/roomTypeGotoPrefixes.ts

@@ -1,33 +0,0 @@
-import { RoomType } from "isaac-typescript-definitions";
-
-export const ROOM_TYPE_GOTO_PREFIXES = {
-  [RoomType.DEFAULT]: "d", // 1
-  [RoomType.SHOP]: "s.shop", // 2
-  [RoomType.ERROR]: "s.error", // 3
-  [RoomType.TREASURE]: "s.treasure", // 4
-  [RoomType.BOSS]: "s.boss", // 5
-  [RoomType.MINI_BOSS]: "s.miniboss", // 6
-  [RoomType.SECRET]: "s.secret", // 7
-  [RoomType.SUPER_SECRET]: "s.supersecret", // 8
-  [RoomType.ARCADE]: "s.arcade", // 9
-  [RoomType.CURSE]: "s.curse", // 10
-  [RoomType.CHALLENGE]: "s.challenge", // 11
-  [RoomType.LIBRARY]: "s.library", // 12
-  [RoomType.SACRIFICE]: "s.sacrifice", // 13
-  [RoomType.DEVIL]: "s.devil", // 14
-  [RoomType.ANGEL]: "s.angel", // 15
-  [RoomType.DUNGEON]: "s.itemdungeon", // 16
-  [RoomType.BOSS_RUSH]: "s.bossrush", // 17
-  [RoomType.CLEAN_BEDROOM]: "s.isaacs", // 18
-  [RoomType.DIRTY_BEDROOM]: "s.barren", // 19
-  [RoomType.CHEST]: "s.chest", // 20
-  [RoomType.DICE]: "s.dice", // 21
-  [RoomType.BLACK_MARKET]: "s.blackmarket", // 22
-  [RoomType.GREED_EXIT]: "s.greedexit", // 23
-  [RoomType.PLANETARIUM]: "s.planetarium", // 24
-  [RoomType.TELEPORTER]: "s.teleporter", // 25
-  [RoomType.TELEPORTER_EXIT]: "s.teleporterexit", // 26
-  [RoomType.SECRET_EXIT]: "s.secretexit", // 27
-  [RoomType.BLUE]: "s.blue", // 28
-  [RoomType.ULTRA_SECRET]: "s.ultrasecret", // 29
-} as const satisfies Record<RoomType, string>;