isaacscript-common 1.0.341 → 1.0.345

package/dist/callbacks/postPlayerChangeHealth.lua

@@ -51,16 +51,16 @@ function getCurrentHealthValue(self, player, healthType)
                 return player:GetSoulHearts()
             end
         end
-        ____cond10 = ____cond10 or (____switch10 == HealthType.BLACK)
+        ____cond10 = ____cond10 or (____switch10 == HealthType.ETERNAL)
         if ____cond10 then
             do
-                return player:GetBlackHearts()
+                return player:GetEternalHearts()
             end
         end
-        ____cond10 = ____cond10 or (____switch10 == HealthType.BONE)
+        ____cond10 = ____cond10 or (____switch10 == HealthType.BLACK)
         if ____cond10 then
             do
-                return player:GetBoneHearts()
+                return player:GetBlackHearts()
             end
         end
         ____cond10 = ____cond10 or (____switch10 == HealthType.GOLDEN)
@@ -69,10 +69,16 @@ function getCurrentHealthValue(self, player, healthType)
                 return player:GetGoldenHearts()
             end
         end
-        ____cond10 = ____cond10 or (____switch10 == HealthType.ETERNAL)
+        ____cond10 = ____cond10 or (____switch10 == HealthType.BONE)
         if ____cond10 then
             do
-                return player:GetEternalHearts()
+                return player:GetBoneHearts()
+            end
+        end
+        ____cond10 = ____cond10 or (____switch10 == HealthType.ROTTEN)
+        if ____cond10 then
+            do
+                return player:GetRottenHearts()
             end
         end
         ____cond10 = ____cond10 or (____switch10 == HealthType.MAX_HEARTS)

package/dist/functions/entity.d.ts

@@ -27,5 +27,6 @@ export declare function getNPCs(): EntityNPC[];
  * in secret rooms and I AM ERROR rooms if the "Corrupted Data" achievement is unlocked.
  */
 export declare function isGlitchedCollectible(entity: Entity): boolean;
-export declare function removeAllEntities(entities: Entity[]): void;
+/** Removes all of the entities in the supplied array. */
+export declare function removeEntities(entities: Entity[]): void;
 export declare function removeAllMatchingEntities(entityType: int, entityVariant?: number, entitySubType?: number): void;

package/dist/functions/entity.lua

@@ -47,7 +47,7 @@ end
 function ____exports.isGlitchedCollectible(self, entity)
     return ((entity.Type == EntityType.ENTITY_PICKUP) and (entity.Variant == PickupVariant.PICKUP_COLLECTIBLE)) and (entity.SubType > GLITCHED_ITEM_THRESHOLD)
 end
-function ____exports.removeAllEntities(self, entities)
+function ____exports.removeEntities(self, entities)
     for ____, entity in ipairs(entities) do
         entity:Remove()
     end
