isaacscript-common 4.2.3 → 4.2.6

package/features/extraConsoleCommands/init.lua

@@ -196,6 +196,7 @@ commandFunctionsMap:set("listGrid", commands.listGrid)
 commandFunctionsMap:set("listGridAll", commands.listGridAll)
 commandFunctionsMap:set("lowHP", commands.lowHP)
 commandFunctionsMap:set("luck", commands.luck)
+commandFunctionsMap:set("mana", commands.mana)
 commandFunctionsMap:set("map", commands.map)
 commandFunctionsMap:set("maxHearts", commands.maxHearts)
 commandFunctionsMap:set("mh", commands.mh)

package/features/extraConsoleCommands/listCommands.d.ts

@@ -209,6 +209,8 @@ export declare function listGridAll(params: string): void;
 export declare function lowHP(): void;
 /** Alias for "debug 9". */
 export declare function luck(): void;
+/** Alias for the "poopMana" command. */
+export declare function mana(params: string): void;
 /** Completely reveals the entire map, including the Ultra Secret Room. */
 export declare function map(): void;
 /**

package/features/extraConsoleCommands/listCommands.lua

@@ -148,6 +148,21 @@ function ____exports.oneHP(self)
     end
     printConsole(nil, "Set every NPC to 1 HP.")
 end
+--- Gives a poop mana charge. This only affects Tainted Blue Baby. Provide a number to give a custom
+-- amount of charges. (You can use negative numbers to remove charges.)
+function ____exports.poopMana(self, params)
+    local charges = 1
+    if params ~= "" then
+        local num = tonumber(params)
+        if num == nil then
+            printConsole(nil, "That is an invalid amount of mana to add.")
+            return
+        end
+        charges = num
+    end
+    local player = Isaac.GetPlayer()
+    player:AddPoopMana(charges)
+end
 --- Gives a half soul heart. Provide a number to give a custom amount of hearts. (You can use
 -- negative numbers to remove hearts.)
 function ____exports.soulHearts(self, params)
@@ -658,6 +673,10 @@ end
 function ____exports.luck(self)
     Isaac.ExecuteCommand("debug 9")
 end
+--- Alias for the "poopMana" command.
+function ____exports.mana(self, params)
+    ____exports.poopMana(nil, params)
+end
 --- Completely reveals the entire map, including the Ultra Secret Room.
 function ____exports.map(self)
     local level = game:GetLevel()
@@ -776,21 +795,6 @@ function ____exports.pocket(self, params)
     local player = Isaac.GetPlayer()
     player:SetPocketActiveItem(collectibleType, ActiveSlot.POCKET)
 end
---- Gives a poop mana charge. This only affects Tainted Blue Baby. Provide a number to give a custom
--- amount of charges. (You can use negative numbers to remove charges.)
-function ____exports.poopMana(self, params)
-    local charges = 1
-    if params ~= "" then
-        local num = tonumber(params)
-        if num == nil then
-            printConsole(nil, "That is an invalid amount of mana to add.")
-            return
-        end
-        charges = num
-    end
-    local player = Isaac.GetPlayer()
-    player:AddPoopMana(charges)
-end
 --- Alias for the "getPosition" command.
 function ____exports.positionCommand(self)
     ____exports.getPosition(nil)

package/functions/character.lua

@@ -5,7 +5,6 @@ local ____constantsFirstLast = require("constantsFirstLast")
 local LAST_VANILLA_CHARACTER = ____constantsFirstLast.LAST_VANILLA_CHARACTER
 local ____characterNames = require("objects.characterNames")
 local CHARACTER_NAMES = ____characterNames.CHARACTER_NAMES
-local DEFAULT_CHARACTER_NAME = ____characterNames.DEFAULT_CHARACTER_NAME
 local ____charactersThatStartWithAnActiveItemSet = require("sets.charactersThatStartWithAnActiveItemSet")
 local CHARACTERS_THAT_START_WITH_AN_ACTIVE_ITEM_SET = ____charactersThatStartWithAnActiveItemSet.CHARACTERS_THAT_START_WITH_AN_ACTIVE_ITEM_SET
 local ____charactersWithBlackHeartFromEternalHeartSet = require("sets.charactersWithBlackHeartFromEternalHeartSet")
@@ -18,6 +17,9 @@ local ____charactersWithNoSoulHeartsSet = require("sets.charactersWithNoSoulHear
 local CHARACTERS_WITH_NO_SOUL_HEARTS_SET = ____charactersWithNoSoulHeartsSet.CHARACTERS_WITH_NO_SOUL_HEARTS_SET
 local ____lostStyleCharactersSet = require("sets.lostStyleCharactersSet")
 local LOST_STYLE_CHARACTERS_SET = ____lostStyleCharactersSet.LOST_STYLE_CHARACTERS_SET
+function ____exports.isModdedCharacter(self, character)
+    return not ____exports.isVanillaCharacter(nil, character)
+end
 function ____exports.isVanillaCharacter(self, character)
     return character <= LAST_VANILLA_CHARACTER
 end
@@ -84,13 +86,9 @@ function ____exports.getCharacterMaxHeartContainers(self, character)
 end
 --- Helper function to get the name of a character. Returns "unknown" for modded characters.
 function ____exports.getCharacterName(self, character)
-    if ____exports.isVanillaCharacter(nil, character) then
+    if ____exports.isModdedCharacter(nil, character) then
         return "unknown"
     end
-    local characterName = CHARACTER_NAMES[character]
-    return characterName == nil and DEFAULT_CHARACTER_NAME or characterName
-end
-function ____exports.isModdedCharacter(self, character)
-    return not ____exports.isVanillaCharacter(nil, character)
+    return CHARACTER_NAMES[character]
 end
 return ____exports

package/functions/collectibleCacheFlag.lua

@@ -7,8 +7,8 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____collectibles = require("functions.collectibles")
-local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ____collectibleSet = require("functions.collectibleSet")
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____flag = require("functions.flag")
@@ -29,7 +29,7 @@ local CACHE_FLAG_TO_COLLECTIBLES_MAP = __TS__New(Map)
 local function initCacheFlagMap(self)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local collectiblesSet = __TS__New(Set)
-        for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
+        for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
             if ____exports.collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
                 collectiblesSet:add(collectibleType)
             end

package/functions/collectibleSet.lua

@@ -6,9 +6,11 @@ local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsFirstLast = require("constantsFirstLast")
+local FIRST_COLLECTIBLE_TYPE = ____constantsFirstLast.FIRST_COLLECTIBLE_TYPE
+local LAST_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_COLLECTIBLE_TYPE
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
-local ____collectibles = require("functions.collectibles")
-local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ____utils = require("functions.utils")
+local irange = ____utils.irange
 local ALL_COLLECTIBLES_ARRAY = {}
 local VANILLA_COLLECTIBLES_ARRAY = {}
 local MODDED_COLLECTIBLES_ARRAY = {}
@@ -19,7 +21,8 @@ local function initCollectibleArraysAndSets(self)
     if #ALL_COLLECTIBLES_ARRAY ~= 0 then
         return
     end
-    for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
+    local collectibleTypeRange = irange(nil, FIRST_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE)
+    for ____, collectibleType in ipairs(collectibleTypeRange) do
         do
             local itemConfigItem = itemConfig:GetCollectible(collectibleType)
             if itemConfigItem == nil then

package/functions/collectibleTag.lua

@@ -8,8 +8,8 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____collectibles = require("functions.collectibles")
-local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ____collectibleSet = require("functions.collectibleSet")
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____flag = require("functions.flag")
@@ -33,7 +33,7 @@ local function initTagMap(self)
             __TS__New(Set)
         )
     end
-    for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
+    for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
         for ____, itemConfigTag in ipairs(getEnumValues(nil, ItemConfigTag)) do
             do
                 if not ____exports.collectibleHasTag(nil, collectibleType, itemConfigTag) then

package/functions/collectibles.d.ts

@@ -106,15 +106,6 @@ export declare function getCollectibleQuality(collectibleType: CollectibleType):
  * ```
  */
 export declare function getCollectibleTags(collectibleType: CollectibleType): BitFlags<ItemConfigTag>;
