isaacscript-common 6.6.3 → 6.7.0

package/dist/functions/pickups.lua

@@ -1,10 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
-local ____constants = require("constants")
-local VectorZero = ____constants.VectorZero
 local ____coinSubTypeToValue = require("objects.coinSubTypeToValue")
 local COIN_SUBTYPE_TO_VALUE = ____coinSubTypeToValue.COIN_SUBTYPE_TO_VALUE
 local DEFAULT_COIN_VALUE = ____coinSubTypeToValue.DEFAULT_COIN_VALUE
@@ -12,463 +8,38 @@ local ____chestPickupVariantsSet = require("sets.chestPickupVariantsSet")
 local CHEST_PICKUP_VARIANTS = ____chestPickupVariantsSet.CHEST_PICKUP_VARIANTS
 local ____redHeartSubTypesSet = require("sets.redHeartSubTypesSet")
 local RED_HEART_SUB_TYPES_SET = ____redHeartSubTypesSet.RED_HEART_SUB_TYPES_SET
-local ____entitySpecific = require("functions.entitySpecific")
-local getPickups = ____entitySpecific.getPickups
-local removeAllPickups = ____entitySpecific.removeAllPickups
-local spawnPickup = ____entitySpecific.spawnPickup
+local ____entities = require("functions.entities")
+local removeEntities = ____entities.removeEntities
+local ____pickupsSpecific = require("functions.pickupsSpecific")
+local getHearts = ____pickupsSpecific.getHearts
 local ____pickupVariants = require("functions.pickupVariants")
 local isHeart = ____pickupVariants.isHeart
---- Helper function to get all of the battery entities in the room.
-function ____exports.getBatteries(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.LIL_BATTERY, matchingSubType)
-end
---- Helper function to get all of the card entities in the room.
-function ____exports.getCards(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.TAROT_CARD, matchingSubType)
-end
 --- Helper function to get the corresponding coin amount from a `CoinSubType`. Returns 1 for modded
 -- sub-types.
 function ____exports.getCoinValue(self, coinSubType)
     local value = COIN_SUBTYPE_TO_VALUE[coinSubType]
     return value == nil and DEFAULT_COIN_VALUE or value
 end
---- Helper function to get all of the coin pickup entities in the room.
-function ____exports.getCoins(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.COIN, matchingSubType)
-end
---- Helper function to get all of the collectible entities in the room.
-function ____exports.getCollectibles(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.COLLECTIBLE, matchingSubType)
-end
---- Helper function to get all of the heart pickup entities in the room.
-function ____exports.getHearts(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.HEART, matchingSubType)
-end
---- Helper function to get all of the key pickup entities in the room.
-function ____exports.getKeys(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.KEY, matchingSubType)
-end
---- Helper function to get all of the pill entities in the room.
-function ____exports.getPills(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.PILL, matchingSubType)
-end
 --- Helper function to get all of the red heart pickup entities in the room.
 function ____exports.getRedHearts(self)
-    local hearts = ____exports.getHearts(nil)
+    local hearts = getHearts(nil)
     return __TS__ArrayFilter(
         hearts,
         function(____, heart) return RED_HEART_SUB_TYPES_SET:has(heart.SubType) end
     )
 end
---- Helper function to get all of the sack (i.e. grab bag) entities in the room.
-function ____exports.getSacks(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.SACK, matchingSubType)
-end
---- Helper function to get all of the trinket entities in the room.
-function ____exports.getTrinkets(self, matchingSubType)
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    return getPickups(nil, PickupVariant.TRINKET, matchingSubType)
-end
 function ____exports.isChest(self, pickup)
     return CHEST_PICKUP_VARIANTS:has(pickup.Variant)
 end
 function ____exports.isRedHeart(self, pickup)
     return isHeart(nil, pickup) and RED_HEART_SUB_TYPES_SET:has(pickup.SubType)
 end
---- Helper function to remove all of the batteries in the room.
--- 
--- @param batterySubType Optional. If specified, will only remove cards that match this sub-type.
--- @param cap Optional. If specified, will only remove the given amount of cards.
--- @returns True if one or more cards were removed, false otherwise.
-function ____exports.removeAllBatteries(self, batterySubType, cap)
-    return removeAllPickups(nil, PickupVariant.LIL_BATTERY, batterySubType, cap)
-end
---- Helper function to remove all of the cards in the room.
--- 
--- @param card Optional. If specified, will only remove cards that match this sub-type.
--- @param cap Optional. If specified, will only remove the given amount of cards.
--- @returns True if one or more cards were removed, false otherwise.
-function ____exports.removeAllCards(self, card, cap)
-    return removeAllPickups(nil, PickupVariant.TAROT_CARD, card, cap)
-end
---- Helper function to remove all of the coins in the room.
--- 
--- @param coinSubType Optional. If specified, will only remove coins that match this sub-type.
--- @param cap Optional. If specified, will only remove the given amount of coins.
--- @returns True if one or more coins were removed, false otherwise.
-function ____exports.removeAllCoins(self, coinSubType, cap)
-    return removeAllPickups(nil, PickupVariant.COIN, coinSubType, cap)
-end
---- Helper function to remove all of the collectibles in the room.
+--- Helper function to remove all of the red heart pickup entities in the room.
 -- 
