isaacscript-common 1.2.46 → 1.2.47

package/dist/callbacks/postPlayerReordered.lua

@@ -6,7 +6,7 @@ local hasSubscriptions, postPEffectUpdate, postPlayerInit, postPlayerUpdate, pos
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____array = require("functions.array")
-local arrayEmpty = ____array.arrayEmpty
+local emptyArray = ____array.emptyArray
 local ____player = require("functions.player")
 local getPlayerFromIndex = ____player.getPlayerFromIndex
 local getPlayerIndex = ____player.getPlayerIndex
@@ -89,7 +89,7 @@ function dequeue(self, playerIndexes, fireFunction)
         end
         ::__continue23::
     end
-    arrayEmpty(nil, playerIndexes)
+    emptyArray(nil, playerIndexes)
 end
 v = {run = {
     postGameStartedFiredOnThisRun = false,

package/dist/callbacks/postTransformation.lua

@@ -2,13 +2,14 @@
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local Map = ____lualib.Map
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdateReordered, UNUSED_TRANSFORMATIONS, v
+local hasSubscriptions, postPEffectUpdateReordered, playerTransformationChanged, updateForgottenOrSoulTransformation, TRANSFORMATIONS, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____array = require("functions.array")
-local arrayInit = ____array.arrayInit
+local copyArray = ____array.copyArray
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
@@ -23,32 +24,59 @@ function postPEffectUpdateReordered(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local index = getPlayerIndex(nil, player)
-    local transformations = v.run.transformations:get(index)
+    local playerIndex = getPlayerIndex(nil, player)
+    local transformations = v.run.transformations:get(playerIndex)
     if transformations == nil then
-        transformations = arrayInit(nil, false, PlayerForm.NUM_PLAYER_FORMS - 1)
-        v.run.transformations:set(index, transformations)
+        transformations = __TS__New(Map)
+        v.run.transformations:set(playerIndex, transformations)
     end
-    do
-        local playerForm = 0
-        while playerForm < PlayerForm.NUM_PLAYER_FORMS do
-            do
-                if UNUSED_TRANSFORMATIONS:has(playerForm) then
-                    goto __continue7
-                end
-                local hasForm = player:HasPlayerForm(playerForm)
-                local storedForm = transformations[playerForm + 1]
-                if hasForm ~= storedForm then
-                    transformations[playerForm + 1] = hasForm
-                    postTransformationFire(nil, player, playerForm, hasForm)
-                end
+    for ____, playerForm in ipairs(TRANSFORMATIONS) do
+        local hasForm = player:HasPlayerForm(playerForm)
+        local storedForm = transformations:get(playerForm)
+        if storedForm == nil then
+            local defaultValue = false
+            storedForm = defaultValue
+            transformations:set(playerForm, defaultValue)
+        end
+        if hasForm ~= storedForm then
+            transformations:set(playerForm, hasForm)
+            playerTransformationChanged(nil, player, playerForm, hasForm)
+        end
+    end
+end
+function playerTransformationChanged(self, player, playerForm, hasForm)
+    postTransformationFire(nil, player, playerForm, hasForm)
+    updateForgottenOrSoulTransformation(nil, player, playerForm, hasForm)
+end
+function updateForgottenOrSoulTransformation(self, player, playerForm, hasForm)
+    local subPlayer = player:GetSubPlayer()
+    if subPlayer == nil then
+        return
+    end
+    local subPlayerIndex = getPlayerIndex(nil, subPlayer)
+    local transformations = v.run.transformations:get(subPlayerIndex)
+    if transformations == nil then
+        transformations = __TS__New(Map)
+        v.run.transformations:set(subPlayerIndex, transformations)
+    end
+    transformations:set(playerForm, hasForm)
+end
+local UNUSED_TRANSFORMATIONS = __TS__New(Set, {PlayerForm.PLAYERFORM_FLIGHT})
+local tempTransformations = {}
+do
+    local playerForm = 0
+    while playerForm < PlayerForm.NUM_PLAYER_FORMS do
+        do
+            if UNUSED_TRANSFORMATIONS:has(playerForm) then
+                goto __continue2
             end
-            ::__continue7::
-            playerForm = playerForm + 1
+            __TS__ArrayPush(tempTransformations, playerForm)
         end
+        ::__continue2::
+        playerForm = playerForm + 1
     end
 end
-UNUSED_TRANSFORMATIONS = __TS__New(Set, {PlayerForm.PLAYERFORM_FLIGHT})
+TRANSFORMATIONS = copyArray(nil, tempTransformations)
 v = {run = {transformations = __TS__New(Map)}}
 function ____exports.postTransformationCallbackInit(self, mod)
     saveDataManager(nil, "postTransformation", v, hasSubscriptions)

package/dist/functions/array.d.ts

@@ -1,20 +1,19 @@
 /// <reference types="isaac-typescript-definitions" />
 /// <reference types="typescript-to-lua/language-extensions" />
 /**
- * Helper function to combine arrays. Returns a new array that is the composition of all of the
- * specified arrays. This function is variadic, meaning that you can specify N arguments to combine
- * N arrays. Note that this will only perform a shallow copy of the array elements.
+ * Helper function to combine two or more arrays. Returns a new array that is the composition of all
+ * of the specified arrays. This function is variadic, meaning that you can specify N arguments to
+ * combine N arrays. Note that this will only perform a shallow copy of the array elements.
  */
-export declare function arrayCombine<T>(...arrays: Array<T[] | readonly T[]>): T[];
+export declare function combineArray<T>(...arrays: Array<T[] | readonly T[]>): T[];
 /** Helper function to perform a shallow copy. */
-export declare function arrayCopy<T>(array: T[] | readonly T[]): T[];
-export declare function arrayEmpty<T>(array: T[]): void;
+export declare function copyArray<T>(array: T[] | readonly T[]): T[];
+export declare function emptyArray<T>(array: T[]): void;
 /**
  * Helper function for determining if two arrays contain the exact same elements. Note that this
  * only performs a shallow comparison.
  */
 export declare function arrayEquals<T>(array1: T[] | readonly T[], array2: T[] | readonly T[]): boolean;
-export declare function arrayInArray<T>(arrayToMatch: T[] | readonly T[], parentArray: Array<T[] | readonly T[]>): boolean;
 /**
  * Initializes an array with all elements containing the specified default value.
  *
@@ -23,20 +22,21 @@ export declare function arrayInArray<T>(arrayToMatch: T[] | readonly T[], parent
  * const playerTransformations = initArray(false, PlayerForm.NUM_PLAYER_FORMS - 1);
  * ```
  */
-export declare function arrayInit<T>(defaultValue: T, size: int): T[];
+export declare function initArray<T>(defaultValue: T, size: int): T[];
+export declare function isArrayInArray<T>(arrayToMatch: T[] | readonly T[], parentArray: Array<T[] | readonly T[]>): boolean;
 /**
  * Shallow copies and shuffles the array using the Fisher-Yates algorithm. Returns the copied array.
  *
  * From: https://stackoverflow.com/questions/2450954/how-to-randomize-shuffle-a-javascript-array
  */
-export declare function arrayShuffle<T>(originalArray: T[] | readonly T[], seed?: number): T[];
+export declare function shuffleArray<T>(originalArray: T[] | readonly T[], seed?: number): T[];
 /**
  * Shuffles the provided array in-place using the Fisher-Yates algorithm.
  *
  * From: https://stackoverflow.com/questions/2450954/how-to-randomize-shuffle-a-javascript-array
  */
-export declare function arrayShuffleInPlace<T>(array: T[], seed?: number): void;
-export declare function arraySum(array: number[] | readonly number[]): number;
+export declare function shuffleArrayInPlace<T>(array: T[], seed?: number): void;
+export declare function sumArray(array: number[] | readonly number[]): number;
 export declare function arrayToString<T>(array: T[]): string;
 /**
  * Shallow copies and removes the specified element(s) from the array. Returns the copied array. If

package/dist/functions/array.lua

@@ -11,7 +11,7 @@ local ____exports = {}
 local ____random = require("functions.random")
 local getRandomInt = ____random.getRandomInt
 local nextSeed = ____random.nextSeed
-function ____exports.arrayShuffleInPlace(self, array, seed)
+function ____exports.shuffleArrayInPlace(self, array, seed)
     if seed == nil then
         seed = Random()
     end
@@ -36,7 +36,7 @@ function ____exports.getRandomArrayIndex(self, array, seed)
     local randomIndex = getRandomInt(nil, 0, #array - 1, seed)
     return randomIndex
 end
-function ____exports.arrayCombine(self, ...)
+function ____exports.combineArray(self, ...)
     local arrays = {...}
     local elements = {}
     for ____, array in ipairs(arrays) do
@@ -46,10 +46,10 @@ function ____exports.arrayCombine(self, ...)
     end
     return elements
 end
-function ____exports.arrayCopy(self, array)
+function ____exports.copyArray(self, array)
     return {table.unpack(array)}
 end
-function ____exports.arrayEmpty(self, array)
+function ____exports.emptyArray(self, array)
     __TS__ArraySplice(array, 0, #array)
 end
 function ____exports.arrayEquals(self, array1, array2)
@@ -64,13 +64,7 @@ function ____exports.arrayEquals(self, array1, array2)
         end
     )
 end
-function ____exports.arrayInArray(self, arrayToMatch, parentArray)
-    return __TS__ArraySome(
-        parentArray,
-        function(____, element) return ____exports.arrayEquals(nil, element, arrayToMatch) end
-    )
-end
-function ____exports.arrayInit(self, defaultValue, size)
+function ____exports.initArray(self, defaultValue, size)
     local array = {}
     do
         local i = 0
@@ -81,15 +75,21 @@ function ____exports.arrayInit(self, defaultValue, size)
     end
     return array
 end
-function ____exports.arrayShuffle(self, originalArray, seed)
+function ____exports.isArrayInArray(self, arrayToMatch, parentArray)
+    return __TS__ArraySome(
+        parentArray,
+        function(____, element) return ____exports.arrayEquals(nil, element, arrayToMatch) end
+    )
+end
+function ____exports.shuffleArray(self, originalArray, seed)
     if seed == nil then
         seed = Random()
     end
-    local array = ____exports.arrayCopy(nil, originalArray)
-    ____exports.arrayShuffleInPlace(nil, array, seed)
+    local array = ____exports.copyArray(nil, originalArray)
+    ____exports.shuffleArrayInPlace(nil, array, seed)
     return array
 end
-function ____exports.arraySum(self, array)
+function ____exports.sumArray(self, array)
     return __TS__ArrayReduce(
         array,
         function(____, accumulator, element) return accumulator + element end,
@@ -109,7 +109,7 @@ function ____exports.arrayToString(self, array)
 end
 function ____exports.arrayRemove(self, originalArray, ...)
     local elements = {...}
-    local array = ____exports.arrayCopy(nil, originalArray)
+    local array = ____exports.copyArray(nil, originalArray)
     for ____, element in ipairs(elements) do
         local index = __TS__ArrayIndexOf(array, element)
         if index > -1 then

package/dist/functions/jsonRoom.lua

@@ -5,7 +5,7 @@ local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local ____exports = {}
 local getTotalWeightOfJSONRooms, getJSONRoomWithChosenWeight
 local ____array = require("functions.array")
-local arraySum = ____array.arraySum
+local sumArray = ____array.sumArray
 local ____log = require("functions.log")
 local log = ____log.log
 local ____random = require("functions.random")
@@ -22,7 +22,7 @@ function getTotalWeightOfJSONRooms(self, jsonRooms)
             return roomWeight
         end
     )
-    return arraySum(nil, weights)
+    return sumArray(nil, weights)
 end
 function getJSONRoomWithChosenWeight(self, jsonRooms, chosenWeight)
     for ____, jsonRoom in ipairs(jsonRooms) do

package/dist/functions/player.lua

@@ -21,7 +21,7 @@ local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____HealthType = require("types.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____array = require("functions.array")
-local arraySum = ____array.arraySum
+local sumArray = ____array.sumArray
 local ____bitwise = require("functions.bitwise")
 local getKBitOfN = ____bitwise.getKBitOfN
 local getNumBitsOfN = ____bitwise.getNumBitsOfN
@@ -433,7 +433,7 @@ function ____exports.getTotalPlayerCollectibles(self, collectibleType)
         players,
         function(____, player) return player:GetCollectibleNum(collectibleType) end
     )
-    return arraySum(nil, numCollectiblesArray)
+    return sumArray(nil, numCollectiblesArray)
 end
 function ____exports.hasLostCurse(self, player)
     local effects = player:GetEffects()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.46",
+  "version": "1.2.47",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",