isaacscript-common 7.1.0 → 7.1.1

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;AAsBrD,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;AA+BrD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAO/D"}

package/dist/callbacks/postPlayerChangeStat.lua

@@ -2,7 +2,7 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdateReordered, v
+local hasSubscriptions, postPEffectUpdateReordered, statEquals, v
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____enums = require("enums.index")
@@ -12,7 +12,11 @@ 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 ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
@@ -31,23 +35,48 @@ function postPEffectUpdateReordered(self, player)
     local playerIndex = getPlayerIndex(nil, player, true)
     local playerStatMap = v.run.playersStatMap:getAndSetDefault(playerIndex)
     for ____, statType in ipairs(getEnumValues(nil, StatType)) do
-        local storedStatValue = playerStatMap:get(statType)
-        local currentStatValue = getPlayerStat(nil, player, statType)
-        playerStatMap:set(statType, currentStatValue)
-        if storedStatValue ~= nil and storedStatValue ~= currentStatValue then
-            local isNumberStat = isNumber(nil, storedStatValue) and isNumber(nil, currentStatValue)
-            local difference = isNumberStat and currentStatValue - storedStatValue or 0
-            postPlayerChangeStatFire(
-                nil,
-                player,
-                statType,
-                difference,
-                storedStatValue,
-                currentStatValue
-            )
+        do
+            local storedStatValue = playerStatMap:get(statType)
+            local currentStatValue = getPlayerStat(nil, player, statType)
+            playerStatMap:set(statType, currentStatValue)
+            if storedStatValue == nil then
+                goto __continue7
+            end
+            if not statEquals(nil, storedStatValue, currentStatValue) then
+                local isNumberStat = isNumber(nil, storedStatValue) and isNumber(nil, currentStatValue)
+                local difference = isNumberStat and currentStatValue - storedStatValue or 0
+                postPlayerChangeStatFire(
+                    nil,
+                    player,
+                    statType,
+                    difference,
+                    storedStatValue,
+                    currentStatValue
+                )
+            end
         end
+        ::__continue7::
     end
 end
