isaacscript-common 1.0.595 → 1.0.599

package/dist/callbacks/preBerserkDeath.lua

@@ -4,6 +4,8 @@ local hasSubscriptions, postPEffectUpdateReordered
 local ____player = require("functions.player")
 local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
 local isChildPlayer = ____player.isChildPlayer
+local ____revive = require("functions.revive")
+local willPlayerRevive = ____revive.willPlayerRevive
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
 local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
 local ____preBerserkDeath = require("callbacks.subscriptions.preBerserkDeath")
@@ -22,7 +24,7 @@ function postPEffectUpdateReordered(self, player)
     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 then
+    if berserkEffect ~= nil and berserkEffect.Cooldown == 1 and playerNumAllHearts == 0 and not willPlayerRevive(nil, player) then
         preBerserkDeathFire(nil, player)
     end
 end

package/dist/constants.d.ts

@@ -105,6 +105,7 @@ export declare const MOVEMENT_ACTIONS: Set<ButtonAction>;
 export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;
 export declare const SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES: Set<CollectibleType>;
 export declare const SHOOTING_ACTIONS: Set<ButtonAction>;
+export declare const STORY_BOSSES: Set<EntityType>;
 /**
  * This is the number of draw coordinates that each heart spans on the UI in the upper left hand
  * corner.

package/dist/constants.lua

@@ -98,5 +98,20 @@ ____exports.SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES = __TS__New(Set, {
     CollectibleType.COLLECTIBLE_R_KEY
 })
 ____exports.SHOOTING_ACTIONS = __TS__New(Set, {ButtonAction.ACTION_SHOOTLEFT, ButtonAction.ACTION_SHOOTRIGHT, ButtonAction.ACTION_SHOOTUP, ButtonAction.ACTION_SHOOTDOWN})
+____exports.STORY_BOSSES = __TS__New(Set, {
+    EntityType.ENTITY_MOM,
+    EntityType.ENTITY_MOMS_HEART,
+    EntityType.ENTITY_SATAN,
+    EntityType.ENTITY_ISAAC,
+    EntityType.ENTITY_THE_LAMB,
+    EntityType.ENTITY_MEGA_SATAN,
+    EntityType.ENTITY_MEGA_SATAN_2,
+    EntityType.ENTITY_ULTRA_GREED,
+    EntityType.ENTITY_HUSH,
+    EntityType.ENTITY_DELIRIUM,
+    EntityType.ENTITY_MOTHER,
+    EntityType.ENTITY_DOGMA,
+    EntityType.ENTITY_BEAST
+})
 ____exports.UI_HEART_WIDTH = 12
 return ____exports

package/dist/functions/entity.d.ts

@@ -165,6 +165,12 @@ export declare function getTears(matchingVariant?: number, matchingSubType?: num
  * @param threshold Optional. The threshold from 0 to consider to be moving. 0.01 by default.
  */
 export declare function isEntityMoving(entity: Entity, threshold?: number): boolean;
+/**
+ * Helper function to determine if the current entity is an end-game story boss, like Isaac, Blue
+ * Baby, Mega Satan, The Beast, and so on. This is useful because certain effects should only apply
+ * to non-story bosses, like Vanishing Twin. Also see the `STORY_BOSSES` constant.
+ */
+export declare function isStoryBoss(entity: Entity): boolean;
 /**
  * Helper function to remove all of the entities in the supplied array.
  *

package/dist/functions/entity.lua

@@ -1,6 +1,8 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
+local ____constants = require("constants")
+local STORY_BOSSES = ____constants.STORY_BOSSES
 local ____random = require("functions.random")
 local getRandom = ____random.getRandom
 local nextSeed = ____random.nextSeed
@@ -230,6 +232,9 @@ function ____exports.isEntityMoving(self, entity, threshold)
     end
     return entity.Velocity:Length() >= threshold
 end
+function ____exports.isStoryBoss(self, entity)
+    return STORY_BOSSES:has(entity.Type)
+end
 function ____exports.removeEntities(self, entities, cap)
     if #entities == 0 then
         return false

package/dist/functions/player.d.ts

@@ -142,7 +142,13 @@ export declare function getPlayerNumAllHearts(player: EntityPlayer): int;
  * the player (i.e. Esau & Tainted Soul). False by default.
  */
 export declare function getPlayers(performExclusions?: boolean): EntityPlayer[];
