isaacscript-common 1.2.100 → 1.2.101

package/dist/callbacks/postPlayerChangeHealth.lua

@@ -6,10 +6,11 @@ local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, getCurrentHealthValue, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____bitwise = require("functions.bitwise")
-local countSetBits = ____bitwise.countSetBits
 local ____player = require("functions.player")
+local getBlackHearts = ____player.getBlackHearts
+local getHearts = ____player.getHearts
 local getPlayerIndex = ____player.getPlayerIndex
+local getSoulHearts = ____player.getSoulHearts
 local ____utils = require("functions.utils")
 local ensureAllCases = ____utils.ensureAllCases
 local getEnumValues = ____utils.getEnumValues
@@ -47,19 +48,13 @@ function getCurrentHealthValue(self, player, healthType)
         local ____cond11 = ____switch11 == HealthType.RED
         if ____cond11 then
             do
-                local rottenHearts = player:GetRottenHearts()
-                local hearts = player:GetHearts()
-                return hearts - rottenHearts * 2
+                return getHearts(nil, player)
             end
         end
         ____cond11 = ____cond11 or ____switch11 == HealthType.SOUL
         if ____cond11 then
             do
-                local soulHearts = player:GetSoulHearts()
-                local blackHeartsBitmask = player:GetBlackHearts()
-                local blackHeartsBits = countSetBits(nil, blackHeartsBitmask)
-                local blackHearts = blackHeartsBits * 2
-                return soulHearts - blackHearts
+                return getSoulHearts(nil, player)
             end
         end
         ____cond11 = ____cond11 or ____switch11 == HealthType.ETERNAL
@@ -71,10 +66,7 @@ function getCurrentHealthValue(self, player, healthType)
         ____cond11 = ____cond11 or ____switch11 == HealthType.BLACK
         if ____cond11 then
             do
-                local blackHeartsBitmask = player:GetBlackHearts()
-                local blackHeartsBits = countSetBits(nil, blackHeartsBitmask)
-                local blackHearts = blackHeartsBits * 2
-                return blackHearts
+                return getBlackHearts(nil, player)
             end
         end
         ____cond11 = ____cond11 or ____switch11 == HealthType.GOLDEN

package/dist/callbacks/postPurchase.lua

@@ -9,8 +9,8 @@ local ____exports = {}
 local hasSubscriptions, postUpdate, checkPickupsPurchased, getPlayerThatIsNoLongerHoldingAnItem, storePickupsInMap, storePlayersInMap, pickupAtIndexStillExists, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____entity = require("functions.entity")
-local getPickups = ____entity.getPickups
+local ____pickups = require("functions.pickups")
+local getPickups = ____pickups.getPickups
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local getPlayers = ____player.getPlayers

package/dist/features/deployJSONRoom.lua

@@ -11,7 +11,6 @@ local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
 local ____entity = require("functions.entity")
 local removeAllMatchingEntities = ____entity.removeAllMatchingEntities
-local removeAllPickups = ____entity.removeAllPickups
 local ____entitySpecific = require("functions.entitySpecific")
 local removeAllBombs = ____entitySpecific.removeAllBombs
 local ____gridEntity = require("functions.gridEntity")
@@ -28,6 +27,8 @@ local ____math = require("functions.math")
 local range = ____math.range
 local ____npc = require("functions.npc")
 local getNPCs = ____npc.getNPCs
+local ____pickups = require("functions.pickups")
+local removeAllPickups = ____pickups.removeAllPickups
 local ____random = require("functions.random")
 local nextSeed = ____random.nextSeed
 local ____rooms = require("functions.rooms")

package/dist/features/isPonyActive.lua

@@ -1,5 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
-require("lualib_bundle");
+local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local postPEffectUpdate, FLAGS_WHEN_PONY_IS_ACTIVE, v
 local ____errors = require("errors")

package/dist/functions/collectibles.lua

@@ -8,11 +8,11 @@ local ____collectibleDescriptionMap = require("maps.collectibleDescriptionMap")
 local COLLECTIBLE_DESCRIPTION_MAP = ____collectibleDescriptionMap.COLLECTIBLE_DESCRIPTION_MAP
 local ____collectibleNameMap = require("maps.collectibleNameMap")
 local COLLECTIBLE_NAME_MAP = ____collectibleNameMap.COLLECTIBLE_NAME_MAP
-local ____entity = require("functions.entity")
-local getPickups = ____entity.getPickups
-local removeAllPickups = ____entity.removeAllPickups
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
+local ____pickups = require("functions.pickups")
+local getPickups = ____pickups.getPickups
+local removeAllPickups = ____pickups.removeAllPickups
 local ____sprite = require("functions.sprite")
 local clearSprite = ____sprite.clearSprite
 function ____exports.setCollectibleSprite(self, collectible, pngPath)

