isaacscript-common 1.0.542 → 1.0.543

package/dist/functions/revive.lua

@@ -6,7 +6,7 @@ local ____sprite = require("functions.sprite")
 local getFinalFrameOfAnimation = ____sprite.getFinalFrameOfAnimation
 local ____trinketGive = require("functions.trinketGive")
 local giveTrinketsBack = ____trinketGive.giveTrinketsBack
-local temporarilyRemoveTrinkets = ____trinketGive.temporarilyRemoveTrinkets
+local temporarilyRemoveTrinket = ____trinketGive.temporarilyRemoveTrinket
 function ____exports.willMysteriousPaperRevive(self, player)
     local game = Game()
     local gameFrameCount = game:GetFrameCount()
@@ -17,7 +17,7 @@ function ____exports.willMysteriousPaperRevive(self, player)
     return (frameOfDeath % 4) == 3
 end
 function ____exports.willPlayerRevive(self, player)
-    local trinketSituation = temporarilyRemoveTrinkets(nil, player, TrinketType.TRINKET_MYSTERIOUS_PAPER)
+    local trinketSituation = temporarilyRemoveTrinket(nil, player, TrinketType.TRINKET_MYSTERIOUS_PAPER)
     local willRevive = player:WillPlayerRevive() or ((trinketSituation ~= nil) and ____exports.willMysteriousPaperRevive(nil, player))
     giveTrinketsBack(nil, player, trinketSituation)
     return willRevive

package/dist/functions/trinketGive.d.ts

@@ -1,21 +1,24 @@
 /// <reference types="isaac-typescript-definitions" />
-export interface TrinketSituation {
-    trinketTypeRemoved: TrinketType | int;
-    trinket1: TrinketType | int;
-    trinket2: TrinketType | int;
-    numSmeltedTrinkets: int;
-}
+import { TrinketSituation } from "../types/TrinketSituation";
 /**
- * Helper function to temporarily remove a trinket from the player. Use this in combination with the
- * `giveTrinketBack` function to take away and give back a trinket on the same frame. This function
- * correctly handles multiple trinket slots and ensures that all copies of the trinket are removed,
- * including smelted trinkets.
+ * Helper function to temporarily remove a specific kind of trinket from the player. Use this in
+ * combination with the `giveTrinketBack` function to take away and give back a trinket on the same
+ * frame. This function correctly handles multiple trinket slots and ensures that all copies of the
+ * trinket are removed, including smelted trinkets.
  *
  * Note that for simplicity, this function assumes that all smelted trinkets are non-golden.
  *
- * @returns Null if the player does not have the trinket, or TrinketSituation if they do.
+ * @returns Undefined if the player does not have the trinket, or TrinketSituation if they do.
  */
-export declare function temporarilyRemoveTrinkets(player: EntityPlayer, trinketType: TrinketType | int): TrinketSituation | undefined;
+export declare function temporarilyRemoveTrinket(player: EntityPlayer, trinketType: TrinketType | int): TrinketSituation | undefined;
+/**
+ * Helper function to temporarily removes a player's held trinkets, if any. This will not remove any
+ * smelted trinkets. Use this in combination with the `giveTrinketBack` function to take away and
+ * give back trinkets on the same frame.
+ *
+ * @returns Undefined if the player does not have any trinkets, or TrinketSituation if they do.
+ */
+export declare function temporarilyRemoveTrinkets(player: EntityPlayer): TrinketSituation | undefined;
 /**
  * Helper function to restore the player's trinkets back to the way they were before the
  * `temporarilyRemoveTrinket` function was used. It will re-smelt any smelted trinkets that were

package/dist/functions/trinketGive.lua

@@ -2,7 +2,7 @@
 local ____exports = {}
 local ____constants = require("constants")
 local GOLDEN_TRINKET_SHIFT = ____constants.GOLDEN_TRINKET_SHIFT
-function ____exports.temporarilyRemoveTrinkets(self, player, trinketType)
+function ____exports.temporarilyRemoveTrinket(self, player, trinketType)
     if not player:HasTrinket(trinketType) then
         return nil
     end
@@ -24,6 +24,20 @@ function ____exports.temporarilyRemoveTrinkets(self, player, trinketType)
     end
     return {trinketTypeRemoved = trinketType, trinket1 = trinket1, trinket2 = trinket2, numSmeltedTrinkets = numSmeltedTrinkets}
 end
+function ____exports.temporarilyRemoveTrinkets(self, player)
+    local trinket1 = player:GetTrinket(0)
+    local trinket2 = player:GetTrinket(1)
+    if (trinket1 == TrinketType.TRINKET_NULL) and (trinket2 == TrinketType.TRINKET_NULL) then
+        return nil
+    end
+    if trinket1 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinket1)
+    end
+    if trinket2 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinket2)
+    end
+    return {trinketTypeRemoved = TrinketType.TRINKET_NULL, trinket1 = trinket1, trinket2 = trinket2, numSmeltedTrinkets = 0}
+end
 function ____exports.giveTrinketsBack(self, player, trinketSituation)
     if trinketSituation == nil then
         return

package/dist/functions/trinkets.d.ts

@@ -41,3 +41,14 @@ export declare function getTrinketName(trinketType: TrinketType | int): string;
  */
 export declare function hasOpenTrinketSlot(player: EntityPlayer): boolean;
 export declare function isGoldenTrinket(trinketType: TrinketType | int): boolean;