-export declare function getPlayersOfType(playerType: PlayerType): EntityPlayer[];
+/**
+ * Helper function to get all of the players that are a certain character.
+ *
+ * This function is variadic, meaning that you can supply as many characters as you want to check
+ * for. Returns true if any of the characters supplied are present.
+ */
+export declare function getPlayersOfType(...characters: PlayerType[]): EntityPlayer[];
 /**
  * Helper function to return the active charge and the battery charge combined. This is useful
  * because you are not able to set the battery charge directly.

package/dist/functions/player.lua

@@ -302,11 +302,13 @@ function ____exports.getPlayerNumAllHearts(self, player)
     local rottenHearts = player:GetRottenHearts()
     return hearts + soulHearts + boneHearts + eternalHearts - rottenHearts
 end
-function ____exports.getPlayersOfType(self, playerType)
+function ____exports.getPlayersOfType(self, ...)
+    local characters = {...}
+    local charactersSet = __TS__New(Set, characters)
     local players = {}
     for ____, player in ipairs(____exports.getPlayers(nil)) do
         local character = player:GetPlayerType()
-        if character == playerType then
+        if charactersSet:has(character) then
             __TS__ArrayPush(players, player)
         end
     end

package/dist/functions/stage.d.ts

@@ -11,6 +11,7 @@ export declare function getStage(): LevelStage;
 export declare function getStageType(): StageType;
 /** Helper function to directly warp to a specific stage using the "stage" console command. */
 export declare function goToStage(stage: LevelStage, stageType: StageType): void;
+export declare function isRepentanceStage(stageType: int): boolean;
 export declare function onCathedral(): boolean;
 export declare function onChest(): boolean;
 export declare function onDarkRoom(): boolean;

package/dist/functions/stage.lua

@@ -2,47 +2,50 @@
 local ____exports = {}
 local ____util = require("functions.util")
 local ensureAllCases = ____util.ensureAllCases
+function ____exports.isRepentanceStage(self, stageType)
+    return stageType == StageType.STAGETYPE_REPENTANCE or stageType == StageType.STAGETYPE_REPENTANCE_B
+end
 function ____exports.onRepentanceStage(self)
     local game = Game()
     local level = game:GetLevel()
     local stageType = level:GetStageType()
-    return stageType == StageType.STAGETYPE_REPENTANCE or stageType == StageType.STAGETYPE_REPENTANCE_B
+    return ____exports.isRepentanceStage(nil, stageType)
 end
 function ____exports.stageTypeToLetter(self, stageType)
     repeat
-        local ____switch14 = stageType
-        local ____cond14 = ____switch14 == StageType.STAGETYPE_ORIGINAL
-        if ____cond14 then
+        local ____switch15 = stageType
+        local ____cond15 = ____switch15 == StageType.STAGETYPE_ORIGINAL
+        if ____cond15 then
             do
                 return ""
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_WOTL
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_WOTL
+        if ____cond15 then
             do
                 return "a"
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_AFTERBIRTH
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_AFTERBIRTH
+        if ____cond15 then
             do
                 return "b"
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_GREEDMODE
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_GREEDMODE
+        if ____cond15 then
             do
                 return ""
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_REPENTANCE
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_REPENTANCE
+        if ____cond15 then
             do
                 return "c"
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_REPENTANCE_B
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_REPENTANCE_B
+        if ____cond15 then
             do
                 return "d"
             end

package/dist/lualib_bundle.lua

@@ -1335,6 +1335,15 @@ Map = Map
 
 __TS__MathAtan2 = math.atan2 or math.atan
 
+function __TS__MathSign(val)
+    if val > 0 then
+        return 1
+    elseif val < 0 then
+        return -1
+    end
+    return 0
+end
+
 function __TS__Number(value)
     local valueType = type(value)
     if valueType == "number" then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.595",
+  "version": "1.0.599",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,11 +25,11 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.331",
+    "isaac-typescript-definitions": "^1.0.332",
     "isaacscript-lint": "^1.0.79",
     "isaacscript-tsconfig": "^1.1.8",
-    "typedoc": "^0.22.10",
-    "typescript": "^4.5.4",
-    "typescript-to-lua": "^1.3.1"
+    "typedoc": "^0.22.11",
+    "typescript": "^4.5.5",
+    "typescript-to-lua": "^1.3.3"
   }
 }