isaacscript-common 1.0.604 → 1.0.608

package/dist/callbacks/postCursedTeleport.lua

@@ -8,7 +8,7 @@ local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
-local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
+local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
 local ____postCursedTeleport = require("callbacks.subscriptions.postCursedTeleport")
 local postCursedTeleportFire = ____postCursedTeleport.postCursedTeleportFire
 local postCursedTeleportHasSubscriptions = ____postCursedTeleport.postCursedTeleportHasSubscriptions
@@ -93,8 +93,8 @@ function playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
     if player:HasCollectible(CollectibleType.COLLECTIBLE_CURSED_EYE) then
         return true
     end
-    local numHitsLeft = getPlayerNumAllHearts(nil, player)
-    if player:HasTrinket(TrinketType.TRINKET_CURSED_SKULL) and numHitsLeft == 1 then
+    local numHitsRemaining = getPlayerNumHitsRemaining(nil, player)
+    if player:HasTrinket(TrinketType.TRINKET_CURSED_SKULL) and numHitsRemaining == 1 then
         return true
     end
     return false

package/dist/callbacks/preBerserkDeath.lua

@@ -2,7 +2,7 @@
 local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered
 local ____player = require("functions.player")
-local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
+local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
 local isChildPlayer = ____player.isChildPlayer
 local ____revive = require("functions.revive")
 local willPlayerRevive = ____revive.willPlayerRevive
@@ -23,8 +23,8 @@ function postPEffectUpdateReordered(self, player)
     end
     local effects = player:GetEffects()
     local berserkEffect = effects:GetCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
-    local playerNumAllHearts = getPlayerNumAllHearts(nil, player)
-    if berserkEffect ~= nil and berserkEffect.Cooldown == 1 and playerNumAllHearts == 0 and not willPlayerRevive(nil, player) then
+    local numHitsRemaining = getPlayerNumHitsRemaining(nil, player)
+    if berserkEffect ~= nil and berserkEffect.Cooldown == 1 and numHitsRemaining == 0 and not willPlayerRevive(nil, player) then
         preBerserkDeathFire(nil, player)
     end
 end

package/dist/functions/globals.lua

@@ -1,11 +1,19 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
+local twoDimensionalSort
 local ____log = require("functions.log")
 local log = ____log.log
 local ____util = require("functions.util")
-local combineSets = ____util.combineSets
+local addSetsToSet = ____util.addSetsToSet
+local copySet = ____util.copySet
 local isLuaDebugEnabled = ____util.isLuaDebugEnabled
