isaacscript-common 44.0.0 → 44.1.0

package/src/functions/trinkets.ts

@@ -1,10 +1,5 @@
 import type { CacheFlag } from "isaac-typescript-definitions";
-import {
-  PlayerType,
-  TrinketSlot,
-  TrinketType,
-} from "isaac-typescript-definitions";
-import { TRINKET_SLOT_VALUES } from "../arrays/cachedEnumValues";
+import { TrinketType } from "isaac-typescript-definitions";
 import { itemConfig } from "../core/cachedClasses";
 import { BLIND_ITEM_PNG_PATH } from "../core/constants";
 import { LAST_VANILLA_TRINKET_TYPE } from "../core/constantsFirstLast";
@@ -21,7 +16,6 @@ import { getEntityID } from "./entities";
 import { getEnumLength } from "./enums";
 import { hasFlag } from "./flag";
 import { isTrinket } from "./pickupVariants";
-import { isCharacter } from "./players";
 import { clearSprite } from "./sprites";
 import { asNumber } from "./types";
 
@@ -84,57 +78,6 @@ export function getMysteriousPaperEffectForFrame(
   return frameCount % NUM_MYSTERIOUS_PAPER_EFFECTS;
 }
 
-/**
- * Returns the slot number corresponding to where a trinket can be safely inserted.
- *
- * For example:
- *
- * ```ts
- * const player = Isaac.GetPlayer();
- * const trinketSlot = getOpenTrinketSlotNum(player);
- * if (trinketSlot !== undefined) {
- *   // They have one or more open trinket slots
- *   player.AddTrinket(TrinketType.SWALLOWED_PENNY);
- * }
- * ```
- */
-export function getOpenTrinketSlot(player: EntityPlayer): int | undefined {
-  const maxTrinkets = player.GetMaxTrinkets();
-  const trinketType1 = player.GetTrinket(TrinketSlot.SLOT_1);
-  const trinketType2 = player.GetTrinket(TrinketSlot.SLOT_2);
-
-  if (maxTrinkets === 1) {
-    return trinketType1 === TrinketType.NULL ? 0 : undefined;
-  }
-
-  if (maxTrinkets === 2) {
-    if (trinketType1 === TrinketType.NULL) {
-      return 0;
-    }
-
-    return trinketType2 === TrinketType.NULL ? 1 : undefined;
-  }
-
-  error(`The player has an unknown number of trinket slots: ${maxTrinkets}`);
-}
-
-/**
- * Helper function to get all of the trinkets that the player is currently holding. This will not
- * include any smelted trinkets.
- */
-export function getPlayerTrinkets(player: EntityPlayer): TrinketType[] {
-  const trinketTypes: TrinketType[] = [];
-
-  for (const trinketSlot of TRINKET_SLOT_VALUES) {
-    const trinketType = player.GetTrinket(trinketSlot);
-    if (trinketType !== TrinketType.NULL) {
-      trinketTypes.push(trinketType);
-    }
-  }
-
-  return trinketTypes;
-}
-
 /**
  * Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
  * trinket type was not valid.
@@ -198,32 +141,6 @@ export function getTrinketName(trinketType: TrinketType): string {
   return DEFAULT_TRINKET_NAME;
 }
 
-/** Helper function to check to see if the player is holding one or more trinkets. */
-export function hasAnyTrinket(player: EntityPlayer): boolean {
-  const playerTrinketTypes = TRINKET_SLOT_VALUES.map((trinketSlot) =>
-    player.GetTrinket(trinketSlot),
-  );
-  return playerTrinketTypes.some(
-    (trinketType) => trinketType !== TrinketType.NULL,
-  );
-}
-
-/**
- * Returns whether the player can hold an additional trinket, beyond what they are currently
- * carrying. This takes into account items that modify the max number of trinkets, like Mom's Purse.
- *
- * If the player is the Tainted Soul, this always returns false, since that character cannot pick up
- * items. (Only Tainted Forgotten can pick up items.)
- */
-export function hasOpenTrinketSlot(player: EntityPlayer): boolean {
-  if (isCharacter(player, PlayerType.SOUL_B)) {
-    return false;
-  }
-
-  const openTrinketSlot = getOpenTrinketSlot(player);
-  return openTrinketSlot !== undefined;
-}
-
 export function isGoldenTrinketType(trinketType: TrinketType): boolean {
   return asNumber(trinketType) > GOLDEN_TRINKET_ADJUSTMENT;
 }

package/src/index.ts

@@ -86,9 +86,11 @@ export * from "./functions/pickups";
 export * from "./functions/pickupsSpecific";
 export * from "./functions/pills";
 export * from "./functions/playerCenter";
