isaacscript-common 1.2.208 → 1.2.211

package/dist/features/deployJSONRoom.lua

@@ -234,6 +234,7 @@ function spawnNormalEntityForJSONRoom(self, entityType, variant, subType, x, y,
     local room = game:GetRoom()
     local roomType = room:GetType()
     local position = gridToPos(nil, x, y)
+    local seed = rng:Next()
     local entity
     if entityType == EntityType.ENTITY_PICKUP and variant == 100 then
         local options = roomType == RoomType.ROOM_ANGEL
@@ -241,12 +242,10 @@ function spawnNormalEntityForJSONRoom(self, entityType, variant, subType, x, y,
             nil,
             subType,
             position,
-            rng,
+            seed,
             options
         )
     else
-        rng:Next()
-        local seed = rng:GetSeed()
         entity = game:Spawn(
             entityType,
             variant,

package/dist/functions/familiars.lua

@@ -54,7 +54,7 @@ function ____exports.checkFamiliar(self, player, collectibleType, numTargetFamil
         nil,
         numFamiliarsToSpawn,
         function()
-            collectibleRNG:Next()
+            local seed = collectibleRNG:Next()
             local familiar = game:Spawn(
                 EntityType.ENTITY_FAMILIAR,
                 familiarVariant,
@@ -62,7 +62,7 @@ function ____exports.checkFamiliar(self, player, collectibleType, numTargetFamil
                 Vector.Zero,
                 player,
                 familiarSubTypeToUse,
-                collectibleRNG:GetSeed()
+                seed
             ):ToFamiliar()
             if familiar ~= nil then
                 familiar.Player = player

package/dist/functions/rng.d.ts

@@ -16,8 +16,6 @@ interface CopyRNGReturn {
  */
 export declare function copyRNG<R extends RNG | SerializedRNG, S extends SerializationType>(rng: R, serializationType: S): CopyRNGReturn[S];
 export declare function copyRNG<R extends RNG | SerializedRNG>(rng: R): CopyRNGReturn[SerializationType.NONE];
-/** Helper function to get the next seed value for the provided RNG object. */
-export declare function getNextSeed(rng: RNG): Seed;
 /**
  * Helper function to get a random `Seed` value to be used in spawning entities and so on. Use this
  * instead of calling the `Random` function directly since that can return a value of 0 and crash

package/dist/functions/rng.lua

@@ -92,10 +92,6 @@ function ____exports.copyRNG(self, rng, serializationType)
         end
     until true
 end
-function ____exports.getNextSeed(self, rng)
-    rng:Next()
-    return rng:GetSeed()
-end
 function ____exports.isSerializedRNG(self, object)
     local objectType = type(object)
     if objectType ~= "table" then

package/dist/functions/spawnCollectible.d.ts

@@ -7,13 +7,14 @@
  *
  * @param collectibleType The collectible type to spawn.
  * @param position The position to spawn the collectible at.
- * @param rng Optional. Default is `newRNG()`.
+ * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+ * `RNG.Next` method will be called. Default is `getRandomSeed()`.
  * @param options Optional. Set to true to make the collectible a "There's Options" style
  * collectible. Default is false.
  * @param forceFreeItem Optional. Set to true to disable the logic that gives the item a price for
  * Tainted Keeper. Default is false.
  */
-export declare function spawnCollectible(collectibleType: CollectibleType | int, position: Vector, rng?: RNG, options?: boolean, forceFreeItem?: boolean): EntityPickup;
+export declare function spawnCollectible(collectibleType: CollectibleType | int, position: Vector, seedOrRNG?: Seed | RNG, options?: boolean, forceFreeItem?: boolean): EntityPickup;
 /**
  * Helper function to spawn an empty collectible. Doing this is tricky since spawning a collectible
  * with `CollectibleType.COLLECTIBLE_NULL` will result in spawning a collectible with a random type
@@ -21,5 +22,9 @@ export declare function spawnCollectible(collectibleType: CollectibleType | int,
  *
  * Instead, this function arbitrarily spawns a collectible with
  * `CollectibleType.COLLECTIBLE_SAD_ONION`, and then converts it to an empty pedestal afterward.
+ *
+ * @param position The position to spawn the empty collectible at.
+ * @param seedOrRNG The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+ * `RNG.Next` method will be called. Default is `getRandomSeed()`.
  */
-export declare function spawnEmptyCollectible(position: Vector, rng?: RNG): EntityPickup;
+export declare function spawnEmptyCollectible(position: Vector, seedOrRNG?: Seed | RNG): EntityPickup;

package/dist/functions/spawnCollectible.lua

@@ -12,10 +12,11 @@ local setCollectibleEmpty = ____collectibles.setCollectibleEmpty
 local ____player = require("functions.player")
 local anyPlayerIs = ____player.anyPlayerIs
 local ____rng = require("functions.rng")
-local newRNG = ____rng.newRNG
-function ____exports.spawnCollectible(self, collectibleType, position, rng, options, forceFreeItem)
-    if rng == nil then
-        rng = newRNG(nil)
+local getRandomSeed = ____rng.getRandomSeed
+local isRNG = ____rng.isRNG
+function ____exports.spawnCollectible(self, collectibleType, position, seedOrRNG, options, forceFreeItem)
+    if seedOrRNG == nil then
+        seedOrRNG = getRandomSeed(nil)
     end
     if options == nil then
         options = false
@@ -23,8 +24,7 @@ function ____exports.spawnCollectible(self, collectibleType, position, rng, opti
     if forceFreeItem == nil then
         forceFreeItem = false
     end
-    rng:Next()
-    local seed = rng:GetSeed()
+    local seed = isRNG(nil, seedOrRNG) and seedOrRNG:Next() or seedOrRNG
     local collectible = game:Spawn(
         EntityType.ENTITY_PICKUP,
         100,
@@ -49,15 +49,15 @@ function ____exports.spawnCollectible(self, collectibleType, position, rng, opti
     end
     return collectible
 end
-function ____exports.spawnEmptyCollectible(self, position, rng)
-    if rng == nil then
-        rng = newRNG(nil)
+function ____exports.spawnEmptyCollectible(self, position, seedOrRNG)
+    if seedOrRNG == nil then
+        seedOrRNG = getRandomSeed(nil)
     end
     local collectible = ____exports.spawnCollectible(
         nil,
         CollectibleType.COLLECTIBLE_SAD_ONION,
         position,
-        rng,
+        seedOrRNG,
         false,
         true
     )

package/package.json

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