isaacscript-common 68.0.0 → 69.0.0

package/dist/index.rollup.d.ts

@@ -4967,13 +4967,13 @@ export declare function getBooleansFromTable(luaMap: LuaMap<string, unknown>, ob
 export declare function getBosses(entityType?: EntityType, variant?: int, subType?: int, ignoreFriendly?: boolean): EntityNPC[];
 
 /**
- * Helper function to get the boss ID corresponding to the current room. Returns 0 if the current
- * room is not a Boss Room.
+ * Helper function to get the boss ID corresponding to the current room. Returns undefined if the
+ * current room is not a Boss Room.
  *
- * Use this instead of the vanilla `Room.GetBossID` method since it correctly handles Dogma and The
- * Beast.
+ * Use this instead of the vanilla `Room.GetBossID` method since it has a saner return type and it
+ * correctly handles Dogma, The Beast, and Ultra Greedier.
  */
-export declare function getBossID(): BossID | 0;
+export declare function getBossID(): BossID | undefined;
 
 export declare function getBossIDFromEntityTypeVariant(entityType: EntityType, variant: int): BossID | undefined;
 

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 68.0.0
+isaacscript-common 69.0.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -19140,9 +19140,6 @@ function ____exports.isBeforeRoomFrame(self, roomFrameCount)
     return thisGameFrameCount < roomFrameCount
 end
 function ____exports.onGameFrame(self, gameFrameCount)
-    if gameFrameCount == nil or gameFrameCount == nil then
-        return false
-    end
     local thisGameFrameCount = game:GetFrameCount()
     return thisGameFrameCount == gameFrameCount
 end
@@ -19173,16 +19170,10 @@ function ____exports.onOrBeforeRoomFrame(self, roomFrameCount)
     return thisGameFrameCount <= roomFrameCount
 end
 function ____exports.onRenderFrame(self, renderFrameCount)
-    if renderFrameCount == nil or renderFrameCount == nil then
-        return false
-    end
     local thisRenderFrameCount = Isaac.GetFrameCount()
     return thisRenderFrameCount == renderFrameCount
 end
 function ____exports.onRoomFrame(self, roomFrameCount)
-    if roomFrameCount == nil or roomFrameCount == nil then
-        return false
-    end
     local room = game:GetRoom()
     local thisGameFrameCount = room:GetFrameCount()
     return thisGameFrameCount == roomFrameCount
@@ -44905,6 +44896,7 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local LokiVariant = ____isaac_2Dtypescript_2Ddefinitions.LokiVariant
+local UltraGreedVariant = ____isaac_2Dtypescript_2Ddefinitions.UltraGreedVariant
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____constants = require("src.core.constants")
@@ -44929,6 +44921,8 @@ local ____sinEntityTypesSet = require("src.sets.sinEntityTypesSet")
 local SIN_ENTITY_TYPES_SET = ____sinEntityTypesSet.SIN_ENTITY_TYPES_SET
 local ____ReadonlySet = require("src.types.ReadonlySet")
 local ReadonlySet = ____ReadonlySet.ReadonlySet
+local ____entities = require("src.functions.entities")
+local doesEntityExist = ____entities.doesEntityExist
 local ____entitiesSpecific = require("src.functions.entitiesSpecific")
 local getNPCs = ____entitiesSpecific.getNPCs
 local spawnNPC = ____entitiesSpecific.spawnNPC
@@ -44990,7 +44984,14 @@ function ____exports.getBossID(self)
         return BossID.BEAST
     end
     local room = game:GetRoom()
-    return room:GetBossID()
+    local bossID = room:GetBossID()
+    if bossID == 0 then
+        return nil
+    end
+    if bossID == BossID.ULTRA_GREED and doesEntityExist(nil, EntityType.ULTRA_GREED, UltraGreedVariant.ULTRA_GREEDIER) then
+        return BossID.ULTRA_GREEDIER
+    end
+    return bossID
 end
 function ____exports.getBossIDFromEntityTypeVariant(self, entityType, variant)
     local entityTypeVariant = (tostring(entityType) .. ".") .. tostring(variant)
@@ -45039,21 +45040,21 @@ local function getNumBossSegments(self, entityType, variant, numSegments)
         return numSegments
     end
     repeat
-        local ____switch20 = entityType
-        local ____cond20 = ____switch20 == EntityType.CHUB
-        if ____cond20 then
+        local ____switch22 = entityType
+        local ____cond22 = ____switch22 == EntityType.CHUB
+        if ____cond22 then
             do
                 return 3
             end
         end
-        ____cond20 = ____cond20 or ____switch20 == EntityType.LOKI
-        if ____cond20 then
+        ____cond22 = ____cond22 or ____switch22 == EntityType.LOKI
+        if ____cond22 then
             do
                 return variant == asNumber(nil, LokiVariant.LOKII) and 2 or 1
             end
         end
-        ____cond20 = ____cond20 or ____switch20 == EntityType.GURGLING
-        if ____cond20 then
+        ____cond22 = ____cond22 or ____switch22 == EntityType.GURGLING
+        if ____cond22 then
             do
                 return 2
             end

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

@@ -37,13 +37,13 @@ export declare function getAliveBosses(entityType?: EntityType | -1, variant?: n
  */
 export declare function getAllBossesSet(includeStoryBosses?: boolean): ReadonlySet<BossID>;
 /**
- * Helper function to get the boss ID corresponding to the current room. Returns 0 if the current
- * room is not a Boss Room.
+ * Helper function to get the boss ID corresponding to the current room. Returns undefined if the
+ * current room is not a Boss Room.
  *
- * Use this instead of the vanilla `Room.GetBossID` method since it correctly handles Dogma and The
- * Beast.
+ * Use this instead of the vanilla `Room.GetBossID` method since it has a saner return type and it
+ * correctly handles Dogma, The Beast, and Ultra Greedier.
  */
-export declare function getBossID(): BossID | 0;
+export declare function getBossID(): BossID | undefined;
 export declare function getBossIDFromEntityTypeVariant(entityType: EntityType, variant: int): BossID | undefined;
 /**
  * Helper function to get the proper English name for a boss. For example, the name for

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

@@ -1 +1 @@
-{"version":3,"file":"bosses.d.ts","sourceRoot":"","sources":["../../../src/functions/bosses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAe,MAAM,8BAA8B,CAAC;AAkC/E;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAC5B,UAAU,GAAE,UAAU,GAAG,CAAC,CAAM,EAChC,OAAO,SAAK,EACZ,OAAO,SAAK,EACZ,cAAc,UAAQ,GACrB,SAAS,EAAE,CAGb;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAC7B,kBAAkB,UAAO,GACxB,WAAW,CAAC,MAAM,CAAC,CAIrB;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,IAAI,MAAM,GAAG,CAAC,CAWtC;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,GACX,MAAM,GAAG,SAAS,CAGpB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,GACnB,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAOjC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CACvB,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,GAAG,EACb,OAAO,CAAC,EAAE,GAAG,EACb,cAAc,UAAQ,GACrB,SAAS,EAAE,CAGb;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,UAAU,GAChB,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAEjC;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,MAAM,GACb,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,CAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,6FAA6F;AAC7F,wBAAgB,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAE7C;AAmCD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAE3D;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,mBAAmB,EAAE,MAAM,GAAG,GAAG,EACjC,QAAQ,GAAE,MAAmB,EAC7B,OAAO,GAAE,MAAM,GAAG,SAAqB,EACvC,SAAS,GAAE,IAAI,GAAG,GAAG,GAAG,SAAqB,EAC7C,WAAW,CAAC,EAAE,GAAG,GAChB,SAAS,CAiCX;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,mBAAmB,EAAE,MAAM,GAAG,GAAG,EACjC,SAAS,EAAE,IAAI,GAAG,GAAG,EACrB,QAAQ,GAAE,MAAmB,EAC7B,OAAO,GAAE,MAAM,GAAG,SAAqB,EACvC,WAAW,CAAC,EAAE,GAAG,GAChB,SAAS,CAYX"}
+{"version":3,"file":"bosses.d.ts","sourceRoot":"","sources":["../../../src/functions/bosses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EACL,MAAM,EACN,UAAU,EAGX,MAAM,8BAA8B,CAAC;AAmCtC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAC5B,UAAU,GAAE,UAAU,GAAG,CAAC,CAAM,EAChC,OAAO,SAAK,EACZ,OAAO,SAAK,EACZ,cAAc,UAAQ,GACrB,SAAS,EAAE,CAGb;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAC7B,kBAAkB,UAAO,GACxB,WAAW,CAAC,MAAM,CAAC,CAIrB;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,IAAI,MAAM,GAAG,SAAS,CAwB9C;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,GACX,MAAM,GAAG,SAAS,CAGpB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,GACnB,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAOjC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CACvB,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,GAAG,EACb,OAAO,CAAC,EAAE,GAAG,EACb,cAAc,UAAQ,GACrB,SAAS,EAAE,CAGb;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,UAAU,GAChB,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAEjC;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,MAAM,GACb,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,CAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,6FAA6F;AAC7F,wBAAgB,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAE7C;AAmCD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAE3D;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,mBAAmB,EAAE,MAAM,GAAG,GAAG,EACjC,QAAQ,GAAE,MAAmB,EAC7B,OAAO,GAAE,MAAM,GAAG,SAAqB,EACvC,SAAS,GAAE,IAAI,GAAG,GAAG,GAAG,SAAqB,EAC7C,WAAW,CAAC,EAAE,GAAG,GAChB,SAAS,CAiCX;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,mBAAmB,EAAE,MAAM,GAAG,GAAG,EACjC,SAAS,EAAE,IAAI,GAAG,GAAG,EACrB,QAAQ,GAAE,MAAmB,EAC7B,OAAO,GAAE,MAAM,GAAG,SAAqB,EACvC,WAAW,CAAC,EAAE,GAAG,GAChB,SAAS,CAYX"}

package/dist/src/functions/bosses.lua

@@ -6,6 +6,7 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local LokiVariant = ____isaac_2Dtypescript_2Ddefinitions.LokiVariant
+local UltraGreedVariant = ____isaac_2Dtypescript_2Ddefinitions.UltraGreedVariant
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____constants = require("src.core.constants")
@@ -30,6 +31,8 @@ local ____sinEntityTypesSet = require("src.sets.sinEntityTypesSet")
 local SIN_ENTITY_TYPES_SET = ____sinEntityTypesSet.SIN_ENTITY_TYPES_SET
 local ____ReadonlySet = require("src.types.ReadonlySet")
 local ReadonlySet = ____ReadonlySet.ReadonlySet
+local ____entities = require("src.functions.entities")
+local doesEntityExist = ____entities.doesEntityExist
 local ____entitiesSpecific = require("src.functions.entitiesSpecific")
 local getNPCs = ____entitiesSpecific.getNPCs
 local spawnNPC = ____entitiesSpecific.spawnNPC
@@ -113,11 +116,11 @@ function ____exports.getAllBossesSet(self, includeStoryBosses)
     end
     return includeStoryBosses and ALL_BOSSES_SET or ALL_BOSSES_EXCLUDING_STORY_BOSSES_SET
 end
---- Helper function to get the boss ID corresponding to the current room. Returns 0 if the current
--- room is not a Boss Room.
+--- Helper function to get the boss ID corresponding to the current room. Returns undefined if the
+-- current room is not a Boss Room.
 -- 
--- Use this instead of the vanilla `Room.GetBossID` method since it correctly handles Dogma and The
--- Beast.
+-- Use this instead of the vanilla `Room.GetBossID` method since it has a saner return type and it
+-- correctly handles Dogma, The Beast, and Ultra Greedier.
 function ____exports.getBossID(self)
     if inDogmaRoom(nil) then
         return BossID.DOGMA
@@ -126,7 +129,14 @@ function ____exports.getBossID(self)
         return BossID.BEAST
     end
     local room = game:GetRoom()
-    return room:GetBossID()
+    local bossID = room:GetBossID()
+    if bossID == 0 then
+        return nil
+    end
+    if bossID == BossID.ULTRA_GREED and doesEntityExist(nil, EntityType.ULTRA_GREED, UltraGreedVariant.ULTRA_GREEDIER) then
+        return BossID.ULTRA_GREEDIER
+    end
+    return bossID
 end
 function ____exports.getBossIDFromEntityTypeVariant(self, entityType, variant)
     local entityTypeVariant = (tostring(entityType) .. ".") .. tostring(variant)
@@ -201,21 +211,21 @@ local function getNumBossSegments(self, entityType, variant, numSegments)
         return numSegments
     end
     repeat
-        local ____switch20 = entityType
-        local ____cond20 = ____switch20 == EntityType.CHUB
-        if ____cond20 then
+        local ____switch22 = entityType
+        local ____cond22 = ____switch22 == EntityType.CHUB
+        if ____cond22 then
             do
                 return 3
             end
         end
-        ____cond20 = ____cond20 or ____switch20 == EntityType.LOKI
-        if ____cond20 then
+        ____cond22 = ____cond22 or ____switch22 == EntityType.LOKI
+        if ____cond22 then
             do
                 return variant == asNumber(nil, LokiVariant.LOKII) and 2 or 1
             end
         end
-        ____cond20 = ____cond20 or ____switch20 == EntityType.GURGLING
-        if ____cond20 then
+        ____cond22 = ____cond22 or ____switch22 == EntityType.GURGLING
+        if ____cond22 then
             do
                 return 2
             end

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

@@ -1 +1 @@
-{"version":3,"file":"frames.d.ts","sourceRoot":"","sources":["../../../src/functions/frames.ts"],"names":[],"mappings":";AAEA,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,GAAG,GAAG,GAAG,CAGlE;AAED,wBAAgB,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,GAAG,GAAG,CAGtE;AAED,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,GAAG,GAAG,GAAG,CAIlE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAG7D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGjE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAK7D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAG9D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGlE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAK9D;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,cAAc,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAO3E;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAG/D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGnE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAK/D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAGhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGpE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAKhE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,gBAAgB,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GACvC,OAAO,CAOT;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,cAAc,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAS3E"}
+{"version":3,"file":"frames.d.ts","sourceRoot":"","sources":["../../../src/functions/frames.ts"],"names":[],"mappings":";AAEA,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,GAAG,GAAG,GAAG,CAGlE;AAED,wBAAgB,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,GAAG,GAAG,CAGtE;AAED,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,GAAG,GAAG,GAAG,CAIlE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAG7D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGjE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAK7D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAG9D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGlE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAK9D;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,cAAc,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG3E;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAG/D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGnE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAK/D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAGhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAGpE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,GAAG,GAAG,OAAO,CAKhE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,gBAAgB,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GACvC,OAAO,CAGT;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,cAAc,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAK3E"}

package/dist/src/functions/frames.lua

@@ -57,9 +57,6 @@ end
 -- 
 -- This returns false if the submitted render frame count is null or undefined.
 function ____exports.onGameFrame(self, gameFrameCount)
-    if gameFrameCount == nil or gameFrameCount == nil then
-        return false
-    end
     local thisGameFrameCount = game:GetFrameCount()
     return thisGameFrameCount == gameFrameCount
 end
@@ -106,9 +103,6 @@ end
 -- 
 -- This returns false if the submitted render frame count is null or undefined.
 function ____exports.onRenderFrame(self, renderFrameCount)
-    if renderFrameCount == nil or renderFrameCount == nil then
-        return false
-    end
     local thisRenderFrameCount = Isaac.GetFrameCount()
     return thisRenderFrameCount == renderFrameCount
 end
@@ -117,9 +111,6 @@ end
 -- 
 -- This returns false if the submitted room frame count is null or undefined.
 function ____exports.onRoomFrame(self, roomFrameCount)
-    if roomFrameCount == nil or roomFrameCount == nil then
-        return false
-    end
     local room = game:GetRoom()
     local thisGameFrameCount = room:GetFrameCount()
     return thisGameFrameCount == roomFrameCount

package/package.json

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

package/src/functions/bosses.ts

@@ -1,5 +1,10 @@
 import type { LevelStage, StageType } from "isaac-typescript-definitions";
-import { BossID, EntityType, LokiVariant } from "isaac-typescript-definitions";
+import {
+  BossID,
+  EntityType,
+  LokiVariant,
+  UltraGreedVariant,
+} from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { VectorZero } from "../core/constants";
 import { ENTITY_TYPE_VARIANT_TO_BOSS_ID_MAP } from "../maps/entityTypeVariantToBossIDMap";
@@ -16,6 +21,7 @@ import {
 import { REPENTANCE_ONLY_BOSS_IDS_SET } from "../sets/repentanceBossIDsSet";
 import { SIN_ENTITY_TYPES_SET } from "../sets/sinEntityTypesSet";
 import { ReadonlySet } from "../types/ReadonlySet";
+import { doesEntityExist } from "./entities";
 import { getNPCs, spawnNPC } from "./entitiesSpecific";
 import { getAliveNPCs } from "./npcs";
 import { isRNG } from "./rng";
@@ -86,13 +92,13 @@ export function getAllBossesSet(
 }
 
 /**
- * Helper function to get the boss ID corresponding to the current room. Returns 0 if the current
- * room is not a Boss Room.
+ * Helper function to get the boss ID corresponding to the current room. Returns undefined if the
+ * current room is not a Boss Room.
  *
- * Use this instead of the vanilla `Room.GetBossID` method since it correctly handles Dogma and The
- * Beast.
+ * Use this instead of the vanilla `Room.GetBossID` method since it has a saner return type and it
+ * correctly handles Dogma, The Beast, and Ultra Greedier.
  */
-export function getBossID(): BossID | 0 {
+export function getBossID(): BossID | undefined {
   if (inDogmaRoom()) {
     return BossID.DOGMA;
   }
@@ -102,7 +108,20 @@ export function getBossID(): BossID | 0 {
   }
 
   const room = game.GetRoom();
-  return room.GetBossID();
+  const bossID = room.GetBossID();
+  if (bossID === 0) {
+    return undefined;
+  }
+
+  // The Ultra Greed room holds both Ultra Greed and Ultra Greedier.
+  if (
+    bossID === BossID.ULTRA_GREED &&
+    doesEntityExist(EntityType.ULTRA_GREED, UltraGreedVariant.ULTRA_GREEDIER)
+  ) {
+    return BossID.ULTRA_GREEDIER;
+  }
+
+  return bossID;
 }
 
 export function getBossIDFromEntityTypeVariant(

package/src/functions/frames.ts

@@ -81,10 +81,6 @@ export function isBeforeRoomFrame(roomFrameCount: int): boolean {
  * This returns false if the submitted render frame count is null or undefined.
  */
 export function onGameFrame(gameFrameCount: int | null | undefined): boolean {
-  if (gameFrameCount === null || gameFrameCount === undefined) {
-    return false;
-  }
-
   const thisGameFrameCount = game.GetFrameCount();
   return thisGameFrameCount === gameFrameCount;
 }
@@ -156,10 +152,6 @@ export function onOrBeforeRoomFrame(roomFrameCount: int): boolean {
 export function onRenderFrame(
   renderFrameCount: int | null | undefined,
 ): boolean {
-  if (renderFrameCount === null || renderFrameCount === undefined) {
-    return false;
-  }
-
   const thisRenderFrameCount = Isaac.GetFrameCount();
   return thisRenderFrameCount === renderFrameCount;
 }
@@ -171,10 +163,6 @@ export function onRenderFrame(
  * This returns false if the submitted room frame count is null or undefined.
  */
 export function onRoomFrame(roomFrameCount: int | null | undefined): boolean {
-  if (roomFrameCount === null || roomFrameCount === undefined) {
-    return false;
-  }
-
   const room = game.GetRoom();
 
   const thisGameFrameCount = room.GetFrameCount();