isaacscript-common 7.2.2 → 7.3.0

package/dist/callbacks/postDiceRoomActivated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postDiceRoomActivated.d.ts","sourceRoot":"","sources":["../../src/callbacks/postDiceRoomActivated.ts"],"names":[],"mappings":";AAeA,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAQxD"}
+{"version":3,"file":"postDiceRoomActivated.d.ts","sourceRoot":"","sources":["../../src/callbacks/postDiceRoomActivated.ts"],"names":[],"mappings":";AAmBA,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAQxD"}

package/dist/callbacks/postDiceRoomActivated.lua

@@ -16,20 +16,19 @@ function hasSubscriptions(self)
     return postDiceRoomActivatedHasSubscriptions(nil)
 end
 function postEffectUpdateDiceFloor(self, effect)
-    local diceFloor = effect
     if not hasSubscriptions(nil) then
         return
     end
     if v.room.diceRoomActivated then
         return
     end
-    if diceFloor.FrameCount == 0 then
+    if effect.FrameCount == 0 then
         return
     end
-    local closestPlayer = getClosestPlayer(nil, diceFloor.Position)
-    if isCloseEnoughToTriggerDiceFloor(nil, closestPlayer, diceFloor) then
+    local closestPlayer = getClosestPlayer(nil, effect.Position)
+    if isCloseEnoughToTriggerDiceFloor(nil, closestPlayer, effect) then
         v.room.diceRoomActivated = true
-        postDiceRoomActivatedFire(nil, closestPlayer, diceFloor.SubType)
+        postDiceRoomActivatedFire(nil, closestPlayer, effect.SubType)
     end
 end
 v = {room = {diceRoomActivated = false}}

