isaacscript-common 1.2.274 → 1.2.277

package/dist/functions/boss.d.ts

@@ -44,8 +44,9 @@ export declare function isSin(npc: EntityNPC): boolean;
  * Use this function instead of `spawnNPC` since it handles automatically spawning multiple segments
  * for multi-segment bosses.
  *
- * By default, this will spawn Chub (and his variants) with 3 segments and other multi-segment
- * bosses with 4 segments. You can customize this via the "numSegments" argument.
+ * By default, this will spawn Chub (and his variants) with 3 segments, Lokii with 2 copies,
+ * Gurglings/Turdlings with 2 copies, and other multi-segment bosses with 4 segments. You can
+ * customize this via the "numSegments" argument.
  */
 export declare function spawnBoss<T extends number>(entityType: T extends EntityTypeNonNPC ? never : T, variant: int, subType: int, position: Vector, velocity?: Readonly<Vector>, spawner?: Entity | undefined, seed?: Seed | undefined, numSegments?: int): EntityNPC;
 /**

package/dist/functions/boss.lua

@@ -3,6 +3,7 @@ local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
+local getNumBossSegments, DEFAULT_BOSS_MULTI_SEGMENTS
 local ____constants = require("constants")
 local VectorZero = ____constants.VectorZero
 local ____bossSets = require("sets.bossSets")
@@ -20,7 +21,45 @@ local ____set = require("functions.set")
 local copySet = ____set.copySet
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
-local BOSSES_THAT_REQUIRE_MULTIPLE_SPAWNS = __TS__New(Set, {EntityType.ENTITY_LARRYJR, EntityType.ENTITY_CHUB, EntityType.ENTITY_TURDLET})
+function getNumBossSegments(self, entityType, variant, numSegments)
+    if numSegments ~= nil then
+        return numSegments
+    end
+    repeat
+        local ____switch18 = entityType
+        local ____cond18 = ____switch18 == EntityType.ENTITY_CHUB
+        if ____cond18 then
+            do
+                return 3
+            end
+        end
+        ____cond18 = ____cond18 or ____switch18 == EntityType.ENTITY_LOKI
+        if ____cond18 then
+            do
+                return variant == 1 and 2 or 1
+            end
+        end
+        ____cond18 = ____cond18 or ____switch18 == EntityType.ENTITY_GURGLING
+        if ____cond18 then
+            do
+                return 2
+            end
+        end
+        do
+            do
+                return DEFAULT_BOSS_MULTI_SEGMENTS
+            end
+        end
+    until true
+end
+local BOSSES_THAT_REQUIRE_MULTIPLE_SPAWNS = __TS__New(Set, {
+    EntityType.ENTITY_LARRYJR,
+    EntityType.ENTITY_CHUB,
+    EntityType.ENTITY_LOKI,
+    EntityType.ENTITY_GURGLING,
+    EntityType.ENTITY_TURDLET
+})
+DEFAULT_BOSS_MULTI_SEGMENTS = 4
 function ____exports.getAliveBosses(self, matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
     if ignoreFriendly == nil then
         ignoreFriendly = false
@@ -98,9 +137,8 @@ function ____exports.spawnBoss(self, entityType, variant, subType, position, vel
         seed
     )
     if BOSSES_THAT_REQUIRE_MULTIPLE_SPAWNS:has(entityType) then
-        local numSegmentsDefined = numSegments == nil and 4 or numSegments
-        local numSegmentsToUse = entityType == EntityType.ENTITY_CHUB and 3 or numSegmentsDefined
-        local remainingSegmentsToSpawn = numSegmentsToUse - 1
+        local numBossSegments = getNumBossSegments(nil, entityType, variant, numSegments)
+        local remainingSegmentsToSpawn = numBossSegments - 1
         ____repeat(
             nil,
             remainingSegmentsToSpawn,

package/dist/functions/doors.d.ts

@@ -29,6 +29,8 @@ export declare function getDoors(...roomTypes: RoomType[]): GridEntityDoor[];
  */
 export declare function getDoorsToRoomIndex(...roomGridIndex: int[]): GridEntityDoor[];
 export declare function getRepentanceDoor(): GridEntityDoor | undefined;
+/** Helper function to find unused door slots in the room that can be used to make custom doors. */
+export declare function getUnusedDoorSlots(): DoorSlot[];
 export declare function isAngelRoomDoor(door: GridEntityDoor): boolean;
 export declare function isDevilRoomDoor(door: GridEntityDoor): boolean;
 /** Helper function to see if a door slot could exist for a given room shape. */

package/dist/functions/doors.lua

