isaacscript-common 1.2.228 → 1.2.229

package/dist/features/deployJSONRoom.lua

@@ -38,8 +38,9 @@ local isRNG = ____rng.isRNG
 local newRNG = ____rng.newRNG
 local ____roomData = require("functions.roomData")
 local getRoomListIndex = ____roomData.getRoomListIndex
+local ____roomGrid = require("functions.roomGrid")
+local gridToPos = ____roomGrid.gridToPos
 local ____rooms = require("functions.rooms")
-local gridToPos = ____rooms.gridToPos
 local setRoomCleared = ____rooms.setRoomCleared
 local setRoomUncleared = ____rooms.setRoomUncleared
 local ____spawnCollectible = require("functions.spawnCollectible")

package/dist/features/extraConsoleCommands/commands.lua

@@ -41,10 +41,11 @@ local getPlayers = ____playerIndex.getPlayers
 local ____roomData = require("functions.roomData")
 local getRoomData = ____roomData.getRoomData
 local getRoomDescriptor = ____roomData.getRoomDescriptor
+local ____roomGrid = require("functions.roomGrid")
+local gridToPos = ____roomGrid.gridToPos
 local ____rooms = require("functions.rooms")
 local changeRoom = ____rooms.changeRoom
 local getRoomGridIndexesForType = ____rooms.getRoomGridIndexesForType
-local gridToPos = ____rooms.gridToPos
 local ____run = require("functions.run")
 local restart = ____run.restart
 local ____utils = require("functions.utils")

package/dist/functions/roomGrid.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * Helper function to convert a room X and Y coordinate to a position.
+ *
+ * For example, the coordinates of 0, 0 are equal to `Vector(80, 160)`.
+ *
+ * This function will crash the game if it is called in the menu, because it needs to access the
+ * current room's grid width.
+ */
+export declare function gridToPos(x: int, y: int): Vector;
+/** Helper function to convert a grid position `Vector` to a world position `Vector`. */
+export declare function gridToWorldPos(gridPos: Vector): Vector;
+/** Helper function to convert a world position `Vector` to a grid position `Vector`. */
+export declare function worldToGridPos(worldPos: Vector): Vector;
+/**
+ * Helper function to convert a world position `Vector` to a grid position `Vector`.
+ *
+ * This is similar to the `worldToGridPos` position, but the values are not rounded.
+ */
+export declare function worldToGridPosFast(worldPos: Vector): Vector;

package/dist/functions/roomGrid.lua

@@ -0,0 +1,28 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local ____cachedClasses = require("cachedClasses")
+local game = ____cachedClasses.game
+function ____exports.gridToPos(self, x, y)
+    local room = game:GetRoom()
+    local gridWidth = room:GetGridWidth()
+    x = x + 1
+    y = y + 1
+    local gridIndex = y * gridWidth + x
+    return room:GetGridPosition(gridIndex)
+end
+function ____exports.gridToWorldPos(self, gridPos)
+    local x = (gridPos.X + 2) * 40
+    local y = (gridPos.Y + 4) * 40
+    return Vector(x, y)
+end
+function ____exports.worldToGridPos(self, worldPos)
+    local x = math.floor(worldPos.X / 40 - 2 + 0.5)
+    local y = math.floor(worldPos.Y / 40 - 4 + 0.5)
+    return Vector(x, y)
+end
+function ____exports.worldToGridPosFast(self, worldPos)
+    local x = worldPos.X / 40 - 2
+    local y = worldPos.Y / 40 - 4
+    return Vector(x, y)
+end
+return ____exports

package/dist/functions/roomShape.lua

@@ -7,17 +7,14 @@ local ____roomShapeLayoutSizes = require("objects.roomShapeLayoutSizes")
 local ROOM_SHAPE_LAYOUT_SIZES = ____roomShapeLayoutSizes.ROOM_SHAPE_LAYOUT_SIZES
 local ____roomShapeToBottomRightPosition = require("objects.roomShapeToBottomRightPosition")
 local ROOM_SHAPE_TO_BOTTOM_RIGHT_POSITION = ____roomShapeToBottomRightPosition.ROOM_SHAPE_TO_BOTTOM_RIGHT_POSITION