-/**
- * Helper function to get an array that represents the range from the first collectible type to the
- * last collectible type. This will include integers that do not represent any valid collectible
- * types.
- *
- * This function is only useful when building collectible type objects. For most purposes, you
- * should use the `getCollectibleSet` helper function instead.
- */
-export declare function getCollectibleTypeRange(): CollectibleType[];
 /**
  * Helper function to get an array that represents the all modded collectible types.
  *

package/functions/collectibles.lua

@@ -311,15 +311,6 @@ function ____exports.getCollectibleTags(self, collectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     return itemConfigItem == nil and ItemConfigTagZero or itemConfigItem.Tags
 end
---- Helper function to get an array that represents the range from the first collectible type to the
--- last collectible type. This will include integers that do not represent any valid collectible
--- types.
--- 
--- This function is only useful when building collectible type objects. For most purposes, you
--- should use the `getCollectibleSet` helper function instead.
-function ____exports.getCollectibleTypeRange(self)
-    return irange(nil, FIRST_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE)
-end
 --- Helper function to get an array that represents the all modded collectible types.
 -- 
 -- This function is only useful when building collectible type objects. For most purposes, you

package/functions/playerHealth.lua

@@ -21,8 +21,6 @@ local getPlayerHearts = ____player.getPlayerHearts
 local getPlayerSoulHearts = ____player.getPlayerSoulHearts
 local isCharacter = ____player.isCharacter
 local setActiveItem = ____player.setActiveItem
-local ____utils = require("functions.utils")
-local ____repeat = ____utils["repeat"]
 function ____exports.removeAllPlayerHealth(self, player)
     local goldenHearts = player:GetGoldenHearts()
     local eternalHearts = player:GetEternalHearts()
@@ -89,16 +87,12 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         end
     )
     player:AddRottenHearts(playerHealth.rottenHearts)
-    ____repeat(
-        nil,
-        playerHealth.hearts,
-        function()
-            player:AddHearts(1)
-            if character == PlayerType.MAGDALENE_B then
-                player:AddHearts(-1)
-            end
-        end
-    )
+    if character == PlayerType.MAGDALENE_B then
+        local effectiveHearts = playerHealth.hearts / 2
+        player:AddHearts(effectiveHearts)
+    else
+        player:AddHearts(playerHealth.hearts)
+    end
     player:AddGoldenHearts(playerHealth.goldenHearts)
     player:AddBrokenHearts(playerHealth.brokenHearts)
     if character == PlayerType.BETHANY then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "4.2.3",
+  "version": "4.2.6",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "index",
   "types": "index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.0.10"
+    "isaac-typescript-definitions": "^3.0.11"
   }
 }