isaacscript-common 4.0.2 → 4.0.5

package/callbacks/postPlayerCollectible.lua

@@ -5,6 +5,7 @@ local __TS__Spread = ____lualib.__TS__Spread
 local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
+local __TS__ArraySort = ____lualib.__TS__ArraySort
 local ____exports = {}
 local hasSubscriptions, postPEffectUpdate, collectibleCountChanged, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
@@ -48,7 +49,7 @@ function postPEffectUpdate(self, player)
     end
 end
 function collectibleCountChanged(self, player, numCollectiblesChanged, increased)
-    local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player, player)
+    local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player)
     local newCollectibleMap = getPlayerCollectibleMap(nil, player)
     mapSetPlayer(nil, v.run.playersCollectibleMap, player, newCollectibleMap)
     local ____array_0 = __TS__SparseArrayNew(__TS__Spread(oldCollectibleMap:keys()))
@@ -57,6 +58,7 @@ function collectibleCountChanged(self, player, numCollectiblesChanged, increased
         __TS__Spread(newCollectibleMap:keys())
     )
     local collectibleTypes = {__TS__SparseArraySpread(____array_0)}
+    __TS__ArraySort(collectibleTypes)
     local numFired = 0
     for ____, collectibleType in ipairs(collectibleTypes) do
         local oldNum = oldCollectibleMap:get(collectibleType) or 0
@@ -83,7 +85,7 @@ v = {run = {
     playersCollectibleCount = __TS__New(Map),
     playersCollectibleMap = __TS__New(
         DefaultMap,
-        function(____, player) return getPlayerCollectibleMap(nil, player) end
+        function() return __TS__New(Map) end
     )
 }}
 ---

package/functions/collectibleSet.d.ts

@@ -1,9 +1,44 @@
 import { CollectibleType } from "isaac-typescript-definitions";
+/**
+ * Returns an array containing every valid collectible type in the game, including modded
+ * collectibles.
+ *
+ * Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
+ * then use the `getCollectibleArray` helper function instead.
+ */
+export declare function getCollectibleArray(): readonly CollectibleType[];
 /**
  * Returns a set containing every valid collectible type in the game, including modded collectibles.
+ *
+ * Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
+ * then use the `getCollectibleArray` helper function instead.
  */
 export declare function getCollectibleSet(): ReadonlySet<CollectibleType>;
-/** Returns a set containing every modded collectible type in the game. */
+/**
+ * Returns an array containing every modded collectible type in the game.
+ *
+ * Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
+ * then use the `getModdedCollectibleSet` helper function instead.
+ */
+export declare function getModdedCollectibleArray(): readonly CollectibleType[];
+/**
+ * Returns a set containing every modded collectible type in the game.
+ *
+ * Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
+ * then use the `getModdedCollectibleArray` helper function instead.
+ */
 export declare function getModdedCollectibleSet(): ReadonlySet<CollectibleType>;
-/** Returns a set containing every valid vanilla collectible type in the game. */
+/**
+ * Returns an array containing every valid vanilla collectible type in the game.
+ *
+ * Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
+ * then use the `getVanillaCollectibleSet` helper function instead.
+ */
+export declare function getVanillaCollectibleArray(): readonly CollectibleType[];
+/**
+ * Returns a set containing every valid vanilla collectible type in the game.
+ *
+ * Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
+ * then use the `getVanillaCollectibleArray` helper function instead.
+ */
 export declare function getVanillaCollectibleSet(): ReadonlySet<CollectibleType>;

package/functions/collectibleSet.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
+local __TS__ArraySort = ____lualib.__TS__ArraySort
 local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
@@ -8,45 +9,91 @@ local ____constantsFirstLast = require("constantsFirstLast")
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
 local ____collectibles = require("functions.collectibles")
 local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ALL_COLLECTIBLES_ARRAY = {}
+local VANILLA_COLLECTIBLES_ARRAY = {}
+local MODDED_COLLECTIBLES_ARRAY = {}
 local ALL_COLLECTIBLES_SET = __TS__New(Set)
 local VANILLA_COLLECTIBLES_SET = __TS__New(Set)
 local MODDED_COLLECTIBLES_SET = __TS__New(Set)
