isaacscript-common 30.4.1 → 30.4.3

package/src/functions/playerHealth.ts

@@ -5,14 +5,18 @@ import {
   PlayerType,
   TrinketType,
 } from "isaac-typescript-definitions";
-import { ACTIVE_SLOT_VALUES } from "../arrays/cachedEnumValues";
 import { MAX_PLAYER_HEART_CONTAINERS } from "../core/constants";
 import { HealthType } from "../enums/HealthType";
 import { PlayerHealth, SoulHeartType } from "../interfaces/PlayerHealth";
 import { countSetBits, getKBitOfN, getNumBitsOfN } from "./bitwise";
 import { getCharacterMaxHeartContainers } from "./characters";
 import { getTotalCharge } from "./charge";
-import { isCharacter, isKeeper, setActiveItem } from "./players";
+import {
+  getActiveItemSlots,
+  isCharacter,
+  isKeeper,
+  setActiveItem,
+} from "./players";
 import { repeat } from "./utils";
 
 export function addPlayerHealthType(
@@ -543,21 +547,24 @@ export function setPlayerHealth(
   const character = player.GetPlayerType();
   const subPlayer = player.GetSubPlayer();
 
-  removeAllPlayerHealth(player);
-
-  // Before we add any health, we have to take away Alabaster Box, if present.
-  const alabasterBoxes: Array<[slot: ActiveSlot, totalCharge: int]> = [];
-  if (player.HasCollectible(CollectibleType.ALABASTER_BOX)) {
-    for (const activeSlot of ACTIVE_SLOT_VALUES) {
-      const activeItem = player.GetActiveItem();
-      if (activeItem === CollectibleType.ALABASTER_BOX) {
-        const totalCharge = getTotalCharge(player, activeSlot);
-        setActiveItem(player, CollectibleType.NULL, activeSlot);
-        alabasterBoxes.push([activeSlot, totalCharge]);
-      }
-    }
+  // Before we add or remove any health, we have to take away Alabaster Box, if present. (Removing
+  // soul hearts from the player will remove Alabaster Box charges.)
+  const alabasterBoxDescriptions: Array<{
+    activeSlot: ActiveSlot;
+    totalCharge: int;
+  }> = [];
+  const alabasterBoxActiveSlots = getActiveItemSlots(
+    player,
+    CollectibleType.ALABASTER_BOX,
+  );
+  for (const activeSlot of alabasterBoxActiveSlots) {
+    const totalCharge = getTotalCharge(player, activeSlot);
+    setActiveItem(player, CollectibleType.NULL, activeSlot);
+    alabasterBoxDescriptions.push({ activeSlot, totalCharge });
   }
 
+  removeAllPlayerHealth(player);
+
   // Add the red heart containers.
   if (character === PlayerType.SOUL && subPlayer !== undefined) {
     // Adding health to The Soul is a special case.
@@ -649,7 +656,7 @@ export function setPlayerHealth(
   }
 
   // Re-add the Alabaster Box, if present.
-  for (const [activeSlot, totalCharge] of alabasterBoxes) {
+  for (const { activeSlot, totalCharge } of alabasterBoxDescriptions) {
     setActiveItem(
       player,
       CollectibleType.ALABASTER_BOX,

package/src/functions/spawnCollectible.ts

@@ -77,8 +77,10 @@ export function spawnCollectibleUnsafe(
  * with `CollectibleType.NULL` will result in spawning a collectible with a random type from the
  * current room's item pool.
  *
- * Instead, this function arbitrarily spawns a collectible with `CollectibleType.SAD_ONION`, and
- * then converts it to an empty pedestal afterward.
+ * Instead, this function arbitrarily spawns a collectible with `CollectibleType.BROKEN_SHOVEL_1`,
+ * and then converts it to an empty pedestal afterward. (Broken Shovel is used instead of e.g. Sad
+ * Onion because it is a quest collectible and quest collectibles will prevent Damocles from
+ * duplicating the pedestal.)
  *
  * @param positionOrGridIndex The position or grid index to spawn the empty collectible at.
  * @param seedOrRNG The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
@@ -89,7 +91,7 @@ export function spawnEmptyCollectible(
   seedOrRNG: Seed | RNG = getRandomSeed(),
 ): EntityPickup {
   const collectible = spawnCollectibleUnsafe(
-    CollectibleType.SAD_ONION,
+    CollectibleType.BROKEN_SHOVEL_1,
     positionOrGridIndex,
     seedOrRNG,
     false,

package/src/index.ts

@@ -135,6 +135,7 @@ export * from "./interfaces/PlayerHealth";
 export * from "./interfaces/PocketItemDescription";
 export * from "./interfaces/RoomDescription";
 export * from "./interfaces/SaveData";
+export * from "./interfaces/StageHistoryEntry";
 export * from "./interfaces/StatTypeType";
 export * from "./interfaces/TrinketSituation";
 export * from "./interfaces/TSTLClassMetatable";

package/src/interfaces/StageHistoryEntry.ts

@@ -0,0 +1,7 @@
+import { LevelStage, StageType } from "isaac-typescript-definitions";
+
+/** This is used by the `StageHistory` feature. */
+export interface StageHistoryEntry {
+  readonly stage: LevelStage;
+  readonly stageType: StageType;
+}

package/dist/src/indexLua.d.ts

@@ -1,185 +0,0 @@
-export * from "./classes/DefaultMap";
-export * from "./classes/ModFeature";
-export * from "./classes/ModUpgraded";
-export * from "./core/cachedClasses";
-export * from "./core/constants";
-export * from "./core/constantsFirstLast";
-export * from "./core/upgradeMod";
-export * from "./enums/AmbushType";
-export * from "./enums/CornerType";
-export * from "./enums/HealthType";
-export * from "./enums/ISCFeature";
-export * from "./enums/LadderSubTypeCustom";
-export * from "./enums/ModCallbackCustom";
-export * from "./enums/MysteriousPaperEffect";
-export * from "./enums/PocketItemType";
-export * from "./enums/RockAltType";
-export * from "./enums/SaveDataKey";
-export * from "./enums/SerializationType";
-export * from "./enums/SlotDestructionType";
-export * from "./enums/StatType";
-export * from "./functions/ambush";
-export * from "./functions/array";
-export * from "./functions/arrayLua";
-export * from "./functions/benchmark";
-export * from "./functions/bitSet128";
-export * from "./functions/bitwise";
-export * from "./functions/bombs";
-export * from "./functions/bosses";
-export * from "./functions/cards";
-export * from "./functions/challenges";
-export * from "./functions/characters";
-export * from "./functions/charge";
-export * from "./functions/chargeBar";
-export * from "./functions/collectibles";
-export * from "./functions/collectibleTag";
-export * from "./functions/color";
-export * from "./functions/console";
-export * from "./functions/curses";
-export * from "./functions/debugFunctions";
-export * from "./functions/decorators";
-export * from "./functions/deepCopy";
-export * from "./functions/deepCopyTests";
-export * from "./functions/dimensions";
-export * from "./functions/direction";
-export * from "./functions/doors";
-export * from "./functions/easing";
-export * from "./functions/effects";
-export * from "./functions/emptyRoom";
-export * from "./functions/entities";
-export * from "./functions/entitiesSpecific";
-export * from "./functions/entityTypes";
-export * from "./functions/enums";
-export * from "./functions/familiars";
-export * from "./functions/flag";
-export * from "./functions/globals";
-export * from "./functions/gridEntities";
-export * from "./functions/gridEntitiesSpecific";
-export * from "./functions/gridIndex";
-export * from "./functions/hex";
-export * from "./functions/initArray";
-export * from "./functions/input";
-export * from "./functions/isaacAPIClass";
-export * from "./functions/itemPool";
-export * from "./functions/jsonHelpers";
-export * from "./functions/jsonRoom";
-export * from "./functions/kColor";
-export * from "./functions/language";
-export * from "./functions/level";
-export * from "./functions/levelGrid";
-export * from "./functions/log";
-export * from "./functions/logEntities";
-export * from "./functions/logMisc";
-export * from "./functions/map";
-export * from "./functions/math";
-export * from "./functions/merge";
-export * from "./functions/mergeTests";
-export * from "./functions/minimap";
-export * from "./functions/modFeatures";
-export * from "./functions/nextStage";
-export * from "./functions/npcs";
-export * from "./functions/pickups";
-export * from "./functions/pickupsSpecific";
-export * from "./functions/pickupVariants";
-export * from "./functions/pills";
-export * from "./functions/playerCenter";
-export * from "./functions/playerDataStructures";
-export * from "./functions/playerHealth";
-export * from "./functions/playerIndex";
-export * from "./functions/players";
-export * from "./functions/playerStats";
-export * from "./functions/pocketItems";
-export * from "./functions/positionVelocity";
-export * from "./functions/pressurePlate";
-export * from "./functions/projectiles";
-export * from "./functions/random";
-export * from "./functions/readOnly";
-export * from "./functions/revive";
-export * from "./functions/rng";
-export * from "./functions/rockAlt";
-export * from "./functions/roomData";
-export * from "./functions/roomGrid";
-export * from "./functions/rooms";
-export * from "./functions/roomShape";
-export * from "./functions/roomShapeWalls";
-export * from "./functions/roomTransition";
-export * from "./functions/run";
-export * from "./functions/seeds";
-export * from "./functions/serialization";
-export * from "./functions/set";
-export * from "./functions/slots";
-export * from "./functions/sort";
-export * from "./functions/sound";
-export * from "./functions/spawnCollectible";
-export * from "./functions/sprites";
-export * from "./functions/stage";
-export * from "./functions/stats";
-export * from "./functions/string";
-export * from "./functions/table";
-export * from "./functions/tears";
-export * from "./functions/transformations";
-export * from "./functions/trinketGive";
-export * from "./functions/trinkets";
-export * from "./functions/tstlClass";
-export * from "./functions/types";
-export * from "./functions/ui";
-export * from "./functions/utils";
-export * from "./functions/vector";
-export * from "./functions/weighted";
-export * from "./interfaces/ChargeBarSprites";
-export * from "./interfaces/Corner";
-export * from "./interfaces/CustomStageTSConfig";
-export * from "./interfaces/GridEntityCustomData";
-export * from "./interfaces/JSONRoomsFile";
-export * from "./interfaces/PlayerHealth";
-export * from "./interfaces/PocketItemDescription";
-export * from "./interfaces/RoomDescription";
-export * from "./interfaces/SaveData";
-export * from "./interfaces/StatTypeType";
-export * from "./interfaces/TrinketSituation";
-export * from "./interfaces/TSTLClassMetatable";
-export * from "./maps/cardNameToTypeMap";
-export * from "./maps/characterNameToTypeMap";
-export * from "./maps/pillNameToEffectMap";
-export * from "./maps/roomNameToTypeMap";
-export * from "./maps/transformationNameToPlayerFormMap";
-export * from "./objects/colors";
-export * from "./objects/kColors";
-export * from "./types/AllButFirst";
-export * from "./types/AllButLast";
-export * from "./types/AnyClass";
-export * from "./types/AnyEntity";
-export * from "./types/AnyFunction";
-export * from "./types/AnyGridEntity";
-export * from "./types/ConversionHeartSubType";
-export * from "./types/Decrement";
-export * from "./types/EntityID";
-export * from "./types/FunctionTuple";
-export * from "./types/GridEntityID";
-export * from "./types/HasFunction";
-export * from "./types/Immutable";
-export * from "./types/Increment";
-export * from "./types/LowercaseKeys";
-export * from "./types/NaturalNumbersLessThan";
-export * from "./types/NaturalNumbersLessThanOrEqualTo";
-export * from "./types/PickingUpItem";
-export * from "./types/PickupIndex";
-export * from "./types/PlayerIndex";
-export * from "./types/PossibleStatType";
-export * from "./types/PublicInterface";
-export * from "./types/Range";
-export * from "./types/ReadonlyMap";
-export * from "./types/ReadonlySet";
-export * from "./types/StartsWithLowercase";
-export * from "./types/StartsWithUppercase";
-export * from "./types/TSTLClass";
-export * from "./types/Tuple";
-export * from "./types/TupleToIntersection";
-export * from "./types/TupleToUnion";
-export * from "./types/TupleWithMaxLength";
-export * from "./types/UnionToIntersection";
-export * from "./types/UppercaseKeys";
-export * from "./types/WeightedArray";
-export * from "./types/Writable";
-export * from "isaac-typescript-definitions";
-//# sourceMappingURL=indexLua.d.ts.map

package/dist/src/indexLua.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"indexLua.d.ts","sourceRoot":"","sources":["../../../../../packages/isaacscript-common/src/indexLua.ts"],"names":[],"mappings":"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"}