+function statEquals(self, oldValue, newValue)
+    local isNumberStat = isNumber(nil, oldValue) and isNumber(nil, newValue)
+    if isNumberStat then
+        return oldValue == newValue
+    end
+    local isBooleanStat = isBoolean(nil, oldValue) and isBoolean(nil, newValue)
+    if isBooleanStat then
+        return oldValue == newValue
+    end
+    local isBitSet128Stat = isBitSet128(nil, oldValue) and isBitSet128(nil, newValue)
+    if isBitSet128Stat then
+        return oldValue == newValue
+    end
+    local isColorStat = isColor(nil, oldValue) and isColor(nil, newValue)
+    if isColorStat then
+        return colorEquals(nil, oldValue, newValue)
+    end
+    error("Failed to determine the type of a stat in the \"POST_PLAYER_CHANGE_STAT\" callback.")
+end
 v = {run = {playersStatMap = __TS__New(
     DefaultMap,
     function() return __TS__New(Map) end

package/dist/enums/StatType.d.ts

@@ -23,8 +23,6 @@ export declare enum StatType {
     /** Corresponds to `CacheFlag.FLYING` (1 << 7) and `EntityPlayer.CanFly`. */
     FLYING = 10,
     /** Corresponds to `CacheFlag.LUCK` (1 << 10) and `EntityPlayer.Luck`. */
-    LUCK = 11,
-    /** Corresponds to `CacheFlag.SIZE` (1 << 11) and `EntityPlayer.SizeMulti`. */
-    SIZE = 12
+    LUCK = 11
 }
 //# sourceMappingURL=StatType.d.ts.map

package/dist/enums/StatType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatType.d.ts","sourceRoot":"","sources":["../../src/enums/StatType.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,oBAAY,QAAQ;IAClB,4EAA4E;IAC5E,MAAM,IAAA;IAEN,sFAAsF;IACtF,UAAU,IAAA;IAEV,mFAAmF;IACnF,UAAU,IAAA;IAEV,+EAA+E;IAC/E,WAAW,IAAA;IAEX,8EAA8E;IAC9E,UAAU,IAAA;IAEV,4FAA4F;IAC5F,yBAAyB,IAAA;IAEzB,qFAAqF;IACrF,kBAAkB,IAAA;IAElB,8EAA8E;IAC9E,UAAU,IAAA;IAEV,kFAAkF;IAClF,SAAS,IAAA;IAET,mFAAmF;IACnF,UAAU,IAAA;IAEV,4EAA4E;IAC5E,MAAM,KAAA;IAKN,yEAAyE;IACzE,IAAI,KAAA;IAEJ,8EAA8E;IAC9E,IAAI,KAAA;CAIL"}
+{"version":3,"file":"StatType.d.ts","sourceRoot":"","sources":["../../src/enums/StatType.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,oBAAY,QAAQ;IAClB,4EAA4E;IAC5E,MAAM,IAAA;IAEN,sFAAsF;IACtF,UAAU,IAAA;IAEV,mFAAmF;IACnF,UAAU,IAAA;IAEV,+EAA+E;IAC/E,WAAW,IAAA;IAEX,8EAA8E;IAC9E,UAAU,IAAA;IAEV,4FAA4F;IAC5F,yBAAyB,IAAA;IAEzB,qFAAqF;IACrF,kBAAkB,IAAA;IAElB,8EAA8E;IAC9E,UAAU,IAAA;IAEV,kFAAkF;IAClF,SAAS,IAAA;IAET,mFAAmF;IACnF,UAAU,IAAA;IAEV,4EAA4E;IAC5E,MAAM,KAAA;IAKN,yEAAyE;IACzE,IAAI,KAAA;CAOL"}

package/dist/enums/StatType.lua

@@ -25,6 +25,4 @@ ____exports.StatType.FLYING = 10
 ____exports.StatType[____exports.StatType.FLYING] = "FLYING"
 ____exports.StatType.LUCK = 11
 ____exports.StatType[____exports.StatType.LUCK] = "LUCK"
-____exports.StatType.SIZE = 12
-____exports.StatType[____exports.StatType.SIZE] = "SIZE"
 return ____exports

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

@@ -1 +1 @@
-{"version":3,"file":"playerStats.d.ts","sourceRoot":"","sources":["../../src/functions/playerStats.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,SAAS,QAAQ,EAC9C,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,CAAC,GACV,YAAY,CAAC,CAAC,CAAC,CAkBjB"}
+{"version":3,"file":"playerStats.d.ts","sourceRoot":"","sources":["../../src/functions/playerStats.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,SAAS,QAAQ,EAC9C,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,CAAC,GACV,YAAY,CAAC,CAAC,CAAC,CAiBjB"}

package/dist/functions/playerStats.lua

@@ -15,8 +15,7 @@ function ____exports.getPlayerStat(self, player, statType)
         [StatType.TEAR_FLAG] = player.TearFlags,
         [StatType.TEAR_COLOR] = player.TearColor,
         [StatType.FLYING] = player.CanFly,
-        [StatType.LUCK] = player.Luck,
-        [StatType.SIZE] = player.SizeMulti
+        [StatType.LUCK] = player.Luck
     })[statType]
 end
 return ____exports

package/dist/interfaces/StatTypeType.d.ts

@@ -13,6 +13,5 @@ export interface StatTypeType {
     [StatType.TEAR_COLOR]: Color;
     [StatType.FLYING]: boolean;
     [StatType.LUCK]: float;
-    [StatType.SIZE]: Vector;
 }
 //# sourceMappingURL=StatTypeType.d.ts.map

package/dist/interfaces/StatTypeType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatTypeType.d.ts","sourceRoot":"","sources":["../../src/interfaces/StatTypeType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,WAAW,YAAY;IAC3B,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC;IACzB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC;IAC9B,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,KAAK,CAAC;IAC5C,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC;IACrC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC3B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC;IACvB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACzB"}
+{"version":3,"file":"StatTypeType.d.ts","sourceRoot":"","sources":["../../src/interfaces/StatTypeType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,WAAW,YAAY;IAC3B,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC;IACzB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC;IAC9B,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,KAAK,CAAC;IAC5C,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC;IACrC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IAC7B,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC3B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC;CACxB"}

package/package.json

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

package/src/callbacks/postPlayerChangeStat.ts

@@ -4,7 +4,14 @@ import { ModUpgraded } from "../classes/ModUpgraded";
 import { StatType } from "../enums";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import { getPlayerStat, isNumber } from "../functions";
+import {
+  colorEquals,
+  getPlayerStat,
+  isBitSet128,
+  isBoolean,
+  isColor,
+  isNumber,
+} from "../functions";
 import { getEnumValues } from "../functions/enums";
 import { getPlayerIndex } from "../functions/playerIndex";
 import { PlayerIndex } from "../types/PlayerIndex";
@@ -13,11 +20,13 @@ import {
   postPlayerChangeStatHasSubscriptions,
 } from "./subscriptions/postPlayerChangeStat";
 
+type PossibleStatType = number | boolean | BitFlags<TearFlag> | Color;
+
 const v = {
   run: {
     playersStatMap: new DefaultMap<
       PlayerIndex,
-      Map<StatType, number | boolean | BitFlags<TearFlag> | Color | Vector>
+      Map<StatType, PossibleStatType>
     >(() => new Map()),
   },
 };
@@ -52,7 +61,11 @@ function postPEffectUpdateReordered(player: EntityPlayer) {
     const currentStatValue = getPlayerStat(player, statType);
     playerStatMap.set(statType, currentStatValue);
 
-    if (storedStatValue !== undefined && storedStatValue !== currentStatValue) {
+    if (storedStatValue === undefined) {
+      continue;
+    }
+
+    if (!statEquals(storedStatValue, currentStatValue)) {
       const isNumberStat =
         isNumber(storedStatValue) && isNumber(currentStatValue);
       const difference = isNumberStat ? currentStatValue - storedStatValue : 0;
@@ -66,3 +79,32 @@ function postPEffectUpdateReordered(player: EntityPlayer) {
     }
   }
 }
+
+function statEquals(
+  oldValue: PossibleStatType,
+  newValue: PossibleStatType,
+): boolean {
+  const isNumberStat = isNumber(oldValue) && isNumber(newValue);
+  if (isNumberStat) {
+    return oldValue === newValue;
+  }
+
+  const isBooleanStat = isBoolean(oldValue) && isBoolean(newValue);
+  if (isBooleanStat) {
+    return oldValue === newValue;
+  }
+
+  const isBitSet128Stat = isBitSet128(oldValue) && isBitSet128(newValue);
+  if (isBitSet128Stat) {
+    return oldValue === newValue; // The class has the "__eq" meta-method.
+  }
+
+  const isColorStat = isColor(oldValue) && isColor(newValue);
+  if (isColorStat) {
+    return colorEquals(oldValue, newValue);
+  }
+
+  error(
+    'Failed to determine the type of a stat in the "POST_PLAYER_CHANGE_STAT" callback.',
+  );
+}

package/src/enums/StatType.ts

@@ -33,15 +33,15 @@ export enum StatType {
   /** Corresponds to `CacheFlag.FLYING` (1 << 7) and `EntityPlayer.CanFly`. */
   FLYING,
 
-  // `CacheFlag.WEAPON` (1 << 8) does not have a corresponding `EntityPlayer` field.
-  // `CacheFlag.FAMILIARS` (1 << 9) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.WEAPON` (1 << 8) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.FAMILIARS` (1 << 9) does not have a corresponding `EntityPlayer` field.
 
   /** Corresponds to `CacheFlag.LUCK` (1 << 10) and `EntityPlayer.Luck`. */
   LUCK,
 
-  /** Corresponds to `CacheFlag.SIZE` (1 << 11) and `EntityPlayer.SizeMulti`. */
-  SIZE,
-
-  // `CacheFlag.COLOR` (1 << 12) does not have a corresponding `EntityPlayer` field.
-  // `CacheFlag.PICKUP_VISION` (1 << 13) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.SIZE` (1 << 12) does not have a corresponding `EntityPlayer` field. (After picking
+  //   up Magic Mushroom, the values of `EntityPlayer.Size` and `EntityPlayer.SizeMulti` do not
+  //   change.)
+  // - `CacheFlag.COLOR` (1 << 12) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.PICKUP_VISION` (1 << 13) does not have a corresponding `EntityPlayer` field.
 }

package/src/functions/playerStats.ts

@@ -21,6 +21,5 @@ export function getPlayerStat<T extends StatType>(
     [StatType.TEAR_COLOR]: player.TearColor, // 1 << 6
     [StatType.FLYING]: player.CanFly, // 1 << 7
     [StatType.LUCK]: player.Luck, // 1 << 10
-    [StatType.SIZE]: player.SizeMulti, // 1 << 11
   }[statType];
 }

package/src/interfaces/StatTypeType.ts

@@ -14,5 +14,4 @@ export interface StatTypeType {
   [StatType.TEAR_COLOR]: Color;
   [StatType.FLYING]: boolean;
   [StatType.LUCK]: float;
-  [StatType.SIZE]: Vector;
 }