--- @param collectibleType Optional. If specified, will only remove collectibles that match this
--- collectible type.
--- @param cap Optional. If specified, will only remove the given amount of collectibles.
--- @returns True if one or more collectibles were removed, false otherwise.
-function ____exports.removeAllCollectibles(self, collectibleType, cap)
-    return removeAllPickups(nil, PickupVariant.COLLECTIBLE, collectibleType, cap)
-end
---- Helper function to remove all of the hearts in the room.
--- 
--- @param heartSubType Optional. If specified, will only remove hearts that match this sub-type.
 -- @param cap Optional. If specified, will only remove the given amount of hearts.
--- @returns True if one or more hearts were removed, false otherwise.
-function ____exports.removeAllHearts(self, heartSubType, cap)
-    return removeAllPickups(nil, PickupVariant.HEART, heartSubType, cap)
-end
---- Helper function to remove all of the keys in the room.
--- 
--- @param keySubType Optional. If specified, will only remove keys that match this sub-type.
--- @param cap Optional. If specified, will only remove the given amount of keys.
--- @returns True if one or more keys were removed, false otherwise.
-function ____exports.removeAllKeys(self, keySubType, cap)
-    return removeAllPickups(nil, PickupVariant.KEY, keySubType, cap)
-end
---- Helper function to remove all of the pills in the room.
--- 
--- @param pillColor Optional. If specified, will only remove pills that match this color.
--- @param cap Optional. If specified, will only remove the given amount of pills.
--- @returns True if one or more pills were removed, false otherwise.
-function ____exports.removeAllPills(self, pillColor, cap)
-    return removeAllPickups(nil, PickupVariant.PILL, pillColor, cap)
-end
---- Helper function to remove all of the sacks (i.e. grab bags) in the room.
--- 
--- @param sackSubType Optional. If specified, will only remove sacks that match this sub-type.
--- @param cap Optional. If specified, will only remove the given amount of trinkets.
--- @returns True if one or more trinkets were removed, false otherwise.
-function ____exports.removeAllSacks(self, sackSubType, cap)
-    return removeAllPickups(nil, PickupVariant.TRINKET, sackSubType, cap)
-end
---- Helper function to remove all of the trinkets in the room.
--- 
--- @param trinketType Optional. If specified, will only remove trinkets that match this trinket
--- type.
--- @param cap Optional. If specified, will only remove the given amount of trinkets.
--- @returns True if one or more trinkets were removed, false otherwise.
-function ____exports.removeAllTrinkets(self, trinketType, cap)
-    return removeAllPickups(nil, PickupVariant.TRINKET, trinketType, cap)
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.LIL_BATTERY` (90).
-function ____exports.spawnBattery(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.LIL_BATTERY,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnBatteryWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnBattery(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.TAROT_CARD` (300).
-function ____exports.spawnCard(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.TAROT_CARD,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnCardWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnCard(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.COIN` (20).
-function ____exports.spawnCoin(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.COIN,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnCoinWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnCoin(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.HEART` (10).
-function ____exports.spawnHeart(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.HEART,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnHeartWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnHeart(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.KEY` (30).
-function ____exports.spawnKey(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.KEY,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnKeyWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnKey(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.PILL` (70).
-function ____exports.spawnPill(self, pillColor, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.PILL,
-        pillColor,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnPillWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnPill(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.SACK` (69).
-function ____exports.spawnSack(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.SACK,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnSackWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnSack(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
---- Helper function to spawn a `EntityType.PICKUP` (5) with variant `PickupVariant.TRINKET` (350).
-function ____exports.spawnTrinket(self, subType, position, velocity, spawner, seedOrRNG)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    if seedOrRNG == nil then
-        seedOrRNG = nil
-    end
-    return spawnPickup(
-        nil,
-        PickupVariant.TRINKET,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
-end
-function ____exports.spawnTrinketWithSeed(self, subType, position, seedOrRNG, velocity, spawner)
-    if velocity == nil then
-        velocity = VectorZero
-    end
-    if spawner == nil then
-        spawner = nil
-    end
-    return ____exports.spawnTrinket(
-        nil,
-        subType,
-        position,
-        velocity,
-        spawner,
-        seedOrRNG
-    )
+-- @returns The red hearts that were removed.
+function ____exports.removeAllRedHearts(self, cap)
+    local redHearts = ____exports.getRedHearts(nil)
+    return removeEntities(nil, redHearts, cap)
 end
 return ____exports