-local ____roomShapeToGridIndexDelta = require("objects.roomShapeToGridIndexDelta")
-local ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA = ____roomShapeToGridIndexDelta.ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA
+local ____roomShapeToDoorSlotsToGridIndexDelta = require("objects.roomShapeToDoorSlotsToGridIndexDelta")
+local ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA = ____roomShapeToDoorSlotsToGridIndexDelta.ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA
 local ____roomShapeToTopLeftPosition = require("objects.roomShapeToTopLeftPosition")
 local ROOM_SHAPE_TO_TOP_LEFT_POSITION = ____roomShapeToTopLeftPosition.ROOM_SHAPE_TO_TOP_LEFT_POSITION
 local ____roomShapeVolumes = require("objects.roomShapeVolumes")
 local ROOM_SHAPE_VOLUMES = ____roomShapeVolumes.ROOM_SHAPE_VOLUMES
 function ____exports.getGridIndexDelta(self, roomShape, doorSlot)
     local doorSlotToGridIndexMap = ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA[roomShape]
-    if doorSlotToGridIndexMap == nil then
-        return nil
-    end
     return doorSlotToGridIndexMap:get(doorSlot)
 end
 function ____exports.getRoomShapeBottomRightPosition(self, roomShape)

package/dist/functions/rooms.d.ts

@@ -39,11 +39,6 @@ export declare function getRoomItemPoolType(): ItemPoolType;
  * `RoomList`. Default is false.
  */
 export declare function getRooms(includeExtraDimensionalRooms?: boolean): RoomDescriptor[];
-/**
- * Converts a room X and Y coordinate to a position. For example, the coordinates of 0, 0 are
- * equal to `Vector(80, 160)`.
- */
-export declare function gridToPos(x: int, y: int): Vector;
 /**
  * Helper function to determine if the current room shape is equal to `RoomShape.ROOMSHAPE_1x2` or
  * `RoomShape.ROOMSHAPE_2x1`.

package/dist/functions/rooms.lua

@@ -133,13 +133,6 @@ function ____exports.getRoomItemPoolType(self)
     local roomSeed = room:GetSpawnSeed()
     return itemPool:GetPoolForRoom(roomType, roomSeed)
 end
-function ____exports.gridToPos(self, x, y)
-    local room = game:GetRoom()
-    x = x + 1
-    y = y + 1
-    local gridIndex = y * room:GetGridWidth() + x
-    return room:GetGridPosition(gridIndex)
-end
 function ____exports.in2x1Room(self)
     local room = game:GetRoom()
     local roomShape = room:GetRoomShape()
@@ -274,12 +267,12 @@ function ____exports.setRoomCleared(self)
     for ____, door in ipairs(getDoors(nil)) do
         do
             if isHiddenSecretRoomDoor(nil, door) then
-                goto __continue52
+                goto __continue51
             end
             openDoorFast(nil, door)
             door.ExtraVisible = false
         end
-        ::__continue52::
+        ::__continue51::
     end
     sfxManager:Stop(SoundEffect.SOUND_DOOR_HEAVY_OPEN)
     game:ShakeScreen(0)

package/dist/index.d.ts

@@ -73,6 +73,7 @@ export * from "./functions/random";
 export * from "./functions/revive";
 export * from "./functions/rng";
 export * from "./functions/roomData";
+export * from "./functions/roomGrid";
 export * from "./functions/rooms";
 export * from "./functions/roomShape";
 export * from "./functions/run";

package/dist/index.lua

@@ -584,6 +584,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.roomGrid")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.rooms")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/objects/roomShapeToDoorSlotsToGridIndexDelta.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * Deltas are considered to be from the safe grid index of the room (i.e. the top left corner, or
+ * top right corner in the case of `RoomShape.ROOMSHAPE_LTL`).
+ */
+export declare const ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA: {
+    readonly [key in RoomShape]: Map<DoorSlot, int>;
+};

package/dist/objects/roomShapeToDoorSlotsToGridIndexDelta.lua

