isaacscript-common 1.2.224 → 1.2.227

package/dist/functions/deepCopy.lua

@@ -236,10 +236,7 @@ function validateValue(self, value, valueType, traversalDescription)
     end
 end
 function getNewValue(self, key, value, traversalDescription, serializationType)
-    if isSerializableIsaacAPIClass(nil, value) then
-        return copySerializableIsaacAPIClass(nil, value, serializationType)
-    end
-    if isSerializedIsaacAPIClass(nil, value) and serializationType == SerializationType.DESERIALIZE then
+    if isSerializableIsaacAPIClass(nil, value) or isSerializedIsaacAPIClass(nil, value) and serializationType == SerializationType.DESERIALIZE then
         return copySerializableIsaacAPIClass(nil, value, serializationType)
     end
     if type(value) == "table" then

package/dist/functions/flying.lua

@@ -17,7 +17,7 @@ local FLYING_CHARACTERS = __TS__New(Set, {
     PlayerType.PLAYER_THESOUL_B
 })
 local FLYING_TRINKETS = __TS__New(Set, {TrinketType.TRINKET_BAT_WING, TrinketType.TRINKET_AZAZELS_STUMP})
-local FLYING_NULL_ITEMS = {66, 101, 112}
+local FLYING_NULL_ITEMS = {NullItemID.ID_REVERSE_SUN, NullItemID.ID_SPIRIT_SHACKLES_SOUL, NullItemID.ID_LOST_CURSE}
 function ____exports.getFlyingCollectibles(self, pruneConditionalItems)
     local collectiblesWithFlyingCacheFlag = getCollectiblesForCacheFlag(nil, CacheFlag.CACHE_FLYING)
     local collectiblesWithAllCacheFlag = getCollectiblesForCacheFlag(nil, CacheFlag.CACHE_ALL)

package/dist/functions/math.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
+export declare function directionToDegrees(direction: Direction): int;
 export declare function getAngleDifference(angle1: float, angle2: float): float;
 /**
  * Helper function to get an array of equidistant points on the circumference around a circle.

package/dist/functions/math.lua

@@ -1,8 +1,13 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local ____exports = {}
+local ____directionToDegrees = require("objects.directionToDegrees")
+local DIRECTION_TO_DEGREES = ____directionToDegrees.DIRECTION_TO_DEGREES
 local ____vector = require("functions.vector")
 local directionToVector = ____vector.directionToVector
+function ____exports.directionToDegrees(self, direction)
+    return DIRECTION_TO_DEGREES[direction]
+end
 function ____exports.getAngleDifference(self, angle1, angle2)
     local subtractedAngle = angle1 - angle2
     return (subtractedAngle + 180) % 360 - 180

package/dist/functions/player.lua

@@ -394,7 +394,7 @@ function ____exports.getTotalPlayerCollectibles(self, collectibleType)
 end
 function ____exports.hasLostCurse(self, player)
     local effects = player:GetEffects()
-    return effects:HasNullEffect(112)
+    return effects:HasNullEffect(NullItemID.ID_LOST_CURSE)
 end
 function ____exports.hasOpenActiveItemSlot(self, player)
     if ____exports.isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
@@ -543,14 +543,14 @@ function ____exports.setBlindfold(self, player, enabled, modifyCostume)
         player:ChangePlayerType(character)
         game.Challenge = challenge
         if not modifyCostume then
-            player:TryRemoveNullCostume(14)
+            player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
         end
     else
         game.Challenge = Challenge.CHALLENGE_NULL
         player:ChangePlayerType(character)
         game.Challenge = challenge
         if modifyCostume then
-            player:TryRemoveNullCostume(14)
+            player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
         end
     end
 end

package/dist/functions/revive.lua

@@ -32,8 +32,8 @@ function ____exports.willReviveFromSpiritShackles(self, player)
         return false
     end
     local effects = player:GetEffects()
-    local spiritShacklesEnabled = not effects:HasNullEffect(102)
-    local playerInSoulForm = effects:HasNullEffect(101)
+    local spiritShacklesEnabled = not effects:HasNullEffect(NullItemID.ID_SPIRIT_SHACKLES_DISABLED)
+    local playerInSoulForm = effects:HasNullEffect(NullItemID.ID_SPIRIT_SHACKLES_SOUL)
     return spiritShacklesEnabled and not playerInSoulForm
 end
 function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageGameFrame)

package/dist/functions/roomShape.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * Helper function to get the grid index delta that a door out of the given room shape would lead
+ * to. For example, if you went through the bottom door in a room of `RoomShape.ROOMSHAPE_1x2`, you
+ * would end up in a room with a grid index that is +26 units from the `SafeGridIndex` of where you
+ * started.
+ */
+export declare function getGridIndexDelta(roomShape: RoomShape, doorSlot: DoorSlot): int | undefined;
+export declare function getRoomShapeBottomRightPosition(roomShape: RoomShape): Vector;
+export declare function getRoomShapeTopLeftPosition(roomShape: RoomShape): Vector;