package/dist/callbacks/postItemDischarged.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postItemDischarged.d.ts","sourceRoot":"","sources":["../../src/callbacks/postItemDischarged.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAoCrD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAS5D"}
+{"version":3,"file":"postItemDischarged.d.ts","sourceRoot":"","sources":["../../src/callbacks/postItemDischarged.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAqCrD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAS5D"}

package/dist/callbacks/postItemDischarged.lua

@@ -22,6 +22,8 @@ local ____playerDataStructures = require("functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
+local ____types = require("functions.types")
+local asNumber = ____types.asNumber
 local ____postItemDischarged = require("callbacks.subscriptions.postItemDischarged")
 local postItemDischargeFire = ____postItemDischarged.postItemDischargeFire
 local postItemDischargeHasSubscriptions = ____postItemDischarged.postItemDischargeHasSubscriptions
@@ -70,11 +72,10 @@ function playerRecentlyCollidedWithBulb(self, player)
     return collidedOnThisFrame or collidedOnLastFrame
 end
 function preNPCCollisionSucker(self, npc, collider)
-    local sucker = npc
     if not hasSubscriptions(nil) then
         return nil
     end
-    if sucker.Variant ~= SuckerVariant.BULB then
+    if npc.Variant ~= asNumber(nil, SuckerVariant.BULB) then
         return nil
     end
     local player = collider:ToPlayer()

package/dist/callbacks/postPlayerChangeStat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postPlayerChangeStat.d.ts","sourceRoot":"","sources":["../../src/callbacks/postPlayerChangeStat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA+BrD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAO/D"}
+{"version":3,"file":"postPlayerChangeStat.d.ts","sourceRoot":"","sources":["../../src/callbacks/postPlayerChangeStat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA2BrD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAO/D"}

package/dist/callbacks/postPlayerChangeStat.lua

@@ -11,17 +11,20 @@ local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____functions = require("functions.index")
-local colorEquals = ____functions.colorEquals
-local getPlayerStat = ____functions.getPlayerStat
-local isBitSet128 = ____functions.isBitSet128
-local isBoolean = ____functions.isBoolean
-local isColor = ____functions.isColor
-local isNumber = ____functions.isNumber
+local ____bitSet128 = require("functions.bitSet128")
+local isBitSet128 = ____bitSet128.isBitSet128
+local ____color = require("functions.color")
+local colorEquals = ____color.colorEquals
+local isColor = ____color.isColor
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____playerIndex = require("functions.playerIndex")
 local getPlayerIndex = ____playerIndex.getPlayerIndex
+local ____playerStats = require("functions.playerStats")
+local getPlayerStat = ____playerStats.getPlayerStat
+local ____types = require("functions.types")
+local isBoolean = ____types.isBoolean
+local isNumber = ____types.isNumber
 local ____postPlayerChangeStat = require("callbacks.subscriptions.postPlayerChangeStat")
 local postPlayerChangeStatFire = ____postPlayerChangeStat.postPlayerChangeStatFire
 local postPlayerChangeStatHasSubscriptions = ____postPlayerChangeStat.postPlayerChangeStatHasSubscriptions

package/dist/functions/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="typescript-to-lua/language-extensions" />
 /// <reference types="lua-types/5.3" />
-import { Card, CollectibleType, LevelStage, PillColor, PillEffect, PlayerType, TrinketType } from "isaac-typescript-definitions";
+import { Card, CollectibleType, LevelStage, NpcState, PillColor, PillEffect, PlayerType, TrinketType } from "isaac-typescript-definitions";
 /**
  * Helper function to safely cast a `number` to a `Card`. (This is better than using the `as`
  * TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )
@@ -22,6 +22,13 @@ export declare function asCollectibleType(num: number): CollectibleType;
  * This is useful to satisfy the "isaacscript/strict-enums" ESLint rule.
  */
 export declare function asLevelStage(num: number): LevelStage;
+/**
+ * Helper function to safely cast a `number` to a `NpcState`. (This is better than using the `as`
+ * TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )
+ *
+ * This is useful to satisfy the "isaacscript/strict-enums" ESLint rule.
+ */
+export declare function asNpcState(num: number): NpcState;
 /**
  * Helper function to safely cast an enum to a `number`. (This is better than using the `as`
  * TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )

package/dist/functions/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/functions/types.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,IAAI,EACJ,eAAe,EACf,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAExC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAEtD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,OAAO,CAEhE;AAGD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,QAAQ,CAElE;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,+EAA+E;AAC/E,wBAAgB,WAAW,CACzB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,OAAO,GAAG,MAAM,GAAG,MAAM,CAOvC;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,wBAAgB,OAAO,CACrB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAExC;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,WAAW,CAErE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/functions/types.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,IAAI,EACJ,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAExC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAEtD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,OAAO,CAEhE;AAGD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,QAAQ,CAElE;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,+EAA+E;AAC/E,wBAAgB,WAAW,CACzB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,OAAO,GAAG,MAAM,GAAG,MAAM,CAOvC;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,wBAAgB,OAAO,CACrB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAExC;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,WAAW,CAErE"}

package/dist/functions/types.lua

@@ -20,6 +20,13 @@ end
 function ____exports.asLevelStage(self, num)
     return num
 end
+--- Helper function to safely cast a `number` to a `NpcState`. (This is better than using the `as`
+-- TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )
+-- 
+-- This is useful to satisfy the "isaacscript/strict-enums" ESLint rule.
+function ____exports.asNpcState(self, num)
+    return num
+end
 --- Helper function to safely cast an enum to a `number`. (This is better than using the `as`
 -- TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )
 -- 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "7.2.2",
+  "version": "7.3.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/callbacks/postDiceRoomActivated.ts

@@ -1,4 +1,8 @@
-import { EffectVariant, ModCallback } from "isaac-typescript-definitions";
+import {
+  DiceFloorSubType,
+  EffectVariant,
+  ModCallback,
+} from "isaac-typescript-definitions";
 import { saveDataManager } from "../features/saveDataManager/exports";
 import { isCloseEnoughToTriggerDiceFloor } from "../functions/effects";
 import { getClosestPlayer } from "../functions/players";
@@ -30,8 +34,6 @@ function hasSubscriptions() {
 // ModCallback.POST_EFFECT_UPDATE (55)
 // EffectVariant.DICE_FLOOR (76)
 function postEffectUpdateDiceFloor(effect: EntityEffect) {
-  const diceFloor = effect as EntityEffectDiceFloor;
-
   if (!hasSubscriptions()) {
     return;
   }
@@ -42,13 +44,16 @@ function postEffectUpdateDiceFloor(effect: EntityEffect) {
 
   // When using the debug console to go to a dice room, the player can appear on top of the dice
   // floor before they snap to the door.
-  if (diceFloor.FrameCount === 0) {
+  if (effect.FrameCount === 0) {
     return;
   }
 
-  const closestPlayer = getClosestPlayer(diceFloor.Position);
-  if (isCloseEnoughToTriggerDiceFloor(closestPlayer, diceFloor)) {
+  const closestPlayer = getClosestPlayer(effect.Position);
+  if (isCloseEnoughToTriggerDiceFloor(closestPlayer, effect)) {
     v.room.diceRoomActivated = true;
-    postDiceRoomActivatedFire(closestPlayer, diceFloor.SubType);
+    postDiceRoomActivatedFire(
+      closestPlayer,
+      effect.SubType as DiceFloorSubType,
+    );
   }
 }

package/src/callbacks/postItemDischarged.ts

@@ -16,6 +16,7 @@ import {
   mapGetPlayer,
   mapSetPlayer,
 } from "../functions/playerDataStructures";
+import { asNumber } from "../functions/types";
 import { PlayerIndex } from "../types/PlayerIndex";
 import {
   postItemDischargeFire,
@@ -131,13 +132,11 @@ function preNPCCollisionSucker(
   npc: EntityNPC,
   collider: Entity,
 ): boolean | undefined {
-  const sucker = npc as EntityNPCSucker;
-
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  if (sucker.Variant !== SuckerVariant.BULB) {
+  if (npc.Variant !== asNumber(SuckerVariant.BULB)) {
     return undefined;
   }
 

package/src/callbacks/postPlayerChangeStat.ts

@@ -4,16 +4,12 @@ import { ModUpgraded } from "../classes/ModUpgraded";
 import { StatType } from "../enums";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import {
-  colorEquals,
-  getPlayerStat,
-  isBitSet128,
-  isBoolean,
-  isColor,
-  isNumber,
-} from "../functions";
+import { isBitSet128 } from "../functions/bitSet128";
+import { colorEquals, isColor } from "../functions/color";
 import { getEnumValues } from "../functions/enums";
 import { getPlayerIndex } from "../functions/playerIndex";
+import { getPlayerStat } from "../functions/playerStats";
+import { isBoolean, isNumber } from "../functions/types";
 import { PlayerIndex } from "../types/PlayerIndex";
 import {
   postPlayerChangeStatFire,

package/src/functions/types.ts

@@ -2,6 +2,7 @@ import {
   Card,
   CollectibleType,
   LevelStage,
+  NpcState,
   PillColor,
   PillEffect,
   PlayerType,
@@ -38,6 +39,16 @@ export function asLevelStage(num: number): LevelStage {
   return num;
 }
 
+/**
+ * Helper function to safely cast a `number` to a `NpcState`. (This is better than using the `as`
+ * TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )
+ *
+ * This is useful to satisfy the "isaacscript/strict-enums" ESLint rule.
+ */
+export function asNpcState(num: number): NpcState {
+  return num;
+}
+
 /**
  * Helper function to safely cast an enum to a `number`. (This is better than using the `as`
  * TypeScript keyword to do a type assertion, since that can obfuscate compiler errors. )