isaacscript-common 8.4.4 → 8.5.0

package/src/functions/trinketSet.ts

@@ -3,17 +3,17 @@ import { itemConfig } from "../core/cachedClasses";
 import { getModdedTrinketTypes } from "../features/firstLast";
 import { getVanillaTrinketTypes } from "./trinkets";
 
-const ALL_TRINKETS_ARRAY: TrinketType[] = [];
-const ALL_TRINKETS_SET = new Set<TrinketType>();
+const ALL_TRINKET_TYPES_ARRAY: TrinketType[] = [];
+const ALL_TRINKET_TYPES_SET = new Set<TrinketType>();
 
-const VANILLA_TRINKETS_ARRAY: TrinketType[] = [];
-const VANILLA_TRINKETS_SET = new Set<TrinketType>();
+const VANILLA_TRINKET_TYPES_ARRAY: TrinketType[] = [];
+const VANILLA_TRINKET_TYPES_SET = new Set<TrinketType>();
 
-const MODDED_TRINKETS_ARRAY: TrinketType[] = [];
-const MODDED_TRINKETS_SET = new Set<TrinketType>();
+const MODDED_TRINKET_TYPES_ARRAY: TrinketType[] = [];
+const MODDED_TRINKET_TYPES_SET = new Set<TrinketType>();
 
