isaacscript-common 43.0.1 → 43.1.0

package/dist/index.rollup.d.ts

@@ -6393,6 +6393,12 @@ export declare function getPlayersWithTrinket(...trinketTypes: TrinketType[]): E
 /** Returns a set of the player's current transformations. */
 export declare function getPlayerTransformations(player: EntityPlayer): Set<PlayerForm>;
 
+/**
+ * Helper function to get all of the trinkets that the player is currently holding. This will not
+ * include any smelted trinkets.
+ */
+export declare function getPlayerTrinkets(player: EntityPlayer): TrinketType[];
+
 /**
  * Use this helper function as a workaround for the `EntityPlayer.GetPocketItem` method not working
  * correctly.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 43.0.1
+isaacscript-common 43.1.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -29680,6 +29680,16 @@ function ____exports.getOpenTrinketSlot(self, player)
     end
     error("The player has an unknown number of trinket slots: " .. tostring(maxTrinkets))
 end
+function ____exports.getPlayerTrinkets(self, player)
+    local trinketTypes = {}
+    for ____, trinketSlot in ipairs(TRINKET_SLOT_VALUES) do
+        local trinketType = player:GetTrinket(trinketSlot)
+        if trinketType ~= TrinketType.NULL then
+            trinketTypes[#trinketTypes + 1] = trinketType
+        end
+    end
+    return trinketTypes
+end
 function ____exports.getTrinketDescription(self, trinketType)
     local trinketDescription = TRINKET_DESCRIPTION_MAP:get(trinketType)
     if trinketDescription ~= nil then
@@ -50133,7 +50143,7 @@ function ____exports.character(self, params)
         playerType = match[2]
     else
         if num < FIRST_CHARACTER or num > LAST_VANILLA_CHARACTER then
-            print("Invalid player sub-type: " .. tostring(num))
+            print("Invalid character number: " .. tostring(num))
             return
         end
         playerType = num

package/dist/src/classes/features/other/extraConsoleCommands/commands.lua

@@ -550,7 +550,7 @@ function ____exports.character(self, params)
         playerType = match[2]
     else
         if num < FIRST_CHARACTER or num > LAST_VANILLA_CHARACTER then
-            print("Invalid player sub-type: " .. tostring(num))
+            print("Invalid character number: " .. tostring(num))
             return
         end
         playerType = num

package/dist/src/functions/trinkets.d.ts

@@ -44,6 +44,11 @@ export declare function getMysteriousPaperEffectForFrame(player: EntityPlayer, f
  * ```
  */
 export declare function getOpenTrinketSlot(player: EntityPlayer): int | undefined;
+/**
+ * Helper function to get all of the trinkets that the player is currently holding. This will not
+ * include any smelted trinkets.
+ */
+export declare function getPlayerTrinkets(player: EntityPlayer): TrinketType[];
 /**
  * Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
  * trinket type was not valid.

package/dist/src/functions/trinkets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trinkets.d.ts","sourceRoot":"","sources":["../../../src/functions/trinkets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AA+BvE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAE1E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,GAAG,GACf,qBAAqB,GAAG,SAAS,CAUnC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,GAAG,SAAS,CAkBxE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CActE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAOtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAc/D;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAO3D;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAOhE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAEtE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAYjE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAiBN;AAED,6FAA6F;AAC7F,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,OAAO,CAOT"}
+{"version":3,"file":"trinkets.d.ts","sourceRoot":"","sources":["../../../src/functions/trinkets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AA+BvE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAE1E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,GAAG,GACf,qBAAqB,GAAG,SAAS,CAUnC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,GAAG,SAAS,CAkBxE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,WAAW,EAAE,CAWrE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CActE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAOtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAc/D;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAO3D;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAOhE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAEtE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAYjE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAiBN;AAED,6FAA6F;AAC7F,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,OAAO,CAOT"}

package/dist/src/functions/trinkets.lua

@@ -109,6 +109,18 @@ function ____exports.getOpenTrinketSlot(self, player)
     end
     error("The player has an unknown number of trinket slots: " .. tostring(maxTrinkets))
 end
+--- Helper function to get all of the trinkets that the player is currently holding. This will not
+-- include any smelted trinkets.
+function ____exports.getPlayerTrinkets(self, player)
+    local trinketTypes = {}
+    for ____, trinketSlot in ipairs(TRINKET_SLOT_VALUES) do
+        local trinketType = player:GetTrinket(trinketSlot)
+        if trinketType ~= TrinketType.NULL then
+            trinketTypes[#trinketTypes + 1] = trinketType
+        end
+    end
+    return trinketTypes
+end
 --- Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
 -- trinket type was not valid.
 -- 

package/package.json

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

package/src/classes/features/other/extraConsoleCommands/commands.ts

@@ -446,7 +446,7 @@ export function character(params: string): void {
     playerType = match[1];
   } else {
     if (num < FIRST_CHARACTER || num > LAST_VANILLA_CHARACTER) {
-      print(`Invalid player sub-type: ${num}`);
+      print(`Invalid character number: ${num}`);
       return;
     }
 

package/src/functions/trinkets.ts

@@ -118,6 +118,23 @@ export function getOpenTrinketSlot(player: EntityPlayer): int | 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.