package/dist/functions/roomShape.lua

@@ -0,0 +1,23 @@
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local ____exports = {}
+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 ____roomShapeToTopLeftPosition = require("objects.roomShapeToTopLeftPosition")
+local ROOM_SHAPE_TO_TOP_LEFT_POSITION = ____roomShapeToTopLeftPosition.ROOM_SHAPE_TO_TOP_LEFT_POSITION
+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)
+    return ROOM_SHAPE_TO_BOTTOM_RIGHT_POSITION[roomShape]
+end
+function ____exports.getRoomShapeTopLeftPosition(self, roomShape)
+    return ROOM_SHAPE_TO_TOP_LEFT_POSITION[roomShape]
+end
+return ____exports

package/dist/functions/rooms.d.ts

@@ -15,13 +15,6 @@ export declare function getAllRoomGridIndexes(): int[];
  * tricky to properly detect.
  */
 export declare function getCurrentDimension(): Dimension;
-/**
- * Helper function to get the grid index delta that a door out of the given room shape would lead
- * to. For example, if you went through the bottom door in a room of `RoomShape.ROOMSHAPE_1x2`, you
- * would end up in a room with a grid index that is +26 units from the `SafeGridIndex` of where you
- * started.
- */
-export declare function getGridIndexDelta(roomShape: RoomShape, doorSlot: DoorSlot): int | undefined;
 /**
  * Helper function to get an array of all of the safe grid indexes for rooms that match the
  * specified room type.

package/dist/functions/rooms.lua

@@ -1,11 +1,11 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
-local Map = ____lualib.Map
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
+local Map = ____lualib.Map
 local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
@@ -13,8 +13,6 @@ local sfxManager = ____cachedClasses.sfxManager
 local ____constants = require("constants")
 local MAX_ROOM_INDEX = ____constants.MAX_ROOM_INDEX
 local NUM_DIMENSIONS = ____constants.NUM_DIMENSIONS
-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 ____doors = require("functions.doors")
 local closeAllDoors = ____doors.closeAllDoors
 local getDoors = ____doors.getDoors
@@ -40,6 +38,8 @@ local getRoomGridIndex = ____roomData.getRoomGridIndex
 local getRoomShape = ____roomData.getRoomShape
 local getRoomStageID = ____roomData.getRoomStageID
 local getRoomSubType = ____roomData.getRoomSubType
+local ____roomShape = require("functions.roomShape")
+local getGridIndexDelta = ____roomShape.getGridIndexDelta
 function ____exports.getRooms(self, includeExtraDimensionalRooms)
     if includeExtraDimensionalRooms == nil then
         includeExtraDimensionalRooms = false
@@ -114,13 +114,6 @@ function ____exports.getCurrentDimension(self)
     end
     return error("Failed to get the current dimension using the starting room index of: " .. tostring(startingRoomGridIndex))
 end
-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.getRoomGridIndexesForType(self, ...)
     local roomTypesSet = __TS__New(Set, {...})
     local rooms = ____exports.getRooms(nil)
@@ -245,7 +238,7 @@ function ____exports.isDoorSlotValidAtGridIndexForRedRoom(self, doorSlot, roomGr
     if roomShape == nil then
         return false
     end
-    local delta = ____exports.getGridIndexDelta(nil, roomShape, doorSlot)
+    local delta = getGridIndexDelta(nil, roomShape, doorSlot)
     if delta == nil then
         return false
     end
@@ -281,12 +274,12 @@ function ____exports.setRoomCleared(self)
     for ____, door in ipairs(getDoors(nil)) do
         do
             if isHiddenSecretRoomDoor(nil, door) then
-                goto __continue54
+                goto __continue52
             end
             openDoorFast(nil, door)
             door.ExtraVisible = false
         end
-        ::__continue54::
+        ::__continue52::
     end
     sfxManager:Stop(SoundEffect.SOUND_DOOR_HEAVY_OPEN)
     game:ShakeScreen(0)

package/dist/functions/utils.d.ts

@@ -122,5 +122,14 @@ export declare function repeat(n: int, func: (i: int) => void): void;
 /**
  * Helper function to check every value of a custom enum for -1. This is helpful as a run-time check
  * because many methods of the Isaac class return -1 if they fail.
+ *
+ * Example:
+ * ```ts
+ * enum EntityTypeCustom {
+ *   FOO = Isaac.GetEntityTypeByName("Foo"),
+ * }
+ *
+ * validateCustomEnum("EntityTypeCustom", EntityTypeCustom);
+ * ```
  */
 export declare function validateCustomEnum(transpiledEnumName: string, transpiledEnum: unknown): void;

package/dist/index.d.ts

@@ -74,6 +74,7 @@ export * from "./functions/revive";
 export * from "./functions/rng";
 export * from "./functions/roomData";
 export * from "./functions/rooms";
