isaacscript-common 51.3.0 → 51.4.0

package/dist/index.rollup.d.ts

@@ -5628,6 +5628,9 @@ export declare function getFloorDisplayFlags(minimapAPI?: boolean): Map<int, Bit
 /**
  * Helper function to get the corresponding golden trinket type from a normal trinket type.
  *
+ * If the provided trinket type is already a golden trinket type, then the trinket type will be
+ * returned unmodified.
+ *
  * For example, passing `TrinketType.SWALLOWED_PENNY` would result in 32769, which is the value that
  * corresponds to the golden trinket sub-type for Swallowed Penny.
  */
@@ -6145,6 +6148,14 @@ export declare function getNormalPillColorFromHorse(pillColor: PillColor): PillC
 /** Helper function to get an array with every non-gold and non-horse pill color. */
 export declare function getNormalPillColors(): PillColor[];
 
+/**
+ * Helper function to get the corresponding normal trinket type from a golden trinket type.
+ *
+ * If the provided trinket type is already a normal trinket type, then the trinket type will be
+ * returned unmodified.
+ */
+export declare function getNormalTrinketType(trinketType: TrinketType): TrinketType;
+
 /**
  * Helper function to get all of the NPCs in the room.
  *

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 51.3.0
+isaacscript-common 51.4.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -29740,6 +29740,7 @@ return ____exports
  end,
 ["src.functions.trinkets"] = function(...) 
 local ____exports = {}
+local GOLDEN_TRINKET_ADJUSTMENT
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("src.core.cachedClasses")
@@ -29768,15 +29769,18 @@ local ____sprites = require("src.functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local ____types = require("src.functions.types")
 local asNumber = ____types.asNumber
+function ____exports.isGoldenTrinketType(self, trinketType)
+    return asNumber(nil, trinketType) > GOLDEN_TRINKET_ADJUSTMENT
+end
 function ____exports.isVanillaTrinketType(self, trinketType)
     return trinketType <= LAST_VANILLA_TRINKET_TYPE
 end
-local GOLDEN_TRINKET_ADJUSTMENT = 32768
+GOLDEN_TRINKET_ADJUSTMENT = 32768
 local NUM_MYSTERIOUS_PAPER_EFFECTS = getEnumLength(nil, MysteriousPaperEffect)
 local TRINKET_ANM2_PATH = "gfx/005.350_trinket.anm2"
 local TRINKET_SPRITE_LAYER = 0
 function ____exports.getGoldenTrinketType(self, trinketType)
-    return asNumber(nil, trinketType) + GOLDEN_TRINKET_ADJUSTMENT
+    return ____exports.isGoldenTrinketType(nil, trinketType) and trinketType or asNumber(nil, trinketType) + GOLDEN_TRINKET_ADJUSTMENT
 end
 function ____exports.getMysteriousPaperEffectForFrame(self, player, frameCount)
     if frameCount == nil then
@@ -29787,6 +29791,9 @@ function ____exports.getMysteriousPaperEffectForFrame(self, player, frameCount)
     end
     return frameCount % NUM_MYSTERIOUS_PAPER_EFFECTS
 end
+function ____exports.getNormalTrinketType(self, trinketType)
+    return ____exports.isGoldenTrinketType(nil, trinketType) and asNumber(nil, trinketType) - GOLDEN_TRINKET_ADJUSTMENT or trinketType
+end
 function ____exports.getTrinketDescription(self, trinketType)
     local trinketDescription = TRINKET_DESCRIPTION_MAP:get(trinketType)
     if trinketDescription ~= nil then
@@ -29816,9 +29823,6 @@ function ____exports.getTrinketName(self, trinketType)
     end
     return DEFAULT_TRINKET_NAME
 end
-function ____exports.isGoldenTrinketType(self, trinketType)
-    return asNumber(nil, trinketType) > GOLDEN_TRINKET_ADJUSTMENT
-end
 function ____exports.isModdedTrinketType(self, trinketType)
     return not ____exports.isVanillaTrinketType(nil, trinketType)
 end

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

@@ -4,6 +4,9 @@ import { MysteriousPaperEffect } from "../enums/MysteriousPaperEffect";
 /**
  * Helper function to get the corresponding golden trinket type from a normal trinket type.
  *
+ * If the provided trinket type is already a golden trinket type, then the trinket type will be
+ * returned unmodified.
+ *
  * For example, passing `TrinketType.SWALLOWED_PENNY` would result in 32769, which is the value that
  * corresponds to the golden trinket sub-type for Swallowed Penny.
  */
@@ -29,6 +32,13 @@ export declare function getGoldenTrinketType(trinketType: TrinketType): TrinketT
  *                   Default is the current frame.
  */
 export declare function getMysteriousPaperEffectForFrame(player: EntityPlayer, frameCount?: int): MysteriousPaperEffect | undefined;
+/**
+ * Helper function to get the corresponding normal trinket type from a golden trinket type.
+ *
+ * If the provided trinket type is already a normal trinket type, then the trinket type will be
+ * returned unmodified.
+ */
+export declare function getNormalTrinketType(trinketType: TrinketType): 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,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AA8BvE;;;;;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;;;;;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,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,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AA8BvE;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAI1E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,GAAG,GACf,qBAAqB,GAAG,SAAS,CAUnC;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAI1E;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,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

