isaacscript-common 87.7.0 → 87.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/classes/ModUpgraded.lua +4 -4
- package/dist/classes/callbacks/InputActionFilter.lua +2 -2
- package/dist/classes/callbacks/InputActionPlayer.lua +2 -2
- package/dist/classes/callbacks/PostCollectibleEmpty.lua +2 -2
- package/dist/classes/callbacks/PostCursedTeleport.lua +2 -2
- package/dist/classes/callbacks/PostCustomRevive.lua +2 -2
- package/dist/classes/callbacks/PostDiceRoomActivated.lua +2 -2
- package/dist/classes/callbacks/PostGridEntityCollision.lua +2 -2
- package/dist/classes/callbacks/PostGridEntityCustomCollision.lua +2 -2
- package/dist/classes/callbacks/PostGridEntityCustomRemove.lua +2 -2
- package/dist/classes/callbacks/PostGridEntityRemove.lua +2 -2
- package/dist/classes/callbacks/PostItemDischarge.lua +2 -2
- package/dist/classes/callbacks/PostKeyboardChanged.lua +2 -2
- package/dist/classes/callbacks/PostPickupSelectionFilter.lua +2 -2
- package/dist/classes/callbacks/PostPurchase.lua +2 -2
- package/dist/classes/callbacks/PostRoomClearChanged.lua +2 -2
- package/dist/classes/callbacks/PostTransformation.lua +2 -2
- package/dist/classes/callbacks/PreEntitySpawnFilter.lua +2 -2
- package/dist/classes/callbacks/PreRoomEntitySpawnFilter.lua +2 -2
- package/dist/classes/features/callbackLogic/GridEntityUpdateDetection.lua +2 -2
- package/dist/classes/features/other/DeployJSONRoom.lua +1 -1
- package/dist/classes/features/other/ExtraConsoleCommands.lua +1 -1
- package/dist/classes/features/other/NoSirenSteal.lua +1 -1
- package/dist/classes/features/other/PersistentEntities.lua +1 -1
- package/dist/classes/features/other/extraConsoleCommands/commands.lua +5 -5
- package/dist/functions/array.js +1 -1
- package/dist/functions/array.lua +2 -2
- package/dist/functions/bitSet128.lua +10 -6
- package/dist/functions/color.lua +10 -6
- package/dist/functions/doors.lua +1 -1
- package/dist/functions/entities.lua +8 -4
- package/dist/functions/globals.lua +1 -1
- package/dist/functions/gridEntities.lua +1 -1
- package/dist/functions/input.lua +1 -1
- package/dist/functions/kColor.lua +10 -6
- package/dist/functions/rng.lua +10 -6
- package/dist/functions/roomShapeWalls.lua +5 -5
- package/dist/functions/vector.lua +10 -6
- package/dist/functions/weighted.lua +1 -1
- package/dist/isaacscript-common.lua +179 -155
- package/dist/maps/entityTypeVariantToBossIDMap.lua +1 -1
- package/dist/shouldFire.lua +56 -56
- package/dist/tsdoc-metadata.json +1 -1
- package/package.json +7 -10
- package/src/functions/array.ts +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
--[[
|
|
2
2
|
|
|
3
|
-
isaacscript-common 87.
|
|
3
|
+
isaacscript-common 87.7.0
|
|
4
4
|
|
|
5
5
|
This is the "isaacscript-common" library, which was created with the IsaacScript tool.
|
|
6
6
|
|
|
@@ -18437,12 +18437,16 @@ function ____exports.deserializeRNG(self, rng)
|
|
|
18437
18437
|
if not isTable(nil, rng) then
|
|
18438
18438
|
error(("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object was not a Lua table.")
|
|
18439
18439
|
end
|
|
18440
|
-
local seed = table.unpack(
|
|
18441
|
-
|
|
18442
|
-
|
|
18443
|
-
|
|
18444
|
-
|
|
18445
|
-
|
|
18440
|
+
local seed = table.unpack(
|
|
18441
|
+
getNumbersFromTable(
|
|
18442
|
+
nil,
|
|
18443
|
+
rng,
|
|
18444
|
+
OBJECT_NAME,
|
|
18445
|
+
table.unpack(KEYS)
|
|
18446
|
+
),
|
|
18447
|
+
1,
|
|
18448
|
+
1
|
|
18449
|
+
)
|
|
18446
18450
|
assertDefined(nil, seed, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: seed")
|
|
18447
18451
|
return ____exports.newRNG(nil, seed)
|
|
18448
18452
|
end
|
|
@@ -18751,7 +18755,7 @@ local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
|
|
|
18751
18755
|
local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
|
|
18752
18756
|
local Set = ____lualib.Set
|
|
18753
18757
|
local __TS__Spread = ____lualib.__TS__Spread
|
|
18754
|
-
local
|
|
18758
|
+
local __TS__ArrayToSorted = ____lualib.__TS__ArrayToSorted
|
|
18755
18759
|
local __TS__ArrayIncludes = ____lualib.__TS__ArrayIncludes
|
|
18756
18760
|
local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
|
|
18757
18761
|
local __TS__ArraySome = ____lualib.__TS__ArraySome
|
|
@@ -19109,7 +19113,7 @@ function ____exports.getArrayDuplicateElements(self, array)
|
|
|
19109
19113
|
set:add(element)
|
|
19110
19114
|
end
|
|
19111
19115
|
local values = {__TS__Spread(duplicateElements)}
|
|
19112
|
-
return
|
|
19116
|
+
return __TS__ArrayToSorted(values, sortNormal)
|
|
19113
19117
|
end
|
|
19114
19118
|
--- Helper function to get an array containing the indexes of an array.
|
|
19115
19119
|
--
|
|
@@ -19703,154 +19707,154 @@ return ____exports
|
|
|
19703
19707
|
["shouldFire"] = function(...)
|
|
19704
19708
|
local ____exports = {}
|
|
19705
19709
|
function ____exports.shouldFireAmbush(self, fireArgs, optionalArgs)
|
|
19706
|
-
local ambushType = table.unpack(fireArgs)
|
|
19707
|
-
local callbackAmbushType = table.unpack(optionalArgs)
|
|
19710
|
+
local ambushType = table.unpack(fireArgs, 1, 1)
|
|
19711
|
+
local callbackAmbushType = table.unpack(optionalArgs, 1, 1)
|
|
19708
19712
|
return callbackAmbushType == nil or callbackAmbushType == ambushType
|
|
19709
19713
|
end
|
|
19710
19714
|
function ____exports.shouldFireBomb(self, fireArgs, optionalArgs)
|
|
19711
|
-
local bomb = table.unpack(fireArgs)
|
|
19712
|
-
local callbackBombVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19715
|
+
local bomb = table.unpack(fireArgs, 1, 1)
|
|
19716
|
+
local callbackBombVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19713
19717
|
return (callbackBombVariant == nil or callbackBombVariant == bomb.Variant) and (callbackSubType == nil or callbackSubType == bomb.SubType)
|
|
19714
19718
|
end
|
|
19715
19719
|
function ____exports.shouldFireBoolean(self, fireArgs, optionalArgs)
|
|
19716
|
-
local fireArg = table.unpack(fireArgs)
|
|
19717
|
-
local optionalArg = table.unpack(optionalArgs)
|
|
19720
|
+
local fireArg = table.unpack(fireArgs, 1, 1)
|
|
19721
|
+
local optionalArg = table.unpack(optionalArgs, 1, 1)
|
|
19718
19722
|
return optionalArg == nil or optionalArg == fireArg
|
|
19719
19723
|
end
|
|
19720
19724
|
function ____exports.shouldFireCollectibleType(self, fireArgs, optionalArgs)
|
|
19721
|
-
local _player, collectibleType = table.unpack(fireArgs)
|
|
19722
|
-
local callbackCollectibleType = table.unpack(optionalArgs)
|
|
19725
|
+
local _player, collectibleType = table.unpack(fireArgs, 1, 2)
|
|
19726
|
+
local callbackCollectibleType = table.unpack(optionalArgs, 1, 1)
|
|
19723
19727
|
return callbackCollectibleType == nil or callbackCollectibleType == collectibleType
|
|
19724
19728
|
end
|
|
19725
19729
|
function ____exports.shouldFireDoor(self, fireArgs, optionalArgs)
|
|
19726
|
-
local door = table.unpack(fireArgs)
|
|
19727
|
-
local callbackDoorVariant = table.unpack(optionalArgs)
|
|
19730
|
+
local door = table.unpack(fireArgs, 1, 1)
|
|
19731
|
+
local callbackDoorVariant = table.unpack(optionalArgs, 1, 1)
|
|
19728
19732
|
local doorVariant = door:GetVariant()
|
|
19729
19733
|
return callbackDoorVariant == nil or callbackDoorVariant == doorVariant
|
|
19730
19734
|
end
|
|
19731
19735
|
function ____exports.shouldFireEffect(self, fireArgs, optionalArgs)
|
|
19732
|
-
local effect = table.unpack(fireArgs)
|
|
19733
|
-
local callbackEffectVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19736
|
+
local effect = table.unpack(fireArgs, 1, 1)
|
|
19737
|
+
local callbackEffectVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19734
19738
|
return (callbackEffectVariant == nil or callbackEffectVariant == effect.Variant) and (callbackSubType == nil or callbackSubType == effect.SubType)
|
|
19735
19739
|
end
|
|
19736
19740
|
function ____exports.shouldFireEntity(self, fireArgs, optionalArgs)
|
|
19737
|
-
local entity = table.unpack(fireArgs)
|
|
19738
|
-
local callbackEntityType, callbackVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19741
|
+
local entity = table.unpack(fireArgs, 1, 1)
|
|
19742
|
+
local callbackEntityType, callbackVariant, callbackSubType = table.unpack(optionalArgs, 1, 3)
|
|
19739
19743
|
return (callbackEntityType == nil or callbackEntityType == entity.Type) and (callbackVariant == nil or callbackVariant == entity.Variant) and (callbackSubType == nil or callbackSubType == entity.SubType)
|
|
19740
19744
|
end
|
|
19741
19745
|
function ____exports.shouldFireFamiliar(self, fireArgs, optionalArgs)
|
|
19742
|
-
local familiar = table.unpack(fireArgs)
|
|
19743
|
-
local callbackFamiliarVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19746
|
+
local familiar = table.unpack(fireArgs, 1, 1)
|
|
19747
|
+
local callbackFamiliarVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19744
19748
|
return (callbackFamiliarVariant == nil or callbackFamiliarVariant == familiar.Variant) and (callbackSubType == nil or callbackSubType == familiar.SubType)
|
|
19745
19749
|
end
|
|
19746
19750
|
function ____exports.shouldFireGridEntity(self, fireArgs, optionalArgs)
|
|
19747
|
-
local gridEntity = table.unpack(fireArgs)
|
|
19748
|
-
local callbackGridEntityType, callbackVariant = table.unpack(optionalArgs)
|
|
19751
|
+
local gridEntity = table.unpack(fireArgs, 1, 1)
|
|
19752
|
+
local callbackGridEntityType, callbackVariant = table.unpack(optionalArgs, 1, 2)
|
|
19749
19753
|
local gridEntityType = gridEntity:GetType()
|
|
19750
19754
|
local variant = gridEntity:GetVariant()
|
|
19751
19755
|
return (callbackGridEntityType == nil or callbackGridEntityType == gridEntityType) and (callbackVariant == nil or callbackVariant == variant)
|
|
19752
19756
|
end
|
|
19753
19757
|
function ____exports.shouldFireGridEntityCustom(self, fireArgs, optionalArgs)
|
|
19754
|
-
local _gridEntity, gridEntityTypeCustom = table.unpack(fireArgs)
|
|
19755
|
-
local callbackGridEntityTypeCustom = table.unpack(optionalArgs)
|
|
19758
|
+
local _gridEntity, gridEntityTypeCustom = table.unpack(fireArgs, 1, 2)
|
|
19759
|
+
local callbackGridEntityTypeCustom = table.unpack(optionalArgs, 1, 1)
|
|
19756
19760
|
return callbackGridEntityTypeCustom == nil or callbackGridEntityTypeCustom == gridEntityTypeCustom
|
|
19757
19761
|
end
|
|
19758
19762
|
function ____exports.shouldFireItemPickup(self, fireArgs, optionalArgs)
|
|
19759
|
-
local _player, pickingUpItem = table.unpack(fireArgs)
|
|
19760
|
-
local callbackItemType, callbackSubtype = table.unpack(optionalArgs)
|
|
19763
|
+
local _player, pickingUpItem = table.unpack(fireArgs, 1, 2)
|
|
19764
|
+
local callbackItemType, callbackSubtype = table.unpack(optionalArgs, 1, 2)
|
|
19761
19765
|
return (callbackItemType == nil or callbackItemType == pickingUpItem.itemType) and (callbackSubtype == nil or callbackSubtype == pickingUpItem.subType)
|
|
19762
19766
|
end
|
|
19763
19767
|
function ____exports.shouldFireKnife(self, fireArgs, optionalArgs)
|
|
19764
|
-
local knife = table.unpack(fireArgs)
|
|
19765
|
-
local callbackKnifeVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19768
|
+
local knife = table.unpack(fireArgs, 1, 1)
|
|
19769
|
+
local callbackKnifeVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19766
19770
|
return (callbackKnifeVariant == nil or callbackKnifeVariant == knife.Variant) and (callbackSubType == nil or callbackSubType == knife.SubType)
|
|
19767
19771
|
end
|
|
19768
19772
|
function ____exports.shouldFireLaser(self, fireArgs, optionalArgs)
|
|
19769
|
-
local laser = table.unpack(fireArgs)
|
|
19770
|
-
local callbackLaserVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19773
|
+
local laser = table.unpack(fireArgs, 1, 1)
|
|
19774
|
+
local callbackLaserVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19771
19775
|
return (callbackLaserVariant == nil or callbackLaserVariant == laser.Variant) and (callbackSubType == nil or callbackSubType == laser.SubType)
|
|
19772
19776
|
end
|
|
19773
19777
|
function ____exports.shouldFireLevel(self, fireArgs, optionalArgs)
|
|
19774
|
-
local stage, stageType = table.unpack(fireArgs)
|
|
19775
|
-
local callbackStage, callbackStageType = table.unpack(optionalArgs)
|
|
19778
|
+
local stage, stageType = table.unpack(fireArgs, 1, 2)
|
|
19779
|
+
local callbackStage, callbackStageType = table.unpack(optionalArgs, 1, 2)
|
|
19776
19780
|
return (callbackStage == nil or callbackStage == stage) and (callbackStageType == nil or callbackStageType == stageType)
|
|
19777
19781
|
end
|
|
19778
19782
|
function ____exports.shouldFireNPC(self, fireArgs, optionalArgs)
|
|
19779
|
-
local npc = table.unpack(fireArgs)
|
|
19780
|
-
local callbackEntityType, callbackVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19783
|
+
local npc = table.unpack(fireArgs, 1, 1)
|
|
19784
|
+
local callbackEntityType, callbackVariant, callbackSubType = table.unpack(optionalArgs, 1, 3)
|
|
19781
19785
|
return (callbackEntityType == nil or callbackEntityType == npc.Type) and (callbackVariant == nil or callbackVariant == npc.Variant) and (callbackSubType == nil or callbackSubType == npc.SubType)
|
|
19782
19786
|
end
|
|
19783
19787
|
function ____exports.shouldFirePickup(self, fireArgs, optionalArgs)
|
|
19784
|
-
local pickup = table.unpack(fireArgs)
|
|
19785
|
-
local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
|
|
19788
|
+
local pickup = table.unpack(fireArgs, 1, 1)
|
|
19789
|
+
local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs, 1, 2)
|
|
19786
19790
|
return (callbackPickupVariant == nil or callbackPickupVariant == pickup.Variant) and (callbackPickupSubType == nil or callbackPickupSubType == pickup.SubType)
|
|
19787
19791
|
end
|
|
19788
19792
|
function ____exports.shouldFirePit(self, fireArgs, optionalArgs)
|
|
19789
|
-
local pit = table.unpack(fireArgs)
|
|
19790
|
-
local callbackPitVariant = table.unpack(optionalArgs)
|
|
19793
|
+
local pit = table.unpack(fireArgs, 1, 1)
|
|
19794
|
+
local callbackPitVariant = table.unpack(optionalArgs, 1, 1)
|
|
19791
19795
|
local pitVariant = pit:GetVariant()
|
|
19792
19796
|
return callbackPitVariant == nil or callbackPitVariant == pitVariant
|
|
19793
19797
|
end
|
|
19794
19798
|
function ____exports.shouldFirePlayer(self, fireArgs, optionalArgs)
|
|
19795
|
-
local player = table.unpack(fireArgs)
|
|
19796
|
-
local callbackPlayerVariant, callbackCharacter = table.unpack(optionalArgs)
|
|
19799
|
+
local player = table.unpack(fireArgs, 1, 1)
|
|
19800
|
+
local callbackPlayerVariant, callbackCharacter = table.unpack(optionalArgs, 1, 2)
|
|
19797
19801
|
local character = player:GetPlayerType()
|
|
19798
19802
|
return (callbackPlayerVariant == nil or callbackPlayerVariant == player.Variant) and (callbackCharacter == nil or callbackCharacter == character)
|
|
19799
19803
|
end
|
|
19800
19804
|
function ____exports.shouldFirePoop(self, fireArgs, optionalArgs)
|
|
19801
|
-
local poop = table.unpack(fireArgs)
|
|
19802
|
-
local callbackPoopGridEntityVariant = table.unpack(optionalArgs)
|
|
19805
|
+
local poop = table.unpack(fireArgs, 1, 1)
|
|
19806
|
+
local callbackPoopGridEntityVariant = table.unpack(optionalArgs, 1, 1)
|
|
19803
19807
|
local poopGridEntityVariant = poop:GetVariant()
|
|
19804
19808
|
return callbackPoopGridEntityVariant == nil or callbackPoopGridEntityVariant == poopGridEntityVariant
|
|
19805
19809
|
end
|
|
19806
19810
|
function ____exports.shouldFirePressurePlate(self, fireArgs, optionalArgs)
|
|
19807
|
-
local pressurePlate = table.unpack(fireArgs)
|
|
19808
|
-
local callbackPressurePlateVariant = table.unpack(optionalArgs)
|
|
19811
|
+
local pressurePlate = table.unpack(fireArgs, 1, 1)
|
|
19812
|
+
local callbackPressurePlateVariant = table.unpack(optionalArgs, 1, 1)
|
|
19809
19813
|
local pressurePlateVariant = pressurePlate:GetVariant()
|
|
19810
19814
|
return callbackPressurePlateVariant == nil or callbackPressurePlateVariant == pressurePlateVariant
|
|
19811
19815
|
end
|
|
19812
19816
|
function ____exports.shouldFireProjectile(self, fireArgs, optionalArgs)
|
|
19813
|
-
local projectile = table.unpack(fireArgs)
|
|
19814
|
-
local callbackProjectileVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19817
|
+
local projectile = table.unpack(fireArgs, 1, 1)
|
|
19818
|
+
local callbackProjectileVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19815
19819
|
return (callbackProjectileVariant == nil or callbackProjectileVariant == projectile.Variant) and (callbackSubType == nil or callbackSubType == projectile.SubType)
|
|
19816
19820
|
end
|
|
19817
19821
|
function ____exports.shouldFireRock(self, fireArgs, optionalArgs)
|
|
19818
|
-
local rock = table.unpack(fireArgs)
|
|
19819
|
-
local callbackGridEntity, callbackVariant = table.unpack(optionalArgs)
|
|
19822
|
+
local rock = table.unpack(fireArgs, 1, 1)
|
|
19823
|
+
local callbackGridEntity, callbackVariant = table.unpack(optionalArgs, 1, 2)
|
|
19820
19824
|
local gridEntityType = rock:GetType()
|
|
19821
19825
|
local variant = rock:GetVariant()
|
|
19822
19826
|
return (callbackGridEntity == nil or callbackGridEntity == gridEntityType) and (callbackVariant == nil or callbackVariant == variant)
|
|
19823
19827
|
end
|
|
19824
19828
|
function ____exports.shouldFireRoom(self, fireArgs, optionalArgs)
|
|
19825
|
-
local roomType = table.unpack(fireArgs)
|
|
19826
|
-
local callbackRoomType = table.unpack(optionalArgs)
|
|
19829
|
+
local roomType = table.unpack(fireArgs, 1, 1)
|
|
19830
|
+
local callbackRoomType = table.unpack(optionalArgs, 1, 1)
|
|
19827
19831
|
return callbackRoomType == nil or callbackRoomType == roomType
|
|
19828
19832
|
end
|
|
19829
19833
|
function ____exports.shouldFireSlot(self, fireArgs, optionalArgs)
|
|
19830
|
-
local slot = table.unpack(fireArgs)
|
|
19831
|
-
local callbackSlotVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19834
|
+
local slot = table.unpack(fireArgs, 1, 1)
|
|
19835
|
+
local callbackSlotVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19832
19836
|
return (callbackSlotVariant == nil or callbackSlotVariant == slot.Variant) and (callbackSubType == nil or callbackSubType == slot.SubType)
|
|
19833
19837
|
end
|
|
19834
19838
|
function ____exports.shouldFireSpikes(self, fireArgs, optionalArgs)
|
|
19835
|
-
local spikes = table.unpack(fireArgs)
|
|
19836
|
-
local callbackVariant = table.unpack(optionalArgs)
|
|
19839
|
+
local spikes = table.unpack(fireArgs, 1, 1)
|
|
19840
|
+
local callbackVariant = table.unpack(optionalArgs, 1, 1)
|
|
19837
19841
|
local variant = spikes:GetVariant()
|
|
19838
19842
|
return callbackVariant == nil or callbackVariant == variant
|
|
19839
19843
|
end
|
|
19840
19844
|
function ____exports.shouldFireTNT(self, fireArgs, optionalArgs)
|
|
19841
|
-
local tnt = table.unpack(fireArgs)
|
|
19842
|
-
local callbackVariant = table.unpack(optionalArgs)
|
|
19845
|
+
local tnt = table.unpack(fireArgs, 1, 1)
|
|
19846
|
+
local callbackVariant = table.unpack(optionalArgs, 1, 1)
|
|
19843
19847
|
local variant = tnt:GetVariant()
|
|
19844
19848
|
return callbackVariant == nil or callbackVariant == variant
|
|
19845
19849
|
end
|
|
19846
19850
|
function ____exports.shouldFireTear(self, fireArgs, optionalArgs)
|
|
19847
|
-
local tear = table.unpack(fireArgs)
|
|
19848
|
-
local callbackTearVariant, callbackSubType = table.unpack(optionalArgs)
|
|
19851
|
+
local tear = table.unpack(fireArgs, 1, 1)
|
|
19852
|
+
local callbackTearVariant, callbackSubType = table.unpack(optionalArgs, 1, 2)
|
|
19849
19853
|
return (callbackTearVariant == nil or callbackTearVariant == tear.Variant) and (callbackSubType == nil or callbackSubType == tear.SubType)
|
|
19850
19854
|
end
|
|
19851
19855
|
function ____exports.shouldFireTrinketType(self, fireArgs, optionalArgs)
|
|
19852
|
-
local _player, trinketType = table.unpack(fireArgs)
|
|
19853
|
-
local callbackTrinketType = table.unpack(optionalArgs)
|
|
19856
|
+
local _player, trinketType = table.unpack(fireArgs, 1, 2)
|
|
19857
|
+
local callbackTrinketType = table.unpack(optionalArgs, 1, 1)
|
|
19854
19858
|
return callbackTrinketType == nil or callbackTrinketType == trinketType
|
|
19855
19859
|
end
|
|
19856
19860
|
return ____exports
|
|
@@ -20032,12 +20036,16 @@ function ____exports.deserializeBitSet128(self, bitSet128)
|
|
|
20032
20036
|
if not isTable(nil, bitSet128) then
|
|
20033
20037
|
error(("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object was not a Lua table.")
|
|
20034
20038
|
end
|
|
20035
|
-
local l, h = table.unpack(
|
|
20036
|
-
|
|
20037
|
-
|
|
20038
|
-
|
|
20039
|
-
|
|
20040
|
-
|
|
20039
|
+
local l, h = table.unpack(
|
|
20040
|
+
getNumbersFromTable(
|
|
20041
|
+
nil,
|
|
20042
|
+
bitSet128,
|
|
20043
|
+
OBJECT_NAME,
|
|
20044
|
+
table.unpack(KEYS)
|
|
20045
|
+
),
|
|
20046
|
+
1,
|
|
20047
|
+
2
|
|
20048
|
+
)
|
|
20041
20049
|
assertDefined(nil, l, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: l")
|
|
20042
20050
|
assertDefined(nil, h, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: h")
|
|
20043
20051
|
return BitSet128(l, h)
|
|
@@ -20126,12 +20134,16 @@ function ____exports.deserializeColor(self, color)
|
|
|
20126
20134
|
if not isTable(nil, color) then
|
|
20127
20135
|
error(("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object was not a Lua table.")
|
|
20128
20136
|
end
|
|
20129
|
-
local r, g, b, a, ro, go, bo = table.unpack(
|
|
20130
|
-
|
|
20131
|
-
|
|
20132
|
-
|
|
20133
|
-
|
|
20134
|
-
|
|
20137
|
+
local r, g, b, a, ro, go, bo = table.unpack(
|
|
20138
|
+
getNumbersFromTable(
|
|
20139
|
+
nil,
|
|
20140
|
+
color,
|
|
20141
|
+
OBJECT_NAME,
|
|
20142
|
+
table.unpack(KEYS)
|
|
20143
|
+
),
|
|
20144
|
+
1,
|
|
20145
|
+
7
|
|
20146
|
+
)
|
|
20135
20147
|
assertDefined(nil, r, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: R")
|
|
20136
20148
|
assertDefined(nil, g, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: G")
|
|
20137
20149
|
assertDefined(nil, b, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: B")
|
|
@@ -20229,12 +20241,16 @@ function ____exports.deserializeKColor(self, kColor)
|
|
|
20229
20241
|
if not isTable(nil, kColor) then
|
|
20230
20242
|
error(("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object was not a Lua table.")
|
|
20231
20243
|
end
|
|
20232
|
-
local r, g, b, a = table.unpack(
|
|
20233
|
-
|
|
20234
|
-
|
|
20235
|
-
|
|
20236
|
-
|
|
20237
|
-
|
|
20244
|
+
local r, g, b, a = table.unpack(
|
|
20245
|
+
getNumbersFromTable(
|
|
20246
|
+
nil,
|
|
20247
|
+
kColor,
|
|
20248
|
+
OBJECT_NAME,
|
|
20249
|
+
table.unpack(KEYS)
|
|
20250
|
+
),
|
|
20251
|
+
1,
|
|
20252
|
+
4
|
|
20253
|
+
)
|
|
20238
20254
|
assertDefined(nil, r, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: Red")
|
|
20239
20255
|
assertDefined(nil, g, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: Green")
|
|
20240
20256
|
assertDefined(nil, b, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: Blue")
|
|
@@ -20962,12 +20978,16 @@ function ____exports.deserializeVector(self, vector)
|
|
|
20962
20978
|
if not isTable(nil, vector) then
|
|
20963
20979
|
error(("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object was not a Lua table.")
|
|
20964
20980
|
end
|
|
20965
|
-
local x, y = table.unpack(
|
|
20966
|
-
|
|
20967
|
-
|
|
20968
|
-
|
|
20969
|
-
|
|
20970
|
-
|
|
20981
|
+
local x, y = table.unpack(
|
|
20982
|
+
getNumbersFromTable(
|
|
20983
|
+
nil,
|
|
20984
|
+
vector,
|
|
20985
|
+
OBJECT_NAME,
|
|
20986
|
+
table.unpack(KEYS)
|
|
20987
|
+
),
|
|
20988
|
+
1,
|
|
20989
|
+
2
|
|
20990
|
+
)
|
|
20971
20991
|
assertDefined(nil, x, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: X")
|
|
20972
20992
|
assertDefined(nil, y, ("Failed to deserialize a " .. OBJECT_NAME) .. " object since the provided object did not have a value for: Y")
|
|
20973
20993
|
return Vector(x, y)
|
|
@@ -21385,8 +21405,8 @@ __TS__ClassExtends(InputActionFilter, CustomCallback)
|
|
|
21385
21405
|
function InputActionFilter.prototype.____constructor(self)
|
|
21386
21406
|
CustomCallback.prototype.____constructor(self)
|
|
21387
21407
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
21388
|
-
local _entity, inputHook, buttonAction = table.unpack(fireArgs)
|
|
21389
|
-
local callbackInputHook, callbackButtonAction = table.unpack(optionalArgs)
|
|
21408
|
+
local _entity, inputHook, buttonAction = table.unpack(fireArgs, 1, 3)
|
|
21409
|
+
local callbackInputHook, callbackButtonAction = table.unpack(optionalArgs, 1, 2)
|
|
21390
21410
|
return (callbackInputHook == nil or callbackInputHook == inputHook) and (callbackButtonAction == nil or callbackButtonAction == buttonAction)
|
|
21391
21411
|
end
|
|
21392
21412
|
self.inputAction = function(____, entity, inputHook, buttonAction) return self:fire(entity, inputHook, buttonAction) end
|
|
@@ -21410,8 +21430,8 @@ __TS__ClassExtends(InputActionPlayer, CustomCallback)
|
|
|
21410
21430
|
function InputActionPlayer.prototype.____constructor(self)
|
|
21411
21431
|
CustomCallback.prototype.____constructor(self)
|
|
21412
21432
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
21413
|
-
local player, inputHook, buttonAction = table.unpack(fireArgs)
|
|
21414
|
-
local callbackPlayerVariant, callbackCharacter, callbackInputHook, callbackButtonAction = table.unpack(optionalArgs)
|
|
21433
|
+
local player, inputHook, buttonAction = table.unpack(fireArgs, 1, 3)
|
|
21434
|
+
local callbackPlayerVariant, callbackCharacter, callbackInputHook, callbackButtonAction = table.unpack(optionalArgs, 1, 4)
|
|
21415
21435
|
local character = player:GetPlayerType()
|
|
21416
21436
|
return (callbackPlayerVariant == nil or callbackPlayerVariant == player.Variant) and (callbackCharacter == nil or callbackCharacter == character) and (callbackInputHook == nil or callbackInputHook == inputHook) and (callbackButtonAction == nil or callbackButtonAction == buttonAction)
|
|
21417
21437
|
end
|
|
@@ -21757,8 +21777,8 @@ function PostCollectibleEmpty.prototype.____constructor(self)
|
|
|
21757
21777
|
CustomCallback.prototype.____constructor(self)
|
|
21758
21778
|
self.v = v
|
|
21759
21779
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
21760
|
-
local _collectible, oldCollectibleType = table.unpack(fireArgs)
|
|
21761
|
-
local callbackCollectibleType = table.unpack(optionalArgs)
|
|
21780
|
+
local _collectible, oldCollectibleType = table.unpack(fireArgs, 1, 2)
|
|
21781
|
+
local callbackCollectibleType = table.unpack(optionalArgs, 1, 1)
|
|
21762
21782
|
return callbackCollectibleType == nil or callbackCollectibleType == oldCollectibleType
|
|
21763
21783
|
end
|
|
21764
21784
|
self.postPickupUpdateCollectible = function(____, pickup)
|
|
@@ -23251,7 +23271,7 @@ function PostCursedTeleport.prototype.____constructor(self)
|
|
|
23251
23271
|
if trackingArray == nil then
|
|
23252
23272
|
return
|
|
23253
23273
|
end
|
|
23254
|
-
local lastDamageFrame, callbackActivatedOnThisFrame = table.unpack(trackingArray)
|
|
23274
|
+
local lastDamageFrame, callbackActivatedOnThisFrame = table.unpack(trackingArray, 1, 2)
|
|
23255
23275
|
if not self:playerIsTeleportingFromCursedTeleport(player, lastDamageFrame) then
|
|
23256
23276
|
return
|
|
23257
23277
|
end
|
|
@@ -23278,7 +23298,7 @@ function PostCursedTeleport.prototype.setDamageFrame(self, player, damageFlags)
|
|
|
23278
23298
|
local gameFrameCount = game:GetFrameCount()
|
|
23279
23299
|
local trackingArray = mapGetPlayer(nil, v.run.playersDamageFrameMap, player)
|
|
23280
23300
|
if trackingArray ~= nil then
|
|
23281
|
-
local lastDamageFrame, callbackFiredOnThisFrame = table.unpack(trackingArray)
|
|
23301
|
+
local lastDamageFrame, callbackFiredOnThisFrame = table.unpack(trackingArray, 1, 2)
|
|
23282
23302
|
if lastDamageFrame == gameFrameCount and callbackFiredOnThisFrame then
|
|
23283
23303
|
return
|
|
23284
23304
|
end
|
|
@@ -23330,8 +23350,8 @@ __TS__ClassExtends(PostCustomRevive, CustomCallback)
|
|
|
23330
23350
|
function PostCustomRevive.prototype.____constructor(self)
|
|
23331
23351
|
CustomCallback.prototype.____constructor(self)
|
|
23332
23352
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
23333
|
-
local _player, revivalType = table.unpack(fireArgs)
|
|
23334
|
-
local callbackRevivalType = table.unpack(optionalArgs)
|
|
23353
|
+
local _player, revivalType = table.unpack(fireArgs, 1, 2)
|
|
23354
|
+
local callbackRevivalType = table.unpack(optionalArgs, 1, 1)
|
|
23335
23355
|
return callbackRevivalType == nil or revivalType == callbackRevivalType
|
|
23336
23356
|
end
|
|
23337
23357
|
self.featuresUsed = {ISCFeature.CUSTOM_REVIVE}
|
|
@@ -23530,8 +23550,8 @@ function PostDiceRoomActivated.prototype.____constructor(self)
|
|
|
23530
23550
|
CustomCallback.prototype.____constructor(self)
|
|
23531
23551
|
self.v = v
|
|
23532
23552
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
23533
|
-
local _player, diceFloorSubType = table.unpack(fireArgs)
|
|
23534
|
-
local callbackDiceFloorSubType = table.unpack(optionalArgs)
|
|
23553
|
+
local _player, diceFloorSubType = table.unpack(fireArgs, 1, 2)
|
|
23554
|
+
local callbackDiceFloorSubType = table.unpack(optionalArgs, 1, 1)
|
|
23535
23555
|
return callbackDiceFloorSubType == nil or diceFloorSubType == callbackDiceFloorSubType
|
|
23536
23556
|
end
|
|
23537
23557
|
self.postEffectUpdateDiceFloor = function(____, effect)
|
|
@@ -24245,7 +24265,7 @@ function ____exports.getRoomShapeDoorSlot(self, roomShape, x, y)
|
|
|
24245
24265
|
if doorSlot == nil or not isEnumValue(nil, doorSlot, DoorSlot) then
|
|
24246
24266
|
goto __continue40
|
|
24247
24267
|
end
|
|
24248
|
-
local doorX, doorY = table.unpack(coordinates)
|
|
24268
|
+
local doorX, doorY = table.unpack(coordinates, 1, 2)
|
|
24249
24269
|
if x == doorX and y == doorY then
|
|
24250
24270
|
return doorSlot
|
|
24251
24271
|
end
|
|
@@ -25033,8 +25053,8 @@ __TS__ClassExtends(PostGridEntityCollision, CustomCallback)
|
|
|
25033
25053
|
function PostGridEntityCollision.prototype.____constructor(self)
|
|
25034
25054
|
CustomCallback.prototype.____constructor(self)
|
|
25035
25055
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
25036
|
-
local gridEntity, entity = table.unpack(fireArgs)
|
|
25037
|
-
local callbackGridEntityType, callbackGridEntityVariant, callbackEntityType, callbackEntityVariant, callbackEntitySubType = table.unpack(optionalArgs)
|
|
25056
|
+
local gridEntity, entity = table.unpack(fireArgs, 1, 2)
|
|
25057
|
+
local callbackGridEntityType, callbackGridEntityVariant, callbackEntityType, callbackEntityVariant, callbackEntitySubType = table.unpack(optionalArgs, 1, 5)
|
|
25038
25058
|
local gridEntityType = gridEntity:GetType()
|
|
25039
25059
|
local gridEntityVariant = gridEntity:GetVariant()
|
|
25040
25060
|
return (callbackGridEntityType == nil or callbackGridEntityType == gridEntityType) and (callbackGridEntityVariant == nil or callbackGridEntityVariant == gridEntityVariant) and (callbackEntityType == nil or callbackEntityType == entity.Type) and (callbackEntityVariant == nil or callbackEntityVariant == entity.Variant) and (callbackEntitySubType == nil or callbackEntitySubType == entity.SubType)
|
|
@@ -25081,8 +25101,8 @@ __TS__ClassExtends(PostGridEntityCustomCollision, CustomCallback)
|
|
|
25081
25101
|
function PostGridEntityCustomCollision.prototype.____constructor(self)
|
|
25082
25102
|
CustomCallback.prototype.____constructor(self)
|
|
25083
25103
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
25084
|
-
local _gridEntity, gridEntityTypeCustom, entity = table.unpack(fireArgs)
|
|
25085
|
-
local callbackGridEntityTypeCustom, callbackEntityType, callbackEntityVariant, callbackEntitySubType = table.unpack(optionalArgs)
|
|
25104
|
+
local _gridEntity, gridEntityTypeCustom, entity = table.unpack(fireArgs, 1, 3)
|
|
25105
|
+
local callbackGridEntityTypeCustom, callbackEntityType, callbackEntityVariant, callbackEntitySubType = table.unpack(optionalArgs, 1, 4)
|
|
25086
25106
|
return (callbackGridEntityTypeCustom == nil or callbackGridEntityTypeCustom == gridEntityTypeCustom) and (callbackEntityType == nil or callbackEntityType == entity.Type) and (callbackEntityVariant == nil or callbackEntityVariant == entity.Variant) and (callbackEntitySubType == nil or callbackEntitySubType == entity.SubType)
|
|
25087
25107
|
end
|
|
25088
25108
|
self.featuresUsed = {ISCFeature.GRID_ENTITY_COLLISION_DETECTION}
|
|
@@ -25127,8 +25147,8 @@ __TS__ClassExtends(PostGridEntityCustomRemove, CustomCallback)
|
|
|
25127
25147
|
function PostGridEntityCustomRemove.prototype.____constructor(self)
|
|
25128
25148
|
CustomCallback.prototype.____constructor(self)
|
|
25129
25149
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
25130
|
-
local _gridIndex, gridEntityTypeCustom = table.unpack(fireArgs)
|
|
25131
|
-
local callbackGridEntityTypeCustom = table.unpack(optionalArgs)
|
|
25150
|
+
local _gridIndex, gridEntityTypeCustom = table.unpack(fireArgs, 1, 2)
|
|
25151
|
+
local callbackGridEntityTypeCustom = table.unpack(optionalArgs, 1, 1)
|
|
25132
25152
|
return callbackGridEntityTypeCustom == nil or callbackGridEntityTypeCustom == gridEntityTypeCustom
|
|
25133
25153
|
end
|
|
25134
25154
|
self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
|
|
@@ -25239,8 +25259,8 @@ __TS__ClassExtends(PostGridEntityRemove, CustomCallback)
|
|
|
25239
25259
|
function PostGridEntityRemove.prototype.____constructor(self)
|
|
25240
25260
|
CustomCallback.prototype.____constructor(self)
|
|
25241
25261
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
25242
|
-
local _gridIndex, gridEntityType, variant = table.unpack(fireArgs)
|
|
25243
|
-
local callbackGridEntityType, callbackVariant = table.unpack(optionalArgs)
|
|
25262
|
+
local _gridIndex, gridEntityType, variant = table.unpack(fireArgs, 1, 3)
|
|
25263
|
+
local callbackGridEntityType, callbackVariant = table.unpack(optionalArgs, 1, 2)
|
|
25244
25264
|
return (callbackGridEntityType == nil or callbackGridEntityType == gridEntityType) and (callbackVariant == nil or callbackVariant == variant)
|
|
25245
25265
|
end
|
|
25246
25266
|
self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
|
|
@@ -27403,7 +27423,7 @@ function ____exports.getConstituentsFromEntityID(self, entityID)
|
|
|
27403
27423
|
if #parts ~= 3 then
|
|
27404
27424
|
error("Failed to get the constituents from entity ID: " .. entityID)
|
|
27405
27425
|
end
|
|
27406
|
-
local entityTypeString, variantString, subTypeString = table.unpack(parts)
|
|
27426
|
+
local entityTypeString, variantString, subTypeString = table.unpack(parts, 1, 3)
|
|
27407
27427
|
assertDefined(nil, entityTypeString, "Failed to get the first constituent from an entity ID: " .. entityID)
|
|
27408
27428
|
assertDefined(nil, variantString, "Failed to get the second constituent from an entity ID: " .. entityID)
|
|
27409
27429
|
assertDefined(nil, subTypeString, "Failed to get the third constituent from an entity ID: " .. entityID)
|
|
@@ -27620,7 +27640,7 @@ function ____exports.parseEntityID(self, entityID)
|
|
|
27620
27640
|
if #entityIDArray ~= 3 then
|
|
27621
27641
|
return nil
|
|
27622
27642
|
end
|
|
27623
|
-
local entityTypeString, variantString, subTypeString = table.unpack(entityIDArray)
|
|
27643
|
+
local entityTypeString, variantString, subTypeString = table.unpack(entityIDArray, 1, 3)
|
|
27624
27644
|
if entityTypeString == nil or variantString == nil or subTypeString == nil then
|
|
27625
27645
|
return nil
|
|
27626
27646
|
end
|
|
@@ -27643,7 +27663,7 @@ function ____exports.parseEntityTypeVariantString(self, entityTypeVariantString)
|
|
|
27643
27663
|
if #entityTypeVariantArray ~= 2 then
|
|
27644
27664
|
return nil
|
|
27645
27665
|
end
|
|
27646
|
-
local entityTypeString, variantString = table.unpack(entityTypeVariantArray)
|
|
27666
|
+
local entityTypeString, variantString = table.unpack(entityTypeVariantArray, 1, 2)
|
|
27647
27667
|
if entityTypeString == nil or variantString == nil then
|
|
27648
27668
|
return nil
|
|
27649
27669
|
end
|
|
@@ -27772,7 +27792,11 @@ function ____exports.spawnEntityID(self, entityID, positionOrGridIndex, velocity
|
|
|
27772
27792
|
if velocity == nil then
|
|
27773
27793
|
velocity = VectorZero
|
|
27774
27794
|
end
|
|
27775
|
-
local entityType, variant, subType = table.unpack(
|
|
27795
|
+
local entityType, variant, subType = table.unpack(
|
|
27796
|
+
____exports.getConstituentsFromEntityID(nil, entityID),
|
|
27797
|
+
1,
|
|
27798
|
+
3
|
|
27799
|
+
)
|
|
27776
27800
|
return ____exports.spawn(
|
|
27777
27801
|
nil,
|
|
27778
27802
|
entityType,
|
|
@@ -29766,8 +29790,8 @@ function PostItemDischarge.prototype.____constructor(self)
|
|
|
29766
29790
|
CustomCallback.prototype.____constructor(self)
|
|
29767
29791
|
self.v = v
|
|
29768
29792
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
29769
|
-
local _player, collectibleType = table.unpack(fireArgs)
|
|
29770
|
-
local callbackCollectibleType = table.unpack(optionalArgs)
|
|
29793
|
+
local _player, collectibleType = table.unpack(fireArgs, 1, 2)
|
|
29794
|
+
local callbackCollectibleType = table.unpack(optionalArgs, 1, 1)
|
|
29771
29795
|
return callbackCollectibleType == nil or callbackCollectibleType == collectibleType
|
|
29772
29796
|
end
|
|
29773
29797
|
self.preNPCCollisionSucker = function(____, npc, collider)
|
|
@@ -30136,7 +30160,7 @@ function ____exports.keyboardToString(self, keyboard, uppercase)
|
|
|
30136
30160
|
if tuple == nil then
|
|
30137
30161
|
return nil
|
|
30138
30162
|
end
|
|
30139
|
-
local lowercaseCharacter, uppercaseCharacter = table.unpack(tuple)
|
|
30163
|
+
local lowercaseCharacter, uppercaseCharacter = table.unpack(tuple, 1, 2)
|
|
30140
30164
|
return uppercase and uppercaseCharacter or lowercaseCharacter
|
|
30141
30165
|
end
|
|
30142
30166
|
return ____exports
|
|
@@ -30166,8 +30190,8 @@ function PostKeyboardChanged.prototype.____constructor(self)
|
|
|
30166
30190
|
CustomCallback.prototype.____constructor(self)
|
|
30167
30191
|
self.v = v
|
|
30168
30192
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
30169
|
-
local keyboard, pressed = table.unpack(fireArgs)
|
|
30170
|
-
local callbackKeyboard, callbackPressed = table.unpack(optionalArgs)
|
|
30193
|
+
local keyboard, pressed = table.unpack(fireArgs, 1, 2)
|
|
30194
|
+
local callbackKeyboard, callbackPressed = table.unpack(optionalArgs, 1, 2)
|
|
30171
30195
|
return (callbackKeyboard == nil or callbackKeyboard == keyboard) and (callbackPressed == nil or callbackPressed == pressed)
|
|
30172
30196
|
end
|
|
30173
30197
|
self.postRender = function()
|
|
@@ -33932,7 +33956,7 @@ function ____exports.getConstituentsFromGridEntityID(self, gridEntityID)
|
|
|
33932
33956
|
if #parts ~= 2 then
|
|
33933
33957
|
error("Failed to get the constituents from a grid entity ID: " .. gridEntityID)
|
|
33934
33958
|
end
|
|
33935
|
-
local gridEntityTypeString, variantString = table.unpack(parts)
|
|
33959
|
+
local gridEntityTypeString, variantString = table.unpack(parts, 1, 2)
|
|
33936
33960
|
assertDefined(nil, gridEntityTypeString, "Failed to get the first constituent from a grid entity ID: " .. gridEntityID)
|
|
33937
33961
|
assertDefined(nil, variantString, "Failed to get the second constituent from a grid entity ID: " .. gridEntityID)
|
|
33938
33962
|
local gridEntityType = parseIntSafe(nil, gridEntityTypeString)
|
|
@@ -34849,8 +34873,8 @@ __TS__ClassExtends(PostPickupSelectionFilter, CustomCallback)
|
|
|
34849
34873
|
function PostPickupSelectionFilter.prototype.____constructor(self)
|
|
34850
34874
|
CustomCallback.prototype.____constructor(self)
|
|
34851
34875
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
34852
|
-
local _pickup, pickupVariant, subType = table.unpack(fireArgs)
|
|
34853
|
-
local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
|
|
34876
|
+
local _pickup, pickupVariant, subType = table.unpack(fireArgs, 1, 3)
|
|
34877
|
+
local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs, 1, 2)
|
|
34854
34878
|
return (callbackPickupVariant == nil or callbackPickupVariant == pickupVariant) and (callbackPickupSubType == nil or callbackPickupSubType == subType)
|
|
34855
34879
|
end
|
|
34856
34880
|
self.postPickupSelection = function(____, pickup, variant, subType) return self:fire(pickup, variant, subType) end
|
|
@@ -37930,8 +37954,8 @@ function PostPurchase.prototype.____constructor(self)
|
|
|
37930
37954
|
CustomCallback.prototype.____constructor(self)
|
|
37931
37955
|
self.v = v
|
|
37932
37956
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
37933
|
-
local _player, pickup = table.unpack(fireArgs)
|
|
37934
|
-
local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
|
|
37957
|
+
local _player, pickup = table.unpack(fireArgs, 1, 2)
|
|
37958
|
+
local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs, 1, 2)
|
|
37935
37959
|
return (callbackPickupVariant == nil or callbackPickupVariant == pickup.Variant) and (callbackPickupSubType == nil or callbackPickupSubType == pickup.SubType)
|
|
37936
37960
|
end
|
|
37937
37961
|
self.postUseItem = function(____, _collectibleType, _rng, player)
|
|
@@ -38054,8 +38078,8 @@ function PostRoomClearChanged.prototype.____constructor(self)
|
|
|
38054
38078
|
CustomCallback.prototype.____constructor(self)
|
|
38055
38079
|
self.v = v
|
|
38056
38080
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
38057
|
-
local roomClear = table.unpack(fireArgs)
|
|
38058
|
-
local callbackRoomClear = table.unpack(optionalArgs)
|
|
38081
|
+
local roomClear = table.unpack(fireArgs, 1, 1)
|
|
38082
|
+
local callbackRoomClear = table.unpack(optionalArgs, 1, 1)
|
|
38059
38083
|
return callbackRoomClear == nil or callbackRoomClear == roomClear
|
|
38060
38084
|
end
|
|
38061
38085
|
self.postUpdate = function()
|
|
@@ -38605,8 +38629,8 @@ function PostTransformation.prototype.____constructor(self)
|
|
|
38605
38629
|
CustomCallback.prototype.____constructor(self)
|
|
38606
38630
|
self.v = v
|
|
38607
38631
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
38608
|
-
local _player, playerForm = table.unpack(fireArgs)
|
|
38609
|
-
local callbackPlayerForm = table.unpack(optionalArgs)
|
|
38632
|
+
local _player, playerForm = table.unpack(fireArgs, 1, 2)
|
|
38633
|
+
local callbackPlayerForm = table.unpack(optionalArgs, 1, 1)
|
|
38610
38634
|
return callbackPlayerForm == nil or callbackPlayerForm == playerForm
|
|
38611
38635
|
end
|
|
38612
38636
|
self.postPEffectUpdateReordered = function(____, player)
|
|
@@ -39497,8 +39521,8 @@ __TS__ClassExtends(PreEntitySpawnFilter, CustomCallback)
|
|
|
39497
39521
|
function PreEntitySpawnFilter.prototype.____constructor(self)
|
|
39498
39522
|
CustomCallback.prototype.____constructor(self)
|
|
39499
39523
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
39500
|
-
local entityType, variant, subType = table.unpack(fireArgs)
|
|
39501
|
-
local callbackEntityType, callbackVariant, callbackSubType = table.unpack(optionalArgs)
|
|
39524
|
+
local entityType, variant, subType = table.unpack(fireArgs, 1, 3)
|
|
39525
|
+
local callbackEntityType, callbackVariant, callbackSubType = table.unpack(optionalArgs, 1, 3)
|
|
39502
39526
|
return (callbackEntityType == nil or callbackEntityType == entityType) and (callbackVariant == nil or callbackVariant == variant) and (callbackSubType == nil or callbackSubType == subType)
|
|
39503
39527
|
end
|
|
39504
39528
|
self.preEntitySpawn = function(____, entityType, variant, subType, position, velocity, spawner, initSeed) return self:fire(
|
|
@@ -39758,8 +39782,8 @@ __TS__ClassExtends(PreRoomEntitySpawnFilter, CustomCallback)
|
|
|
39758
39782
|
function PreRoomEntitySpawnFilter.prototype.____constructor(self)
|
|
39759
39783
|
CustomCallback.prototype.____constructor(self)
|
|
39760
39784
|
self.shouldFire = function(____, fireArgs, optionalArgs)
|
|
39761
|
-
local entityTypeOrGridEntityXMLType, variant, subType = table.unpack(fireArgs)
|
|
39762
|
-
local callbackEntityTypeOrGridEntityXMLType, callbackVariant, callbackSubType = table.unpack(optionalArgs)
|
|
39785
|
+
local entityTypeOrGridEntityXMLType, variant, subType = table.unpack(fireArgs, 1, 3)
|
|
39786
|
+
local callbackEntityTypeOrGridEntityXMLType, callbackVariant, callbackSubType = table.unpack(optionalArgs, 1, 3)
|
|
39763
39787
|
return (callbackEntityTypeOrGridEntityXMLType == nil or callbackEntityTypeOrGridEntityXMLType == entityTypeOrGridEntityXMLType) and (callbackVariant == nil or callbackVariant == variant) and (callbackSubType == nil or callbackSubType == subType)
|
|
39764
39788
|
end
|
|
39765
39789
|
self.preRoomEntitySpawn = function(____, entityTypeOrGridEntityXMLType, variant, subType, gridIndex, initSeed) return self:fire(
|
|
@@ -41836,7 +41860,7 @@ function GridEntityUpdateDetection.prototype.checkGridEntitiesRemoved(self, grid
|
|
|
41836
41860
|
for ____, ____value in __TS__Iterator(v.room.initializedGridEntities) do
|
|
41837
41861
|
local gridIndex = ____value[1]
|
|
41838
41862
|
local gridEntityTuple = ____value[2]
|
|
41839
|
-
local storedGridEntityType, storedGridEntityVariant = table.unpack(gridEntityTuple)
|
|
41863
|
+
local storedGridEntityType, storedGridEntityVariant = table.unpack(gridEntityTuple, 1, 2)
|
|
41840
41864
|
local gridEntity = gridEntitiesMap:get(gridIndex)
|
|
41841
41865
|
if gridEntity == nil or gridEntity:GetType() ~= storedGridEntityType then
|
|
41842
41866
|
v.room.initializedGridEntities:delete(gridIndex)
|
|
@@ -41854,7 +41878,7 @@ function GridEntityUpdateDetection.prototype.checkGridEntityStateChanged(self, g
|
|
|
41854
41878
|
if gridEntityTuple == nil then
|
|
41855
41879
|
return
|
|
41856
41880
|
end
|
|
41857
|
-
local _gridEntityType, _gridEntityVariant, oldState = table.unpack(gridEntityTuple)
|
|
41881
|
+
local _gridEntityType, _gridEntityVariant, oldState = table.unpack(gridEntityTuple, 1, 3)
|
|
41858
41882
|
local newState = gridEntity.State
|
|
41859
41883
|
if oldState ~= newState then
|
|
41860
41884
|
self:updateTupleInMap(gridEntity)
|
|
@@ -47350,7 +47374,7 @@ function ____exports.getRandomIndexFromWeightedArray(self, weightedArray, seedOr
|
|
|
47350
47374
|
for ____, ____value in __TS__Iterator(__TS__ArrayEntries(weightedArray)) do
|
|
47351
47375
|
local i = ____value[1]
|
|
47352
47376
|
local tuple = ____value[2]
|
|
47353
|
-
local _element, weight = table.unpack(tuple)
|
|
47377
|
+
local _element, weight = table.unpack(tuple, 1, 2)
|
|
47354
47378
|
weightAccumulator = weightAccumulator + weight
|
|
47355
47379
|
if weightAccumulator >= randomWeight then
|
|
47356
47380
|
return i
|
|
@@ -50826,7 +50850,7 @@ ____exports.ENTITY_TYPE_VARIANT_TO_BOSS_ID_MAP = __TS__New(
|
|
|
50826
50850
|
bossIDRaw = ____bindingPattern0[1]
|
|
50827
50851
|
entityTypeVariant = ____bindingPattern0[2]
|
|
50828
50852
|
local bossID = bossIDRaw
|
|
50829
|
-
local entityType, variant = table.unpack(entityTypeVariant)
|
|
50853
|
+
local entityType, variant = table.unpack(entityTypeVariant, 1, 2)
|
|
50830
50854
|
local entityTypeVariantString = (tostring(entityType) .. ".") .. tostring(variant)
|
|
50831
50855
|
return {entityTypeVariantString, bossID}
|
|
50832
50856
|
end
|
|
@@ -54094,7 +54118,7 @@ function ____exports.getVanillaWallGridIndexSetForRoomShape(self, roomShape)
|
|
|
54094
54118
|
local ____cond5 = ____switch5 == RoomShape.LTL
|
|
54095
54119
|
if ____cond5 then
|
|
54096
54120
|
do
|
|
54097
|
-
local topMiddle, topRight, middleLeft, middle, bottomLeft, bottomRight = table.unpack(corners)
|
|
54121
|
+
local topMiddle, topRight, middleLeft, middle, bottomLeft, bottomRight = table.unpack(corners, 1, 6)
|
|
54098
54122
|
local ____ReadonlySet_1 = ReadonlySet
|
|
54099
54123
|
local ____array_0 = __TS__SparseArrayNew(table.unpack(getGridIndexesBetween(nil, topMiddle.gridIndex, topRight.gridIndex, roomShape)))
|
|
54100
54124
|
__TS__SparseArrayPush(
|
|
@@ -54126,7 +54150,7 @@ function ____exports.getVanillaWallGridIndexSetForRoomShape(self, roomShape)
|
|
|
54126
54150
|
____cond5 = ____cond5 or ____switch5 == RoomShape.LTR
|
|
54127
54151
|
if ____cond5 then
|
|
54128
54152
|
do
|
|
54129
|
-
local topLeft, topMiddle, middle, middleRight, bottomLeft, bottomRight = table.unpack(corners)
|
|
54153
|
+
local topLeft, topMiddle, middle, middleRight, bottomLeft, bottomRight = table.unpack(corners, 1, 6)
|
|
54130
54154
|
local ____ReadonlySet_3 = ReadonlySet
|
|
54131
54155
|
local ____array_2 = __TS__SparseArrayNew(table.unpack(getGridIndexesBetween(nil, topLeft.gridIndex, topMiddle.gridIndex, roomShape)))
|
|
54132
54156
|
__TS__SparseArrayPush(
|
|
@@ -54158,7 +54182,7 @@ function ____exports.getVanillaWallGridIndexSetForRoomShape(self, roomShape)
|
|
|
54158
54182
|
____cond5 = ____cond5 or ____switch5 == RoomShape.LBL
|
|
54159
54183
|
if ____cond5 then
|
|
54160
54184
|
do
|
|
54161
|
-
local topLeft, topRight, middleLeft, middle, bottomMiddle, bottomRight = table.unpack(corners)
|
|
54185
|
+
local topLeft, topRight, middleLeft, middle, bottomMiddle, bottomRight = table.unpack(corners, 1, 6)
|
|
54162
54186
|
local ____ReadonlySet_5 = ReadonlySet
|
|
54163
54187
|
local ____array_4 = __TS__SparseArrayNew(table.unpack(getGridIndexesBetween(nil, topLeft.gridIndex, topRight.gridIndex, roomShape)))
|
|
54164
54188
|
__TS__SparseArrayPush(
|
|
@@ -54190,7 +54214,7 @@ function ____exports.getVanillaWallGridIndexSetForRoomShape(self, roomShape)
|
|
|
54190
54214
|
____cond5 = ____cond5 or ____switch5 == RoomShape.LBR
|
|
54191
54215
|
if ____cond5 then
|
|
54192
54216
|
do
|
|
54193
|
-
local topLeft, topRight, middle, middleRight, bottomLeft, bottomMiddle = table.unpack(corners)
|
|
54217
|
+
local topLeft, topRight, middle, middleRight, bottomLeft, bottomMiddle = table.unpack(corners, 1, 6)
|
|
54194
54218
|
local ____ReadonlySet_7 = ReadonlySet
|
|
54195
54219
|
local ____array_6 = __TS__SparseArrayNew(table.unpack(getGridIndexesBetween(nil, topLeft.gridIndex, topRight.gridIndex, roomShape)))
|
|
54196
54220
|
__TS__SparseArrayPush(
|
|
@@ -54230,7 +54254,7 @@ function getVanillaWallGridIndexSetForRectangleRoomShape(self, roomShape, corner
|
|
|
54230
54254
|
if #corners ~= 4 then
|
|
54231
54255
|
error("Failed to get the correct amount of corners for rectangular room shape.")
|
|
54232
54256
|
end
|
|
54233
|
-
local topLeft, topRight, bottomLeft, bottomRight = table.unpack(corners)
|
|
54257
|
+
local topLeft, topRight, bottomLeft, bottomRight = table.unpack(corners, 1, 4)
|
|
54234
54258
|
local ____ReadonlySet_9 = ReadonlySet
|
|
54235
54259
|
local ____array_8 = __TS__SparseArrayNew(table.unpack(getGridIndexesBetween(nil, topLeft.gridIndex, topRight.gridIndex, roomShape)))
|
|
54236
54260
|
__TS__SparseArrayPush(
|
|
@@ -55100,7 +55124,7 @@ function spawnGridEntityForJSONRoom(self, gridEntityXMLType, gridEntityXMLVarian
|
|
|
55100
55124
|
if gridEntityTuple == nil then
|
|
55101
55125
|
return nil
|
|
55102
55126
|
end
|
|
55103
|
-
local gridEntityType, variant = table.unpack(gridEntityTuple)
|
|
55127
|
+
local gridEntityType, variant = table.unpack(gridEntityTuple, 1, 2)
|
|
55104
55128
|
local position = gridCoordinatesToWorldPosition(nil, x, y)
|
|
55105
55129
|
local gridIndex = room:GetGridIndex(position)
|
|
55106
55130
|
local gridEntity = spawnGridEntityWithVariant(nil, gridEntityType, variant, gridIndex)
|
|
@@ -60913,7 +60937,7 @@ function ____exports.spawnTrinketAt(self, params, golden)
|
|
|
60913
60937
|
print("You must specify the number corresponding to the trinket type and the number corresponding to the grid tile location.")
|
|
60914
60938
|
return
|
|
60915
60939
|
end
|
|
60916
|
-
local trinketTypeString, gridIndexString = table.unpack(args)
|
|
60940
|
+
local trinketTypeString, gridIndexString = table.unpack(args, 1, 2)
|
|
60917
60941
|
if trinketTypeString == nil or gridIndexString == nil then
|
|
60918
60942
|
return
|
|
60919
60943
|
end
|
|
@@ -60950,7 +60974,7 @@ function ____exports.addCharges(self, params)
|
|
|
60950
60974
|
print("Invalid amount of arguments: " .. tostring(#args))
|
|
60951
60975
|
return
|
|
60952
60976
|
end
|
|
60953
|
-
local activeSlotString, numChargeString = table.unpack(args)
|
|
60977
|
+
local activeSlotString, numChargeString = table.unpack(args, 1, 2)
|
|
60954
60978
|
if activeSlotString == nil then
|
|
60955
60979
|
return
|
|
60956
60980
|
end
|
|
@@ -61741,7 +61765,7 @@ function ____exports.setCharges(self, params)
|
|
|
61741
61765
|
print("Invalid amount of arguments: " .. tostring(#args))
|
|
61742
61766
|
return
|
|
61743
61767
|
end
|
|
61744
|
-
local activeSlotString, chargeString = table.unpack(args)
|
|
61768
|
+
local activeSlotString, chargeString = table.unpack(args, 1, 2)
|
|
61745
61769
|
if activeSlotString == nil or chargeString == nil then
|
|
61746
61770
|
return
|
|
61747
61771
|
end
|
|
@@ -61776,7 +61800,7 @@ function ____exports.setPosition(self, params)
|
|
|
61776
61800
|
print("You must specify a position. (e.g. \"setPosition 100 50\")")
|
|
61777
61801
|
return
|
|
61778
61802
|
end
|
|
61779
|
-
local xString, yString = table.unpack(args)
|
|
61803
|
+
local xString, yString = table.unpack(args, 1, 2)
|
|
61780
61804
|
if xString == nil or yString == nil then
|
|
61781
61805
|
return
|
|
61782
61806
|
end
|
|
@@ -61855,7 +61879,7 @@ function ____exports.spawnCollectibleAt(self, params)
|
|
|
61855
61879
|
print("You must specify the number corresponding to the collectible type and the number corresponding to the grid tile location.")
|
|
61856
61880
|
return
|
|
61857
61881
|
end
|
|
61858
|
-
local collectibleTypeString, gridIndexString = table.unpack(args)
|
|
61882
|
+
local collectibleTypeString, gridIndexString = table.unpack(args, 1, 2)
|
|
61859
61883
|
if collectibleTypeString == nil or gridIndexString == nil then
|
|
61860
61884
|
return
|
|
61861
61885
|
end
|
|
@@ -62127,7 +62151,7 @@ function ExtraConsoleCommands.prototype.____constructor(self)
|
|
|
62127
62151
|
if resultTuple == nil then
|
|
62128
62152
|
return
|
|
62129
62153
|
end
|
|
62130
|
-
local commandName, commandFunction = table.unpack(resultTuple)
|
|
62154
|
+
local commandName, commandFunction = table.unpack(resultTuple, 1, 2)
|
|
62131
62155
|
print("Command: " .. commandName)
|
|
62132
62156
|
commandFunction(nil, params)
|
|
62133
62157
|
end
|
|
@@ -62626,7 +62650,7 @@ function NoSirenSteal.prototype.checkReturnFamiliarToPlayer(self, npc)
|
|
|
62626
62650
|
end
|
|
62627
62651
|
function NoSirenSteal.prototype.blacklistEntryExists(self, incomingFamiliarVariant, incomingFamiliarSubType)
|
|
62628
62652
|
for ____, familiarTuple in ipairs(v.run.familiarBlacklist) do
|
|
62629
|
-
local familiarVariant, familiarSubType = table.unpack(familiarTuple)
|
|
62653
|
+
local familiarVariant, familiarSubType = table.unpack(familiarTuple, 1, 2)
|
|
62630
62654
|
if familiarVariant == incomingFamiliarVariant and familiarSubType == incomingFamiliarSubType then
|
|
62631
62655
|
return true
|
|
62632
62656
|
end
|
|
@@ -62774,7 +62798,7 @@ function PersistentEntities.prototype.removePersistentEntity(self, persistentEnt
|
|
|
62774
62798
|
local ptrHash = ____value[1]
|
|
62775
62799
|
local tuple = ____value[2]
|
|
62776
62800
|
do
|
|
62777
|
-
local index, entityPtr = table.unpack(tuple)
|
|
62801
|
+
local index, entityPtr = table.unpack(tuple, 1, 2)
|
|
62778
62802
|
if index ~= persistentEntityIndex then
|
|
62779
62803
|
goto __continue16
|
|
62780
62804
|
end
|
|
@@ -64150,7 +64174,7 @@ function ModUpgraded.prototype.initFeature(self, feature)
|
|
|
64150
64174
|
end
|
|
64151
64175
|
if feature.callbacksUsed ~= nil then
|
|
64152
64176
|
for ____, callbackTuple in ipairs(feature.callbacksUsed) do
|
|
64153
|
-
local modCallback, callbackFunc, optionalArgs = table.unpack(callbackTuple)
|
|
64177
|
+
local modCallback, callbackFunc, optionalArgs = table.unpack(callbackTuple, 1, 3)
|
|
64154
64178
|
self:AddPriorityCallback(
|
|
64155
64179
|
modCallback,
|
|
64156
64180
|
CallbackPriority.IMPORTANT,
|
|
@@ -64161,7 +64185,7 @@ function ModUpgraded.prototype.initFeature(self, feature)
|
|
|
64161
64185
|
end
|
|
64162
64186
|
if feature.customCallbacksUsed ~= nil then
|
|
64163
64187
|
for ____, callbackTuple in ipairs(feature.customCallbacksUsed) do
|
|
64164
|
-
local modCallback, callbackFunc, optionalArgs = table.unpack(callbackTuple)
|
|
64188
|
+
local modCallback, callbackFunc, optionalArgs = table.unpack(callbackTuple, 1, 3)
|
|
64165
64189
|
self:AddPriorityCallbackCustom(
|
|
64166
64190
|
modCallback,
|
|
64167
64191
|
CallbackPriority.IMPORTANT,
|
|
@@ -64199,13 +64223,13 @@ function ModUpgraded.prototype.uninitFeature(self, feature)
|
|
|
64199
64223
|
end
|
|
64200
64224
|
if feature.callbacksUsed ~= nil then
|
|
64201
64225
|
for ____, callbackTuple in ipairs(feature.callbacksUsed) do
|
|
64202
|
-
local modCallback, callbackFunc = table.unpack(callbackTuple)
|
|
64226
|
+
local modCallback, callbackFunc = table.unpack(callbackTuple, 1, 2)
|
|
64203
64227
|
self:RemoveCallback(modCallback, callbackFunc)
|
|
64204
64228
|
end
|
|
64205
64229
|
end
|
|
64206
64230
|
if feature.customCallbacksUsed ~= nil then
|
|
64207
64231
|
for ____, callbackTuple in ipairs(feature.customCallbacksUsed) do
|
|
64208
|
-
local modCallback, callbackFunc = table.unpack(callbackTuple)
|
|
64232
|
+
local modCallback, callbackFunc = table.unpack(callbackTuple, 1, 2)
|
|
64209
64233
|
self:RemoveCallbackCustom(modCallback, callbackFunc)
|
|
64210
64234
|
end
|
|
64211
64235
|
end
|
|
@@ -65538,7 +65562,7 @@ function ____exports.logNewGlobals(self)
|
|
|
65538
65562
|
for ____, ____value in __TS__Iterator(__TS__ArrayEntries(newGlobals)) do
|
|
65539
65563
|
local i = ____value[1]
|
|
65540
65564
|
local tuple = ____value[2]
|
|
65541
|
-
local key, value = table.unpack(tuple)
|
|
65565
|
+
local key, value = table.unpack(tuple, 1, 2)
|
|
65542
65566
|
log((((tostring(i + 1) .. ") ") .. tostring(key)) .. " - ") .. tostring(value))
|
|
65543
65567
|
end
|
|
65544
65568
|
end
|