@@ -12,6 +12,8 @@ local ____doorSlotToDirection = require("objects.doorSlotToDirection")
 local DOOR_SLOT_TO_DIRECTION = ____doorSlotToDirection.DOOR_SLOT_TO_DIRECTION
 local ____roomShapeToDoorSlots = require("objects.roomShapeToDoorSlots")
 local ROOM_SHAPE_TO_DOOR_SLOTS = ____roomShapeToDoorSlots.ROOM_SHAPE_TO_DOOR_SLOTS
+local ____utils = require("functions.utils")
+local getEnumValues = ____utils.getEnumValues
 function ____exports.getDoors(self, ...)
     local roomTypes = {...}
     local room = game:GetRoom()
@@ -116,6 +118,14 @@ function ____exports.getRepentanceDoor(self)
         function(____, door) return ____exports.isRepentanceDoor(nil, door) end
     )
 end
+function ____exports.getUnusedDoorSlots(self)
+    local room = game:GetRoom()
+    local doorSlots = getEnumValues(nil, DoorSlot)
+    return __TS__ArrayFilter(
+        doorSlots,
+        function(____, doorSlot) return room:IsDoorSlotAllowed(doorSlot) and room:GetDoor(doorSlot) == nil end
+    )
+end
 function ____exports.isAngelRoomDoor(self, door)
     return door.TargetRoomType == RoomType.ROOM_ANGEL
 end

package/dist/functions/rooms.lua

@@ -3,6 +3,7 @@ local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
+local __TS__StringIncludes = ____lualib.__TS__StringIncludes
 local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local Map = ____lualib.Map
 local ____exports = {}
@@ -12,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 ____doubleTroubleRoomVariants = require("sets.doubleTroubleRoomVariants")
-local DOUBLE_TROUBLE_ROOM_VARIANTS = ____doubleTroubleRoomVariants.DOUBLE_TROUBLE_ROOM_VARIANTS
 local ____doors = require("functions.doors")
 local closeAllDoors = ____doors.closeAllDoors
 local getDoors = ____doors.getDoors
@@ -36,10 +35,10 @@ local getRoomAllowedDoors = ____roomData.getRoomAllowedDoors
 local getRoomData = ____roomData.getRoomData
 local getRoomDescriptor = ____roomData.getRoomDescriptor
 local getRoomGridIndex = ____roomData.getRoomGridIndex
+local getRoomName = ____roomData.getRoomName
 local getRoomShape = ____roomData.getRoomShape
 local getRoomStageID = ____roomData.getRoomStageID
 local getRoomSubType = ____roomData.getRoomSubType
-local getRoomVariant = ____roomData.getRoomVariant
 local ____roomShape = require("functions.roomShape")
 local getGridIndexDelta = ____roomShape.getGridIndexDelta
 function ____exports.getRooms(self, includeExtraDimensionalRooms)
@@ -175,8 +174,8 @@ end
 function ____exports.inDoubleTrouble(self)
     local room = game:GetRoom()
     local roomType = room:GetType()
-    local roomVariant = getRoomVariant(nil)
-    return roomType == RoomType.ROOM_BOSS and DOUBLE_TROUBLE_ROOM_VARIANTS:has(roomVariant)
+    local roomName = getRoomName(nil)
+    return roomType == RoomType.ROOM_BOSS and __TS__StringIncludes(roomName, "Double Trouble")
 end
 function ____exports.inGenesisRoom(self)
     local roomGridIndex = getRoomGridIndex(nil)

package/dist/functions/trinketGive.lua

@@ -10,13 +10,13 @@ function ____exports.giveTrinketsBack(self, player, trinketSituation)
     if trinketSituation == nil then
         return
     end
-    local trinket1 = player:GetTrinket(0)
-    local trinket2 = player:GetTrinket(1)
-    if trinket1 ~= TrinketType.TRINKET_NULL then
-        player:TryRemoveTrinket(trinket1)
+    local trinketType1 = player:GetTrinket(0)
+    local trinketType2 = player:GetTrinket(1)
+    if trinketType1 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinketType1)
     end
-    if trinket2 ~= TrinketType.TRINKET_NULL then
-        player:TryRemoveTrinket(trinket2)
+    if trinketType2 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinketType2)
     end
     ____repeat(
         nil,
@@ -26,47 +26,47 @@ function ____exports.giveTrinketsBack(self, player, trinketSituation)
             useActiveItemTemp(nil, player, CollectibleType.COLLECTIBLE_SMELTER)
         end
     )
-    if trinketSituation.trinket1 ~= TrinketType.TRINKET_NULL then
-        player:AddTrinket(trinketSituation.trinket1, false)
+    if trinketSituation.trinketType1 ~= TrinketType.TRINKET_NULL then
+        player:AddTrinket(trinketSituation.trinketType1, false)
     end
