isaacscript-common 1.0.344 → 1.0.348

package/dist/callbacks/postPlayerChangeHealth.lua

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

package/dist/functions/math.d.ts

@@ -1,7 +1,22 @@
 /// <reference types="isaac-typescript-definitions" />
 export declare function getAngleDifference(angle1: float, angle2: float): float;
+/**
+ * Helper function to get an array of equidistant points on the circumference around a circle.
+ * Useful for equally distributing things in a circle pattern.
+ *
+ * @param centerPos A position that represents the center of the center to get the points from.
+ * @param radius The radius of the circle.
+ * @param numPoints The number of points on the circumference of the circle to get.
+ * @param xMultiplier An optional multiplier to get the points around an oval. Default is 1.
+ * @param yMultiplier An optional multiplier to get the points around an oval. Default is 1.
+ * @param initialDirection By default, the first point on the circle will be on the top center, but
+ * this can be optionally changed by specifying this argument.
+ */
+export declare function getCircleDiscretizedPoints(centerPos: Vector, radius: float, numPoints: int, xMultiplier?: number, yMultiplier?: number, initialDirection?: Direction): Vector[];
 export declare function isEven(num: int): boolean;
 export declare function isOdd(num: int): boolean;
+export declare function lerp(a: number, b: number, pos: float): number;
+export declare function lerpAngleDegrees(aStart: number, aEnd: number, percent: float): number;
 /**
  * If rounding fails, this function returns 0.
  * From: http://lua-users.org/wiki/SimpleRound

package/dist/functions/math.lua

@@ -1,15 +1,91 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
 local ____exports = {}
+local ____util = require("functions.util")
+local ensureAllCases = ____util.ensureAllCases
+local getCircleInitialPosition
+function getCircleInitialPosition(self, direction, radius)
+    repeat
+        local ____switch6 = direction
+        local ____cond6 = ____switch6 == Direction.NO_DIRECTION
+        if ____cond6 then
+            do
+                return Vector.Zero
+            end
+        end
+        ____cond6 = ____cond6 or (____switch6 == Direction.LEFT)
+        if ____cond6 then
+            do
+                return Vector(-radius, 0)
+            end
+        end
+        ____cond6 = ____cond6 or (____switch6 == Direction.UP)
+        if ____cond6 then
+            do
+                return Vector(0, -radius)
+            end
+        end
+        ____cond6 = ____cond6 or (____switch6 == Direction.RIGHT)
+        if ____cond6 then
+            do
+                return Vector(radius, 0)
+            end
+        end
+        ____cond6 = ____cond6 or (____switch6 == Direction.DOWN)
+        if ____cond6 then
+            do
+                return Vector(0, radius)
+            end
+        end
+        do
+            do
+                ensureAllCases(nil, direction)
+                return Vector.Zero
+            end
+        end
+    until true
+end
 function ____exports.getAngleDifference(self, angle1, angle2)
     local subtractedAngle = angle1 - angle2
     return ((subtractedAngle + 180) % 360) - 180
 end
+function ____exports.getCircleDiscretizedPoints(self, centerPos, radius, numPoints, xMultiplier, yMultiplier, initialDirection)
+    if xMultiplier == nil then
+        xMultiplier = 1
+    end
+    if yMultiplier == nil then
+        yMultiplier = 1
+    end
+    if initialDirection == nil then
+        initialDirection = Direction.UP
+    end
+    local initialPosition = getCircleInitialPosition(nil, initialDirection, radius)
+    local positions = {}
+    do
+        local i = 0
+        while i < numPoints do
+            local rotatedPosition = initialPosition:Rotated((i * 360) / numPoints)
+            rotatedPosition.X = rotatedPosition.X * xMultiplier
+            rotatedPosition.Y = rotatedPosition.Y * yMultiplier
+            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
 function ____exports.isOdd(self, num)
     return (num & 1) == 1
 end
+function ____exports.lerp(self, a, b, pos)
+    return a + ((b - a) * pos)
+end
+function ____exports.lerpAngleDegrees(self, aStart, aEnd, percent)
+    return aStart + (____exports.getAngleDifference(nil, aStart, aEnd) * percent)
+end
 function ____exports.round(self, num, numDecimalPlaces)
     if numDecimalPlaces == nil then
         numDecimalPlaces = 0

package/dist/functions/player.lua

@@ -138,10 +138,10 @@ function ____exports.getLastHeart(self, player)
         end
         return HealthType.RED
     end
-    local numBits = getNumBitsOfN(nil, blackHearts)
-    local finalBit = getKBitOfN(nil, numBits - 1, blackHearts)
-    local isBlack = finalBit == 1
     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

package/dist/functions/util.d.ts

@@ -63,8 +63,6 @@ export declare function isGreedMode(): boolean;
  */
 export declare function isSerializedVector(object: unknown): boolean;
 export declare function isVector(object: unknown): boolean;
-export declare function lerp(a: number, b: number, pos: float): number;
-export declare function lerpAngleDegrees(aStart: number, aEnd: number, percent: float): number;
 /**
  * Whether or not the player is playing on a set seed (i.e. that they entered in a specific seed by
  * pressing tab on the character selection screen). When the player resets the game on a set seed,

package/dist/functions/util.lua

@@ -3,8 +3,6 @@ require("lualib_bundle");
 local ____exports = {}
 local ____constants = require("constants")
 local VECTOR_BRAND = ____constants.VECTOR_BRAND
-local ____math = require("functions.math")
-local getAngleDifference = ____math.getAngleDifference
 local HEX_STRING_LENGTH = 6
 function ____exports.copySet(self, oldSet)
     local newSet = __TS__New(Set)
@@ -75,12 +73,6 @@ function ____exports.isVector(self, object)
     local vectorMetatable = metatable
     return vectorMetatable.__type == "Vector"
 end
-function ____exports.lerp(self, a, b, pos)
-    return a + ((b - a) * pos)
-end
-function ____exports.lerpAngleDegrees(self, aStart, aEnd, percent)
-    return aStart + (getAngleDifference(nil, aStart, aEnd) * percent)
-end
 function ____exports.onSetSeed(self)
     local game = Game()
     local seeds = game:GetSeeds()

package/dist/types/ModUpgraded.lua

@@ -71,8 +71,11 @@ ____exports.default = (function()
             local debugMsg = getDebugPrependString(nil, callbackName)
             local function callbackWithLogger(____, ...)
                 Isaac.DebugString(debugMsg .. " - START")
-                callback(nil, ...)
-                Isaac.DebugString(debugMsg .. " - END")
+                local value = callback(nil, ...)
+                Isaac.DebugString(
+                    (debugMsg .. " - END - ") .. tostring(value)
+                )
+                return value
             end
             self.Mod:AddCallback(callbackID, callbackWithLogger, optionalArg)
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.344",
+  "version": "1.0.348",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,10 +25,10 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.212",
+    "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"
   }
 }