isaacscript-common 83.4.1 → 83.5.0

package/dist/classes/features/other/EdenStartingStatsHealth.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
+import type { CollectibleType } from "isaac-typescript-definitions";
 import type { PlayerStat } from "../../../enums/PlayerStat";
 import type { PlayerHealth } from "../../../interfaces/PlayerHealth";
 import type { PlayerStats } from "../../../interfaces/PlayerStats";
@@ -11,6 +11,34 @@ export declare class EdenStartingStatsHealth extends Feature {
     private readonly postPlayerInit;
     private getEdenStats;
     private getEdenHealth;
+    /**
+     * We must use the `POST_PLAYER_COLLECTIBLE_ADDED` callback since the collectibles are not yet
+     * granted in the `POST_PLAYER_INIT` callback.
+     */
+    private readonly postPlayerCollectibleAdded;
+    /**
+     * Helper function to get the active collectible that Eden started with at the beginning of the
+     * run.
+     *
+     * Returns undefined if passed a player that is not Eden or if the starting collectibles are not
+     * yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback has
+     * fired.)
+     *
+     * @public
+     */
+    getEdenStartingActiveCollectible(player: EntityPlayer): CollectibleType | undefined;
+    /**
+     * Helper function to get an array containing the active collectible and the passive collectible
+     * that Eden started with at the beginning of the run. The active collectible will be the first
+     * element and the passive collectible will be the second element.
+     *
+     * Returns an empty array if passed a player that is not Eden or if the starting collectibles are
+     * not yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback
+     * has fired.)
+     *
+     * @public
+     */
+    getEdenStartingCollectibles(player: EntityPlayer): CollectibleType[];
     /**
      * Helper function to get the health that Eden started with at the beginning of the run before any
      * of the random collectibles were added.
@@ -22,6 +50,17 @@ export declare class EdenStartingStatsHealth extends Feature {
      * @public
      */
     getEdenStartingHealth(player: EntityPlayer): Readonly<PlayerHealth> | undefined;
+    /**
+     * Helper function to get the passive collectible that Eden started with at the beginning of the
+     * run.
+     *
+     * Returns undefined if passed a player that is not Eden or if the starting collectibles are not
+     * yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback has
+     * fired.)
+     *
+     * @public
+     */
+    getEdenStartingPassiveCollectible(player: EntityPlayer): CollectibleType | undefined;
     /**
      * Helper function to get the value of the randomized starting stat for Eden that was assigned at
      * the beginning of the run before any of the random collectibles were added.

package/dist/classes/features/other/EdenStartingStatsHealth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EdenStartingStatsHealth.d.ts","sourceRoot":"","sources":["../../../../src/classes/features/other/EdenStartingStatsHealth.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAQ5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAShD,qBAAa,uBAAwB,SAAQ,OAAO;IAclD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAO7B;IAEF,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,aAAa;IAUrB;;;;;;;;;OASG;IAEI,qBAAqB,CAC1B,MAAM,EAAE,YAAY,GACnB,QAAQ,CAAC,YAAY,CAAC,GAAG,SAAS;IAIrC;;;;;;;;;OASG;IAEI,mBAAmB,CAAC,CAAC,SAAS,UAAU,EAC7C,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,CAAC,GACZ,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAS7B;;;;;;;;;OASG;IAEI,oBAAoB,CACzB,MAAM,EAAE,YAAY,GACnB,QAAQ,CAAC,WAAW,CAAC,GAAG,SAAS;CAGrC"}
+{"version":3,"file":"EdenStartingStatsHealth.d.ts","sourceRoot":"","sources":["../../../../src/classes/features/other/EdenStartingStatsHealth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAIpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAU5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAWhD,qBAAa,uBAAwB,SAAQ,OAAO;IAqBlD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAO7B;IAEF,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,aAAa;IAUrB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAezC;IAEF;;;;;;;;;OASG;IAEI,gCAAgC,CACrC,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS;IAI9B;;;;;;;;;;OAUG;IAEI,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG,eAAe,EAAE;IAwB3E;;;;;;;;;OASG;IAEI,qBAAqB,CAC1B,MAAM,EAAE,YAAY,GACnB,QAAQ,CAAC,YAAY,CAAC,GAAG,SAAS;IAIrC;;;;;;;;;OASG;IAEI,iCAAiC,CACtC,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS;IAI9B;;;;;;;;;OASG;IAEI,mBAAmB,CAAC,CAAC,SAAS,UAAU,EAC7C,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,CAAC,GACZ,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAS7B;;;;;;;;;OASG;IAEI,oBAAoB,CACzB,MAAM,EAAE,YAAY,GACnB,QAAQ,CAAC,WAAW,CAAC,GAAG,SAAS;CAGrC"}

package/dist/classes/features/other/EdenStartingStatsHealth.lua

@@ -9,8 +9,13 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____decorators = require("decorators")
 local Exported = ____decorators.Exported
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____collectibles = require("functions.collectibles")
+local isActiveCollectible = ____collectibles.isActiveCollectible
 local ____playerDataStructures = require("functions.playerDataStructures")
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapHasPlayer = ____playerDataStructures.mapHasPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____playerHealth = require("functions.playerHealth")
 local getPlayerHealth = ____playerHealth.getPlayerHealth
@@ -21,6 +26,8 @@ local getPlayerStats = ____stats.getPlayerStats
 local ____Feature = require("classes.private.Feature")
 local Feature = ____Feature.Feature
 local v = {run = {
+    edenActiveCollectibles = __TS__New(Map),
+    edenPassiveCollectibles = __TS__New(Map),
     edenPlayerStats = __TS__New(Map),
     edenPlayerHealth = __TS__New(Map)
 }}
@@ -38,7 +45,17 @@ function EdenStartingStatsHealth.prototype.____constructor(self)
         self:getEdenStats(player)
         self:getEdenHealth(player)
     end
+    self.postPlayerCollectibleAdded = function(____, player, collectibleType)
+        if not isEden(nil, player) then
+            return
+        end
+        local map = isActiveCollectible(nil, collectibleType) and v.run.edenActiveCollectibles or v.run.edenPassiveCollectibles
+        if not mapHasPlayer(nil, map, player) then
+            mapSetPlayer(nil, map, player, collectibleType)
+        end
+    end
     self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, self.postPlayerInit}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postPlayerCollectibleAdded}}
 end
 function EdenStartingStatsHealth.prototype.getEdenStats(self, player)
     local existingStatMap = mapGetPlayer(nil, v.run.edenPlayerStats, player)
@@ -56,10 +73,31 @@ function EdenStartingStatsHealth.prototype.getEdenHealth(self, player)
     local playerHealth = getPlayerHealth(nil, player)
     mapSetPlayer(nil, v.run.edenPlayerHealth, player, playerHealth)
 end
+function EdenStartingStatsHealth.prototype.getEdenStartingActiveCollectible(self, player)
+    return mapGetPlayer(nil, v.run.edenActiveCollectibles, player)
+end
+__TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingActiveCollectible", true)
+function EdenStartingStatsHealth.prototype.getEdenStartingCollectibles(self, player)
+    local collectibleTypes = {}
+    local activeCollectibleType = mapGetPlayer(nil, v.run.edenActiveCollectibles, player)
+    if activeCollectibleType ~= nil then
+        collectibleTypes[#collectibleTypes + 1] = activeCollectibleType
+    end
+    local passiveCollectibleType = mapGetPlayer(nil, v.run.edenPassiveCollectibles, player)
+    if passiveCollectibleType ~= nil then
+        collectibleTypes[#collectibleTypes + 1] = passiveCollectibleType
+    end
+    return collectibleTypes
+end
+__TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingCollectibles", true)
 function EdenStartingStatsHealth.prototype.getEdenStartingHealth(self, player)
     return mapGetPlayer(nil, v.run.edenPlayerHealth, player)
 end
 __TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingHealth", true)
+function EdenStartingStatsHealth.prototype.getEdenStartingPassiveCollectible(self, player)
+    return mapGetPlayer(nil, v.run.edenPassiveCollectibles, player)
+end
+__TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingPassiveCollectible", true)
 function EdenStartingStatsHealth.prototype.getEdenStartingStat(self, player, playerStat)
     local playerStats = mapGetPlayer(nil, v.run.edenPlayerStats, player)
     if playerStats == nil then

package/dist/index.rollup.d.ts

@@ -4260,6 +4260,34 @@ declare class EdenStartingStatsHealth extends Feature {
     private readonly postPlayerInit;
     private getEdenStats;
     private getEdenHealth;
+    /**
+     * We must use the `POST_PLAYER_COLLECTIBLE_ADDED` callback since the collectibles are not yet
+     * granted in the `POST_PLAYER_INIT` callback.
+     */
+    private readonly postPlayerCollectibleAdded;
+    /**
+     * Helper function to get the active collectible that Eden started with at the beginning of the
+     * run.
+     *
+     * Returns undefined if passed a player that is not Eden or if the starting collectibles are not
+     * yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback has
+     * fired.)
+     *
+     * @public
+     */
+    getEdenStartingActiveCollectible(player: EntityPlayer): CollectibleType | undefined;
+    /**
+     * Helper function to get an array containing the active collectible and the passive collectible
+     * that Eden started with at the beginning of the run. The active collectible will be the first
+     * element and the passive collectible will be the second element.
+     *
+     * Returns an empty array if passed a player that is not Eden or if the starting collectibles are
+     * not yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback
+     * has fired.)
+     *
+     * @public
+     */
+    getEdenStartingCollectibles(player: EntityPlayer): CollectibleType[];
     /**
      * Helper function to get the health that Eden started with at the beginning of the run before any
      * of the random collectibles were added.
@@ -4271,6 +4299,17 @@ declare class EdenStartingStatsHealth extends Feature {
      * @public
      */
     getEdenStartingHealth(player: EntityPlayer): Readonly<PlayerHealth> | undefined;
+    /**
+     * Helper function to get the passive collectible that Eden started with at the beginning of the
+     * run.
+     *
+     * Returns undefined if passed a player that is not Eden or if the starting collectibles are not
+     * yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback has
+     * fired.)
+     *
+     * @public
+     */
+    getEdenStartingPassiveCollectible(player: EntityPlayer): CollectibleType | undefined;
     /**
      * Helper function to get the value of the randomized starting stat for Eden that was assigned at
      * the beginning of the run before any of the random collectibles were added.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 83.4.0
+isaacscript-common 83.4.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -55095,8 +55095,13 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____decorators = require("decorators")
 local Exported = ____decorators.Exported
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____collectibles = require("functions.collectibles")
+local isActiveCollectible = ____collectibles.isActiveCollectible
 local ____playerDataStructures = require("functions.playerDataStructures")
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapHasPlayer = ____playerDataStructures.mapHasPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____playerHealth = require("functions.playerHealth")
 local getPlayerHealth = ____playerHealth.getPlayerHealth
@@ -55107,6 +55112,8 @@ local getPlayerStats = ____stats.getPlayerStats
 local ____Feature = require("classes.private.Feature")
 local Feature = ____Feature.Feature
 local v = {run = {
+    edenActiveCollectibles = __TS__New(Map),
+    edenPassiveCollectibles = __TS__New(Map),
     edenPlayerStats = __TS__New(Map),
     edenPlayerHealth = __TS__New(Map)
 }}
@@ -55124,7 +55131,17 @@ function EdenStartingStatsHealth.prototype.____constructor(self)
         self:getEdenStats(player)
         self:getEdenHealth(player)
     end
+    self.postPlayerCollectibleAdded = function(____, player, collectibleType)
+        if not isEden(nil, player) then
+            return
+        end
+        local map = isActiveCollectible(nil, collectibleType) and v.run.edenActiveCollectibles or v.run.edenPassiveCollectibles
+        if not mapHasPlayer(nil, map, player) then
+            mapSetPlayer(nil, map, player, collectibleType)
+        end
+    end
     self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, self.postPlayerInit}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postPlayerCollectibleAdded}}
 end
 function EdenStartingStatsHealth.prototype.getEdenStats(self, player)
     local existingStatMap = mapGetPlayer(nil, v.run.edenPlayerStats, player)
@@ -55142,10 +55159,31 @@ function EdenStartingStatsHealth.prototype.getEdenHealth(self, player)
     local playerHealth = getPlayerHealth(nil, player)
     mapSetPlayer(nil, v.run.edenPlayerHealth, player, playerHealth)
 end
+function EdenStartingStatsHealth.prototype.getEdenStartingActiveCollectible(self, player)
+    return mapGetPlayer(nil, v.run.edenActiveCollectibles, player)
+end
+__TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingActiveCollectible", true)
+function EdenStartingStatsHealth.prototype.getEdenStartingCollectibles(self, player)
+    local collectibleTypes = {}
+    local activeCollectibleType = mapGetPlayer(nil, v.run.edenActiveCollectibles, player)
+    if activeCollectibleType ~= nil then
+        collectibleTypes[#collectibleTypes + 1] = activeCollectibleType
+    end
+    local passiveCollectibleType = mapGetPlayer(nil, v.run.edenPassiveCollectibles, player)
+    if passiveCollectibleType ~= nil then
+        collectibleTypes[#collectibleTypes + 1] = passiveCollectibleType
+    end
+    return collectibleTypes
+end
+__TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingCollectibles", true)
 function EdenStartingStatsHealth.prototype.getEdenStartingHealth(self, player)
     return mapGetPlayer(nil, v.run.edenPlayerHealth, player)
 end
 __TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingHealth", true)
+function EdenStartingStatsHealth.prototype.getEdenStartingPassiveCollectible(self, player)
+    return mapGetPlayer(nil, v.run.edenPassiveCollectibles, player)
+end
+__TS__DecorateLegacy({Exported}, EdenStartingStatsHealth.prototype, "getEdenStartingPassiveCollectible", true)
 function EdenStartingStatsHealth.prototype.getEdenStartingStat(self, player, playerStat)
     local playerStats = mapGetPlayer(nil, v.run.edenPlayerStats, player)
     if playerStats == nil then

package/dist/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.38.4"
+      "packageVersion": "7.38.5"
     }
   ]
 }

package/package.json

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

package/src/classes/features/other/EdenStartingStatsHealth.ts

@@ -1,8 +1,12 @@
+import type { CollectibleType } from "isaac-typescript-definitions";
 import { ModCallback } from "isaac-typescript-definitions";
 import { Exported } from "../../../decorators";
+import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import type { PlayerStat } from "../../../enums/PlayerStat";
+import { isActiveCollectible } from "../../../functions/collectibles";
 import {
   mapGetPlayer,
+  mapHasPlayer,
   mapSetPlayer,
 } from "../../../functions/playerDataStructures";
 import { getPlayerHealth } from "../../../functions/playerHealth";
@@ -15,6 +19,8 @@ import { Feature } from "../../private/Feature";
 
 const v = {
   run: {
+    edenActiveCollectibles: new Map<PlayerIndex, CollectibleType>(),
+    edenPassiveCollectibles: new Map<PlayerIndex, CollectibleType>(),
     edenPlayerStats: new Map<PlayerIndex, PlayerStats>(),
     edenPlayerHealth: new Map<PlayerIndex, PlayerHealth>(),
   },
@@ -32,6 +38,13 @@ export class EdenStartingStatsHealth extends Feature {
       // 9
       [ModCallback.POST_PLAYER_INIT, this.postPlayerInit],
     ];
+
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED,
+        this.postPlayerCollectibleAdded,
+      ],
+    ];
   }
 
   /**
@@ -67,6 +80,80 @@ export class EdenStartingStatsHealth extends Feature {
     mapSetPlayer(v.run.edenPlayerHealth, player, playerHealth);
   }
 
+  /**
+   * We must use the `POST_PLAYER_COLLECTIBLE_ADDED` callback since the collectibles are not yet
+   * granted in the `POST_PLAYER_INIT` callback.
+   */
+  private readonly postPlayerCollectibleAdded = (
+    player: EntityPlayer,
+    collectibleType: CollectibleType,
+  ): void => {
+    if (!isEden(player)) {
+      return;
+    }
+
+    const map = isActiveCollectible(collectibleType)
+      ? v.run.edenActiveCollectibles
+      : v.run.edenPassiveCollectibles;
+
+    if (!mapHasPlayer(map, player)) {
+      mapSetPlayer(map, player, collectibleType);
+    }
+  };
+
+  /**
+   * Helper function to get the active collectible that Eden started with at the beginning of the
+   * run.
+   *
+   * Returns undefined if passed a player that is not Eden or if the starting collectibles are not
+   * yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback has
+   * fired.)
+   *
+   * @public
+   */
+  @Exported
+  public getEdenStartingActiveCollectible(
+    player: EntityPlayer,
+  ): CollectibleType | undefined {
+    return mapGetPlayer(v.run.edenActiveCollectibles, player);
+  }
+
+  /**
+   * Helper function to get an array containing the active collectible and the passive collectible
+   * that Eden started with at the beginning of the run. The active collectible will be the first
+   * element and the passive collectible will be the second element.
+   *
+   * Returns an empty array if passed a player that is not Eden or if the starting collectibles are
+   * not yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback
+   * has fired.)
+   *
+   * @public
+   */
+  @Exported
+  public getEdenStartingCollectibles(player: EntityPlayer): CollectibleType[] {
+    const collectibleTypes: CollectibleType[] = [];
+
+    const activeCollectibleType = mapGetPlayer(
+      v.run.edenActiveCollectibles,
+      player,
+    );
+
+    if (activeCollectibleType !== undefined) {
+      collectibleTypes.push(activeCollectibleType);
+    }
+
+    const passiveCollectibleType = mapGetPlayer(
+      v.run.edenPassiveCollectibles,
+      player,
+    );
+
+    if (passiveCollectibleType !== undefined) {
+      collectibleTypes.push(passiveCollectibleType);
+    }
+
+    return collectibleTypes;
+  }
+
   /**
    * Helper function to get the health that Eden started with at the beginning of the run before any
    * of the random collectibles were added.
@@ -84,6 +171,23 @@ export class EdenStartingStatsHealth extends Feature {
     return mapGetPlayer(v.run.edenPlayerHealth, player);
   }
 
+  /**
+   * Helper function to get the passive collectible that Eden started with at the beginning of the
+   * run.
+   *
+   * Returns undefined if passed a player that is not Eden or if the starting collectibles are not
+   * yet added. (Eden's starting collectibles are added after the `POST_PLAYER_INIT` callback has
+   * fired.)
+   *
+   * @public
+   */
+  @Exported
+  public getEdenStartingPassiveCollectible(
+    player: EntityPlayer,
+  ): CollectibleType | undefined {
+    return mapGetPlayer(v.run.edenPassiveCollectibles, player);
+  }
+
   /**
    * Helper function to get the value of the randomized starting stat for Eden that was assigned at
    * the beginning of the run before any of the random collectibles were added.