isaacscript-common 1.0.447 → 1.0.448

package/dist/functions/collectibleSet.lua

@@ -1,9 +1,28 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
-local ____collectibleSet = require("collectibleSet")
-local COLLECTIBLE_SET = ____collectibleSet.COLLECTIBLE_SET
+local ____collectibles = require("functions.collectibles")
+local getMaxCollectibleID = ____collectibles.getMaxCollectibleID
+local ____util = require("functions.util")
+local copySet = ____util.copySet
+local COLLECTIBLE_SET = __TS__New(Set)
+local function initSet(self)
+    local itemConfig = Isaac.GetItemConfig()
+    do
+        local collectibleType = 1
+        while collectibleType <= getMaxCollectibleID(nil) do
+            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+            if itemConfigItem ~= nil then
+                COLLECTIBLE_SET:add(collectibleType)
+            end
+            collectibleType = collectibleType + 1
+        end
+    end
+end
 function ____exports.getCollectibleSet(self)
-    return __TS__New(Set, COLLECTIBLE_SET)
+    if COLLECTIBLE_SET.size == 0 then
+        initSet(nil)
+    end
+    return copySet(nil, COLLECTIBLE_SET)
 end
 return ____exports

package/dist/functions/collectibles.d.ts

@@ -23,8 +23,6 @@ export declare function getCollectibleMaxCharges(collectibleType: CollectibleTyp
  * ```
  */
 export declare function getCollectibleName(collectibleType: CollectibleType | int): string;
-/** Returns a set containing every valid collectible type in the game, including modded items. */
-export declare function getCollectibleSet(): Set<CollectibleType | int>;
 /** Helper function to get all of the collectible entities in the room. */
 export declare function getCollectibles(matchingSubType?: number): EntityPickup[];
 export declare function getMaxCollectibleID(): int;

package/dist/functions/collectibles.lua

@@ -6,12 +6,6 @@ local ____collectibleNameMap = require("collectibleNameMap")
 local COLLECTIBLE_NAME_MAP = ____collectibleNameMap.COLLECTIBLE_NAME_MAP
 local ____entity = require("functions.entity")
 local removeAllMatchingEntities = ____entity.removeAllMatchingEntities
-local ____util = require("functions.util")
-local copySet = ____util.copySet
-function ____exports.getMaxCollectibleID(self)
-    local itemConfig = Isaac.GetItemConfig()
-    return itemConfig:GetCollectibles().Size - 1
-end
 function ____exports.setCollectibleSprite(self, pickup, pngPath)
     if pickup.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
         error(
@@ -25,20 +19,6 @@ end
 COLLECTIBLE_SPRITE_LAYER = 1
 local BLIND_ITEM_PNG_PATH = "gfx/items/collectibles/questionmark.png"
 local GLITCHED_ITEM_THRESHOLD = 4000000000
-local COLLECTIBLE_SET = __TS__New(Set)
-local function initSet(self)
-    local itemConfig = Isaac.GetItemConfig()
-    do
-        local collectibleType = 1
-        while collectibleType <= ____exports.getMaxCollectibleID(nil) do
-            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
-            if itemConfigItem ~= nil then
-                COLLECTIBLE_SET:add(collectibleType)
-            end
-            collectibleType = collectibleType + 1
-        end
-    end
-end
 function ____exports.changeCollectibleSubType(self, collectible, newCollectibleType)
     collectible.SubType = newCollectibleType
     local itemConfig = Isaac.GetItemConfig()
@@ -115,12 +95,6 @@ function ____exports.getCollectibleName(self, collectibleType)
     end
     return itemConfigItem.Name
 end
-function ____exports.getCollectibleSet(self)
-    if COLLECTIBLE_SET.size == 0 then
-        initSet(nil)
-    end
-    return copySet(nil, COLLECTIBLE_SET)
-end
 function ____exports.getCollectibles(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
@@ -135,6 +109,10 @@ function ____exports.getCollectibles(self, matchingSubType)
     end
     return collectibles
 end
+function ____exports.getMaxCollectibleID(self)
+    local itemConfig = Isaac.GetItemConfig()
+    return itemConfig:GetCollectibles().Size - 1
+end
 function ____exports.isGlitchedCollectible(self, entity)
     return ((entity.Type == EntityType.ENTITY_PICKUP) and (entity.Variant == PickupVariant.PICKUP_COLLECTIBLE)) and (entity.SubType > GLITCHED_ITEM_THRESHOLD)
 end

package/dist/functions/player.lua

@@ -9,8 +9,8 @@ local PocketItemType = ____PocketItemType.PocketItemType
 local ____bitwise = require("functions.bitwise")
 local getKBitOfN = ____bitwise.getKBitOfN
 local getNumBitsOfN = ____bitwise.getNumBitsOfN
-local ____collectibles = require("functions.collectibles")
-local getCollectibleSet = ____collectibles.getCollectibleSet
+local ____collectibleSet = require("functions.collectibleSet")
+local getCollectibleSet = ____collectibleSet.getCollectibleSet
 function ____exports.getPlayers(self, performExclusions)
     if performExclusions == nil then
         performExclusions = false

package/dist/functions/revive.lua

@@ -4,9 +4,9 @@ local ____player = require("functions.player")
 local getDeathAnimationName = ____player.getDeathAnimationName
 local ____sprite = require("functions.sprite")
 local getFinalFrameOfAnimation = ____sprite.getFinalFrameOfAnimation
-local ____trinkets = require("functions.trinkets")
-local giveTrinketsBack = ____trinkets.giveTrinketsBack
-local temporarilyRemoveTrinkets = ____trinkets.temporarilyRemoveTrinkets
+local ____trinketGive = require("functions.trinketGive")
+local giveTrinketsBack = ____trinketGive.giveTrinketsBack
+local temporarilyRemoveTrinkets = ____trinketGive.temporarilyRemoveTrinkets
 function ____exports.willMysteriousPaperRevive(self, player)
     local game = Game()
     local gameFrameCount = game:GetFrameCount()

package/dist/functions/trinketGive.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="isaac-typescript-definitions" />
+export interface TrinketSituation {
+    trinketTypeRemoved: TrinketType | int;
+    trinket1: TrinketType | int;
+    trinket2: TrinketType | int;
+    numSmeltedTrinkets: int;
+}
+/**
+ * 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.
+ *
+ * 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.
+ */
+export declare function temporarilyRemoveTrinkets(player: EntityPlayer, trinketType: TrinketType): 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
+ * removed.
+ */
+export declare function giveTrinketsBack(player: EntityPlayer, trinketSituation: TrinketSituation | undefined): void;

package/dist/functions/trinketGive.lua

@@ -0,0 +1,54 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local ____constants = require("constants")
+local GOLDEN_TRINKET_SHIFT = ____constants.GOLDEN_TRINKET_SHIFT
+function ____exports.temporarilyRemoveTrinkets(self, player, trinketType)
+    if not player:HasTrinket(trinketType) then
+        return nil
+    end
+    local trinket1 = player:GetTrinket(0)
+    local trinket2 = player:GetTrinket(1)
+    local numTrinkets = 0
+    while player:HasTrinket(trinketType) do
+        player:TryRemoveTrinket(trinketType)
+        numTrinkets = numTrinkets + 1
+    end
+    local numSmeltedTrinkets = numTrinkets
+    local trinketWasInSlot1 = (trinket1 == trinketType) or ((trinket1 + GOLDEN_TRINKET_SHIFT) == trinketType)
+    if trinketWasInSlot1 then
+        numSmeltedTrinkets = numSmeltedTrinkets - 1
+    end
+    local trinketWasInSlot2 = (trinket2 == trinketType) or ((trinket2 + GOLDEN_TRINKET_SHIFT) == trinketType)
+    if trinketWasInSlot2 then
+        numSmeltedTrinkets = numSmeltedTrinkets - 1
+    end
+    return {trinketTypeRemoved = trinketType, trinket1 = trinket1, trinket2 = trinket2, numSmeltedTrinkets = numSmeltedTrinkets}
+end
+function ____exports.giveTrinketsBack(self, player, trinketSituation)
+    if trinketSituation == nil then
+        return
+    end
+    local trinket1 = player:GetTrinket(0)
+    local trinket2 = player:GetTrinket(1)
+    if trinket1 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinket1)
+    end
+    if trinket2 ~= TrinketType.TRINKET_NULL then
+        player:TryRemoveTrinket(trinket2)
+    end
+    do
+        local i = 0
+        while i < trinketSituation.numSmeltedTrinkets do
+            player:AddTrinket(trinketSituation.trinketTypeRemoved, false)
+            player:UseActiveItem(CollectibleType.COLLECTIBLE_SMELTER, UseFlag.USE_NOANIM)
+            i = i + 1
+        end
+    end
+    if trinketSituation.trinket1 ~= TrinketType.TRINKET_NULL then
+        player:AddTrinket(trinketSituation.trinket1, false)
+    end
+    if trinketSituation.trinket2 ~= TrinketType.TRINKET_NULL then
+        player:AddTrinket(trinketSituation.trinket2, false)
+    end
+end
+return ____exports

package/dist/functions/trinketSet.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="isaac-typescript-definitions" />
+/** Returns a set containing every valid trinket type in the game, including modded items. */
+export declare function getTrinketSet(): Set<TrinketType | int>;

package/dist/functions/trinketSet.lua

@@ -0,0 +1,28 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
+local ____exports = {}
+local ____trinkets = require("functions.trinkets")
+local getMaxTrinketID = ____trinkets.getMaxTrinketID
+local ____util = require("functions.util")
+local copySet = ____util.copySet
+local TRINKET_SET = __TS__New(Set)
+local function initSet(self)
+    local itemConfig = Isaac.GetItemConfig()
+    do
+        local trinketType = 1
+        while trinketType <= getMaxTrinketID(nil) do
+            local itemConfigTrinket = itemConfig:GetTrinket(trinketType)
+            if itemConfigTrinket ~= nil then
+                TRINKET_SET:add(trinketType)
+            end
+            trinketType = trinketType + 1
+        end
+    end
+end
+function ____exports.getTrinketSet(self)
+    if TRINKET_SET.size == 0 then
+        initSet(nil)
+    end
+    return copySet(nil, TRINKET_SET)
+end
+return ____exports

package/dist/functions/trinkets.d.ts

@@ -1,27 +1,4 @@
 /// <reference types="isaac-typescript-definitions" />
-export interface TrinketSituation {
-    trinketTypeRemoved: TrinketType | int;
-    trinket1: TrinketType | int;
-    trinket2: TrinketType | int;
-    numSmeltedTrinkets: int;
-}
-/**
- * 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.
- *
- * 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.
- */
-export declare function temporarilyRemoveTrinkets(player: EntityPlayer, trinketType: TrinketType): 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
- * removed.
- */
-export declare function giveTrinketsBack(player: EntityPlayer, trinketSituation: TrinketSituation | undefined): void;
 export declare function getMaxTrinketID(): int;
 /** Helper function to get all of the collectible entities in the room. */
 export declare function getTrinkets(matchingSubType?: number): EntityPickup[];
@@ -35,5 +12,4 @@ export declare function getTrinkets(matchingSubType?: number): EntityPickup[];
  * ```
  */
 export declare function getTrinketName(trinketType: TrinketType | int): string;
-/** Returns a set containing every valid trinket type in the game, including modded items. */
-export declare function getTrinketSet(): Set<TrinketType | int>;
+export declare function isGoldenTrinket(trinketType: TrinketType | int): boolean;

package/dist/functions/trinkets.lua

@@ -5,57 +5,6 @@ local ____constants = require("constants")
 local GOLDEN_TRINKET_SHIFT = ____constants.GOLDEN_TRINKET_SHIFT
 local ____trinketNameMap = require("trinketNameMap")
 local TRINKET_NAME_MAP = ____trinketNameMap.TRINKET_NAME_MAP
-local ____util = require("functions.util")
-local copySet = ____util.copySet
-function ____exports.temporarilyRemoveTrinkets(self, player, trinketType)
-    if not player:HasTrinket(trinketType) then
-        return nil
-    end
-    local trinket1 = player:GetTrinket(0)
-    local trinket2 = player:GetTrinket(1)
-    local numTrinkets = 0
-    while player:HasTrinket(trinketType) do
-        player:TryRemoveTrinket(trinketType)
-        numTrinkets = numTrinkets + 1
-    end
-    local numSmeltedTrinkets = numTrinkets
-    local trinketWasInSlot1 = (trinket1 == trinketType) or ((trinket1 + GOLDEN_TRINKET_SHIFT) == trinketType)
-    if trinketWasInSlot1 then
-        numSmeltedTrinkets = numSmeltedTrinkets - 1
-    end
-    local trinketWasInSlot2 = (trinket2 == trinketType) or ((trinket2 + GOLDEN_TRINKET_SHIFT) == trinketType)
-    if trinketWasInSlot2 then
-        numSmeltedTrinkets = numSmeltedTrinkets - 1
-    end
-    return {trinketTypeRemoved = trinketType, trinket1 = trinket1, trinket2 = trinket2, numSmeltedTrinkets = numSmeltedTrinkets}
-end
-function ____exports.giveTrinketsBack(self, player, trinketSituation)
-    if trinketSituation == nil then
-        return
-    end
-    local trinket1 = player:GetTrinket(0)
-    local trinket2 = player:GetTrinket(1)
-    if trinket1 ~= TrinketType.TRINKET_NULL then
-        player:TryRemoveTrinket(trinket1)
-    end
-    if trinket2 ~= TrinketType.TRINKET_NULL then
-        player:TryRemoveTrinket(trinket2)
-    end
-    do
-        local i = 0
-        while i < trinketSituation.numSmeltedTrinkets do
-            player:AddTrinket(trinketSituation.trinketTypeRemoved, false)
-            player:UseActiveItem(CollectibleType.COLLECTIBLE_SMELTER, UseFlag.USE_NOANIM)
-            i = i + 1
-        end
-    end
-    if trinketSituation.trinket1 ~= TrinketType.TRINKET_NULL then
-        player:AddTrinket(trinketSituation.trinket1, false)
-    end
-    if trinketSituation.trinket2 ~= TrinketType.TRINKET_NULL then
-        player:AddTrinket(trinketSituation.trinket2, false)
-    end
-end
 function ____exports.getMaxTrinketID(self)
     local itemConfig = Isaac.GetItemConfig()
     return itemConfig:GetTrinkets().Size - 1
@@ -90,24 +39,7 @@ function ____exports.getTrinketName(self, trinketType)
     end
     return itemConfigItem.Name
 end
-local TRINKET_SET = __TS__New(Set)
-local function initSet(self)
-    local itemConfig = Isaac.GetItemConfig()
-    do
-        local trinketType = 1
-        while trinketType <= ____exports.getMaxTrinketID(nil) do
-            local itemConfigTrinket = itemConfig:GetTrinket(trinketType)
-            if itemConfigTrinket ~= nil then
-                TRINKET_SET:add(trinketType)
-            end
-            trinketType = trinketType + 1
-        end
-    end
-end
-function ____exports.getTrinketSet(self)
-    if TRINKET_SET.size == 0 then
-        initSet(nil)
-    end
-    return copySet(nil, TRINKET_SET)
+function ____exports.isGoldenTrinket(self, trinketType)
+    return trinketType > GOLDEN_TRINKET_SHIFT
 end
 return ____exports

package/dist/index.d.ts

@@ -12,6 +12,7 @@ export * from "./functions/bitwise";
 export * from "./functions/card";
 export * from "./functions/charge";
 export * from "./functions/collectibles";
+export * from "./functions/collectibleSet";
 export * from "./functions/color";
 export { deepCopy } from "./functions/deepCopy";
 export { deepCopyTests } from "./functions/deepCopyTests";
@@ -36,7 +37,9 @@ export * from "./functions/sprite";
 export * from "./functions/stage";
 export * from "./functions/tears";
 export * from "./functions/transformations";
+export * from "./functions/trinketGive";
 export * from "./functions/trinkets";
+export * from "./functions/trinketSet";
 export * from "./functions/ui";
 export * from "./functions/util";
 export * from "./functions/vector";

package/dist/index.lua

@@ -113,6 +113,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.collectibleSet")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.color")
     for ____exportKey, ____exportValue in pairs(____export) do
@@ -299,6 +307,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.trinketGive")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.trinkets")
     for ____exportKey, ____exportValue in pairs(____export) do
@@ -307,6 +323,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.trinketSet")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.ui")
     for ____exportKey, ____exportValue in pairs(____export) do

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.447",
+  "version": "1.0.448",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "isaac-typescript-definitions": "^1.0.275",
-    "isaacscript-lint": "^1.0.65",
+    "isaacscript-lint": "^1.0.67",
     "typedoc": "^0.22.9",
     "typescript": "4.4.4",
     "typescript-to-lua": "^1.1.1"