+function twoDimensionalSort(self, a, b)
+    if a[1] == b[1] then
+        return 0
+    end
+    return a[1] < b[1] and -1 or 1
+end
 local DEFAULT_GLOBALS = __TS__New(Set, {
     "ActionTriggers",
     "ActiveSlot",
@@ -126,6 +134,7 @@ local DEFAULT_GLOBALS = __TS__New(Set, {
     "SeedEffect",
     "Seeds",
     "ShockwaveParams",
+    "SkinColor",
     "SortingLayer",
     "SoundEffect",
     "Sprite",
@@ -173,8 +182,14 @@ local DEFAULT_GLOBALS = __TS__New(Set, {
     "xpcall"
 })
 local LUA_DEBUG_ADDED_GLOBALS = __TS__New(Set, {"debug", "io", "os", "package"})
+local RACING_PLUS_SANDBOX_ADDED_GLOBALS = __TS__New(Set, {"sandboxTraceback", "sandboxGetTraceback", "getParentFunctionDescription"})
 function ____exports.getDefaultGlobals(self)
-    return isLuaDebugEnabled(nil) and combineSets(nil, DEFAULT_GLOBALS, LUA_DEBUG_ADDED_GLOBALS) or DEFAULT_GLOBALS
+    local defaultGlobals = copySet(nil, DEFAULT_GLOBALS)
+    if isLuaDebugEnabled(nil) then
+        addSetsToSet(nil, defaultGlobals, LUA_DEBUG_ADDED_GLOBALS)
+    end
+    addSetsToSet(nil, defaultGlobals, RACING_PLUS_SANDBOX_ADDED_GLOBALS)
+    return defaultGlobals
 end
 function ____exports.getNewGlobals(self)
     local defaultGlobals = ____exports.getDefaultGlobals(nil)
@@ -185,6 +200,7 @@ function ____exports.getNewGlobals(self)
             __TS__ArrayPush(newGlobals, keyValueTuple)
         end
     end
+    __TS__ArraySort(newGlobals, twoDimensionalSort)
     return newGlobals
 end
 function ____exports.logNewGlobals(self)

package/dist/functions/npc.lua

@@ -70,7 +70,9 @@ NON_ALIVE_NPCS_TYPE_VARIANT = __TS__New(
         (tostring(EntityType.ENTITY_MAMA_GURDY) .. ".") .. 1,
         (tostring(EntityType.ENTITY_MAMA_GURDY) .. ".") .. 2,
         (tostring(EntityType.ENTITY_BIG_HORN) .. ".") .. 1,
-        (tostring(EntityType.ENTITY_BIG_HORN) .. ".") .. 2
+        (tostring(EntityType.ENTITY_BIG_HORN) .. ".") .. 2,
+        (tostring(EntityType.ENTITY_DARK_ESAU) .. ".") .. 0,
+        (tostring(EntityType.ENTITY_DARK_ESAU) .. ".") .. 1
     }
 )
 NON_ALIVE_NPCS_TYPE_VARIANT_SUBTYPE = __TS__New(

package/dist/functions/player.d.ts

@@ -132,10 +132,15 @@ export declare function getPlayerIndexVanilla(playerToFind: EntityPlayer): int |
  */
 export declare function getPlayerMaxHeartContainers(player: EntityPlayer): int;
 /**
- * Returns the combined value of all of the player's red hearts, soul/black hearts, and bone hearts.
- * This is equivalent to the number of hits that the player can currently take.
+ * Returns the combined value of all of the player's red hearts, soul/black hearts, and bone hearts,
+ * minus the value of the player's rotten hearts.
+ *
+ * This is equivalent to the number of hits that the player can currently take, but does not take
+ * into account double damage from champion enemies and/or being on later floors. (For example, on
+ * Womb 1, players who have 1 soul heart remaining would die in 1 hit to anything, even though this
+ * function would report that they have 2 hits remaining.)
  */
-export declare function getPlayerNumAllHearts(player: EntityPlayer): int;
+export declare function getPlayerNumHitsRemaining(player: EntityPlayer): int;
 /**
  * This function always excludes players with a non-undefined parent, since they are not real
  * players. (e.g. the Strawman Keeper)

package/dist/functions/player.lua

@@ -299,7 +299,7 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
     end
     return nil
 end
-function ____exports.getPlayerNumAllHearts(self, player)
+function ____exports.getPlayerNumHitsRemaining(self, player)
     local hearts = player:GetHearts()
     local soulHearts = player:GetSoulHearts()
     local boneHearts = player:GetBoneHearts()
@@ -371,7 +371,7 @@ function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSou
     if ____exports.hasLostCurse(nil, player) then
         return true
     end
-    local playerNumAllHearts = ____exports.getPlayerNumAllHearts(nil, player)
+    local playerNumAllHearts = ____exports.getPlayerNumHitsRemaining(nil, player)
     if damageAmount < playerNumAllHearts then
         return false
     end

package/dist/functions/util.d.ts

@@ -1,5 +1,12 @@
 /// <reference types="isaac-typescript-definitions" />
 /// <reference types="typescript-to-lua/language-extensions" />
+/**
+ * Helper function to add all of the contents of one set to another set. The first set passed will
+ * be modified in place.
+ *
+ * This function is variadic, meaning that you can specify N sets to add to the first set.
+ */
+export declare function addSetsToSet<T>(mainSet: Set<T>, ...setsToAdd: Array<Set<T>>): void;
 /**
  * Using a Map constructor to copy a Map does not seem to work properly, so use this helper function
  * instead.
@@ -10,6 +17,11 @@ export declare function copyMap<K, V>(oldMap: Map<K, V>): Map<K, V>;
  * instead.
  */
 export declare function copySet<T>(oldSet: Set<T>): Set<T>;
+/**
+ * Helper function to create a new set that is the composition of two or more sets.
+ *
+ * This function is variadic, meaning that you can specify N sets.
+ */
 export declare function combineSets<T>(...sets: Array<Set<T>>): Set<T>;
 /**
  * Helper function to get type safety on a switch statement.

package/dist/functions/util.lua

@@ -2,6 +2,14 @@
 require("lualib_bundle");
 local ____exports = {}
 local HEX_STRING_LENGTH = 6
+function ____exports.addSetsToSet(self, mainSet, ...)
+    local setsToAdd = {...}
+    for ____, set in ipairs(setsToAdd) do
+        for ____, value in __TS__Iterator(set:values()) do
+            mainSet:add(value)
+        end
+    end
+end
 function ____exports.copyMap(self, oldMap)
     local newMap = __TS__New(Map)
     for ____, ____value in __TS__Iterator(oldMap:entries()) do

package/package.json

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