@@ -60,6 +60,6 @@ function ____exports.removeAllMatchingEntities(self, entityType, entityVariant,
         entitySubType = -1
     end
     local entities = Isaac.FindByType(entityType, entityVariant, entitySubType)
-    ____exports.removeAllEntities(nil, entities)
+    ____exports.removeEntities(nil, entities)
 end
 return ____exports

package/dist/functions/math.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="isaac-typescript-definitions" />
 export declare function getAngleDifference(angle1: float, angle2: float): float;
+export declare function getCircleDiscretizedPoints(centerPos: Vector, distance: int, numPoints: int): Vector[];
 export declare function isEven(num: int): boolean;
 export declare function isOdd(num: int): boolean;
 /**

package/dist/functions/math.lua

@@ -1,9 +1,24 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
 local ____exports = {}
 function ____exports.getAngleDifference(self, angle1, angle2)
     local subtractedAngle = angle1 - angle2
     return ((subtractedAngle + 180) % 360) - 180
 end
+function ____exports.getCircleDiscretizedPoints(self, centerPos, distance, numPoints)
+    local positions = {}
+    local leftOfCenter = Vector(-distance, 0)
+    do
+        local i = 0
+        while i < numPoints do
+            local rotatedPosition = leftOfCenter:Rotated((i * 360) / numPoints)
+            local positionFromCenter = centerPos + rotatedPosition
+            __TS__ArrayPush(positions, positionFromCenter)
+            i = i + 1
+        end
+    end
+    return positions
+end
 function ____exports.isEven(self, num)
     return (num & 1) == 0
 end

package/dist/functions/player.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
+import HealthType from "../types/HealthType";
 import PocketItemDescription from "../types/PocketItemDescription";
 /**
  * PlayerIndex is a specific type of string; see the documentation for the [[`getPlayerIndex`]]
@@ -24,6 +25,11 @@ export declare function getClosestPlayer(position: Vector): EntityPlayer;
  * The Lost and Tainted Lost use a 38 frame death animation (i.e. the "LostDeath" animation).
  */
 export declare function getDeathAnimationName(player: EntityPlayer): string;
+/**
+ * Helper function that returns the type of the rightmost heart, not including golden hearts since
+ * they can't be damaged directly.
+ */
+export declare function getLastHeart(player: EntityPlayer): HealthType;
 /**
  * Helper function to get the first player with the lowest frame count of 0. Useful to find a
  * freshly spawned player after using items like Esau Jr.

package/dist/functions/player.lua

@@ -1,8 +1,13 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
+local ____HealthType = require("types.HealthType")
+local HealthType = ____HealthType.default
 local ____PocketItemType = require("types.PocketItemType")
 local PocketItemType = ____PocketItemType.default
+local ____bitwise = require("functions.bitwise")
+local getKBitOfN = ____bitwise.getKBitOfN
+local getNumBitsOfN = ____bitwise.getNumBitsOfN
 local ____collectibles = require("functions.collectibles")
 local getCollectibleSet = ____collectibles.getCollectibleSet
 local EXCLUDED_CHARACTERS
@@ -18,18 +23,18 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue38
+                    goto __continue46
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue38
+                    goto __continue46
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue38
+                    goto __continue46
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue38::
+            ::__continue46::
             i = i + 1
         end
     end
@@ -109,6 +114,47 @@ function ____exports.getDeathAnimationName(self, player)
     local isLostTypeCharacter = (((character == PlayerType.PLAYER_THELOST) or (character == PlayerType.PLAYER_THELOST_B)) or (character == PlayerType.PLAYER_THESOUL)) or (character == PlayerType.PLAYER_THESOUL_B)
     return (isLostTypeCharacter and "LostDeath") or "Death"
 end
+function ____exports.getLastHeart(self, player)
+    local hearts = player:GetHearts()
+    local effectiveMaxHearts = player:GetEffectiveMaxHearts()
+    local soulHearts = player:GetSoulHearts()
+    local blackHearts = player:GetBlackHearts()
+    local eternalHearts = player:GetEternalHearts()
+    local boneHearts = player:GetBoneHearts()
+    local rottenHearts = player:GetRottenHearts()
+    local soulHeartSlots = soulHearts / 2
+    local lastHeartIndex = (boneHearts + soulHeartSlots) - 1
+    local isLastHeartBone = player:IsBoneHeart(lastHeartIndex)
+    if isLastHeartBone then
+        local isLastContainerEmpty = hearts <= (effectiveMaxHearts - 2)
+        if isLastContainerEmpty then
+            return HealthType.BONE
+        end
+        if rottenHearts > 0 then
+            return HealthType.ROTTEN
+        end
+        if eternalHearts > 0 then
+            return HealthType.ETERNAL
+        end
+        return HealthType.RED
+    end
+    if soulHearts > 0 then
+        local numBits = getNumBitsOfN(nil, blackHearts)
+        local finalBit = getKBitOfN(nil, numBits - 1, blackHearts)
+        local isBlack = finalBit == 1
+        if isBlack then
+            return HealthType.BLACK
+        end
+        return HealthType.SOUL
+    end
+    if eternalHearts > 0 then
+        return HealthType.ETERNAL
+    end
+    if rottenHearts > 0 then
+        return HealthType.ROTTEN
+    end
+    return HealthType.RED
+end
 function ____exports.getNewestPlayer(self)
     local newestPlayer = nil
     local lowestFrame = math.huge
@@ -159,16 +205,10 @@ function ____exports.getPlayerCollectibleMap(self, player)
     for ____, collectibleType in __TS__Iterator(
         collectibleSet:values()
     ) do
-        do
-            if not player:HasCollectible(collectibleType) then
-                goto __continue31
-            end
-            local collectibleNum = player:GetCollectibleNum(collectibleType)
-            if collectibleNum > 0 then
-                collectibleMap:set(collectibleType, collectibleNum)
-            end
+        local collectibleNum = player:GetCollectibleNum(collectibleType, true)
+        if collectibleNum > 0 then
+            collectibleMap:set(collectibleType, collectibleNum)
         end
-        ::__continue31::
     end
     return collectibleMap
 end
@@ -204,14 +244,14 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue47
+                    goto __continue55
                 end
                 local playerHash = GetPtrHash(player)
                 if playerHash == playerToFindHash then
                     return i
                 end
             end
-            ::__continue47::
+            ::__continue55::
             i = i + 1
         end
     end

package/dist/types/HealthType.d.ts

@@ -1,10 +1,11 @@
 declare enum HealthType {
     RED = 0,
     SOUL = 1,
-    BLACK = 2,
-    BONE = 3,
+    ETERNAL = 2,
+    BLACK = 3,
     GOLDEN = 4,
-    ETERNAL = 5,
-    MAX_HEARTS = 6
+    BONE = 5,
+    ROTTEN = 6,
+    MAX_HEARTS = 7
 }
 export default HealthType;

package/dist/types/HealthType.lua

@@ -5,15 +5,17 @@ HealthType.RED = 0
 HealthType[HealthType.RED] = "RED"
 HealthType.SOUL = 1
 HealthType[HealthType.SOUL] = "SOUL"
-HealthType.BLACK = 2
+HealthType.ETERNAL = 2
+HealthType[HealthType.ETERNAL] = "ETERNAL"
+HealthType.BLACK = 3
 HealthType[HealthType.BLACK] = "BLACK"
-HealthType.BONE = 3
-HealthType[HealthType.BONE] = "BONE"
 HealthType.GOLDEN = 4
 HealthType[HealthType.GOLDEN] = "GOLDEN"
-HealthType.ETERNAL = 5
-HealthType[HealthType.ETERNAL] = "ETERNAL"
-HealthType.MAX_HEARTS = 6
+HealthType.BONE = 5
+HealthType[HealthType.BONE] = "BONE"
+HealthType.ROTTEN = 6
+HealthType[HealthType.ROTTEN] = "ROTTEN"
+HealthType.MAX_HEARTS = 7
 HealthType[HealthType.MAX_HEARTS] = "MAX_HEARTS"
 ____exports.default = HealthType
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.341",
+  "version": "1.0.345",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,10 +25,10 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.211",
-    "isaacscript-lint": "^1.0.61",
+    "isaac-typescript-definitions": "^1.0.230",
+    "isaacscript-lint": "^1.0.63",
     "typedoc": "^0.22.5",
-    "typescript": "4.4.3",
+    "typescript": "4.4.4",
     "typescript-to-lua": "^1.0.1"
   }
 }