-local function initCollectibleSets(self)
+local function initCollectibleArraysAndSets(self)
+    if #ALL_COLLECTIBLES_ARRAY ~= 0 then
+        return
+    end
     for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
         do
             local itemConfigItem = itemConfig:GetCollectible(collectibleType)
             if itemConfigItem == nil then
-                goto __continue3
+                goto __continue4
             end
-            ALL_COLLECTIBLES_SET:add(collectibleType)
+            ALL_COLLECTIBLES_ARRAY[#ALL_COLLECTIBLES_ARRAY + 1] = collectibleType
             if collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE then
-                VANILLA_COLLECTIBLES_SET:add(collectibleType)
+                VANILLA_COLLECTIBLES_ARRAY[#VANILLA_COLLECTIBLES_ARRAY + 1] = collectibleType
             else
-                MODDED_COLLECTIBLES_SET:add(collectibleType)
+                MODDED_COLLECTIBLES_ARRAY[#MODDED_COLLECTIBLES_ARRAY + 1] = collectibleType
             end
         end
-        ::__continue3::
+        ::__continue4::
+    end
+    __TS__ArraySort(ALL_COLLECTIBLES_ARRAY)
+    __TS__ArraySort(VANILLA_COLLECTIBLES_ARRAY)
+    __TS__ArraySort(MODDED_COLLECTIBLES_ARRAY)
+    for ____, collectibleType in ipairs(ALL_COLLECTIBLES_ARRAY) do
+        ALL_COLLECTIBLES_SET:add(collectibleType)
+    end
+    for ____, collectibleType in ipairs(VANILLA_COLLECTIBLES_ARRAY) do
+        VANILLA_COLLECTIBLES_SET:add(collectibleType)
     end
+    for ____, collectibleType in ipairs(MODDED_COLLECTIBLES_ARRAY) do
+        MODDED_COLLECTIBLES_SET:add(collectibleType)
+    end
+end
+--- Returns an array containing every valid collectible type in the game, including modded
+-- collectibles.
+-- 
+-- Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
+-- then use the `getCollectibleArray` helper function instead.
+function ____exports.getCollectibleArray(self)
+    initCollectibleArraysAndSets(nil)
+    return ALL_COLLECTIBLES_ARRAY
 end
 --- Returns a set containing every valid collectible type in the game, including modded collectibles.
+-- 
+-- Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
+-- then use the `getCollectibleArray` helper function instead.
 function ____exports.getCollectibleSet(self)
-    if ALL_COLLECTIBLES_SET.size == 0 then
-        initCollectibleSets(nil)
-    end
+    initCollectibleArraysAndSets(nil)
     return ALL_COLLECTIBLES_SET
 end
+--- Returns an array containing every modded collectible type in the game.
+-- 
+-- Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
+-- then use the `getModdedCollectibleSet` helper function instead.
+function ____exports.getModdedCollectibleArray(self)
+    initCollectibleArraysAndSets(nil)
+    return MODDED_COLLECTIBLES_ARRAY
+end
 --- Returns a set containing every modded collectible type in the game.
+-- 
+-- Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
+-- then use the `getModdedCollectibleArray` helper function instead.
 function ____exports.getModdedCollectibleSet(self)
-    if ALL_COLLECTIBLES_SET.size == 0 then
-        initCollectibleSets(nil)
-    end
+    initCollectibleArraysAndSets(nil)
     return MODDED_COLLECTIBLES_SET
 end
+--- Returns an array containing every valid vanilla collectible type in the game.
+-- 
+-- Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
+-- then use the `getVanillaCollectibleSet` helper function instead.
+function ____exports.getVanillaCollectibleArray(self)
+    initCollectibleArraysAndSets(nil)
+    return VANILLA_COLLECTIBLES_ARRAY
+end
 --- Returns a set containing every valid vanilla collectible type in the game.
+-- 
+-- Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
+-- then use the `getVanillaCollectibleArray` helper function instead.
 function ____exports.getVanillaCollectibleSet(self)
-    if ALL_COLLECTIBLES_SET.size == 0 then
-        initCollectibleSets(nil)
-    end
+    initCollectibleArraysAndSets(nil)
     return VANILLA_COLLECTIBLES_SET
 end
 return ____exports

package/functions/player.lua

@@ -5,7 +5,6 @@ local __TS__ArraySome = ____lualib.__TS__ArraySome
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local Map = ____lualib.Map
-local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local ____exports = {}
@@ -39,7 +38,7 @@ local isVanillaCharacter = ____character.isVanillaCharacter
 local ____collectibles = require("functions.collectibles")
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
 local ____collectibleSet = require("functions.collectibleSet")
-local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____playerIndex = require("functions.playerIndex")
@@ -404,9 +403,9 @@ end
 --- Iterates over every item in the game and returns a map containing the number of each item that
 -- the player has.
 function ____exports.getPlayerCollectibleMap(self, player)
-    local collectibleSet = getCollectibleSet(nil)
+    local collectibleArray = getCollectibleArray(nil)
     local collectibleMap = __TS__New(Map)
-    for ____, collectibleType in __TS__Iterator(collectibleSet:values()) do
+    for ____, collectibleType in ipairs(collectibleArray) do
         local collectibleNum = player:GetCollectibleNum(collectibleType, true)
         if collectibleNum > 0 then
             collectibleMap:set(collectibleType, collectibleNum)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "4.0.2",
+  "version": "4.0.5",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "index",
   "types": "index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.0.5"
+    "isaac-typescript-definitions": "^3.0.6"
   }
 }

package/cachedClasses.ts

@@ -1,39 +0,0 @@
-/**
- * A cached version of the class returned from the `Game()` constructor.
- *
- * Use this instead of invoking the constructor again for a miniscule performance increase.
- *
- * Caching the results of this constructor is safe, but caching other classes (like `Level` or
- * `Room`) is not safe and can lead to the game crashing in certain situations.
- */
-export const game = Game();
-
-/**
- * A cached version of the class returned from the `Isaac.GetItemConfig()` constructor.
- *
- * Use this instead of invoking the constructor again for a miniscule performance increase.
- *
- * Caching the results of this constructor is safe, but caching other classes (like `Level` or
- * `Room`) is not safe and can lead to the game crashing in certain situations.
- */
-export const itemConfig = Isaac.GetItemConfig();
-
-/**
- * A cached version of the class returned from the `MusicManager()` constructor.
- *
- * Use this instead of invoking the constructor again for a miniscule performance increase.
- *
- * Caching the results of this constructor is safe, but caching other classes (like `Level` or
- * `Room`) is not safe and can lead to the game crashing in certain situations.
- */
-export const musicManager = MusicManager();
-
-/**
- * A cached version of the class returned from the `SFXManager()` constructor.
- *
- * Use this instead of invoking the constructor again for a miniscule performance increase.
- *
- * Caching the results of this constructor is safe, but caching other classes (like `Level` or
- * `Room`) is not safe and can lead to the game crashing in certain situations.
- */
-export const sfxManager = SFXManager();

package/callbacks/customRevive.ts

@@ -1,215 +0,0 @@
-// This provides the logic for:
-// - PRE_CUSTOM_REVIVE
-// - POST_CUSTOM_REVIVE
-
-import {
-  CollectibleType,
-  FamiliarVariant,
-  ModCallback,
-  PlayerType,
-  SoundEffect,
-} from "isaac-typescript-definitions";
-import { sfxManager } from "../cachedClasses";
-import { ModUpgraded } from "../classes/ModUpgraded";
-import { ModCallbackCustom } from "../enums/ModCallbackCustom";
-import { runNextGameFrame } from "../features/runInNFrames";
-import { saveDataManager } from "../features/saveDataManager/exports";
-import { removeCollectibleFromItemTracker } from "../functions/collectibles";
-import { removeAllFamiliars } from "../functions/entitySpecific";
-import { log, logError } from "../functions/log";
-import { isCharacter } from "../functions/player";
-import { getPlayerFromIndex, getPlayerIndex } from "../functions/playerIndex";
-import { PlayerIndex } from "../types/PlayerIndex";
-import {
-  postCustomReviveFire,
-  postCustomReviveHasSubscriptions,
-} from "./subscriptions/postCustomRevive";
-import {
-  preCustomReviveFire,
-  preCustomReviveHasSubscriptions,
-} from "./subscriptions/preCustomRevive";
-
-const DEBUG = false;
-
-enum CustomReviveState {
-  DISABLED,
-
-  /**
-   * We can't immediately jump to waiting for an item animation because it is possible for a player
-   * to be holding an item above their head as they are dying (e.g. with Razor Blade).
-   */
-  WAITING_FOR_ROOM_TRANSITION,
-
-  WAITING_FOR_ITEM_ANIMATION,
-}
-
-const v = {
-  run: {
-    state: CustomReviveState.DISABLED,
-    revivalType: null as int | null,
-    dyingPlayerIndex: null as PlayerIndex | null,
-  },
-};
-
-/** @internal */
-export function customReviveCallbacksInit(mod: ModUpgraded): void {
-  saveDataManager("customRevive", v, hasSubscriptions);
-
-  mod.AddCallback(ModCallback.POST_RENDER, postRender); // 2
-  mod.AddCallbackCustom(
-    ModCallbackCustom.POST_NEW_ROOM_REORDERED,
-    postNewRoomReordered,
-  );
-  mod.AddCallbackCustom(
-    ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-    postPEffectUpdateReordered,
-  );
-  mod.AddCallbackCustom(
-    ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE,
-    postPlayerFatalDamage,
-  );
-  mod.AddCallbackCustom(ModCallbackCustom.PRE_BERSERK_DEATH, preBerserkDeath);
-}
-
-function hasSubscriptions() {
-  return (
-    preCustomReviveHasSubscriptions() || postCustomReviveHasSubscriptions()
-  );
-}
-
-// ModCallback.POST_RENDER (2)
-function postRender() {
-  if (v.run.state !== CustomReviveState.WAITING_FOR_ITEM_ANIMATION) {
-    return;
-  }
-
-  // The 1-up sound will fire before the item holding animation begins, so we mute it on every
-  // render frame.
-  sfxManager.Stop(SoundEffect.ONE_UP);
-}
-
-// ModCallbackCustom.POST_NEW_ROOM_REORDERED
-function postNewRoomReordered() {
-  if (v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
-    return;
-  }
-
-  v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION;
-  logStateChanged();
-}
-
-// ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
-function postPEffectUpdateReordered(player: EntityPlayer) {
-  checkWaitingForItemAnimation(player);
-}
-
-function checkWaitingForItemAnimation(player: EntityPlayer) {
-  if (v.run.state !== CustomReviveState.WAITING_FOR_ITEM_ANIMATION) {
-    return;
-  }
-
-  if (v.run.dyingPlayerIndex === null) {
-    return;
-  }
-
-  const playerIndex = getPlayerIndex(player);
-  if (playerIndex !== v.run.dyingPlayerIndex) {
-    return;
-  }
-
-  let playerToCheckHoldingItem = player;
-  if (isCharacter(player, PlayerType.THE_SOUL_B)) {
-    const forgottenBody = player.GetOtherTwin();
-    if (forgottenBody !== undefined) {
-      playerToCheckHoldingItem = forgottenBody;
-    }
-  }
-
-  if (!playerToCheckHoldingItem.IsHoldingItem()) {
-    return;
-  }
-
-  // The player is now playing the animation where they hold the 1-Up item overhead. The
-  // `EntityPlayer.StopExtraAnimation` method will not work to stop this animation. End-users are
-  // expected to play a new animation in the PostCustomRevive callback, which will overwrite the
-  // 1-Up animation.
-
-  if (v.run.revivalType !== null) {
-    postCustomReviveFire(playerToCheckHoldingItem, v.run.revivalType);
-  }
-
-  v.run.state = CustomReviveState.DISABLED;
-  v.run.revivalType = null;
-  v.run.dyingPlayerIndex = null;
-  logStateChanged();
-}
-
-// ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE
-function postPlayerFatalDamage(player: EntityPlayer): boolean | undefined {
-  if (!hasSubscriptions()) {
-    return undefined;
-  }
-
-  playerIsAboutToDie(player);
-  return undefined;
-}
-
-// ModCallbackCustom.PRE_BERSERK_DEATH
-function preBerserkDeath(player: EntityPlayer) {
-  if (!hasSubscriptions()) {
-    return;
-  }
-
-  playerIsAboutToDie(player);
-}
-
-/**
- * The player is about to die, which will immediately delete the save data for the run. To prevent
- * this from happening, we grant the 1-Up item.
- */
-function playerIsAboutToDie(player: EntityPlayer) {
-  const revivalType = preCustomReviveFire(player);
-  if (revivalType === undefined) {
-    return;
-  }
-
-  v.run.state = CustomReviveState.WAITING_FOR_ROOM_TRANSITION;
-  v.run.revivalType = revivalType;
-  v.run.dyingPlayerIndex = getPlayerIndex(player);
-  logStateChanged();
-
-  player.AddCollectible(CollectibleType.ONE_UP, 0, false);
-  removeAllFamiliars(FamiliarVariant.ONE_UP);
-  removeCollectibleFromItemTracker(CollectibleType.ONE_UP);
-
-  // The player should always be dead one frame from now. If they are not, then something has gone
-  // wrong, probably with the `isDamageToPlayerFatal` function. Since end-user code is already
-  // assuming that a custom revive is occurring, explicitly kill the player.
-  const playerIndex = getPlayerIndex(player);
-  runNextGameFrame(() => {
-    const futurePlayer = getPlayerFromIndex(playerIndex);
-    if (futurePlayer === undefined) {
-      return;
-    }
-
-    if (futurePlayer.IsDead()) {
-      return;
-    }
-
-    logError(
-      "The player is still alive after initializing a custom revive. Explicitly killing the player.",
-    );
-    futurePlayer.Kill();
-  });
-}
-
-function logStateChanged() {
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if (DEBUG) {
-    log(
-      `Custom revive state changed: ${CustomReviveState[v.run.state]} (${
-        v.run.state
-      })`,
-    );
-  }
-}

package/callbacks/itemPickup.ts

@@ -1,101 +0,0 @@
-// This provides the logic for:
-// - PRE_ITEM_PICKUP
-// - POST_ITEM_PICKUP
-
-import {
-  CollectibleType,
-  ItemType,
-  TrinketType,
-} from "isaac-typescript-definitions";
-import { DefaultMap } from "../classes/DefaultMap";
-import { ModUpgraded } from "../classes/ModUpgraded";
-import { ModCallbackCustom } from "../enums/ModCallbackCustom";
-import { saveDataManager } from "../features/saveDataManager/exports";
-import { defaultMapGetPlayer } from "../functions/playerDataStructures";
-import {
-  newPickingUpItem,
-  PickingUpItem,
-  resetPickingUpItem,
-} from "../types/PickingUpItem";
-import { PlayerIndex } from "../types/PlayerIndex";
-import {
-  postItemPickupFire,
-  postItemPickupHasSubscriptions,
-} from "./subscriptions/postItemPickup";
-import {
-  preItemPickupFire,
-  preItemPickupHasSubscriptions,
-} from "./subscriptions/preItemPickup";
-
-const v = {
-  run: {
-    playersPickingUpItemMap: new DefaultMap<PlayerIndex, PickingUpItem>(() =>
-      newPickingUpItem(),
-    ),
-  },
-};
-
-/** @internal */
-export function itemPickupCallbacksInit(mod: ModUpgraded): void {
-  saveDataManager("itemPickup", v, hasSubscriptions);
-
-  mod.AddCallbackCustom(
-    ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-    postPEffectUpdateReordered,
-  );
-}
-
-function hasSubscriptions() {
-  return preItemPickupHasSubscriptions() || postItemPickupHasSubscriptions();
-}
-
-// ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
-function postPEffectUpdateReordered(player: EntityPlayer) {
-  if (!hasSubscriptions()) {
-    return;
-  }
-
-  const pickingUpItem = defaultMapGetPlayer(
-    v.run.playersPickingUpItemMap,
-    player,
-  );
-
-  if (player.IsItemQueueEmpty()) {
-    queueEmpty(player, pickingUpItem);
-    // If a player enters a room with a trinket next to the entrance, the player will pick up the
-    // trinket, but it will not become queued (it will be deposited into their inventory
-    // immediately). Since we don't know what type of item the player is holding, don't account for
-    // this bug.
-  } else {
-    queueNotEmpty(player, pickingUpItem);
-  }
-}
-
-function queueEmpty(player: EntityPlayer, pickingUpItem: PickingUpItem) {
-  // eslint-disable-next-line isaacscript/strict-enums
-  if (pickingUpItem.itemType === ItemType.NULL || pickingUpItem.subType === 0) {
-    return;
-  }
-
-  postItemPickupFire(player, pickingUpItem);
-  resetPickingUpItem(pickingUpItem);
-}
-
-function queueNotEmpty(player: EntityPlayer, pickingUpItem: PickingUpItem) {
-  const queuedItem = player.QueuedItem.Item;
-  if (queuedItem === undefined || queuedItem.Type === ItemType.NULL) {
-    // This should never happen, since the `EntityPlayer.IsItemQueueEmpty` method returned true.
-    return;
-  }
-
-  if (
-    queuedItem.Type !== pickingUpItem.itemType ||
-    queuedItem.ID !== pickingUpItem.subType
-  ) {
-    // Record which item we are picking up.
-    pickingUpItem.itemType = queuedItem.Type;
-    pickingUpItem.subType = queuedItem.ID as CollectibleType | TrinketType;
-
-    preItemPickupFire(player, pickingUpItem);
-  }
-}

package/callbacks/postAmbush.ts

@@ -1,73 +0,0 @@
-// This provides the logic for:
-// - POST_AMBUSH_STARTED
-// - POST_AMBUSH_FINISHED
-
-import { ModCallback, RoomType } from "isaac-typescript-definitions";
-import { game } from "../cachedClasses";
-import { AmbushType } from "../enums/AmbushType";
-import { saveDataManager } from "../features/saveDataManager/exports";
-import { getRoomType } from "../functions/roomData";
-import {
-  postAmbushFinishedFire,
-  postAmbushFinishedHasSubscriptions,
-} from "./subscriptions/postAmbushFinished";
-import {
-  postAmbushStartedFire,
-  postAmbushStartedHasSubscriptions,
-} from "./subscriptions/postAmbushStarted";
-
-const v = {
-  room: {
-    ambushActive: false,
-    ambushDone: false,
-  },
-};
-
-/** @internal */
-export function postAmbushCallbacksInit(mod: Mod): void {
-  saveDataManager("postAmbushCallbacks", v, hasSubscriptions);
-
-  mod.AddCallback(ModCallback.POST_UPDATE, postUpdate); // 1
-}
-
-function hasSubscriptions() {
-  return (
-    postAmbushStartedHasSubscriptions() || postAmbushFinishedHasSubscriptions()
-  );
-}
-
-// ModCallback.POST_UPDATE (1)
-function postUpdate() {
-  if (!hasSubscriptions()) {
-    return;
-  }
-
-  const room = game.GetRoom();
-
-  if (!v.room.ambushActive) {
-    const ambushActive = room.IsAmbushActive();
-    if (ambushActive) {
-      v.room.ambushActive = true;
-
-      const ambushType = getAmbushType();
-      postAmbushStartedFire(ambushType);
-    }
-  }
-
-  if (!v.room.ambushDone) {
-    const ambushDone = room.IsAmbushDone();
-    if (ambushDone) {
-      v.room.ambushDone = true;
-
-      const ambushType = getAmbushType();
-      postAmbushFinishedFire(ambushType);
-    }
-  }
-}
-
-function getAmbushType(): AmbushType {
-  const roomType = getRoomType();
-  return roomType === RoomType.BOSS_RUSH
-    ? AmbushType.BOSS_RUSH
-    : AmbushType.CHALLENGE_ROOM;
-}