isaacscript-common 1.2.80 → 1.2.83

package/dist/features/saveDataManager/load.lua

@@ -3,8 +3,8 @@ local ____lualib = require("lualib_bundle")
 local __TS__StringTrim = ____lualib.__TS__StringTrim
 local ____exports = {}
 local readSaveDatFile, tryLoadModData, DEFAULT_MOD_DATA
-local ____json = require("functions.json")
-local jsonDecode = ____json.jsonDecode
+local ____jsonHelpers = require("functions.jsonHelpers")
+local jsonDecode = ____jsonHelpers.jsonDecode
 local ____log = require("functions.log")
 local log = ____log.log
 local ____debug = require("features.saveDataManager.debug")

package/dist/features/saveDataManager/save.lua

@@ -7,8 +7,8 @@ local getAllSaveDataToWriteToDisk
 local ____deepCopy = require("functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
 local SerializationType = ____deepCopy.SerializationType
-local ____json = require("functions.json")
-local jsonEncode = ____json.jsonEncode
+local ____jsonHelpers = require("functions.jsonHelpers")
+local jsonEncode = ____jsonHelpers.jsonEncode
 local ____log = require("functions.log")
 local log = ____log.log
 function getAllSaveDataToWriteToDisk(self, saveDataMap, saveDataConditionalFuncMap)

package/dist/functions/jsonHelpers.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="typescript-to-lua/language-extensions" />
+/**
+ * Converts a Lua table to a JSON string.
+ * In most cases, this function will be used for writing data to a "save#.dat" file.
+ * If encoding fails, it will throw an error to prevent writing a blank string or corrupted data to
+ * a user's "save#.dat" file.
+ */
+export declare function jsonEncode(table: unknown): string;
+/**
+ * Converts a JSON string to a Lua table.
+ * In most cases, this function will be used for reading data from a "save#.dat" file.
+ * If decoding fails, it will return a blank Lua table instead of throwing an error.
+ * (This allows execution to continue in cases where users have no current save data or have
+ * manually removed their existing save data.)
+ */
+export declare function jsonDecode(jsonString: string): LuaTable;

package/dist/functions/jsonHelpers.lua

@@ -0,0 +1,28 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local tryEncode, tryDecode
+local json = require("@NoResolution:json")
+local ____log = require("functions.log")
+local log = ____log.log
+function tryEncode(____table)
+    return json.encode(____table)
+end
+function tryDecode(jsonString)
+    return json.decode(jsonString)
+end
+function ____exports.jsonEncode(self, ____table)
+    local ok, jsonStringOrErrMsg = pcall(tryEncode, ____table)
+    if not ok then
+        error("Failed to convert the Lua table to JSON: " .. jsonStringOrErrMsg)
+    end
+    return jsonStringOrErrMsg
+end
+function ____exports.jsonDecode(self, jsonString)
+    local ok, luaTableOrErrMsg = pcall(tryDecode, jsonString)
+    if not ok then
+        log("Failed to convert the JSON string to a Lua table: " .. jsonString)
+        return {}
+    end
+    return luaTableOrErrMsg
+end
+return ____exports

package/dist/functions/player.d.ts

@@ -97,9 +97,9 @@ export declare function getLastHeart(player: EntityPlayer): HealthType;
  */
 export declare function getNewestPlayer(): EntityPlayer;
 /**
- * Returns the number of slots that the player has remaining for heart containers, accounting for
- * broken hearts. For example, if the player is Judas and has 1 red heart containers and 2 full soul
- * hearts and 3 broken hearts, then this function would return 6 (i.e. 12 - 1 - 2 - 3).
+ * Returns the number of slots that the player has remaining for new heart containers, accounting
+ * for broken hearts. For example, if the player is Judas and has 1 red heart containers and 2 full
+ * soul hearts and 3 broken hearts, then this function would return 6 (i.e. 12 - 1 - 2 - 3).
  */
 export declare function getPlayerAvailableHeartSlots(player: EntityPlayer): int;
 /**

package/dist/functions/revive.d.ts

@@ -5,8 +5,8 @@
  */
 export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int): boolean;
 /**
- * The `EntityPlayer.WillPlayerRevive()` function does not properly account for Mysterious Paper,
- * so use this helper function instead for more robust revival detection.
+ * The `EntityPlayer.WillPlayerRevive()` function does not properly account for Mysterious Paper, so
+ * use this helper function instead for more robust revival detection.
  */
 export declare function willPlayerRevive(player: EntityPlayer): boolean;
 /**
@@ -18,6 +18,12 @@ export declare function willPlayerRevive(player: EntityPlayer): boolean;
  * Mysterious Paper be Missing Power is: `gameFrameCount % 4 === 3`
  */
 export declare function willMysteriousPaperRevive(player: EntityPlayer): boolean;
