isaacscript-common 6.22.1 → 6.22.2

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

@@ -1 +1 @@
-{"version":3,"file":"postTransformation.d.ts","sourceRoot":"","sources":["../../src/callbacks/postTransformation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAsBrD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAO7D"}
+{"version":3,"file":"postTransformation.d.ts","sourceRoot":"","sources":["../../src/callbacks/postTransformation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAuBrD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAO7D"}

package/dist/callbacks/postTransformation.lua

@@ -1,4 +1,5 @@
 local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, PLAYER_FORMS, v
@@ -27,7 +28,10 @@ function postPEffectUpdateReordered(self, player)
     local playerTransformationsMap = defaultMapGetPlayer(nil, v.run.playersTransformationsMap, player)
     for ____, playerForm in ipairs(PLAYER_FORMS) do
         local hasForm = player:HasPlayerForm(playerForm)
-        local storedForm = playerTransformationsMap:getAndSetDefault(playerForm)
+        local storedForm = playerTransformationsMap:get(playerForm)
+        if storedForm == nil then
+            storedForm = false
+        end
         if hasForm ~= storedForm then
             playerTransformationsMap:set(playerForm, hasForm)
             postTransformationFire(nil, player, playerForm, hasForm)
@@ -37,7 +41,7 @@ end
 PLAYER_FORMS = getEnumValues(nil, PlayerForm)
 v = {run = {playersTransformationsMap = __TS__New(
     DefaultMap,
-    function() return __TS__New(DefaultMap, false) end
+    function() return __TS__New(Map) end
 )}}
 function ____exports.postTransformationInit(self, mod)
     saveDataManager(nil, "postTransformation", v, hasSubscriptions)

package/dist/callbacks/postTrinketBreak.lua

@@ -1,4 +1,5 @@
 local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local hasSubscriptions, entityTakeDmgPlayer, postPEffectUpdateReordered, TRINKETS_THAT_CAN_BREAK, v
@@ -33,7 +34,10 @@ function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _dam
     for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
         do
             local numTrinketsHeld = player:GetTrinketMultiplier(trinketType)
-            local oldNumTrinketsHeld = trinketMap:getAndSetDefault(trinketType)
+            local oldNumTrinketsHeld = trinketMap:get(trinketType)
+            if oldNumTrinketsHeld == nil then
+                oldNumTrinketsHeld = 0
+            end
             if numTrinketsHeld >= oldNumTrinketsHeld then
                 goto __continue8
             end
@@ -61,7 +65,7 @@ end
 TRINKETS_THAT_CAN_BREAK = {TrinketType.WISH_BONE, TrinketType.WALNUT}
 v = {run = {playersTrinketMap = __TS__New(
     DefaultMap,
-    function() return __TS__New(DefaultMap, 0) end
+    function() return __TS__New(Map) end
 )}}
 function ____exports.postTrinketBreakInit(self, mod)
     saveDataManager(nil, "postTrinketBreak", v, hasSubscriptions)

package/package.json

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

package/src/callbacks/postTransformation.ts

@@ -15,10 +15,11 @@ const PLAYER_FORMS: readonly PlayerForm[] = getEnumValues(PlayerForm);
 
 const v = {
   run: {
+    // We cannot use a nested `DefaultMap` here.
     playersTransformationsMap: new DefaultMap<
       PlayerIndex,
-      DefaultMap<PlayerForm, boolean>
-    >(() => new DefaultMap(false)),
+      Map<PlayerForm, boolean>
+    >(() => new Map()),
   },
 };
 
@@ -48,7 +49,10 @@ function postPEffectUpdateReordered(player: EntityPlayer) {
 
   for (const playerForm of PLAYER_FORMS) {
     const hasForm = player.HasPlayerForm(playerForm);
-    const storedForm = playerTransformationsMap.getAndSetDefault(playerForm);
+    let storedForm = playerTransformationsMap.get(playerForm);
+    if (storedForm === undefined) {
+      storedForm = false;
+    }
 
     if (hasForm !== storedForm) {
       playerTransformationsMap.set(playerForm, hasForm);

package/src/callbacks/postTrinketBreak.ts

@@ -23,10 +23,10 @@ const TRINKETS_THAT_CAN_BREAK: readonly TrinketType[] = [
 
 const v = {
   run: {
-    playersTrinketMap: new DefaultMap<
-      PlayerIndex,
-      DefaultMap<TrinketType, int>
-    >(() => new DefaultMap(0)),
+    // We cannot use a nested `DefaultMap` here.
+    playersTrinketMap: new DefaultMap<PlayerIndex, Map<TrinketType, int>>(
+      () => new Map(),
+    ),
   },
 };
 
@@ -71,7 +71,11 @@ function entityTakeDmgPlayer(
 
   for (const trinketType of TRINKETS_THAT_CAN_BREAK) {
     const numTrinketsHeld = player.GetTrinketMultiplier(trinketType);
-    const oldNumTrinketsHeld = trinketMap.getAndSetDefault(trinketType);
+    let oldNumTrinketsHeld = trinketMap.get(trinketType);
+    if (oldNumTrinketsHeld === undefined) {
+      oldNumTrinketsHeld = 0;
+    }
+
     if (numTrinketsHeld >= oldNumTrinketsHeld) {
       continue;
     }