-function lazyInitVanillaTrinkets() {
-  if (VANILLA_TRINKETS_ARRAY.length > 0) {
+function lazyInitVanillaTrinketTypes() {
+  if (VANILLA_TRINKET_TYPES_ARRAY.length > 0) {
     return;
   }
 
@@ -22,22 +22,22 @@ function lazyInitVanillaTrinkets() {
     // Vanilla trinket types are contiguous, but we check every value just in case.
     const itemConfigItem = itemConfig.GetTrinket(trinketType);
     if (itemConfigItem !== undefined) {
-      VANILLA_TRINKETS_ARRAY.push(trinketType);
-      VANILLA_TRINKETS_SET.add(trinketType);
+      VANILLA_TRINKET_TYPES_ARRAY.push(trinketType);
+      VANILLA_TRINKET_TYPES_SET.add(trinketType);
     }
   }
 }
 
-function lazyInitModdedTrinkets() {
-  if (MODDED_TRINKETS_ARRAY.length > 0) {
+function lazyInitModdedTrinketTypes() {
+  if (MODDED_TRINKET_TYPES_ARRAY.length > 0) {
     return;
   }
 
-  lazyInitVanillaTrinkets();
+  lazyInitVanillaTrinketTypes();
 
-  for (const trinketType of VANILLA_TRINKETS_ARRAY) {
-    ALL_TRINKETS_ARRAY.push(trinketType);
-    ALL_TRINKETS_SET.add(trinketType);
+  for (const trinketType of VANILLA_TRINKET_TYPES_ARRAY) {
+    ALL_TRINKET_TYPES_ARRAY.push(trinketType);
+    ALL_TRINKET_TYPES_SET.add(trinketType);
   }
 
   const moddedTrinketTypes = getModdedTrinketTypes();
@@ -45,11 +45,11 @@ function lazyInitModdedTrinkets() {
     // Modded trinket types are contiguous, but we check every value just in case.
     const itemConfigItem = itemConfig.GetTrinket(trinketType);
     if (itemConfigItem !== undefined) {
-      MODDED_TRINKETS_ARRAY.push(trinketType);
-      MODDED_TRINKETS_SET.add(trinketType);
+      MODDED_TRINKET_TYPES_ARRAY.push(trinketType);
+      MODDED_TRINKET_TYPES_SET.add(trinketType);
 
-      ALL_TRINKETS_ARRAY.push(trinketType);
-      ALL_TRINKETS_SET.add(trinketType);
+      ALL_TRINKET_TYPES_ARRAY.push(trinketType);
+      ALL_TRINKET_TYPES_SET.add(trinketType);
     }
   }
 }
@@ -64,8 +64,8 @@ function lazyInitModdedTrinkets() {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedTrinketArray(): readonly TrinketType[] {
-  lazyInitModdedTrinkets();
-  return MODDED_TRINKETS_ARRAY;
+  lazyInitModdedTrinketTypes();
+  return MODDED_TRINKET_TYPES_ARRAY;
 }
 
 /**
@@ -78,8 +78,8 @@ export function getModdedTrinketArray(): readonly TrinketType[] {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedTrinketSet(): ReadonlySet<TrinketType> {
-  lazyInitModdedTrinkets();
-  return MODDED_TRINKETS_SET;
+  lazyInitModdedTrinketTypes();
+  return MODDED_TRINKET_TYPES_SET;
 }
 
 /**
@@ -92,8 +92,8 @@ export function getModdedTrinketSet(): ReadonlySet<TrinketType> {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getTrinketArray(): readonly TrinketType[] {
-  lazyInitModdedTrinkets();
-  return ALL_TRINKETS_ARRAY;
+  lazyInitModdedTrinketTypes();
+  return ALL_TRINKET_TYPES_ARRAY;
 }
 
 /**
@@ -106,8 +106,8 @@ export function getTrinketArray(): readonly TrinketType[] {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getTrinketSet(): ReadonlySet<TrinketType> {
-  lazyInitModdedTrinkets();
-  return ALL_TRINKETS_SET;
+  lazyInitModdedTrinketTypes();
+  return ALL_TRINKET_TYPES_SET;
 }
 
 /**
@@ -117,8 +117,8 @@ export function getTrinketSet(): ReadonlySet<TrinketType> {
  * use the `getVanillaTrinketSet` helper function instead.
  */
 export function getVanillaTrinketArray(): readonly TrinketType[] {
-  lazyInitVanillaTrinkets();
-  return VANILLA_TRINKETS_ARRAY;
+  lazyInitVanillaTrinketTypes();
+  return VANILLA_TRINKET_TYPES_ARRAY;
 }
 
 /**
@@ -128,6 +128,6 @@ export function getVanillaTrinketArray(): readonly TrinketType[] {
  * use the `getVanillaTrinketArray` helper function instead.
  */
 export function getVanillaTrinketSet(): ReadonlySet<TrinketType> {
-  lazyInitVanillaTrinkets();
-  return VANILLA_TRINKETS_SET;
+  lazyInitVanillaTrinketTypes();
+  return VANILLA_TRINKET_TYPES_SET;
 }

package/src/sets/bossSets.ts

@@ -29,10 +29,16 @@ import {
   WarVariant,
   WidowVariant,
 } from "isaac-typescript-definitions";
+import { parseEntityTypeVariantString } from "../functions/entities";
+import { copySet } from "../functions/set";
+import { STORY_BOSSES_SET } from "./storyBossesSet";
 
 // The "bosspools.xml" file does not actually correspond to the real boss pools, so these sets were
 // determined through experimentation on v1.7.8a.
 
+// We use sets of strings instead of tuples for these data structures because TypeScript/Lua does
+// not have real tuples. If we store bosses as tuples, then we cannot do a set lookup in O(1).
+
 /** Contains just the bosses in Basement (not e.g. Burning Basement). */
 const BASEMENT_BOSSES_SET: ReadonlySet<string> = new Set([
   `${EntityType.LARRY_JR}.${LarryJrVariant.LARRY_JR}`, // 19.0
@@ -468,3 +474,21 @@ export const ALL_BOSSES_SET: ReadonlySet<string> = new Set([
   ...ALL_STAGE_10_BOSSES_SET.values(),
   ...ALL_STAGE_11_BOSSES_SET.values(),
 ]);
+
+// Since story bosses are stored by entity type, we copy the existing bosses and filter them (to
+// avoid having to hard-code story boss variants).
+const allBossesExcludingStoryBossesSet = copySet(ALL_BOSSES_SET);
+const allBosses = [...ALL_BOSSES_SET.values()];
+for (const entityTypeVariantString of allBosses) {
+  const tuple = parseEntityTypeVariantString(entityTypeVariantString);
+  if (tuple === undefined) {
+    error("Failed to parse a boss tuple when constructing the story boss set.");
+  }
+
+  const [entityType, _variant] = tuple;
+  if (STORY_BOSSES_SET.has(entityType)) {
+    allBossesExcludingStoryBossesSet.delete(entityTypeVariantString);
+  }
+}
+export const ALL_BOSSES_EXCLUDING_STORY_BOSSES_SET: ReadonlySet<string> =
+  allBossesExcludingStoryBossesSet;