+export * from "./functions/roomShape";
 export * from "./functions/run";
 export * from "./functions/seeds";
 export * from "./functions/serialization";

package/dist/index.lua

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

package/dist/objects/directionToDegrees.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare const DIRECTION_TO_DEGREES: {
+    readonly [key in Direction]: int;
+};

package/dist/objects/directionToDegrees.lua

@@ -0,0 +1,10 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+____exports.DIRECTION_TO_DEGREES = {
+    [Direction.NO_DIRECTION] = 0,
+    [Direction.LEFT] = 180,
+    [Direction.UP] = 270,
+    [Direction.RIGHT] = 0,
+    [Direction.DOWN] = 90
+}
+return ____exports

package/dist/objects/roomShapeToBottomRightPosition.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * "Vector(0, 0)" corresponds to the top left tile of a room, not including the walls. (The top-left
+ * wall would be at "Vector(-1, -1)".)
+ */
+export declare const ROOM_SHAPE_TO_BOTTOM_RIGHT_POSITION: {
+    readonly [key in RoomShape]: Vector;
+};

package/dist/objects/roomShapeToBottomRightPosition.lua

@@ -0,0 +1,20 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local TWO_BY_TWO_BOTTOM_RIGHT_POSITION = Vector(25, 13)
+local ONE_BY_TWO_VERTICAL_BOTTOM_RIGHT_POSITION = Vector(12, 13)
+____exports.ROOM_SHAPE_TO_BOTTOM_RIGHT_POSITION = {
+    [RoomShape.ROOMSHAPE_1x1] = Vector(12, 6),
+    [RoomShape.ROOMSHAPE_IH] = Vector(12, 4),
+    [RoomShape.ROOMSHAPE_IV] = Vector(8, 6),
+    [RoomShape.ROOMSHAPE_1x2] = ONE_BY_TWO_VERTICAL_BOTTOM_RIGHT_POSITION,
+    [RoomShape.ROOMSHAPE_IIV] = Vector(8, 13),
+    [RoomShape.ROOMSHAPE_2x1] = Vector(25, 6),
+    [RoomShape.ROOMSHAPE_IIH] = Vector(25, 4),
+    [RoomShape.ROOMSHAPE_2x2] = TWO_BY_TWO_BOTTOM_RIGHT_POSITION,
+    [RoomShape.ROOMSHAPE_LTL] = TWO_BY_TWO_BOTTOM_RIGHT_POSITION,
+    [RoomShape.ROOMSHAPE_LTR] = TWO_BY_TWO_BOTTOM_RIGHT_POSITION,
+    [RoomShape.ROOMSHAPE_LBL] = TWO_BY_TWO_BOTTOM_RIGHT_POSITION,
+    [RoomShape.ROOMSHAPE_LBR] = ONE_BY_TWO_VERTICAL_BOTTOM_RIGHT_POSITION,
+    [RoomShape.NUM_ROOMSHAPES] = Vector.Zero
+}
+return ____exports

package/dist/objects/roomShapeToTopLeftPosition.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * "Vector(0, 0)" corresponds to the top left tile of a room, not including the walls. (The top-left
+ * wall would be at "Vector(-1, -1)".)
+ */
+export declare const ROOM_SHAPE_TO_TOP_LEFT_POSITION: {
+    readonly [key in RoomShape]: Vector;
+};

package/dist/objects/roomShapeToTopLeftPosition.lua

@@ -0,0 +1,20 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local NARROW_HORIZONTAL_TOP_LEFT_POSITION = Vector(0, 2)
+local NARROW_VERTICAL_TOP_LEFT_POSITION = Vector(4, 0)
+____exports.ROOM_SHAPE_TO_TOP_LEFT_POSITION = {
+    [RoomShape.ROOMSHAPE_1x1] = Vector.Zero,
+    [RoomShape.ROOMSHAPE_IH] = NARROW_HORIZONTAL_TOP_LEFT_POSITION,
+    [RoomShape.ROOMSHAPE_IV] = NARROW_VERTICAL_TOP_LEFT_POSITION,
+    [RoomShape.ROOMSHAPE_1x2] = Vector.Zero,
+    [RoomShape.ROOMSHAPE_IIV] = NARROW_VERTICAL_TOP_LEFT_POSITION,
+    [RoomShape.ROOMSHAPE_2x1] = Vector.Zero,
+    [RoomShape.ROOMSHAPE_IIH] = NARROW_HORIZONTAL_TOP_LEFT_POSITION,
+    [RoomShape.ROOMSHAPE_2x2] = Vector.Zero,
+    [RoomShape.ROOMSHAPE_LTL] = Vector(13, 0),
+    [RoomShape.ROOMSHAPE_LTR] = Vector.Zero,
+    [RoomShape.ROOMSHAPE_LBL] = Vector.Zero,
+    [RoomShape.ROOMSHAPE_LBR] = Vector.Zero,
+    [RoomShape.NUM_ROOMSHAPES] = Vector.Zero
+}
+return ____exports

package/package.json

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