isaacscript-common 1.0.326 → 1.0.330

package/dist/functions/collectibles.d.ts

@@ -7,6 +7,8 @@ export declare function changeCollectibleSubType(collectible: EntityPickup, newC
 export declare function collectibleHasTag(collectibleType: CollectibleType | int, tag: ItemConfigTag): boolean;
 export declare function getCollectibleInitCharges(collectibleType: CollectibleType | int): int;
 export declare function getCollectibleMaxCharges(collectibleType: CollectibleType | int): int;
+/** Returns a set containing every valid collectible type in the game, including modded items. */
+export declare function getCollectibleSet(): Set<CollectibleType | int>;
 export declare function getMaxCollectibleID(): int;
 export declare function isQuestCollectible(collectibleType: CollectibleType | int): boolean;
 export declare function setCollectibleBlind(pickup: EntityPickup): void;

package/dist/functions/collectibles.lua

@@ -1,6 +1,11 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
 local ____exports = {}
 local COLLECTIBLE_SPRITE_LAYER
+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(
@@ -48,9 +53,20 @@ function ____exports.getCollectibleMaxCharges(self, collectibleType)
     end
     return itemConfigItem.MaxCharges
 end
-function ____exports.getMaxCollectibleID(self)
+function ____exports.getCollectibleSet(self)
     local itemConfig = Isaac.GetItemConfig()
-    return itemConfig:GetCollectibles().Size - 1
+    local collectibleSet = __TS__New(Set)
+    do
+        local collectibleType = 1
+        while collectibleType <= ____exports.getMaxCollectibleID(nil) do
+            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+            if itemConfigItem ~= nil then
+                collectibleSet:add(collectibleType)
+            end
+            collectibleType = collectibleType + 1
+        end
+    end
+    return collectibleSet
 end
 function ____exports.isQuestCollectible(self, collectibleType)
     return ____exports.collectibleHasTag(nil, collectibleType, 32768)

package/dist/functions/log.d.ts

@@ -35,6 +35,8 @@ export declare function logAllProjectileFlags(flags: int): void;
  */
 export declare function logAllUseFlags(flags: int): void;
 export declare function logArray<T>(array: T[]): void;
+export declare function logColor(color: Color): void;
 export declare function logEntity(entity: Entity): void;
+export declare function logKColor(kColor: KColor): void;
 export declare function logMap(map: Map<AnyNotNil, unknown>): void;
 export declare function logSet(set: Set<AnyNotNil>): void;

package/dist/functions/log.lua

@@ -74,12 +74,24 @@ function ____exports.logArray(self, array)
     local arrayString = arrayToString(nil, array)
     ____exports.log(nil, "Array: " .. arrayString)
 end
+function ____exports.logColor(self, color)
+    ____exports.log(
+        nil,
+        (((((((((((("Color: R" .. tostring(color.R)) .. ", G") .. tostring(color.G)) .. ", B") .. tostring(color.B)) .. ", A") .. tostring(color.A)) .. ", RO") .. tostring(color.RO)) .. ", BO") .. tostring(color.BO)) .. ", GO") .. tostring(color.GO)
+    )
+end
 function ____exports.logEntity(self, entity)
     ____exports.log(
         nil,
         (((("Entity: " .. tostring(entity.Type)) .. ".") .. tostring(entity.Variant)) .. ".") .. tostring(entity.SubType)
     )
 end
+function ____exports.logKColor(self, kColor)
+    ____exports.log(
+        nil,
+        (((((("Color: R" .. tostring(kColor.Red)) .. ", G") .. tostring(kColor.Green)) .. ", B") .. tostring(kColor.Blue)) .. ", A") .. tostring(kColor.Alpha)
+    )
+end
 function ____exports.logMap(self, map)
     ____exports.log(nil, "Printing out map:")
     for ____, ____value in __TS__Iterator(

package/dist/functions/player.d.ts

@@ -53,7 +53,7 @@ export declare function getPlayerCloserThan(position: Vector, distance: float):
  * Iterates over every item in the game and returns a map containing the number of each item that
  * the player has.
  */
-export declare function getPlayerCollectibleMap(player: EntityPlayer): Map<CollectibleType | int, int>;
+export declare function getPlayerCollectibleMap(player: EntityPlayer, collectibleSet: Set<int>): Map<CollectibleType | int, int>;
 export declare function getPlayerFromIndex(playerIndex: PlayerIndex): EntityPlayer | undefined;
 /**
  * This function always excludes players with a non-undefined parent, since they are not real

package/dist/functions/player.lua

@@ -3,8 +3,6 @@ require("lualib_bundle");
 local ____exports = {}
 local ____PocketItemType = require("types.PocketItemType")
 local PocketItemType = ____PocketItemType.default
-local ____util = require("functions.util")
-local getCollectibleSet = ____util.getCollectibleSet
 local EXCLUDED_CHARACTERS
 function ____exports.getPlayers(self, performExclusions)
     if performExclusions == nil then
@@ -154,9 +152,8 @@ function ____exports.getPlayerCloserThan(self, position, distance)
     end
     return nil
 end
-function ____exports.getPlayerCollectibleMap(self, player)
+function ____exports.getPlayerCollectibleMap(self, player, collectibleSet)
     local collectibleMap = __TS__New(Map)
-    local collectibleSet = getCollectibleSet(nil)
     for ____, collectibleType in __TS__Iterator(
         collectibleSet:values()
     ) do

package/dist/functions/ui.lua

@@ -49,13 +49,11 @@ function ____exports.getScreenCenter(self)
     return bottomRight / 2
 end
 function ____exports.getVisibleHearts(self, player)
-    local maxHearts = math.max(
-        player:GetEffectiveMaxHearts(),
-        player:GetBoneHearts() * 2
-    )
-    local visibleHearts = math.ceil(
-        (maxHearts + player:GetSoulHearts()) / 2
-    )
+    local effectiveMaxHearts = player:GetEffectiveMaxHearts()
+    local soulHearts = player:GetSoulHearts()
+    local boneHearts = player:GetBoneHearts()
+    local maxHearts = math.max(effectiveMaxHearts, boneHearts * 2)
+    local visibleHearts = math.ceil((maxHearts + soulHearts) / 2)
     if visibleHearts < 1 then
         visibleHearts = 1
     end

package/dist/functions/util.d.ts

@@ -45,8 +45,6 @@ export declare const ensureAllCases: (obj: never) => never;
  * https://isaacscript.github.io/docs/gotchas#iterating-over-enums
  */
 export declare function getEnumValues(transpiledEnum: unknown): int[];
-/** Returns a set containing every valid collectible type in the game, including modded items. */
-export declare function getCollectibleSet(): Set<CollectibleType | int>;
 /**
  * Converts a hex string like "#33aa33" to a KColor object.
  *

package/dist/functions/util.lua

@@ -3,8 +3,6 @@ require("lualib_bundle");
 local ____exports = {}
 local ____constants = require("constants")
 local VECTOR_BRAND = ____constants.VECTOR_BRAND
-local ____collectibles = require("functions.collectibles")
-local getMaxCollectibleID = ____collectibles.getMaxCollectibleID
 local ____math = require("functions.math")
 local getAngleDifference = ____math.getAngleDifference
 local HEX_STRING_LENGTH = 6
@@ -19,21 +17,6 @@ function ____exports.getEnumValues(self, transpiledEnum)
     __TS__ArraySort(enumValues)
     return enumValues
 end
-function ____exports.getCollectibleSet(self)
-    local itemConfig = Isaac.GetItemConfig()
-    local collectibleSet = __TS__New(Set)
-    do
-        local collectibleType = 1
-        while collectibleType <= getMaxCollectibleID(nil) do
-            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
-            if itemConfigItem ~= nil then
-                collectibleSet:add(collectibleType)
-            end
-            collectibleType = collectibleType + 1
-        end
-    end
-    return collectibleSet
-end
 function ____exports.hexToKColor(self, hexString, alpha)
     hexString = __TS__StringReplace(hexString, "#", "")
     if #hexString ~= HEX_STRING_LENGTH then
@@ -46,17 +29,18 @@ function ____exports.hexToKColor(self, hexString, alpha)
     if R == nil then
         error(("Failed to convert `0x" .. rString) .. "` to a number.")
     end
-    local gString = __TS__StringSubstr(hexString, 2, 4)
+    local gString = __TS__StringSubstr(hexString, 2, 2)
     local G = tonumber("0x" .. gString)
     if G == nil then
         error(("Failed to convert `0x" .. gString) .. "` to a number.")
     end
-    local bString = __TS__StringSubstr(hexString, 4, 6)
+    local bString = __TS__StringSubstr(hexString, 4, 2)
     local B = tonumber("0x" .. bString)
     if B == nil then
         error(("Failed to convert `0x" .. bString) .. "` to a number.")
     end
-    return KColor(R, G, B, alpha)
+    local base = 255
+    return KColor(R / base, G / base, B / base, alpha)
 end
 function ____exports.isGreedMode(self)
     local game = Game()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.326",
+  "version": "1.0.330",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,10 +25,10 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.189",
+    "isaac-typescript-definitions": "^1.0.190",
     "isaacscript-lint": "^1.0.61",
-    "ts-prune": "^0.10.0",
-    "typedoc": "^0.22.4",
+    "ts-prune": "^0.10.1",
+    "typedoc": "^0.22.5",
     "typescript": "4.4.3",
     "typescript-to-lua": "^1.0.1"
   }