isaacscript-common 1.2.103 → 1.2.104

package/dist/constants.d.ts

@@ -63,8 +63,6 @@ export declare const FINAL_STAGE: number;
  * second TMTRAINER item subtracts one from that, and so on.
  */
 export declare const FIRST_GLITCHED_COLLECTIBLE_TYPE: number;
-export declare const GENESIS_ROOM_VARIANT = -1;
-export declare const GENESIS_ROOM_SUBTYPE = -1;
 export declare const GOLDEN_TRINKET_SHIFT: number;
 export declare const GRID_INDEX_CENTER_OF_1X1_ROOM = 67;
 export declare const GAME_FRAMES_PER_SECOND = 30;

package/dist/constants.lua

@@ -79,8 +79,6 @@ ____exports.FAMILIARS_THAT_SHOOT_PLAYER_TEARS = __TS__New(Set, {
 })
 ____exports.FINAL_STAGE = LevelStage.NUM_STAGES - 1
 ____exports.FIRST_GLITCHED_COLLECTIBLE_TYPE = (1 << 32) - 1
-____exports.GENESIS_ROOM_VARIANT = -1
-____exports.GENESIS_ROOM_SUBTYPE = -1
 ____exports.GOLDEN_TRINKET_SHIFT = 1 << 15
 ____exports.GRID_INDEX_CENTER_OF_1X1_ROOM = 67
 ____exports.GAME_FRAMES_PER_SECOND = 30

package/dist/functions/log.lua

@@ -15,10 +15,9 @@ local hasFlag = ____flag.hasFlag
 local ____player = require("functions.player")
 local getEffectsList = ____player.getEffectsList
 local ____rooms = require("functions.rooms")
+local getRoomData = ____rooms.getRoomData
 local getRoomGridIndex = ____rooms.getRoomGridIndex
 local getRoomListIndex = ____rooms.getRoomListIndex
-local getRoomSubType = ____rooms.getRoomSubType
-local getRoomVariant = ____rooms.getRoomVariant
 local ____trinkets = require("functions.trinkets")
 local getTrinketName = ____trinkets.getTrinketName
 function ____exports.getDebugPrependString(self, msg, numParentFunctions)
@@ -130,14 +129,14 @@ function ____exports.logMap(map)
     ____exports.log("The size of the map was: " .. tostring(map.size))
 end
 function ____exports.logRoom()
-    local game = Game()
-    local room = game:GetRoom()
-    local roomType = room:GetType()
-    local roomVariant = getRoomVariant(nil)
-    local roomSubType = getRoomSubType(nil)
     local roomGridIndex = getRoomGridIndex(nil)
     local roomListIndex = getRoomListIndex(nil)
-    ____exports.log((((("Current room type/variant/sub-type: " .. tostring(roomType)) .. ".") .. tostring(roomVariant)) .. ".") .. tostring(roomSubType))
+    local roomData = getRoomData(nil)
+    if roomData == nil then
+        ____exports.log("Current room data is undefined.")
+    else
+        ____exports.log((((("Current room type/variant/sub-type: " .. tostring(roomData.Type)) .. ".") .. tostring(roomData.Variant)) .. ".") .. tostring(roomData.Subtype))
+    end
     ____exports.log("Current room grid index: " .. tostring(roomGridIndex))
     ____exports.log("Current room list index: " .. tostring(roomListIndex))
 end

package/dist/functions/rooms.d.ts

@@ -14,7 +14,10 @@ export declare function getAllRoomGridIndexes(): int[];
  * tricky to properly detect.
  */
 export declare function getCurrentDimension(): Dimension;