@@ -0,0 +1,85 @@
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local ____constants = require("constants")
+local LEVEL_GRID_ROW_LENGTH = ____constants.LEVEL_GRID_ROW_LENGTH
+local LEFT = -1
+local UP = -LEVEL_GRID_ROW_LENGTH
+local RIGHT = 1
+local DOWN = LEVEL_GRID_ROW_LENGTH
+____exports.ROOM_SHAPE_TO_DOOR_SLOTS_TO_GRID_INDEX_DELTA = {
+    [RoomShape.ROOMSHAPE_1x1] = __TS__New(Map, {{DoorSlot.LEFT0, LEFT}, {DoorSlot.UP0, UP}, {DoorSlot.RIGHT0, RIGHT}, {DoorSlot.DOWN0, DOWN}}),
+    [RoomShape.ROOMSHAPE_IH] = __TS__New(Map, {{DoorSlot.LEFT0, LEFT}, {DoorSlot.RIGHT0, RIGHT}}),
+    [RoomShape.ROOMSHAPE_IV] = __TS__New(Map, {{DoorSlot.UP0, UP}, {DoorSlot.DOWN0, DOWN}}),
+    [RoomShape.ROOMSHAPE_1x2] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, UP},
+        {DoorSlot.RIGHT0, RIGHT},
+        {DoorSlot.DOWN0, DOWN + DOWN},
+        {DoorSlot.LEFT1, DOWN + LEFT},
+        {DoorSlot.RIGHT1, DOWN + RIGHT}
+    }),
+    [RoomShape.ROOMSHAPE_IIV] = __TS__New(Map, {{DoorSlot.UP0, UP}, {DoorSlot.DOWN0, DOWN + DOWN}}),
+    [RoomShape.ROOMSHAPE_2x1] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, UP},
+        {DoorSlot.RIGHT0, RIGHT + RIGHT},
+        {DoorSlot.DOWN0, DOWN},
+        {DoorSlot.UP1, RIGHT + UP},
+        {DoorSlot.DOWN1, RIGHT + DOWN}
+    }),
+    [RoomShape.ROOMSHAPE_IIH] = __TS__New(Map, {{DoorSlot.LEFT0, LEFT}, {DoorSlot.RIGHT0, RIGHT + RIGHT}}),
+    [RoomShape.ROOMSHAPE_2x2] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, UP},
+        {DoorSlot.RIGHT0, RIGHT + RIGHT},
+        {DoorSlot.DOWN0, DOWN + DOWN},
+        {DoorSlot.LEFT1, DOWN + LEFT},
+        {DoorSlot.UP1, RIGHT + UP},
+        {DoorSlot.RIGHT1, RIGHT + DOWN + RIGHT},
+        {DoorSlot.DOWN1, RIGHT + DOWN + DOWN}
+    }),
+    [RoomShape.ROOMSHAPE_LTL] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, DOWN + LEFT + UP},
+        {DoorSlot.RIGHT0, RIGHT},
+        {DoorSlot.DOWN0, DOWN + LEFT + DOWN},
+        {DoorSlot.LEFT1, DOWN + LEFT + LEFT},
+        {DoorSlot.UP1, UP},
+        {DoorSlot.RIGHT1, DOWN + RIGHT},
+        {DoorSlot.DOWN1, DOWN + DOWN}
+    }),
+    [RoomShape.ROOMSHAPE_LTR] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, UP},
+        {DoorSlot.RIGHT0, RIGHT},
+        {DoorSlot.DOWN0, DOWN + DOWN},
+        {DoorSlot.LEFT1, DOWN + LEFT},
+        {DoorSlot.UP1, DOWN + RIGHT + UP},
+        {DoorSlot.RIGHT1, DOWN + RIGHT + RIGHT},
+        {DoorSlot.DOWN1, DOWN + RIGHT + DOWN}
+    }),
+    [RoomShape.ROOMSHAPE_LBL] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, UP},
+        {DoorSlot.RIGHT0, RIGHT + RIGHT},
+        {DoorSlot.DOWN0, DOWN},
+        {DoorSlot.LEFT1, RIGHT + DOWN + LEFT},
+        {DoorSlot.UP1, RIGHT + UP},
+        {DoorSlot.RIGHT1, RIGHT + DOWN + RIGHT},
+        {DoorSlot.DOWN1, RIGHT + DOWN + DOWN}
+    }),
+    [RoomShape.ROOMSHAPE_LBR] = __TS__New(Map, {
+        {DoorSlot.LEFT0, LEFT},
+        {DoorSlot.UP0, UP},
+        {DoorSlot.RIGHT0, RIGHT + RIGHT},
+        {DoorSlot.DOWN0, DOWN + DOWN},
+        {DoorSlot.LEFT1, DOWN + LEFT},
+        {DoorSlot.UP1, RIGHT + UP},
+        {DoorSlot.RIGHT1, DOWN + RIGHT},
+        {DoorSlot.DOWN1, RIGHT + DOWN}
+    }),
+    [RoomShape.NUM_ROOMSHAPES] = __TS__New(Map)
+}
+return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.228",
+  "version": "1.2.229",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.384",
+    "isaac-typescript-definitions": "^1.0.385",
     "isaacscript-lint": "^1.0.95",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",