+/**
+ * Helper function to determine if the player will be revived by the Heartbreak collectible if they
+ * take fatal damage. This is contingent on the character that they are playing as and the amount of
+ * broken hearts that they already have.
+ */
+export declare function willReviveFromHeartbreak(player: EntityPlayer): boolean;
 /**
  * Helper function to determine if the Spirit Shackles item is in an enabled state. (It can be
  * either enabled or disabled.)

package/dist/functions/revive.lua

@@ -2,9 +2,10 @@
 local ____exports = {}
 local ____player = require("functions.player")
 local getDeathAnimationName = ____player.getDeathAnimationName
-local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
+local getPlayerMaxHeartContainers = ____player.getPlayerMaxHeartContainers
 local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
 local hasLostCurse = ____player.hasLostCurse
+local isKeeper = ____player.isKeeper
 local ____sprite = require("functions.sprite")
 local getFinalFrameOfAnimation = ____sprite.getFinalFrameOfAnimation
 local ____trinketGive = require("functions.trinketGive")
@@ -19,6 +20,16 @@ function ____exports.willMysteriousPaperRevive(self, player)
     local frameOfDeath = gameFrameCount + deathAnimationFrames + 1
     return frameOfDeath % 4 == 3
 end
+function ____exports.willReviveFromHeartbreak(self, player)
+    if not player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) then
+        return false
+    end
+    local maxHeartContainers = getPlayerMaxHeartContainers(nil, player)
+    local numBrokenHeartsThatWillBeAdded = isKeeper(nil, player) and 1 or 2
+    local brokenHearts = player:GetBrokenHearts()
+    local numBrokenHeartsAfterRevival = numBrokenHeartsThatWillBeAdded + brokenHearts
+    return maxHeartContainers > numBrokenHeartsAfterRevival
+end
 function ____exports.willReviveFromSpiritShackles(self, player)
     if not player:HasCollectible(CollectibleType.COLLECTIBLE_SPIRIT_SHACKLES) then
         return false
@@ -53,8 +64,7 @@ function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSou
     if damageAmount < playerNumAllHearts then
         return false
     end
-    local playerAvailableHeartSlots = getPlayerAvailableHeartSlots(nil, player)
-    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and playerAvailableHeartSlots >= 2 then
+    if ____exports.willReviveFromHeartbreak(nil, player) then
         return false
     end
     if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageGameFrame then

package/dist/index.d.ts

@@ -29,7 +29,7 @@ export * from "./functions/flying";
 export * from "./functions/globals";
 export * from "./functions/gridEntity";
 export * from "./functions/input";
-export * from "./functions/json";
+export * from "./functions/jsonHelpers";
 export * from "./functions/jsonRoom";
 export * from "./functions/language";
 export * from "./functions/log";

package/dist/index.lua

@@ -243,7 +243,7 @@ do
     end
 end
 do
-    local ____export = require("functions.json")
+    local ____export = require("functions.jsonHelpers")
     for ____exportKey, ____exportValue in pairs(____export) do
         if ____exportKey ~= "default" then
             ____exports[____exportKey] = ____exportValue

package/package.json

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