-/** Alias for the `Level.GetCurrentRoomDesc()` method. */
+/**
+ * Alias for the `Level.GetCurrentRoomDesc()` method. Use this to make it more clear what type of
+ * `RoomDescriptor` object that you are retrieving.
+ */
 export declare function getCurrentRoomDescriptorReadOnly(): RoomDescriptorReadOnly;
 /**
  * Helper function to get the room data for the provided room.
@@ -25,9 +28,10 @@ export declare function getRoomData(roomGridIndex?: int): RoomConfig | undefined
 /**
  * Helper function for getting the type of the room with the given grid index.
  *
+ * @param roomGridIndex Optional. Equal to the current room index by default.
  * @returns The room data type. Returns -1 if the type was not found.
  */
-export declare function getRoomType(roomGridIndex: int): RoomType;
+export declare function getRoomType(roomGridIndex?: int): RoomType;
 /**
  * Helper function to get the descriptor for a room.
  *

package/dist/functions/rooms.lua

@@ -10,8 +10,6 @@ local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local Map = ____lualib.Map
 local ____exports = {}
 local ____constants = require("constants")
-local GENESIS_ROOM_SUBTYPE = ____constants.GENESIS_ROOM_SUBTYPE
-local GENESIS_ROOM_VARIANT = ____constants.GENESIS_ROOM_VARIANT
 local MAX_ROOM_INDEX = ____constants.MAX_ROOM_INDEX
 local NUM_DIMENSIONS = ____constants.NUM_DIMENSIONS
 local ____doors = require("functions.doors")
@@ -43,11 +41,20 @@ function ____exports.getRoomDescriptor(self, roomGridIndex)
     local game = Game()
     local level = game:GetLevel()
     if roomGridIndex == nil then
-        local currentRoomDescriptor = ____exports.getCurrentRoomDescriptorReadOnly(nil)
-        roomGridIndex = currentRoomDescriptor.SafeGridIndex
+        roomGridIndex = ____exports.getRoomGridIndex(nil)
     end
     return level:GetRoomByIdx(roomGridIndex)
 end
+function ____exports.getRoomGridIndex(self)
+    local game = Game()
+    local level = game:GetLevel()
+    local currentRoomIndex = level:GetCurrentRoomIndex()
+    if currentRoomIndex < 0 then
+        return currentRoomIndex
+    end
+    local roomDescriptor = ____exports.getCurrentRoomDescriptorReadOnly(nil)
+    return roomDescriptor.SafeGridIndex
+end
 function ____exports.getRoomStageID(self, roomGridIndex)
     local roomData = ____exports.getRoomData(nil, roomGridIndex)
     return roomData == nil and -1 or roomData.StageID
@@ -133,16 +140,6 @@ function ____exports.getRoomType(self, roomGridIndex)
     local roomData = ____exports.getRoomData(nil, roomGridIndex)
     return roomData == nil and -1 or roomData.Type
 end
-function ____exports.getRoomGridIndex(self)
-    local game = Game()
-    local level = game:GetLevel()
-    local currentRoomIndex = level:GetCurrentRoomIndex()
-    if currentRoomIndex < 0 then
-        return currentRoomIndex
-    end
-    local roomDescriptor = ____exports.getCurrentRoomDescriptorReadOnly(nil)
-    return roomDescriptor.SafeGridIndex
-end
 function ____exports.getRoomGridIndexesForType(self, ...)
     local roomTypes = {...}
     local rooms = ____exports.getRooms(nil)
@@ -239,9 +236,8 @@ function ____exports.inGenesisRoom(self)
     local game = Game()
     local room = game:GetRoom()
     local roomType = room:GetType()
-    local roomVariant = ____exports.getRoomVariant(nil)
     local roomSubType = ____exports.getRoomSubType(nil)
-    return roomType == RoomType.ROOM_ISAACS and roomVariant == GENESIS_ROOM_VARIANT and roomSubType == GENESIS_ROOM_SUBTYPE
+    return roomType == RoomType.ROOM_ISAACS and roomSubType == 99
 end
 function ____exports.inMegaSatanRoom(self)
     local roomGridIndex = ____exports.getRoomGridIndex(nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.103",
+  "version": "1.2.104",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",