isaacscript-common 6.7.0 → 6.9.0

package/dist/functions/pickupsSpecific.lua

@@ -287,7 +287,7 @@ function ____exports.spawnBombPickupWithSeed(self, bombSubType, position, seedOr
     )
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.TAROT_CARD` (300).
-function ____exports.spawnCard(self, subType, position, velocity, spawner, seedOrRNG)
+function ____exports.spawnCard(self, card, position, velocity, spawner, seedOrRNG)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -300,7 +300,7 @@ function ____exports.spawnCard(self, subType, position, velocity, spawner, seedO
     return spawnPickup(
         nil,
         PickupVariant.TAROT_CARD,
-        subType,
+        card,
         position,
         velocity,
         spawner,
@@ -309,7 +309,7 @@ function ____exports.spawnCard(self, subType, position, velocity, spawner, seedO
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.TAROT_CARD` (300)
 -- and a specific seed.
-function ____exports.spawnCardWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnCardWithSeed(self, card, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -318,7 +318,7 @@ function ____exports.spawnCardWithSeed(self, subType, position, seedOrRNG, veloc
     end
     return ____exports.spawnCard(
         nil,
-        subType,
+        card,
         position,
         velocity,
         spawner,
@@ -326,7 +326,7 @@ function ____exports.spawnCardWithSeed(self, subType, position, seedOrRNG, veloc
     )
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.COIN` (20).
-function ____exports.spawnCoin(self, subType, position, velocity, spawner, seedOrRNG)
+function ____exports.spawnCoin(self, coinSubType, position, velocity, spawner, seedOrRNG)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -339,7 +339,7 @@ function ____exports.spawnCoin(self, subType, position, velocity, spawner, seedO
     return spawnPickup(
         nil,
         PickupVariant.COIN,
-        subType,
+        coinSubType,
         position,
         velocity,
         spawner,
@@ -348,7 +348,7 @@ function ____exports.spawnCoin(self, subType, position, velocity, spawner, seedO
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.COIN` (20) and a
 -- specific seed.
-function ____exports.spawnCoinWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnCoinWithSeed(self, coinSubType, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -357,7 +357,7 @@ function ____exports.spawnCoinWithSeed(self, subType, position, seedOrRNG, veloc
     end
     return ____exports.spawnCoin(
         nil,
-        subType,
+        coinSubType,
         position,
         velocity,
         spawner,
@@ -365,7 +365,7 @@ function ____exports.spawnCoinWithSeed(self, subType, position, seedOrRNG, veloc
     )
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.HEART` (10).
-function ____exports.spawnHeart(self, subType, position, velocity, spawner, seedOrRNG)
+function ____exports.spawnHeart(self, heartSubType, position, velocity, spawner, seedOrRNG)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -378,14 +378,14 @@ function ____exports.spawnHeart(self, subType, position, velocity, spawner, seed
     return spawnPickup(
         nil,
         PickupVariant.HEART,
-        subType,
+        heartSubType,
         position,
         velocity,
         spawner,
         seedOrRNG
     )
 end
-function ____exports.spawnHeartWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnHeartWithSeed(self, heartSubType, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -394,7 +394,7 @@ function ____exports.spawnHeartWithSeed(self, subType, position, seedOrRNG, velo
     end
     return ____exports.spawnHeart(
         nil,
-        subType,
+        heartSubType,
         position,
         velocity,
         spawner,
@@ -402,7 +402,7 @@ function ____exports.spawnHeartWithSeed(self, subType, position, seedOrRNG, velo
     )
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.KEY` (30).
-function ____exports.spawnKey(self, subType, position, velocity, spawner, seedOrRNG)
+function ____exports.spawnKey(self, keySubType, position, velocity, spawner, seedOrRNG)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -415,7 +415,7 @@ function ____exports.spawnKey(self, subType, position, velocity, spawner, seedOr
     return spawnPickup(
         nil,
         PickupVariant.KEY,
-        subType,
+        keySubType,
         position,
         velocity,
         spawner,
@@ -424,7 +424,7 @@ function ____exports.spawnKey(self, subType, position, velocity, spawner, seedOr
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.KEY` (30) and a
 -- specific seed.
-function ____exports.spawnKeyWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnKeyWithSeed(self, keySubType, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -433,7 +433,7 @@ function ____exports.spawnKeyWithSeed(self, subType, position, seedOrRNG, veloci
     end
     return ____exports.spawnKey(
         nil,
-        subType,
+        keySubType,
         position,
         velocity,
         spawner,
@@ -463,7 +463,7 @@ function ____exports.spawnPill(self, pillColor, position, velocity, spawner, see
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.PILL` (70) and a
 -- specific seed.
-function ____exports.spawnPillWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnPillWithSeed(self, pillColor, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -472,7 +472,7 @@ function ____exports.spawnPillWithSeed(self, subType, position, seedOrRNG, veloc
     end
     return ____exports.spawnPill(
         nil,
-        subType,
+        pillColor,
         position,
         velocity,
         spawner,
@@ -480,7 +480,7 @@ function ____exports.spawnPillWithSeed(self, subType, position, seedOrRNG, veloc
     )
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.SACK` (69).
-function ____exports.spawnSack(self, subType, position, velocity, spawner, seedOrRNG)
+function ____exports.spawnSack(self, sackSubType, position, velocity, spawner, seedOrRNG)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -493,7 +493,7 @@ function ____exports.spawnSack(self, subType, position, velocity, spawner, seedO
     return spawnPickup(
         nil,
         PickupVariant.SACK,
-        subType,
+        sackSubType,
         position,
         velocity,
         spawner,
@@ -502,7 +502,7 @@ function ____exports.spawnSack(self, subType, position, velocity, spawner, seedO
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.SACK` (69) and a
 -- specific seed.
-function ____exports.spawnSackWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnSackWithSeed(self, sackSubType, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -511,7 +511,7 @@ function ____exports.spawnSackWithSeed(self, subType, position, seedOrRNG, veloc
     end
     return ____exports.spawnSack(
         nil,
-        subType,
+        sackSubType,
         position,
         velocity,
         spawner,
@@ -519,7 +519,7 @@ function ____exports.spawnSackWithSeed(self, subType, position, seedOrRNG, veloc
     )
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.TRINKET` (350).
-function ____exports.spawnTrinket(self, subType, position, velocity, spawner, seedOrRNG)
+function ____exports.spawnTrinket(self, trinketType, position, velocity, spawner, seedOrRNG)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -532,7 +532,7 @@ function ____exports.spawnTrinket(self, subType, position, velocity, spawner, se
     return spawnPickup(
         nil,
         PickupVariant.TRINKET,
-        subType,
+        trinketType,
         position,
         velocity,
         spawner,
@@ -541,7 +541,7 @@ function ____exports.spawnTrinket(self, subType, position, velocity, spawner, se
 end
 --- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.TRINKET` (350) and
 -- a specific seed.
-function ____exports.spawnTrinketWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
+function ____exports.spawnTrinketWithSeed(self, trinketType, position, seedOrRNG, velocity, spawner)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -550,7 +550,7 @@ function ____exports.spawnTrinketWithSeed(self, subType, position, seedOrRNG, ve
     end
     return ____exports.spawnTrinket(
         nil,
-        subType,
+        trinketType,
         position,
         velocity,
         spawner,

package/dist/functions/run.d.ts

@@ -13,6 +13,14 @@ export declare function onSetSeed(): boolean;
  * You can optionally specify a `PlayerType` to restart the game as that character.
  */
 export declare function restart(character?: PlayerType): void;
+/**
+ * Helper function to restart on the next render frame. Useful because it is impossible to restart
+ * the game inside of the `POST_NEW_ROOM`, `POST_NEW_LEVEL`, or `POST_GAME_STARTED` callbacks when a
+ * run is first starting.
+ *
+ * You can optionally specify a `PlayerType` to restart the game as that character.
+ */
+export declare function restartNextRenderFrame(character?: PlayerType): void;
 /**
  * Helper function to change the run status to that of an unseeded run with a new random seed.
  *

package/dist/functions/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/functions/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAKrE;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAMnC;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,IAAI,CAiBpD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAUlC"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/functions/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAMrE;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAMnC;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,IAAI,CAiBpD;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,IAAI,CAInE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAUlC"}

package/dist/functions/run.lua

@@ -6,6 +6,8 @@ local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local ____constantsFirstLast = require("constantsFirstLast")
 local FIRST_CHARACTER = ____constantsFirstLast.FIRST_CHARACTER
+local ____runInNFrames = require("features.runInNFrames")
+local runNextRenderFrame = ____runInNFrames.runNextRenderFrame
 local ____log = require("functions.log")
 local log = ____log.log
 --- Whether or not the player is playing on a set seed (i.e. that they entered in a specific seed by
@@ -36,6 +38,19 @@ function ____exports.restart(self, character)
     log((((("Restarting the run as PlayerType." .. tostring(PlayerType[character])) .. " (") .. tostring(character)) .. ") with a console command of: ") .. command)
     Isaac.ExecuteCommand(command)
 end
+--- Helper function to restart on the next render frame. Useful because it is impossible to restart
+-- the game inside of the `POST_NEW_ROOM`, `POST_NEW_LEVEL`, or `POST_GAME_STARTED` callbacks when a
+-- run is first starting.
+-- 
+-- You can optionally specify a `PlayerType` to restart the game as that character.
+function ____exports.restartNextRenderFrame(self, character)
+    runNextRenderFrame(
+        nil,
+        function()
+            ____exports.restart(nil, character)
+        end
+    )
+end
 --- Helper function to change the run status to that of an unseeded run with a new random seed.
 -- 
 -- This is useful to revert the behavior where playing on a set and restarting the game will not

package/package.json

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

package/src/features/extraConsoleCommands/commandsSubroutines.ts

@@ -9,7 +9,7 @@ import { game } from "../../cachedClasses";
 import { HealthType } from "../../enums/HealthType";
 import { directionToVector } from "../../functions/direction";
 import { spawnGridEntityWithVariant } from "../../functions/gridEntities";
-import { logEntities, logGridEntities } from "../../functions/log";
+import { logAllEntities, logAllGridEntities } from "../../functions/log";
 import { addPlayerHealthType } from "../../functions/playerHealth";
 import { getRoomData, getRoomDescriptor } from "../../functions/roomData";
 import { changeRoom, getRoomGridIndexesForType } from "../../functions/rooms";
@@ -73,7 +73,7 @@ export function listEntities(
     }
   }
 
-  logEntities(includeBackgroundEffects, entityTypeFilter);
+  logAllEntities(includeBackgroundEffects, entityTypeFilter);
   printConsole('Logged the entities in the room to the "log.txt" file.');
 }
 
@@ -87,7 +87,7 @@ export function listGridEntities(params: string, includeWalls: boolean): void {
     }
   }
 
-  logGridEntities(includeWalls, gridEntityTypeFilter);
+  logAllGridEntities(includeWalls, gridEntityTypeFilter);
   printConsole('Logged the grid entities in the room to the "log.txt" file.');
 }