isaacscript-common 1.0.469 → 1.0.473

package/dist/features/deployJSONRoom.d.ts

@@ -21,6 +21,10 @@ export declare function deployJSONRoom(jsonRoom: JSONRoom, seed?: number): int;
  *
  * This function is meant to be used in the PostNewRoom callback.
  *
+ * Note that this function does not simply choose a random element in the provided array; it will
+ * properly account for each room weight using the algorithm from:
+ * https://stackoverflow.com/questions/1761626/weighted-random-numbers
+ *
  * @returns The iterated seed, which can be used in subsequent room deployments. (The seed is used
  * to spawn every entity contained within the custom room.)
  */
@@ -29,7 +33,7 @@ export declare function deployRandomJSONRoom(jsonRooms: JSONRoom[], seed?: numbe
  * Helper function to remove all naturally spawning entities and grid entities from a room. Notably,
  * this will not remove players (1), tears (2), familiars (3), lasers (7), knives (8),
  * projectiles (9), blacklisted NPCs such as Dark Esau, charmed NPCs, friendly NPCs, persistent
- * NPCs, doors, and walls.
+ * NPCs, most effects (1000), doors, and walls.
  *
  * @param fillWithDecorations Optional. Set to true to fill every grid tile with an invisible
  * decoration, which prevents vanilla entities in the room from respawning the next time that the

package/dist/features/deployJSONRoom.lua

@@ -1,7 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
-local postNewRoom, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntity, spawnNormalEntity, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPCS_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, initialized, v
+local postNewRoom, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntity, spawnNormalEntity, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPC_TYPES_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, initialized, v
 local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
 local ____entity = require("functions.entity")
@@ -75,6 +75,8 @@ function ____exports.emptyRoom(self, fillWithDecorations)
     removeAllPickups(nil)
     removeAllMatchingEntities(nil, EntityType.ENTITY_SLOT)
     removeSpecificNPCs(nil)
+    removeAllMatchingEntities(nil, EntityType.ENTITY_EFFECT, EffectVariant.DEVIL)
+    removeAllMatchingEntities(nil, EntityType.ENTITY_EFFECT, EffectVariant.ANGEL)
     removeAllGridEntitiesExceptFor(nil, GridEntityType.GRID_WALL, GridEntityType.GRID_DOOR)
     setRoomCleared(nil)
     if fillWithDecorations then
@@ -88,7 +90,7 @@ function removeSpecificNPCs(self)
         getNPCs(nil)
     ) do
         do
-            if NPCS_TO_NOT_REMOVE:has(npc.Type) then
+            if NPC_TYPES_TO_NOT_REMOVE:has(npc.Type) then
                 goto __continue20
             end
             if (npc:HasEntityFlags(EntityFlag.FLAG_CHARM) or npc:HasEntityFlags(EntityFlag.FLAG_FRIENDLY)) or npc:HasEntityFlags(EntityFlag.FLAG_PERSISTENT) then
@@ -348,7 +350,7 @@ function getPitFrame(self, L, R, U, D, UL, UR, DL, DR)
     return F
 end
 FEATURE_NAME = "JSON room deployer"
-NPCS_TO_NOT_REMOVE = __TS__New(Set, {EntityType.ENTITY_DARK_ESAU})
+NPC_TYPES_TO_NOT_REMOVE = __TS__New(Set, {EntityType.ENTITY_DARK_ESAU})
 PERSISTENT_ENTITY_TYPES = __TS__New(Set, {EntityType.ENTITY_WALL_HUGGER})
 initialized = false
 v = {

package/dist/functions/jsonRoom.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
 import { JSONRoom } from "../types/JSONRoom";
-export declare function getJSONRoomOfVariant(jsonRooms: JSONRoom[], variant: int): JSONRoom | null;
+export declare function getJSONRoomOfVariant(jsonRooms: JSONRoom[], variant: int): JSONRoom | undefined;
 export declare function getJSONRoomsOfSubType(jsonRooms: JSONRoom[], subType: int): JSONRoom[];
 export declare function getRandomJSONRoom(jsonRooms: JSONRoom[], seed?: number): JSONRoom;

package/dist/functions/rooms.d.ts

@@ -102,6 +102,7 @@ export declare function inCrawlspace(): boolean;
  * area.
  */
 export declare function inDeathCertificateArea(): boolean;
+export declare function isDevilsCrownTreasureRoom(): boolean;
 export declare function inDimension(dimension: Dimension): boolean;
 /** Helper function to see if the current room shape is one of the four L room shapes. */
 export declare function inLRoom(): boolean;

package/dist/functions/rooms.lua

@@ -11,6 +11,8 @@ local ____doors = require("functions.doors")
 local closeAllDoors = ____doors.closeAllDoors
 local getDoors = ____doors.getDoors
 local isHiddenSecretRoomDoor = ____doors.isHiddenSecretRoomDoor
+local ____flag = require("functions.flag")
+local hasFlag = ____flag.hasFlag
 function ____exports.getRoomIndex(self)
     local game = Game()
     local level = game:GetLevel()
@@ -164,6 +166,12 @@ function ____exports.inDeathCertificateArea(self)
     local roomSubType = ____exports.getRoomSubType(nil)
     return (roomStageID == 35) and ((roomSubType == 33) or (roomSubType == 33))
 end
+function ____exports.isDevilsCrownTreasureRoom(self)
+    local game = Game()
+    local level = game:GetLevel()
+    local roomDesc = level:GetCurrentRoomDesc()
+    return hasFlag(nil, roomDesc.Flags, 2048)
+end
 function ____exports.inDimension(self, dimension)
     return dimension == ____exports.getCurrentDimension(nil)
 end
@@ -202,14 +210,14 @@ function ____exports.setRoomCleared(self)
     ) do
         do
             if isHiddenSecretRoomDoor(nil, door) then
-                goto __continue37
+                goto __continue38
             end
             door.State = DoorState.STATE_OPEN
             local sprite = door:GetSprite()
             sprite:Play("Opened", true)
             door.ExtraVisible = false
         end
-        ::__continue37::
+        ::__continue38::
     end
     sfx:Stop(SoundEffect.SOUND_DOOR_HEAVY_OPEN)
     game:ShakeScreen(0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.469",
+  "version": "1.0.473",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.281",
+    "isaac-typescript-definitions": "^1.0.282",
     "isaacscript-lint": "^1.0.67",
     "typedoc": "^0.22.10",
     "typescript": "4.4.4",