isaacscript-common 26.1.0 → 26.1.2
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/index.rollup.d.ts +14 -10
- package/dist/isaacscript-common.lua +62 -64
- package/dist/src/classes/callbacks/PostCursedTeleport.d.ts +2 -1
- package/dist/src/classes/callbacks/PostCursedTeleport.d.ts.map +1 -1
- package/dist/src/classes/callbacks/PostCursedTeleport.lua +26 -29
- package/dist/src/classes/callbacks/PostNewRoomEarly.d.ts.map +1 -1
- package/dist/src/classes/callbacks/PreNewLevel.d.ts +1 -1
- package/dist/src/classes/callbacks/PreNewLevel.d.ts.map +1 -1
- package/dist/src/classes/callbacks/PreNewLevel.lua +4 -4
- package/dist/src/classes/features/callbackLogic/GameReorderedCallbacks.d.ts.map +1 -1
- package/dist/src/classes/features/callbackLogic/PlayerReorderedCallbacks.d.ts +9 -3
- package/dist/src/classes/features/callbackLogic/PlayerReorderedCallbacks.d.ts.map +1 -1
- package/dist/src/classes/features/callbackLogic/PlayerReorderedCallbacks.lua +13 -9
- package/dist/src/classes/features/other/CustomItemPools.d.ts +1 -2
- package/dist/src/classes/features/other/CustomItemPools.d.ts.map +1 -1
- package/dist/src/classes/features/other/CustomItemPools.lua +6 -9
- package/dist/src/classes/features/other/FadeInRemover.d.ts +1 -1
- package/dist/src/classes/features/other/FadeInRemover.d.ts.map +1 -1
- package/dist/src/classes/features/other/FadeInRemover.lua +6 -6
- package/dist/src/classes/features/other/SaveDataManager.d.ts.map +1 -1
- package/dist/src/classes/features/other/debugDisplay/DebugDisplayPlayer.d.ts +1 -1
- package/dist/src/classes/features/other/debugDisplay/DebugDisplayPlayer.d.ts.map +1 -1
- package/dist/src/classes/features/other/debugDisplay/DebugDisplayPlayer.lua +4 -4
- package/dist/src/classes/features/other/extraConsoleCommands/commands.lua +2 -2
- package/dist/src/enums/ModCallbackCustom.d.ts +1 -1
- package/dist/src/functions/utils.d.ts +1 -1
- package/dist/src/functions/utils.lua +1 -1
- package/dist/src/interfaces/private/AddCallbackParametersCustom.d.ts +1 -1
- package/dist/src/interfaces/private/AddCallbackParametersCustom.d.ts.map +1 -1
- package/dist/src/shouldFire.d.ts +1 -1
- package/dist/src/shouldFire.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/classes/callbacks/PostCursedTeleport.ts +59 -65
- package/src/classes/callbacks/PostNewRoomEarly.ts +1 -0
- package/src/classes/callbacks/PreNewLevel.ts +7 -6
- package/src/classes/features/callbackLogic/GameReorderedCallbacks.ts +3 -0
- package/src/classes/features/callbackLogic/PlayerReorderedCallbacks.ts +29 -13
- package/src/classes/features/other/CustomItemPools.ts +12 -14
- package/src/classes/features/other/FadeInRemover.ts +11 -8
- package/src/classes/features/other/SaveDataManager.ts +2 -0
- package/src/classes/features/other/debugDisplay/DebugDisplayPlayer.ts +8 -6
- package/src/classes/features/other/extraConsoleCommands/commands.ts +2 -2
- package/src/enums/ModCallbackCustom.ts +1 -1
- package/src/functions/sort.ts +2 -2
- package/src/functions/stage.ts +1 -1
- package/src/functions/utils.ts +1 -1
- package/src/interfaces/private/AddCallbackParametersCustom.ts +1 -1
- package/src/shouldFire.ts +1 -0
package/dist/index.rollup.d.ts
CHANGED
|
@@ -432,7 +432,7 @@ declare interface AddCallbackParametersCustom {
|
|
|
432
432
|
character?: PlayerType
|
|
433
433
|
];
|
|
434
434
|
[ModCallbackCustom.POST_PLAYER_RENDER_REORDERED]: [
|
|
435
|
-
callback: (player: EntityPlayer) => void,
|
|
435
|
+
callback: (player: EntityPlayer, renderOffset: Vector) => void,
|
|
436
436
|
playerVariant?: PlayerVariant,
|
|
437
437
|
character?: PlayerType
|
|
438
438
|
];
|
|
@@ -1788,8 +1788,7 @@ declare class CustomHotkeys extends Feature {
|
|
|
1788
1788
|
}
|
|
1789
1789
|
|
|
1790
1790
|
declare class CustomItemPools extends Feature {
|
|
1791
|
-
private
|
|
1792
|
-
private postGameStartedReordered;
|
|
1791
|
+
private postGameStartedReorderedFalse;
|
|
1793
1792
|
/**
|
|
1794
1793
|
* Helper function to register a custom item pool. Use this function once when your mod first
|
|
1795
1794
|
* loads to declare the items that you want to be in the item pools. Then, in the middle of a run,
|
|
@@ -3795,7 +3794,7 @@ export declare type FactoryFunction<V, Args extends unknown[]> = (...args: Args)
|
|
|
3795
3794
|
|
|
3796
3795
|
declare class FadeInRemover extends Feature {
|
|
3797
3796
|
private enabled;
|
|
3798
|
-
private
|
|
3797
|
+
private postGameStartedReordered;
|
|
3799
3798
|
/**
|
|
3800
3799
|
* Removes the fade-in that occurs at the beginning of a run. If this behavior is desired, call
|
|
3801
3800
|
* this function once at the beginning of your mod.
|
|
@@ -8062,7 +8061,7 @@ export declare function isReflectionRender(): boolean;
|
|
|
8062
8061
|
/**
|
|
8063
8062
|
* Helper function to check if the player is using Afterbirth+ or Repentance.
|
|
8064
8063
|
*
|
|
8065
|
-
* This function should always be used over the `REPENTANCE` constant, since
|
|
8064
|
+
* This function should always be used over the `REPENTANCE` constant, since the latter is not safe.
|
|
8066
8065
|
*
|
|
8067
8066
|
* Specifically, this function checks for the `Sprite.GetAnimation` method:
|
|
8068
8067
|
* https://bindingofisaacrebirth.fandom.com/wiki/V1.06.J818#Lua_Changes
|
|
@@ -10367,7 +10366,7 @@ export declare enum ModCallbackCustom {
|
|
|
10367
10366
|
* matches the `PlayerType` provided.
|
|
10368
10367
|
*
|
|
10369
10368
|
* ```ts
|
|
10370
|
-
* function postPlayerRenderReordered(player: EntityPlayer): void {}
|
|
10369
|
+
* function postPlayerRenderReordered(player: EntityPlayer, renderOffset: Vector): void {}
|
|
10371
10370
|
* ```
|
|
10372
10371
|
*/
|
|
10373
10372
|
POST_PLAYER_RENDER_REORDERED = 76,
|
|
@@ -12470,9 +12469,9 @@ declare class PlayerReorderedCallbacks extends Feature {
|
|
|
12470
12469
|
v: {
|
|
12471
12470
|
run: {
|
|
12472
12471
|
postGameStartedFiredOnThisRun: boolean;
|
|
12473
|
-
postPEffectUpdateQueue:
|
|
12474
|
-
postPlayerUpdateQueue:
|
|
12475
|
-
postPlayerRenderQueue:
|
|
12472
|
+
postPEffectUpdateQueue: QueueElement[];
|
|
12473
|
+
postPlayerUpdateQueue: QueueElement[];
|
|
12474
|
+
postPlayerRenderQueue: QueueElement[];
|
|
12476
12475
|
};
|
|
12477
12476
|
};
|
|
12478
12477
|
private postPEffectUpdateReordered;
|
|
@@ -12791,6 +12790,11 @@ export declare function PriorityCallbackCustom<T extends ModCallbackCustom>(modC
|
|
|
12791
12790
|
/** Helper type to extract only the public interface of a class. */
|
|
12792
12791
|
export declare type PublicInterface<T> = Pick<T, keyof T>;
|
|
12793
12792
|
|
|
12793
|
+
declare interface QueueElement {
|
|
12794
|
+
playerIndex: PlayerIndex;
|
|
12795
|
+
renderOffset: Vector;
|
|
12796
|
+
}
|
|
12797
|
+
|
|
12794
12798
|
/** An alias for the `Map` constructor that returns a read-only map. */
|
|
12795
12799
|
declare const ReadonlyMap_2: ReadonlyMapConstructor;
|
|
12796
12800
|
export { ReadonlyMap_2 as ReadonlyMap }
|
|
@@ -14537,7 +14541,7 @@ newVariant: PickupVariant,
|
|
|
14537
14541
|
newSubType: int
|
|
14538
14542
|
], optionalArgs: [pickupVariant?: PickupVariant, subType?: int]): boolean;
|
|
14539
14543
|
|
|
14540
|
-
declare function shouldFirePlayer(fireArgs: [player: EntityPlayer] | [player: EntityPlayer, numSacrifices: int] | [player: EntityPlayer, collectible: EntityPickupCollectible] | [player: EntityPlayer, oldCharacter: PlayerType, newCharacter: PlayerType] | [
|
|
14544
|
+
declare function shouldFirePlayer(fireArgs: [player: EntityPlayer] | [player: EntityPlayer, renderOffset: Vector] | [player: EntityPlayer, numSacrifices: int] | [player: EntityPlayer, collectible: EntityPickupCollectible] | [player: EntityPlayer, oldCharacter: PlayerType, newCharacter: PlayerType] | [
|
|
14541
14545
|
player: EntityPlayer,
|
|
14542
14546
|
healthType: HealthType,
|
|
14543
14547
|
difference: int,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
--[[
|
|
2
2
|
|
|
3
|
-
isaacscript-common 26.1.
|
|
3
|
+
isaacscript-common 26.1.2
|
|
4
4
|
|
|
5
5
|
This is the "isaacscript-common" library, which was created with the IsaacScript tool.
|
|
6
6
|
|
|
@@ -22641,11 +22641,9 @@ local __TS__New = ____lualib.__TS__New
|
|
|
22641
22641
|
local __TS__Class = ____lualib.__TS__Class
|
|
22642
22642
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
22643
22643
|
local ____exports = {}
|
|
22644
|
-
local playerIsTeleportingFromCursedTeleport
|
|
22645
22644
|
local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
|
|
22646
22645
|
local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
|
|
22647
22646
|
local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
|
|
22648
|
-
local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
|
|
22649
22647
|
local PlayerVariant = ____isaac_2Dtypescript_2Ddefinitions.PlayerVariant
|
|
22650
22648
|
local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
|
|
22651
22649
|
local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
|
|
@@ -22664,24 +22662,6 @@ local ____shouldFire = require("src.shouldFire")
|
|
|
22664
22662
|
local shouldFirePlayer = ____shouldFire.shouldFirePlayer
|
|
22665
22663
|
local ____CustomCallback = require("src.classes.private.CustomCallback")
|
|
22666
22664
|
local CustomCallback = ____CustomCallback.CustomCallback
|
|
22667
|
-
function playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
|
|
22668
|
-
local gameFrameCount = game:GetFrameCount()
|
|
22669
|
-
if gameFrameCount ~= lastDamageFrame then
|
|
22670
|
-
return false
|
|
22671
|
-
end
|
|
22672
|
-
local sprite = player:GetSprite()
|
|
22673
|
-
if not sprite:IsPlaying("TeleportUp") or sprite:GetFrame() ~= 1 then
|
|
22674
|
-
return false
|
|
22675
|
-
end
|
|
22676
|
-
if player:HasCollectible(CollectibleType.CURSED_EYE) then
|
|
22677
|
-
return true
|
|
22678
|
-
end
|
|
22679
|
-
local numHitsRemaining = getPlayerNumHitsRemaining(nil, player)
|
|
22680
|
-
if player:HasTrinket(TrinketType.CURSED_SKULL) and numHitsRemaining == 1 then
|
|
22681
|
-
return true
|
|
22682
|
-
end
|
|
22683
|
-
return false
|
|
22684
|
-
end
|
|
22685
22665
|
local v = {
|
|
22686
22666
|
run = {playersDamageFrameMap = __TS__New(Map)},
|
|
22687
22667
|
level = {numSacrifices = 0}
|
|
@@ -22694,13 +22674,18 @@ function PostCursedTeleport.prototype.____constructor(self)
|
|
|
22694
22674
|
CustomCallback.prototype.____constructor(self)
|
|
22695
22675
|
self.v = v
|
|
22696
22676
|
self.shouldFire = shouldFirePlayer
|
|
22697
|
-
self.
|
|
22677
|
+
self.entityTakeDmgPlayer = function(____, player, _amount, damageFlags, _source, _countdownFrames)
|
|
22678
|
+
self:incrementNumSacrifices(damageFlags)
|
|
22679
|
+
self:setDamageFrame(player, damageFlags)
|
|
22680
|
+
return nil
|
|
22681
|
+
end
|
|
22682
|
+
self.postPlayerRenderReorderedPlayer = function(____, player, _renderOffset)
|
|
22698
22683
|
local trackingArray = mapGetPlayer(nil, v.run.playersDamageFrameMap, player)
|
|
22699
22684
|
if trackingArray == nil then
|
|
22700
22685
|
return
|
|
22701
22686
|
end
|
|
22702
22687
|
local lastDamageFrame, callbackActivatedOnThisFrame = table.unpack(trackingArray)
|
|
22703
|
-
if not playerIsTeleportingFromCursedTeleport(
|
|
22688
|
+
if not self:playerIsTeleportingFromCursedTeleport(player, lastDamageFrame) then
|
|
22704
22689
|
return
|
|
22705
22690
|
end
|
|
22706
22691
|
if callbackActivatedOnThisFrame then
|
|
@@ -22711,13 +22696,7 @@ function PostCursedTeleport.prototype.____constructor(self)
|
|
|
22711
22696
|
mapSetPlayer(nil, v.run.playersDamageFrameMap, player, newTrackingArray)
|
|
22712
22697
|
self:fire(player)
|
|
22713
22698
|
end
|
|
22714
|
-
self.
|
|
22715
|
-
self:incrementNumSacrifices(damageFlags)
|
|
22716
|
-
self:setDamageFrame(player, damageFlags)
|
|
22717
|
-
return nil
|
|
22718
|
-
end
|
|
22719
|
-
self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, self.postPlayerRenderPlayer, {PlayerVariant.PLAYER}}}
|
|
22720
|
-
self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}}
|
|
22699
|
+
self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}, {ModCallbackCustom.POST_PLAYER_RENDER_REORDERED, self.postPlayerRenderReorderedPlayer, {PlayerVariant.PLAYER}}}
|
|
22721
22700
|
end
|
|
22722
22701
|
function PostCursedTeleport.prototype.incrementNumSacrifices(self, damageFlags)
|
|
22723
22702
|
local room = game:GetRoom()
|
|
@@ -22749,6 +22728,24 @@ function PostCursedTeleport.prototype.isPotentialNaturalTeleportFromSacrificeRoo
|
|
|
22749
22728
|
local isSpikeDamage = hasFlag(nil, damageFlags, DamageFlag.SPIKES)
|
|
22750
22729
|
return roomType == RoomType.SACRIFICE and isSpikeDamage and (v.level.numSacrifices == 6 or v.level.numSacrifices >= 12)
|
|
22751
22730
|
end
|
|
22731
|
+
function PostCursedTeleport.prototype.playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
|
|
22732
|
+
local gameFrameCount = game:GetFrameCount()
|
|
22733
|
+
if gameFrameCount ~= lastDamageFrame then
|
|
22734
|
+
return false
|
|
22735
|
+
end
|
|
22736
|
+
local sprite = player:GetSprite()
|
|
22737
|
+
if not sprite:IsPlaying("TeleportUp") or sprite:GetFrame() ~= 1 then
|
|
22738
|
+
return false
|
|
22739
|
+
end
|
|
22740
|
+
if player:HasCollectible(CollectibleType.CURSED_EYE) then
|
|
22741
|
+
return true
|
|
22742
|
+
end
|
|
22743
|
+
local numHitsRemaining = getPlayerNumHitsRemaining(nil, player)
|
|
22744
|
+
if player:HasTrinket(TrinketType.CURSED_SKULL) and numHitsRemaining == 1 then
|
|
22745
|
+
return true
|
|
22746
|
+
end
|
|
22747
|
+
return false
|
|
22748
|
+
end
|
|
22752
22749
|
return ____exports
|
|
22753
22750
|
end,
|
|
22754
22751
|
["src.classes.callbacks.PostCustomRevive"] = function(...)
|
|
@@ -31464,8 +31461,8 @@ local __TS__New = ____lualib.__TS__New
|
|
|
31464
31461
|
local __TS__Class = ____lualib.__TS__Class
|
|
31465
31462
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
31466
31463
|
local ____exports = {}
|
|
31467
|
-
local
|
|
31468
|
-
local
|
|
31464
|
+
local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
|
|
31465
|
+
local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
|
|
31469
31466
|
local ____sprites = require("src.functions.sprites")
|
|
31470
31467
|
local getLastFrameOfAnimation = ____sprites.getLastFrameOfAnimation
|
|
31471
31468
|
local ____stage = require("src.functions.stage")
|
|
@@ -31483,7 +31480,7 @@ __TS__ClassExtends(PreNewLevel, CustomCallback)
|
|
|
31483
31480
|
function PreNewLevel.prototype.____constructor(self)
|
|
31484
31481
|
CustomCallback.prototype.____constructor(self)
|
|
31485
31482
|
self.v = v
|
|
31486
|
-
self.
|
|
31483
|
+
self.postPlayerRenderReordered = function(____, player)
|
|
31487
31484
|
local effectiveStage = getEffectiveStage(nil)
|
|
31488
31485
|
if effectiveStage == v.run.firedOnStage then
|
|
31489
31486
|
return
|
|
@@ -31500,7 +31497,7 @@ function PreNewLevel.prototype.____constructor(self)
|
|
|
31500
31497
|
self:fire(player)
|
|
31501
31498
|
end
|
|
31502
31499
|
end
|
|
31503
|
-
self.
|
|
31500
|
+
self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_RENDER_REORDERED, self.postPlayerRenderReordered}}
|
|
31504
31501
|
end
|
|
31505
31502
|
return ____exports
|
|
31506
31503
|
end,
|
|
@@ -36989,6 +36986,8 @@ local ____exports = {}
|
|
|
36989
36986
|
local dequeue
|
|
36990
36987
|
local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
|
|
36991
36988
|
local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
|
|
36989
|
+
local ____constants = require("src.core.constants")
|
|
36990
|
+
local VectorZero = ____constants.VectorZero
|
|
36992
36991
|
local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
|
|
36993
36992
|
local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
|
|
36994
36993
|
local ____array = require("src.functions.array")
|
|
@@ -36998,14 +36997,16 @@ local getPlayerFromIndex = ____playerIndex.getPlayerFromIndex
|
|
|
36998
36997
|
local getPlayerIndex = ____playerIndex.getPlayerIndex
|
|
36999
36998
|
local ____Feature = require("src.classes.private.Feature")
|
|
37000
36999
|
local Feature = ____Feature.Feature
|
|
37001
|
-
function dequeue(self,
|
|
37002
|
-
for ____,
|
|
37000
|
+
function dequeue(self, queue, fireFunc)
|
|
37001
|
+
for ____, element in ipairs(queue) do
|
|
37002
|
+
local playerIndex = element.playerIndex
|
|
37003
|
+
local renderOffset = element.renderOffset
|
|
37003
37004
|
local player = getPlayerFromIndex(nil, playerIndex)
|
|
37004
37005
|
if player ~= nil then
|
|
37005
|
-
fireFunc(nil, player)
|
|
37006
|
+
fireFunc(nil, player, renderOffset)
|
|
37006
37007
|
end
|
|
37007
37008
|
end
|
|
37008
|
-
emptyArray(nil,
|
|
37009
|
+
emptyArray(nil, queue)
|
|
37009
37010
|
end
|
|
37010
37011
|
local v = {run = {postGameStartedFiredOnThisRun = false, postPEffectUpdateQueue = {}, postPlayerUpdateQueue = {}, postPlayerRenderQueue = {}}}
|
|
37011
37012
|
____exports.PlayerReorderedCallbacks = __TS__Class()
|
|
@@ -37021,7 +37022,7 @@ function PlayerReorderedCallbacks.prototype.____constructor(self, postPEffectUpd
|
|
|
37021
37022
|
else
|
|
37022
37023
|
local playerIndex = getPlayerIndex(nil, player)
|
|
37023
37024
|
local ____v_run_postPEffectUpdateQueue_0 = v.run.postPEffectUpdateQueue
|
|
37024
|
-
____v_run_postPEffectUpdateQueue_0[#____v_run_postPEffectUpdateQueue_0 + 1] = playerIndex
|
|
37025
|
+
____v_run_postPEffectUpdateQueue_0[#____v_run_postPEffectUpdateQueue_0 + 1] = {playerIndex = playerIndex, renderOffset = VectorZero}
|
|
37025
37026
|
end
|
|
37026
37027
|
end
|
|
37027
37028
|
self.postPlayerUpdate = function(____, player)
|
|
@@ -37030,16 +37031,16 @@ function PlayerReorderedCallbacks.prototype.____constructor(self, postPEffectUpd
|
|
|
37030
37031
|
else
|
|
37031
37032
|
local playerIndex = getPlayerIndex(nil, player)
|
|
37032
37033
|
local ____v_run_postPlayerUpdateQueue_1 = v.run.postPlayerUpdateQueue
|
|
37033
|
-
____v_run_postPlayerUpdateQueue_1[#____v_run_postPlayerUpdateQueue_1 + 1] = playerIndex
|
|
37034
|
+
____v_run_postPlayerUpdateQueue_1[#____v_run_postPlayerUpdateQueue_1 + 1] = {playerIndex = playerIndex, renderOffset = VectorZero}
|
|
37034
37035
|
end
|
|
37035
37036
|
end
|
|
37036
|
-
self.postPlayerRender = function(____, player,
|
|
37037
|
+
self.postPlayerRender = function(____, player, renderOffset)
|
|
37037
37038
|
if v.run.postGameStartedFiredOnThisRun then
|
|
37038
|
-
self.postPlayerRenderReordered:fire(player)
|
|
37039
|
+
self.postPlayerRenderReordered:fire(player, renderOffset)
|
|
37039
37040
|
else
|
|
37040
37041
|
local playerIndex = getPlayerIndex(nil, player)
|
|
37041
37042
|
local ____v_run_postPlayerRenderQueue_2 = v.run.postPlayerRenderQueue
|
|
37042
|
-
____v_run_postPlayerRenderQueue_2[#____v_run_postPlayerRenderQueue_2 + 1] = playerIndex
|
|
37043
|
+
____v_run_postPlayerRenderQueue_2[#____v_run_postPlayerRenderQueue_2 + 1] = {playerIndex = playerIndex, renderOffset = renderOffset}
|
|
37043
37044
|
end
|
|
37044
37045
|
end
|
|
37045
37046
|
self.postGameStartedReorderedLast = function()
|
|
@@ -38348,6 +38349,7 @@ local getRandomIndexFromWeightedArray = ____weighted.getRandomIndexFromWeightedA
|
|
|
38348
38349
|
local ____Feature = require("src.classes.private.Feature")
|
|
38349
38350
|
local Feature = ____Feature.Feature
|
|
38350
38351
|
local v = {run = {customItemPools = __TS__New(Map)}}
|
|
38352
|
+
local customItemPoolMap = __TS__New(Map)
|
|
38351
38353
|
____exports.CustomItemPools = __TS__Class()
|
|
38352
38354
|
local CustomItemPools = ____exports.CustomItemPools
|
|
38353
38355
|
CustomItemPools.name = "CustomItemPools"
|
|
@@ -38355,20 +38357,16 @@ __TS__ClassExtends(CustomItemPools, Feature)
|
|
|
38355
38357
|
function CustomItemPools.prototype.____constructor(self)
|
|
38356
38358
|
Feature.prototype.____constructor(self)
|
|
38357
38359
|
self.v = v
|
|
38358
|
-
self.
|
|
38359
|
-
|
|
38360
|
-
if isContinued then
|
|
38361
|
-
return
|
|
38362
|
-
end
|
|
38363
|
-
v.run.customItemPools = copyMap(nil, self.customItemPoolMap)
|
|
38360
|
+
self.postGameStartedReorderedFalse = function()
|
|
38361
|
+
v.run.customItemPools = copyMap(nil, customItemPoolMap)
|
|
38364
38362
|
end
|
|
38365
|
-
self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED, self.
|
|
38363
|
+
self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED, self.postGameStartedReorderedFalse, {false}}}
|
|
38366
38364
|
end
|
|
38367
38365
|
function CustomItemPools.prototype.registerCustomItemPool(self, itemPoolTypeCustom, collectibles)
|
|
38368
|
-
if
|
|
38366
|
+
if customItemPoolMap:has(itemPoolTypeCustom) then
|
|
38369
38367
|
error(("Failed to register a custom item pool since the provided type of " .. tostring(itemPoolTypeCustom)) .. " was already registered.")
|
|
38370
38368
|
end
|
|
38371
|
-
|
|
38369
|
+
customItemPoolMap:set(itemPoolTypeCustom, collectibles)
|
|
38372
38370
|
end
|
|
38373
38371
|
function CustomItemPools.prototype.getCustomItemPoolCollectible(self, itemPoolTypeCustom, decrease, seedOrRNG, defaultItem)
|
|
38374
38372
|
if decrease == nil then
|
|
@@ -43556,8 +43554,8 @@ local ____lualib = require("lualib_bundle")
|
|
|
43556
43554
|
local __TS__Class = ____lualib.__TS__Class
|
|
43557
43555
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
43558
43556
|
local ____exports = {}
|
|
43559
|
-
local
|
|
43560
|
-
local
|
|
43557
|
+
local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
|
|
43558
|
+
local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
|
|
43561
43559
|
local ____Feature = require("src.classes.private.Feature")
|
|
43562
43560
|
local Feature = ____Feature.Feature
|
|
43563
43561
|
local ____utils = require("src.classes.features.other.debugDisplay.utils")
|
|
@@ -43570,11 +43568,11 @@ __TS__ClassExtends(DebugDisplayPlayer, Feature)
|
|
|
43570
43568
|
function DebugDisplayPlayer.prototype.____constructor(self)
|
|
43571
43569
|
Feature.prototype.____constructor(self)
|
|
43572
43570
|
self.textCallback = defaultEntityDisplayCallback
|
|
43573
|
-
self.
|
|
43571
|
+
self.postPlayerRenderReordered = function(____, player)
|
|
43574
43572
|
local text = self:textCallback(player)
|
|
43575
43573
|
renderTextOnEntity(nil, player, text)
|
|
43576
43574
|
end
|
|
43577
|
-
self.
|
|
43575
|
+
self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_RENDER_REORDERED, self.postPlayerRenderReordered}}
|
|
43578
43576
|
end
|
|
43579
43577
|
return ____exports
|
|
43580
43578
|
end,
|
|
@@ -48009,7 +48007,7 @@ function ____exports.flight(self, params)
|
|
|
48009
48007
|
else
|
|
48010
48008
|
removeCollectibleCostume(nil, player, collectibleUsedToShowFlight)
|
|
48011
48009
|
end
|
|
48012
|
-
printEnabled(nil, v.persistent.
|
|
48010
|
+
printEnabled(nil, v.persistent.flight, "flight")
|
|
48013
48011
|
end
|
|
48014
48012
|
function ____exports.fool(self)
|
|
48015
48013
|
____exports.startingRoom(nil)
|
|
@@ -48498,7 +48496,7 @@ function ____exports.speed(self, params)
|
|
|
48498
48496
|
player:EvaluateItems()
|
|
48499
48497
|
local value = tostring(v.persistent.speed)
|
|
48500
48498
|
____exports.flight(nil, value)
|
|
48501
|
-
printEnabled(nil, v.persistent.speed, "set speed
|
|
48499
|
+
printEnabled(nil, v.persistent.speed, "set speed")
|
|
48502
48500
|
end
|
|
48503
48501
|
function ____exports.startRoom(self)
|
|
48504
48502
|
____exports.startingRoom(nil)
|
|
@@ -48737,15 +48735,15 @@ local __TS__Class = ____lualib.__TS__Class
|
|
|
48737
48735
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
48738
48736
|
local __TS__Decorate = ____lualib.__TS__Decorate
|
|
48739
48737
|
local ____exports = {}
|
|
48740
|
-
local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
|
|
48741
|
-
local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
|
|
48742
48738
|
local ____cachedClasses = require("src.core.cachedClasses")
|
|
48743
48739
|
local game = ____cachedClasses.game
|
|
48744
48740
|
local ____decorators = require("src.decorators")
|
|
48745
48741
|
local Exported = ____decorators.Exported
|
|
48742
|
+
local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
|
|
48743
|
+
local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
|
|
48746
48744
|
local ____Feature = require("src.classes.private.Feature")
|
|
48747
48745
|
local Feature = ____Feature.Feature
|
|
48748
|
-
local
|
|
48746
|
+
local INSTANT_FADE_IN_SPEED = 1
|
|
48749
48747
|
____exports.FadeInRemover = __TS__Class()
|
|
48750
48748
|
local FadeInRemover = ____exports.FadeInRemover
|
|
48751
48749
|
FadeInRemover.name = "FadeInRemover"
|
|
@@ -48753,12 +48751,12 @@ __TS__ClassExtends(FadeInRemover, Feature)
|
|
|
48753
48751
|
function FadeInRemover.prototype.____constructor(self)
|
|
48754
48752
|
Feature.prototype.____constructor(self)
|
|
48755
48753
|
self.enabled = false
|
|
48756
|
-
self.
|
|
48754
|
+
self.postGameStartedReordered = function()
|
|
48757
48755
|
if self.enabled then
|
|
48758
|
-
game:Fadein(
|
|
48756
|
+
game:Fadein(INSTANT_FADE_IN_SPEED)
|
|
48759
48757
|
end
|
|
48760
48758
|
end
|
|
48761
|
-
self.
|
|
48759
|
+
self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED, self.postGameStartedReordered, {nil}}}
|
|
48762
48760
|
end
|
|
48763
48761
|
function FadeInRemover.prototype.removeFadeIn(self)
|
|
48764
48762
|
self.enabled = true
|
|
@@ -13,10 +13,11 @@ export declare class PostCursedTeleport extends CustomCallback<ModCallbackCustom
|
|
|
13
13
|
};
|
|
14
14
|
protected shouldFire: typeof shouldFirePlayer;
|
|
15
15
|
constructor();
|
|
16
|
-
private postPlayerRenderPlayer;
|
|
17
16
|
private entityTakeDmgPlayer;
|
|
18
17
|
private incrementNumSacrifices;
|
|
19
18
|
private setDamageFrame;
|
|
20
19
|
private isPotentialNaturalTeleportFromSacrificeRoom;
|
|
20
|
+
private postPlayerRenderReorderedPlayer;
|
|
21
|
+
private playerIsTeleportingFromCursedTeleport;
|
|
21
22
|
}
|
|
22
23
|
//# sourceMappingURL=PostCursedTeleport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostCursedTeleport.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCursedTeleport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PostCursedTeleport.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCursedTeleport.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAe3D,qBAAa,kBAAmB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,oBAAoB,CAAC;IAC5E,CAAC;;;;;;;MAAK;IAEtB,UAAmB,UAAU,0BAAoB;;IAgBjD,OAAO,CAAC,mBAAmB,CAWzB;IAEF,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,2CAA2C;IAkBnD,OAAO,CAAC,+BAA+B,CAyBrC;IAEF,OAAO,CAAC,qCAAqC;CA8B9C"}
|
|
@@ -4,11 +4,9 @@ local __TS__New = ____lualib.__TS__New
|
|
|
4
4
|
local __TS__Class = ____lualib.__TS__Class
|
|
5
5
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
6
6
|
local ____exports = {}
|
|
7
|
-
local playerIsTeleportingFromCursedTeleport
|
|
8
7
|
local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
|
|
9
8
|
local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
|
|
10
9
|
local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
|
|
11
|
-
local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
|
|
12
10
|
local PlayerVariant = ____isaac_2Dtypescript_2Ddefinitions.PlayerVariant
|
|
13
11
|
local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
|
|
14
12
|
local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
|
|
@@ -27,24 +25,6 @@ local ____shouldFire = require("src.shouldFire")
|
|
|
27
25
|
local shouldFirePlayer = ____shouldFire.shouldFirePlayer
|
|
28
26
|
local ____CustomCallback = require("src.classes.private.CustomCallback")
|
|
29
27
|
local CustomCallback = ____CustomCallback.CustomCallback
|
|
30
|
-
function playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
|
|
31
|
-
local gameFrameCount = game:GetFrameCount()
|
|
32
|
-
if gameFrameCount ~= lastDamageFrame then
|
|
33
|
-
return false
|
|
34
|
-
end
|
|
35
|
-
local sprite = player:GetSprite()
|
|
36
|
-
if not sprite:IsPlaying("TeleportUp") or sprite:GetFrame() ~= 1 then
|
|
37
|
-
return false
|
|
38
|
-
end
|
|
39
|
-
if player:HasCollectible(CollectibleType.CURSED_EYE) then
|
|
40
|
-
return true
|
|
41
|
-
end
|
|
42
|
-
local numHitsRemaining = getPlayerNumHitsRemaining(nil, player)
|
|
43
|
-
if player:HasTrinket(TrinketType.CURSED_SKULL) and numHitsRemaining == 1 then
|
|
44
|
-
return true
|
|
45
|
-
end
|
|
46
|
-
return false
|
|
47
|
-
end
|
|
48
28
|
local v = {
|
|
49
29
|
run = {playersDamageFrameMap = __TS__New(Map)},
|
|
50
30
|
level = {numSacrifices = 0}
|
|
@@ -57,13 +37,18 @@ function PostCursedTeleport.prototype.____constructor(self)
|
|
|
57
37
|
CustomCallback.prototype.____constructor(self)
|
|
58
38
|
self.v = v
|
|
59
39
|
self.shouldFire = shouldFirePlayer
|
|
60
|
-
self.
|
|
40
|
+
self.entityTakeDmgPlayer = function(____, player, _amount, damageFlags, _source, _countdownFrames)
|
|
41
|
+
self:incrementNumSacrifices(damageFlags)
|
|
42
|
+
self:setDamageFrame(player, damageFlags)
|
|
43
|
+
return nil
|
|
44
|
+
end
|
|
45
|
+
self.postPlayerRenderReorderedPlayer = function(____, player, _renderOffset)
|
|
61
46
|
local trackingArray = mapGetPlayer(nil, v.run.playersDamageFrameMap, player)
|
|
62
47
|
if trackingArray == nil then
|
|
63
48
|
return
|
|
64
49
|
end
|
|
65
50
|
local lastDamageFrame, callbackActivatedOnThisFrame = table.unpack(trackingArray)
|
|
66
|
-
if not playerIsTeleportingFromCursedTeleport(
|
|
51
|
+
if not self:playerIsTeleportingFromCursedTeleport(player, lastDamageFrame) then
|
|
67
52
|
return
|
|
68
53
|
end
|
|
69
54
|
if callbackActivatedOnThisFrame then
|
|
@@ -74,13 +59,7 @@ function PostCursedTeleport.prototype.____constructor(self)
|
|
|
74
59
|
mapSetPlayer(nil, v.run.playersDamageFrameMap, player, newTrackingArray)
|
|
75
60
|
self:fire(player)
|
|
76
61
|
end
|
|
77
|
-
self.
|
|
78
|
-
self:incrementNumSacrifices(damageFlags)
|
|
79
|
-
self:setDamageFrame(player, damageFlags)
|
|
80
|
-
return nil
|
|
81
|
-
end
|
|
82
|
-
self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, self.postPlayerRenderPlayer, {PlayerVariant.PLAYER}}}
|
|
83
|
-
self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}}
|
|
62
|
+
self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}, {ModCallbackCustom.POST_PLAYER_RENDER_REORDERED, self.postPlayerRenderReorderedPlayer, {PlayerVariant.PLAYER}}}
|
|
84
63
|
end
|
|
85
64
|
function PostCursedTeleport.prototype.incrementNumSacrifices(self, damageFlags)
|
|
86
65
|
local room = game:GetRoom()
|
|
@@ -112,4 +91,22 @@ function PostCursedTeleport.prototype.isPotentialNaturalTeleportFromSacrificeRoo
|
|
|
112
91
|
local isSpikeDamage = hasFlag(nil, damageFlags, DamageFlag.SPIKES)
|
|
113
92
|
return roomType == RoomType.SACRIFICE and isSpikeDamage and (v.level.numSacrifices == 6 or v.level.numSacrifices >= 12)
|
|
114
93
|
end
|
|
94
|
+
function PostCursedTeleport.prototype.playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
|
|
95
|
+
local gameFrameCount = game:GetFrameCount()
|
|
96
|
+
if gameFrameCount ~= lastDamageFrame then
|
|
97
|
+
return false
|
|
98
|
+
end
|
|
99
|
+
local sprite = player:GetSprite()
|
|
100
|
+
if not sprite:IsPlaying("TeleportUp") or sprite:GetFrame() ~= 1 then
|
|
101
|
+
return false
|
|
102
|
+
end
|
|
103
|
+
if player:HasCollectible(CollectibleType.CURSED_EYE) then
|
|
104
|
+
return true
|
|
105
|
+
end
|
|
106
|
+
local numHitsRemaining = getPlayerNumHitsRemaining(nil, player)
|
|
107
|
+
if player:HasTrinket(TrinketType.CURSED_SKULL) and numHitsRemaining == 1 then
|
|
108
|
+
return true
|
|
109
|
+
end
|
|
110
|
+
return false
|
|
111
|
+
end
|
|
115
112
|
return ____exports
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostNewRoomEarly.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostNewRoomEarly.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,mBAAmB,CAAC;IACzF,OAAO,CAAC,6BAA6B,CAAwB;IAE7D,kEAAkE;IAClE,OAAO,CAAC,8BAA8B,CAAwB;;
|
|
1
|
+
{"version":3,"file":"PostNewRoomEarly.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostNewRoomEarly.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,mBAAmB,CAAC;IACzF,OAAO,CAAC,6BAA6B,CAAwB;IAE7D,kEAAkE;IAClE,OAAO,CAAC,8BAA8B,CAAwB;;IAgB9D,OAAO,CAAC,WAAW,CAEjB;IAGF,OAAO,CAAC,cAAc,CAGpB;IAEF,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,SAAS;CA8ClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PreNewLevel.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PreNewLevel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PreNewLevel.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PreNewLevel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,qBAAa,WAAY,SAAQ,cAAc,CAAC,iBAAiB,CAAC,aAAa,CAAC;IAC9D,CAAC;;;;MAAK;;IActB,OAAO,CAAC,yBAAyB,CAqB/B;CACH"}
|
|
@@ -3,8 +3,8 @@ local __TS__New = ____lualib.__TS__New
|
|
|
3
3
|
local __TS__Class = ____lualib.__TS__Class
|
|
4
4
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
5
5
|
local ____exports = {}
|
|
6
|
-
local
|
|
7
|
-
local
|
|
6
|
+
local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
|
|
7
|
+
local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
|
|
8
8
|
local ____sprites = require("src.functions.sprites")
|
|
9
9
|
local getLastFrameOfAnimation = ____sprites.getLastFrameOfAnimation
|
|
10
10
|
local ____stage = require("src.functions.stage")
|
|
@@ -22,7 +22,7 @@ __TS__ClassExtends(PreNewLevel, CustomCallback)
|
|
|
22
22
|
function PreNewLevel.prototype.____constructor(self)
|
|
23
23
|
CustomCallback.prototype.____constructor(self)
|
|
24
24
|
self.v = v
|
|
25
|
-
self.
|
|
25
|
+
self.postPlayerRenderReordered = function(____, player)
|
|
26
26
|
local effectiveStage = getEffectiveStage(nil)
|
|
27
27
|
if effectiveStage == v.run.firedOnStage then
|
|
28
28
|
return
|
|
@@ -39,6 +39,6 @@ function PreNewLevel.prototype.____constructor(self)
|
|
|
39
39
|
self:fire(player)
|
|
40
40
|
end
|
|
41
41
|
end
|
|
42
|
-
self.
|
|
42
|
+
self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_RENDER_REORDERED, self.postPlayerRenderReordered}}
|
|
43
43
|
end
|
|
44
44
|
return ____exports
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GameReorderedCallbacks.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/GameReorderedCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,sBAAuB,SAAQ,OAAO;IACjD,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,4BAA4B,CAA+B;
|
|
1
|
+
{"version":3,"file":"GameReorderedCallbacks.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/GameReorderedCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,sBAAuB,SAAQ,OAAO;IACjD,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,4BAA4B,CAA+B;IAwCnE,OAAO,CAAC,uBAAuB,CAM7B;IAGF,OAAO,CAAC,eAAe,CAMrB;IAGF,OAAO,CAAC,YAAY,CAYlB;IAGF,OAAO,CAAC,WAAW,CA+BjB;IAEF,OAAO,CAAC,kBAAkB;IAS1B;;;;;;;;;;;;OAYG;IAEI,qBAAqB,IAAI,IAAI;IAIpC;;;;;;;;;;;;OAYG;IAEI,oBAAoB,IAAI,IAAI;IAInC;;;;;;;;;OASG;IAEI,0BAA0B,CAC/B,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,GACnB,IAAI;CAIR"}
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
+
/// <reference types="isaac-typescript-definitions" />
|
|
1
2
|
import { PlayerIndex } from "../../../types/PlayerIndex";
|
|
2
3
|
import { PostPEffectUpdateReordered } from "../../callbacks/PostPEffectUpdateReordered";
|
|
3
4
|
import { PostPlayerRenderReordered } from "../../callbacks/PostPlayerRenderReordered";
|
|
4
5
|
import { PostPlayerUpdateReordered } from "../../callbacks/PostPlayerUpdateReordered";
|
|
5
6
|
import { Feature } from "../../private/Feature";
|
|
7
|
+
interface QueueElement {
|
|
8
|
+
playerIndex: PlayerIndex;
|
|
9
|
+
renderOffset: Vector;
|
|
10
|
+
}
|
|
6
11
|
export declare class PlayerReorderedCallbacks extends Feature {
|
|
7
12
|
v: {
|
|
8
13
|
run: {
|
|
9
14
|
postGameStartedFiredOnThisRun: boolean;
|
|
10
|
-
postPEffectUpdateQueue:
|
|
11
|
-
postPlayerUpdateQueue:
|
|
12
|
-
postPlayerRenderQueue:
|
|
15
|
+
postPEffectUpdateQueue: QueueElement[];
|
|
16
|
+
postPlayerUpdateQueue: QueueElement[];
|
|
17
|
+
postPlayerRenderQueue: QueueElement[];
|
|
13
18
|
};
|
|
14
19
|
};
|
|
15
20
|
private postPEffectUpdateReordered;
|
|
@@ -21,4 +26,5 @@ export declare class PlayerReorderedCallbacks extends Feature {
|
|
|
21
26
|
private postPlayerRender;
|
|
22
27
|
private postGameStartedReorderedLast;
|
|
23
28
|
}
|
|
29
|
+
export {};
|
|
24
30
|
//# sourceMappingURL=PlayerReorderedCallbacks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayerReorderedCallbacks.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/PlayerReorderedCallbacks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PlayerReorderedCallbacks.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/PlayerReorderedCallbacks.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,UAAU,YAAY;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACtB;AAYD,qBAAa,wBAAyB,SAAQ,OAAO;IACnC,CAAC;;;;;;;MAAK;IAEtB,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,yBAAyB,CAA4B;IAC7D,OAAO,CAAC,yBAAyB,CAA4B;gBAG3D,0BAA0B,EAAE,0BAA0B,EACtD,yBAAyB,EAAE,yBAAyB,EACpD,yBAAyB,EAAE,yBAAyB;IA+BtD,OAAO,CAAC,iBAAiB,CAWvB;IAGF,OAAO,CAAC,gBAAgB,CAWtB;IAGF,OAAO,CAAC,gBAAgB,CAWtB;IAGF,OAAO,CAAC,4BAA4B,CAMlC;CACH"}
|
|
@@ -5,6 +5,8 @@ local ____exports = {}
|
|
|
5
5
|
local dequeue
|
|
6
6
|
local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
|
|
7
7
|
local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
|
|
8
|
+
local ____constants = require("src.core.constants")
|
|
9
|
+
local VectorZero = ____constants.VectorZero
|
|
8
10
|
local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
|
|
9
11
|
local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
|
|
10
12
|
local ____array = require("src.functions.array")
|
|
@@ -14,14 +16,16 @@ local getPlayerFromIndex = ____playerIndex.getPlayerFromIndex
|
|
|
14
16
|
local getPlayerIndex = ____playerIndex.getPlayerIndex
|
|
15
17
|
local ____Feature = require("src.classes.private.Feature")
|
|
16
18
|
local Feature = ____Feature.Feature
|
|
17
|
-
function dequeue(self,
|
|
18
|
-
for ____,
|
|
19
|
+
function dequeue(self, queue, fireFunc)
|
|
20
|
+
for ____, element in ipairs(queue) do
|
|
21
|
+
local playerIndex = element.playerIndex
|
|
22
|
+
local renderOffset = element.renderOffset
|
|
19
23
|
local player = getPlayerFromIndex(nil, playerIndex)
|
|
20
24
|
if player ~= nil then
|
|
21
|
-
fireFunc(nil, player)
|
|
25
|
+
fireFunc(nil, player, renderOffset)
|
|
22
26
|
end
|
|
23
27
|
end
|
|
24
|
-
emptyArray(nil,
|
|
28
|
+
emptyArray(nil, queue)
|
|
25
29
|
end
|
|
26
30
|
local v = {run = {postGameStartedFiredOnThisRun = false, postPEffectUpdateQueue = {}, postPlayerUpdateQueue = {}, postPlayerRenderQueue = {}}}
|
|
27
31
|
____exports.PlayerReorderedCallbacks = __TS__Class()
|
|
@@ -37,7 +41,7 @@ function PlayerReorderedCallbacks.prototype.____constructor(self, postPEffectUpd
|
|
|
37
41
|
else
|
|
38
42
|
local playerIndex = getPlayerIndex(nil, player)
|
|
39
43
|
local ____v_run_postPEffectUpdateQueue_0 = v.run.postPEffectUpdateQueue
|
|
40
|
-
____v_run_postPEffectUpdateQueue_0[#____v_run_postPEffectUpdateQueue_0 + 1] = playerIndex
|
|
44
|
+
____v_run_postPEffectUpdateQueue_0[#____v_run_postPEffectUpdateQueue_0 + 1] = {playerIndex = playerIndex, renderOffset = VectorZero}
|
|
41
45
|
end
|
|
42
46
|
end
|
|
43
47
|
self.postPlayerUpdate = function(____, player)
|
|
@@ -46,16 +50,16 @@ function PlayerReorderedCallbacks.prototype.____constructor(self, postPEffectUpd
|
|
|
46
50
|
else
|
|
47
51
|
local playerIndex = getPlayerIndex(nil, player)
|
|
48
52
|
local ____v_run_postPlayerUpdateQueue_1 = v.run.postPlayerUpdateQueue
|
|
49
|
-
____v_run_postPlayerUpdateQueue_1[#____v_run_postPlayerUpdateQueue_1 + 1] = playerIndex
|
|
53
|
+
____v_run_postPlayerUpdateQueue_1[#____v_run_postPlayerUpdateQueue_1 + 1] = {playerIndex = playerIndex, renderOffset = VectorZero}
|
|
50
54
|
end
|
|
51
55
|
end
|
|
52
|
-
self.postPlayerRender = function(____, player,
|
|
56
|
+
self.postPlayerRender = function(____, player, renderOffset)
|
|
53
57
|
if v.run.postGameStartedFiredOnThisRun then
|
|
54
|
-
self.postPlayerRenderReordered:fire(player)
|
|
58
|
+
self.postPlayerRenderReordered:fire(player, renderOffset)
|
|
55
59
|
else
|
|
56
60
|
local playerIndex = getPlayerIndex(nil, player)
|
|
57
61
|
local ____v_run_postPlayerRenderQueue_2 = v.run.postPlayerRenderQueue
|
|
58
|
-
____v_run_postPlayerRenderQueue_2[#____v_run_postPlayerRenderQueue_2 + 1] = playerIndex
|
|
62
|
+
____v_run_postPlayerRenderQueue_2[#____v_run_postPlayerRenderQueue_2 + 1] = {playerIndex = playerIndex, renderOffset = renderOffset}
|
|
59
63
|
end
|
|
60
64
|
end
|
|
61
65
|
self.postGameStartedReorderedLast = function()
|