+export * from "./functions/playerCollectibles";
 export * from "./functions/playerDataStructures";
 export * from "./functions/playerHealth";
 export * from "./functions/playerIndex";
+export * from "./functions/playerTrinkets";
 export * from "./functions/players";
 export * from "./functions/pocketItems";
 export * from "./functions/positionVelocity";

package/src/objects/{characterStartingCollectibles.ts → characterStartingCollectibleTypes.ts}

@@ -1,6 +1,6 @@
 import { CollectibleType, PlayerType } from "isaac-typescript-definitions";
 
-export const CHARACTER_STARTING_COLLECTIBLES = {
+export const CHARACTER_STARTING_COLLECTIBLE_TYPES = {
   // -1
   [PlayerType.POSSESSOR]: [],
 

package/src/objects/characterStartingTrinketTypes.ts

@@ -0,0 +1,129 @@
+import { PlayerType, TrinketType } from "isaac-typescript-definitions";
+
+export const CHARACTER_STARTING_TRINKET_TYPE = {
+  // -1
+  [PlayerType.POSSESSOR]: undefined,
+
+  // 0
+  [PlayerType.ISAAC]: undefined,
+
+  // 1
+  [PlayerType.MAGDALENE]: undefined,
+
+  // 2
+  [PlayerType.CAIN]: TrinketType.PAPER_CLIP,
+
+  // 3
+  [PlayerType.JUDAS]: undefined,
+
+  // 4
+  [PlayerType.BLUE_BABY]: undefined,
+
+  // 5
+  [PlayerType.EVE]: undefined,
+
+  // 6
+  [PlayerType.SAMSON]: TrinketType.CHILDS_HEART,
+
+  // 7
+  [PlayerType.AZAZEL]: undefined,
+
+  // 8
+  [PlayerType.LAZARUS]: undefined,
+
+  // 9
+  [PlayerType.EDEN]: undefined,
+
+  // 10
+  [PlayerType.LOST]: undefined,
+
+  // 11
+  [PlayerType.LAZARUS_2]: undefined,
+
+  // 12
+  [PlayerType.DARK_JUDAS]: undefined,
+
+  // 13
+  [PlayerType.LILITH]: undefined,
+
+  // 14
+  [PlayerType.KEEPER]: TrinketType.STORE_KEY,
+
+  // 15
+  [PlayerType.APOLLYON]: undefined,
+
+  // 16
+  [PlayerType.FORGOTTEN]: undefined,
+
+  // 17
+  [PlayerType.SOUL]: undefined,
+
+  // 18
+  [PlayerType.BETHANY]: undefined,
+
+  // 19
+  [PlayerType.JACOB]: undefined,
+
+  // 20
+  [PlayerType.ESAU]: undefined,
+
+  // 21
+  [PlayerType.ISAAC_B]: undefined,
+
+  // 22
+  [PlayerType.MAGDALENE_B]: undefined,
+
+  // 23
+  [PlayerType.CAIN_B]: undefined,
+
+  // 24
+  [PlayerType.JUDAS_B]: undefined,
+
+  // 25
+  [PlayerType.BLUE_BABY_B]: undefined,
+
+  // 26
+  [PlayerType.EVE_B]: undefined,
+
+  // 27
+  [PlayerType.SAMSON_B]: undefined,
+
+  // 28
+  [PlayerType.AZAZEL_B]: undefined,
+
+  // 29
+  [PlayerType.LAZARUS_B]: undefined,
+
+  // 30
+  [PlayerType.EDEN_B]: undefined,
+
+  // 31
+  [PlayerType.LOST_B]: undefined,
+
+  // 32
+  [PlayerType.LILITH_B]: undefined,
+
+  // 33
+  [PlayerType.KEEPER_B]: undefined,
+
+  // 34
+  [PlayerType.APOLLYON_B]: undefined,
+
+  // 35
+  [PlayerType.FORGOTTEN_B]: undefined,
+
+  // 36
+  [PlayerType.BETHANY_B]: undefined,
+
+  // 37
+  [PlayerType.JACOB_B]: undefined,
+
+  // 38
+  [PlayerType.LAZARUS_2_B]: undefined,
+
+  // 39
+  [PlayerType.JACOB_2_B]: undefined,
+
+  // 40
+  [PlayerType.SOUL_B]: undefined,
+} as const satisfies Record<PlayerType, TrinketType | undefined>;

package/dist/src/objects/characterStartingCollectibles.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"characterStartingCollectibles.d.ts","sourceRoot":"","sources":["../../../src/objects/characterStartingCollectibles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAc,MAAM,8BAA8B,CAAC;AAE3E,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6IuB,CAAC"}