+/**
+ * Helper function to smelt a trinket. Before smelting, this function will automatically remove the
+ * trinkets that the player is holding, if any, and then give them back after the new trinket is
+ * smelted.
+ *
+ * @param player The player to smelt the trinkets to.
+ * @param trinketType The trinket type to smelt.
+ * @param numTrinkets Optional. If specified, will smelt the given number of trinkets. Use this to
+ * avoid calling this function multiple times. 1 by default.
+ */
+export declare function smeltTrinket(player: EntityPlayer, trinketType: TrinketType | int, numTrinkets?: number): void;

package/dist/functions/trinkets.lua

@@ -7,6 +7,9 @@ local ____trinketDescriptionMap = require("maps.trinketDescriptionMap")
 local TRINKET_DESCRIPTION_MAP = ____trinketDescriptionMap.TRINKET_DESCRIPTION_MAP
 local ____trinketNameMap = require("maps.trinketNameMap")
 local TRINKET_NAME_MAP = ____trinketNameMap.TRINKET_NAME_MAP
+local ____trinketGive = require("functions.trinketGive")
+local giveTrinketsBack = ____trinketGive.giveTrinketsBack
+local temporarilyRemoveTrinkets = ____trinketGive.temporarilyRemoveTrinkets
 function ____exports.getMaxTrinketID(self)
     local itemConfig = Isaac.GetItemConfig()
     return itemConfig:GetTrinkets().Size - 1
@@ -86,4 +89,19 @@ end
 function ____exports.isGoldenTrinket(self, trinketType)
     return trinketType > GOLDEN_TRINKET_SHIFT
 end
+function ____exports.smeltTrinket(self, player, trinketType, numTrinkets)
+    if numTrinkets == nil then
+        numTrinkets = 1
+    end
+    local trinketSituation = temporarilyRemoveTrinkets(nil, player)
+    do
+        local i = 0
+        while i < numTrinkets do
+            player:AddTrinket(trinketType)
+            player:UseActiveItem(CollectibleType.COLLECTIBLE_SMELTER, false, false, true, false)
+            i = i + 1
+        end
+    end
+    giveTrinketsBack(nil, player, trinketSituation)
+end
 return ____exports

package/dist/index.d.ts

@@ -72,4 +72,5 @@ export * from "./types/PickingUpItem";
 export * from "./types/PlayerHealth";
 export * from "./types/PocketItemDescription";
 export * from "./types/PocketItemType";
+export * from "./types/TrinketSituation";
 export * from "./upgradeMod";

package/dist/types/TrinketSituation.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="isaac-typescript-definitions" />
+export interface TrinketSituation {
+    trinketTypeRemoved: TrinketType | int;
+    trinket1: TrinketType | int;
+    trinket2: TrinketType | int;
+    numSmeltedTrinkets: int;
+}

package/dist/types/TrinketSituation.lua

@@ -0,0 +1,3 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.542",
+  "version": "1.0.543",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",