@@ -1,4 +1,5 @@
 local ____exports = {}
+local GOLDEN_TRINKET_ADJUSTMENT
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("src.core.cachedClasses")
@@ -27,24 +28,25 @@ local ____sprites = require("src.functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local ____types = require("src.functions.types")
 local asNumber = ____types.asNumber
+function ____exports.isGoldenTrinketType(self, trinketType)
+    return asNumber(nil, trinketType) > GOLDEN_TRINKET_ADJUSTMENT
+end
 function ____exports.isVanillaTrinketType(self, trinketType)
     return trinketType <= LAST_VANILLA_TRINKET_TYPE
 end
---- Add this to a `TrinketType` to get the corresponding golden trinket type.
--- 
--- Corresponds to the vanilla `PillColor.TRINKET_GOLDEN_FLAG` value.
--- 
--- 1 << 15
-local GOLDEN_TRINKET_ADJUSTMENT = 32768
+GOLDEN_TRINKET_ADJUSTMENT = 32768
 local NUM_MYSTERIOUS_PAPER_EFFECTS = getEnumLength(nil, MysteriousPaperEffect)
 local TRINKET_ANM2_PATH = "gfx/005.350_trinket.anm2"
 local TRINKET_SPRITE_LAYER = 0
 --- Helper function to get the corresponding golden trinket type from a normal trinket type.
 -- 
+-- If the provided trinket type is already a golden trinket type, then the trinket type will be
+-- returned unmodified.
+-- 
 -- For example, passing `TrinketType.SWALLOWED_PENNY` would result in 32769, which is the value that
 -- corresponds to the golden trinket sub-type for Swallowed Penny.
 function ____exports.getGoldenTrinketType(self, trinketType)
-    return asNumber(nil, trinketType) + GOLDEN_TRINKET_ADJUSTMENT
+    return ____exports.isGoldenTrinketType(nil, trinketType) and trinketType or asNumber(nil, trinketType) + GOLDEN_TRINKET_ADJUSTMENT
 end
 --- Helper function to get the current effect that the Mysterious Paper trinket is providing to the
 -- player. Returns undefined if the player does not have the Mysterious Paper trinket.
@@ -73,6 +75,13 @@ function ____exports.getMysteriousPaperEffectForFrame(self, player, frameCount)
     end
     return frameCount % NUM_MYSTERIOUS_PAPER_EFFECTS
 end
+--- Helper function to get the corresponding normal trinket type from a golden trinket type.
+-- 
+-- If the provided trinket type is already a normal trinket type, then the trinket type will be
+-- returned unmodified.
+function ____exports.getNormalTrinketType(self, trinketType)
+    return ____exports.isGoldenTrinketType(nil, trinketType) and asNumber(nil, trinketType) - GOLDEN_TRINKET_ADJUSTMENT or trinketType
+end
 --- Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
 -- trinket type was not valid.
 -- 
@@ -118,9 +127,6 @@ function ____exports.getTrinketName(self, trinketType)
     end
     return DEFAULT_TRINKET_NAME
 end
-function ____exports.isGoldenTrinketType(self, trinketType)
-    return asNumber(nil, trinketType) > GOLDEN_TRINKET_ADJUSTMENT
-end
 function ____exports.isModdedTrinketType(self, trinketType)
     return not ____exports.isVanillaTrinketType(nil, trinketType)
 end

package/package.json

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

package/src/functions/trinkets.ts

@@ -36,11 +36,16 @@ const TRINKET_SPRITE_LAYER = 0;
 /**
  * Helper function to get the corresponding golden trinket type from a normal trinket type.
  *
+ * If the provided trinket type is already a golden trinket type, then the trinket type will be
+ * returned unmodified.
+ *
  * For example, passing `TrinketType.SWALLOWED_PENNY` would result in 32769, which is the value that
  * corresponds to the golden trinket sub-type for Swallowed Penny.
  */
 export function getGoldenTrinketType(trinketType: TrinketType): TrinketType {
-  return asNumber(trinketType) + GOLDEN_TRINKET_ADJUSTMENT;
+  return isGoldenTrinketType(trinketType)
+    ? trinketType
+    : asNumber(trinketType) + GOLDEN_TRINKET_ADJUSTMENT;
 }
 
 /**
@@ -78,6 +83,18 @@ export function getMysteriousPaperEffectForFrame(
   return frameCount % NUM_MYSTERIOUS_PAPER_EFFECTS;
 }
 
+/**
+ * Helper function to get the corresponding normal trinket type from a golden trinket type.
+ *
+ * If the provided trinket type is already a normal trinket type, then the trinket type will be
+ * returned unmodified.
+ */
+export function getNormalTrinketType(trinketType: TrinketType): TrinketType {
+  return isGoldenTrinketType(trinketType)
+    ? asNumber(trinketType) - GOLDEN_TRINKET_ADJUSTMENT
+    : trinketType;
+}
+
 /**
  * Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
  * trinket type was not valid.