package/dist/functions/entity.d.ts

@@ -42,18 +42,6 @@ export declare function getFilteredNewEntities<T extends AnyEntity>(oldEntities:
  * returned. False by default. Will only be taken into account if `matchingEntityType` is specified.
  */
 export declare function getEntities(matchingEntityType?: EntityType | int, matchingVariant?: number, matchingSubType?: number, ignoreFriendly?: boolean): Entity[];
-/**
- * Helper function to get all of the pickups in the room.
- *
- * Example:
- * ```
- * // Make all of the pickups in the room invisible
- * for (const pickup of getPickups()) {
- *   pickup.Visible = false;
- * }
- * ```
- */
-export declare function getPickups(matchingVariant?: PickupVariant | int, matchingSubType?: number): EntityPickup[];
 /**
  * Helper function to measure an entity's velocity to see if it is moving.
  *
@@ -87,15 +75,6 @@ export declare function removeEntities(entities: Entity[], cap?: int): boolean;
  * @returns True if one or more entities was removed, false otherwise.
  */
 export declare function removeAllMatchingEntities(entityType: int, entityVariant?: number, entitySubType?: number, cap?: int | undefined): boolean;
-/**
- * Helper function to remove all of the pickups in the room.
- *
- * @param variant Optional. If specified, will only remove pickups that match this variant.
- * @param subType Optional. If specified, will only remove pickups that match this sub-type.
- * @param cap Optional. If specified, will only remove the given amount of pickups.
- * @returns True if one or more pickups was removed, false otherwise.
- */
-export declare function removeAllPickups(variant?: PickupVariant | int, subType?: int, cap?: int): boolean;
 /**
  * Helper function to reroll an enemy. Use this instead of the vanilla "Game.RerollEnemy" function
  * if you want the rerolled enemy to be returned.

package/dist/functions/entity.lua

@@ -63,23 +63,6 @@ function ____exports.getEntities(self, matchingEntityType, matchingVariant, matc
     end
     return Isaac.FindByType(matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
 end
-function ____exports.getPickups(self, matchingVariant, matchingSubType)
-    if matchingVariant == nil then
-        matchingVariant = -1
-    end
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    local entities = ____exports.getEntities(nil, EntityType.ENTITY_PICKUP, matchingVariant, matchingSubType)
-    local pickups = {}
-    for ____, entity in ipairs(entities) do
-        local pickup = entity:ToPickup()
-        if pickup ~= nil then
-            __TS__ArrayPush(pickups, pickup)
-        end
-    end
-    return pickups
-end
 function ____exports.isEntityMoving(self, entity, threshold)
     if threshold == nil then
         threshold = 0.01
@@ -116,10 +99,6 @@ function ____exports.removeAllMatchingEntities(self, entityType, entityVariant,
     local entities = ____exports.getEntities(nil, entityType, entityVariant, entitySubType)
     return ____exports.removeEntities(nil, entities, cap)
 end
-function ____exports.removeAllPickups(self, variant, subType, cap)
-    local pickups = ____exports.getPickups(nil, variant, subType)
-    return ____exports.removeEntities(nil, pickups, cap)
-end
 function ____exports.rerollEnemy(self, entity)
     local game = Game()
     local oldEntities = ____exports.getEntities(nil)

package/dist/functions/pickups.d.ts

@@ -1,4 +1,16 @@
 /// <reference types="isaac-typescript-definitions" />
+/**
+ * Helper function to get all of the pickups in the room.
+ *
+ * Example:
+ * ```
+ * // Make all of the pickups in the room invisible
+ * for (const pickup of getPickups()) {
+ *   pickup.Visible = false;
+ * }
+ * ```
+ */
+export declare function getPickups(matchingVariant?: PickupVariant | int, matchingSubType?: number): EntityPickup[];
 /**
  * Has as an equal chance of returning any value in the `HeartSubType` enum. Useful for spawning a random type of heart.
  *
@@ -7,3 +19,12 @@
  */
 export declare function getRandomHeartSubType(seed?: number, exceptions?: HeartSubType[]): HeartSubType;
 export declare function isChest(pickup: EntityPickup): boolean;
+/**
+ * Helper function to remove all of the pickups in the room.
+ *
+ * @param variant Optional. If specified, will only remove pickups that match this variant.
+ * @param subType Optional. If specified, will only remove pickups that match this sub-type.
+ * @param cap Optional. If specified, will only remove the given amount of pickups.
+ * @returns True if one or more pickups was removed, false otherwise.
+ */
+export declare function removeAllPickups(variant?: PickupVariant | int, subType?: int, cap?: int): boolean;

package/dist/functions/pickups.lua

@@ -1,11 +1,33 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local ____exports = {}
 local ____constants = require("constants")
 local CHEST_PICKUP_VARIANTS = ____constants.CHEST_PICKUP_VARIANTS
 local ____array = require("functions.array")
 local getRandomArrayElement = ____array.getRandomArrayElement
+local ____entity = require("functions.entity")
+local getEntities = ____entity.getEntities
+local removeEntities = ____entity.removeEntities
 local ____utils = require("functions.utils")
 local getEnumValues = ____utils.getEnumValues
+function ____exports.getPickups(self, matchingVariant, matchingSubType)
+    if matchingVariant == nil then
+        matchingVariant = -1
+    end
+    if matchingSubType == nil then
+        matchingSubType = -1
+    end
+    local entities = getEntities(nil, EntityType.ENTITY_PICKUP, matchingVariant, matchingSubType)
+    local pickups = {}
+    for ____, entity in ipairs(entities) do
+        local pickup = entity:ToPickup()
+        if pickup ~= nil then
+            __TS__ArrayPush(pickups, pickup)
+        end
+    end
+    return pickups
+end
 function ____exports.getRandomHeartSubType(self, seed, exceptions)
     if seed == nil then
         seed = Random()
@@ -19,4 +41,8 @@ end
 function ____exports.isChest(self, pickup)
     return CHEST_PICKUP_VARIANTS:has(pickup.Variant)
 end
+function ____exports.removeAllPickups(self, variant, subType, cap)
+    local pickups = ____exports.getPickups(nil, variant, subType)
+    return removeEntities(nil, pickups, cap)
+end
 return ____exports

package/dist/functions/trinkets.lua

@@ -6,10 +6,10 @@ 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 ____entity = require("functions.entity")
-local getPickups = ____entity.getPickups
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
+local ____pickups = require("functions.pickups")
+local getPickups = ____pickups.getPickups
 local ____player = require("functions.player")
 local useActiveItemTemp = ____player.useActiveItemTemp
 local ____trinketGive = require("functions.trinketGive")

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { deployJSONRoom, deployRandomJSONRoom, emptyRoom, } from "./features/dep
 export { disableAllInputs, disableAllInputsExceptFor, disableMovementInputs, disableShootingInputs, enableAllInputs, enableAllInputsExceptFor, } from "./features/disableInputs";
 export { forgottenSwitch } from "./features/forgottenSwitch";
 export { getCollectibleItemPoolType } from "./features/getCollectibleItemPoolType";
+export * from "./features/isPonyActive";
 export { preventCollectibleRotate } from "./features/preventCollectibleRotate";
 export { runInNGameFrames, runInNRenderFrames, runNextGameFrame, runNextRenderFrame, } from "./features/runInNFrames";
 export * from "./features/saveDataManager/exports";

package/dist/index.lua

@@ -49,6 +49,14 @@ do
     local getCollectibleItemPoolType = ____getCollectibleItemPoolType.getCollectibleItemPoolType
     ____exports.getCollectibleItemPoolType = getCollectibleItemPoolType
 end
+do
+    local ____export = require("features.isPonyActive")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____preventCollectibleRotate = require("features.preventCollectibleRotate")
     local preventCollectibleRotate = ____preventCollectibleRotate.preventCollectibleRotate

package/dist/upgradeMod.lua

@@ -79,6 +79,8 @@ local ____forgottenSwitch = require("features.forgottenSwitch")
 local forgottenSwitchInit = ____forgottenSwitch.forgottenSwitchInit
 local ____getCollectibleItemPoolType = require("features.getCollectibleItemPoolType")
 local getCollectibleItemPoolTypeInit = ____getCollectibleItemPoolType.getCollectibleItemPoolTypeInit
+local ____isPonyActive = require("features.isPonyActive")
+local isPonyActiveInit = ____isPonyActive.isPonyActiveInit
 local ____preventCollectibleRotate = require("features.preventCollectibleRotate")
 local preventCollectibleRotateInit = ____preventCollectibleRotate.preventCollectibleRotateInit
 local ____runInNFrames = require("features.runInNFrames")
@@ -137,6 +139,7 @@ function initFeatures(self, mod)
     preventCollectibleRotateInit(nil, mod)
     runInNFramesInit(nil, mod)
     sirenHelpersInit(nil, mod)
+    isPonyActiveInit(nil, mod)
 end
 function ____exports.upgradeMod(self, modVanilla, verbose)
     if verbose == nil then

package/package.json

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