-    if trinketSituation.trinket2 ~= TrinketType.TRINKET_NULL then
-        player:AddTrinket(trinketSituation.trinket2, false)
+    if trinketSituation.trinketType2 ~= TrinketType.TRINKET_NULL then
+        player:AddTrinket(trinketSituation.trinketType2, false)
     end
 end
 function ____exports.temporarilyRemoveTrinket(self, player, trinketType)
     if not player:HasTrinket(trinketType) then
         return nil
     end
-    local trinket1 = player:GetTrinket(0)
-    local trinket2 = player:GetTrinket(1)
+    local trinketType1 = player:GetTrinket(0)
+    local trinketType2 = player:GetTrinket(1)
     local numTrinkets = 0
     while player:HasTrinket(trinketType) do
         player:TryRemoveTrinket(trinketType)
         numTrinkets = numTrinkets + 1
     end
     local numSmeltedTrinkets = numTrinkets
-    local trinketWasInSlot1 = trinket1 == trinketType or trinket1 + TRINKET_GOLDEN_FLAG == trinketType
+    local trinketWasInSlot1 = trinketType1 == trinketType or trinketType1 + TRINKET_GOLDEN_FLAG == trinketType
     if trinketWasInSlot1 then
         numSmeltedTrinkets = numSmeltedTrinkets - 1
     end
-    local trinketWasInSlot2 = trinket2 == trinketType or trinket2 + TRINKET_GOLDEN_FLAG == trinketType
+    local trinketWasInSlot2 = trinketType2 == trinketType or trinketType2 + TRINKET_GOLDEN_FLAG == trinketType
     if trinketWasInSlot2 then
         numSmeltedTrinkets = numSmeltedTrinkets - 1
     end
-    return {trinketTypeRemoved = trinketType, trinket1 = trinket1, trinket2 = trinket2, numSmeltedTrinkets = numSmeltedTrinkets}
+    return {trinketTypeRemoved = trinketType, trinketType1 = trinketType1, trinketType2 = trinketType2, numSmeltedTrinkets = numSmeltedTrinkets}
 end
 function ____exports.temporarilyRemoveTrinkets(self, player)
-    local trinket1 = player:GetTrinket(0)
-    local trinket2 = player:GetTrinket(1)
-    if trinket1 == TrinketType.TRINKET_NULL and trinket2 == TrinketType.TRINKET_NULL then
+    local trinketType1 = player:GetTrinket(0)
+    local trinketType2 = player:GetTrinket(1)
+    if trinketType1 == TrinketType.TRINKET_NULL and trinketType2 == TrinketType.TRINKET_NULL then
         return nil
     end
-    if trinket1 ~= TrinketType.TRINKET_NULL then
-        player:TryRemoveTrinket(trinket1)
+    if trinketType1 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinketType1)
     end
-    if trinket2 ~= TrinketType.TRINKET_NULL then
-        player:TryRemoveTrinket(trinket2)
+    if trinketType2 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinketType2)
     end
-    return {trinketTypeRemoved = TrinketType.TRINKET_NULL, trinket1 = trinket1, trinket2 = trinket2, numSmeltedTrinkets = 0}
+    return {trinketTypeRemoved = TrinketType.TRINKET_NULL, trinketType1 = trinketType1, trinketType2 = trinketType2, numSmeltedTrinkets = 0}
 end
 return ____exports

package/dist/functions/trinkets.lua

@@ -28,16 +28,16 @@ function ____exports.getMaxTrinketType(self)
 end
 function ____exports.getOpenTrinketSlot(self, player)
     local maxTrinkets = player:GetMaxTrinkets()
-    local trinket0 = player:GetTrinket(0)
-    local trinket1 = player:GetTrinket(1)
+    local trinketType1 = player:GetTrinket(0)
+    local trinketType2 = player:GetTrinket(1)
     if maxTrinkets == 1 then
-        return trinket0 == TrinketType.TRINKET_NULL and 0 or nil
+        return trinketType1 == TrinketType.TRINKET_NULL and 0 or nil
     end
     if maxTrinkets == 2 then
-        if trinket0 == TrinketType.TRINKET_NULL then
+        if trinketType1 == TrinketType.TRINKET_NULL then
             return 0
         end
-        return trinket1 == TrinketType.TRINKET_NULL and 1 or nil
+        return trinketType2 == TrinketType.TRINKET_NULL and 1 or nil
     end
     return error("The player has an unknown number of trinket slots: " .. tostring(maxTrinkets))
 end

package/dist/types/TrinketSituation.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="isaac-typescript-definitions" />
 export interface TrinketSituation {
     trinketTypeRemoved: TrinketType | int;
-    trinket1: TrinketType | int;
-    trinket2: TrinketType | int;
+    trinketType1: TrinketType | int;
+    trinketType2: TrinketType | int;
     numSmeltedTrinkets: int;
 }

package/package.json

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