isaacscript-common 1.2.210 → 1.2.211

package/dist/functions/familiars.lua

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

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 seed Optional. Default is `getRandomSeed()`.
+ * @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, seed?: Seed, 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, seed?: Seed): EntityPickup;
+export declare function spawnEmptyCollectible(position: Vector, seedOrRNG?: Seed | RNG): EntityPickup;

package/dist/functions/spawnCollectible.lua

@@ -13,9 +13,10 @@ local ____player = require("functions.player")
 local anyPlayerIs = ____player.anyPlayerIs
 local ____rng = require("functions.rng")
 local getRandomSeed = ____rng.getRandomSeed
-function ____exports.spawnCollectible(self, collectibleType, position, seed, options, forceFreeItem)
-    if seed == nil then
-        seed = getRandomSeed(nil)
+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,6 +24,7 @@ function ____exports.spawnCollectible(self, collectibleType, position, seed, opt
     if forceFreeItem == nil then
         forceFreeItem = false
     end
+    local seed = isRNG(nil, seedOrRNG) and seedOrRNG:Next() or seedOrRNG
     local collectible = game:Spawn(
         EntityType.ENTITY_PICKUP,
         100,
@@ -47,15 +49,15 @@ function ____exports.spawnCollectible(self, collectibleType, position, seed, opt
     end
     return collectible
 end
-function ____exports.spawnEmptyCollectible(self, position, seed)
-    if seed == nil then
-        seed = getRandomSeed(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,
-        seed,
+        seedOrRNG,
         false,
         true
     )

package/package.json

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