isaacscript-common 7.2.0 → 7.2.1
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/callbacks/itemPickup.d.ts.map +1 -1
- package/dist/callbacks/itemPickup.lua +3 -1
- package/dist/callbacks/postCustomDoorEnter.d.ts.map +1 -1
- package/dist/callbacks/postCustomDoorEnter.lua +14 -11
- package/dist/callbacks/postDiceRoomActivated.d.ts.map +1 -1
- package/dist/callbacks/postDiceRoomActivated.lua +5 -4
- package/dist/callbacks/postItemDischarged.lua +2 -1
- package/dist/callbacks/postSlotDestroyed.lua +3 -3
- package/dist/core/constants.d.ts +2 -2
- package/dist/core/constants.d.ts.map +1 -1
- package/dist/core/constants.lua +3 -1
- package/dist/core/constantsFirstLast.d.ts +2 -0
- package/dist/core/constantsFirstLast.d.ts.map +1 -1
- package/dist/core/constantsFirstLast.lua +36 -9
- package/dist/enums/SaveDataKey.d.ts +11 -0
- package/dist/enums/SaveDataKey.d.ts.map +1 -0
- package/dist/enums/{private/SaveDataKey.lua → SaveDataKey.lua} +2 -0
- package/dist/enums/index.d.ts +1 -0
- package/dist/enums/index.d.ts.map +1 -1
- package/dist/enums/index.lua +8 -0
- package/dist/features/customGridEntity.d.ts.map +1 -1
- package/dist/features/customGridEntity.lua +3 -1
- package/dist/features/customStage/backdrop.lua +4 -2
- package/dist/features/customStage/customStageGridEntities.d.ts.map +1 -1
- package/dist/features/customStage/customStageGridEntities.lua +3 -1
- package/dist/features/customStage/exports.d.ts.map +1 -1
- package/dist/features/customStage/exports.lua +3 -1
- package/dist/features/customStage/shadows.d.ts.map +1 -1
- package/dist/features/customStage/shadows.lua +2 -1
- package/dist/features/deployJSONRoom.lua +13 -10
- package/dist/features/extraConsoleCommands/listCommands.d.ts.map +1 -1
- package/dist/features/extraConsoleCommands/listCommands.lua +8 -2
- package/dist/features/saveDataManager/exports.d.ts +2 -1
- package/dist/features/saveDataManager/exports.d.ts.map +1 -1
- package/dist/features/saveDataManager/main.d.ts +1 -1
- package/dist/features/saveDataManager/main.d.ts.map +1 -1
- package/dist/features/saveDataManager/main.lua +1 -1
- package/dist/functions/bitSet128.d.ts.map +1 -1
- package/dist/functions/bosses.d.ts.map +1 -1
- package/dist/functions/bosses.lua +3 -1
- package/dist/functions/collectibles.d.ts.map +1 -1
- package/dist/functions/deepCopy.lua +2 -1
- package/dist/functions/doors.d.ts.map +1 -1
- package/dist/functions/doors.lua +3 -1
- package/dist/functions/entities.lua +2 -1
- package/dist/functions/gridEntities.lua +2 -1
- package/dist/functions/gridEntitiesSpecific.d.ts.map +1 -1
- package/dist/functions/gridEntitiesSpecific.lua +5 -3
- package/dist/functions/input.d.ts +1 -1
- package/dist/functions/input.d.ts.map +1 -1
- package/dist/functions/input.lua +1 -1
- package/dist/functions/kColor.d.ts.map +1 -1
- package/dist/functions/levelGrid.d.ts.map +1 -1
- package/dist/functions/levelGrid.lua +3 -1
- package/dist/functions/nextStage.d.ts.map +1 -1
- package/dist/functions/nextStage.lua +7 -5
- package/dist/functions/npcs.d.ts.map +1 -1
- package/dist/functions/npcs.lua +4 -2
- package/dist/functions/pills.d.ts.map +1 -1
- package/dist/functions/pills.lua +9 -3
- package/dist/functions/playerIndex.d.ts.map +1 -1
- package/dist/functions/playerIndex.lua +2 -1
- package/dist/functions/players.d.ts +1 -1
- package/dist/functions/players.d.ts.map +1 -1
- package/dist/functions/players.lua +13 -15
- package/dist/functions/pocketItems.d.ts.map +1 -1
- package/dist/functions/pocketItems.lua +3 -1
- package/dist/functions/rng.d.ts.map +1 -1
- package/dist/functions/rng.lua +3 -0
- package/dist/functions/rooms.d.ts +4 -4
- package/dist/functions/rooms.d.ts.map +1 -1
- package/dist/functions/rooms.lua +17 -16
- package/dist/functions/spawnCollectible.d.ts.map +1 -1
- package/dist/functions/stage.d.ts.map +1 -1
- package/dist/functions/stage.lua +8 -2
- package/dist/functions/trinkets.d.ts.map +1 -1
- package/dist/functions/trinkets.lua +4 -2
- package/dist/functions/types.d.ts +64 -0
- package/dist/functions/types.d.ts.map +1 -1
- package/dist/functions/types.lua +63 -0
- package/dist/functions/vector.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/callbacks/itemPickup.ts +5 -2
- package/src/callbacks/postCustomDoorEnter.ts +18 -11
- package/src/callbacks/postDiceRoomActivated.ts +7 -12
- package/src/callbacks/postItemDischarged.ts +3 -1
- package/src/callbacks/postSlotDestroyed.ts +3 -2
- package/src/callbacks/reorderedCallbacks.ts +2 -2
- package/src/classes/DefaultMap.ts +1 -1
- package/src/core/constants.ts +3 -3
- package/src/core/constantsFirstLast.ts +29 -14
- package/src/enums/SaveDataKey.ts +10 -0
- package/src/enums/index.ts +1 -0
- package/src/enums/indexTypeDoc.ts +1 -0
- package/src/features/customGridEntity.ts +2 -1
- package/src/features/customStage/backdrop.ts +4 -2
- package/src/features/customStage/customStageGridEntities.ts +2 -1
- package/src/features/customStage/exports.ts +5 -4
- package/src/features/customStage/shadows.ts +2 -1
- package/src/features/deployJSONRoom.ts +14 -19
- package/src/features/extraConsoleCommands/listCommands.ts +3 -2
- package/src/features/saveDataManager/exports.ts +4 -4
- package/src/features/saveDataManager/main.ts +1 -1
- package/src/features/saveDataManager/save.ts +1 -1
- package/src/functions/bitSet128.ts +1 -5
- package/src/functions/bosses.ts +2 -1
- package/src/functions/cards.ts +3 -3
- package/src/functions/collectibles.ts +2 -8
- package/src/functions/color.ts +1 -1
- package/src/functions/deepCopy.ts +2 -2
- package/src/functions/dimensions.ts +1 -1
- package/src/functions/doors.ts +2 -2
- package/src/functions/entities.ts +2 -2
- package/src/functions/gridEntities.ts +2 -2
- package/src/functions/gridEntitiesSpecific.ts +4 -3
- package/src/functions/input.ts +2 -2
- package/src/functions/jsonHelpers.ts +1 -1
- package/src/functions/kColor.ts +1 -5
- package/src/functions/levelGrid.ts +3 -2
- package/src/functions/nextStage.ts +6 -5
- package/src/functions/npcs.ts +3 -2
- package/src/functions/pills.ts +11 -9
- package/src/functions/playerIndex.ts +3 -1
- package/src/functions/players.ts +5 -6
- package/src/functions/pocketItems.ts +4 -4
- package/src/functions/rng.ts +8 -5
- package/src/functions/rooms.ts +26 -26
- package/src/functions/spawnCollectible.ts +1 -2
- package/src/functions/stage.ts +3 -2
- package/src/functions/trinkets.ts +6 -5
- package/src/functions/types.ts +100 -0
- package/src/functions/vector.ts +1 -5
- package/dist/enums/private/SaveDataKey.d.ts +0 -7
- package/dist/enums/private/SaveDataKey.d.ts.map +0 -1
- package/src/enums/private/SaveDataKey.ts +0 -6
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
DiceFloorSubType,
|
|
3
|
-
EffectVariant,
|
|
4
|
-
ModCallback,
|
|
5
|
-
} from "isaac-typescript-definitions";
|
|
1
|
+
import { EffectVariant, ModCallback } from "isaac-typescript-definitions";
|
|
6
2
|
import { saveDataManager } from "../features/saveDataManager/exports";
|
|
7
3
|
import { isCloseEnoughToTriggerDiceFloor } from "../functions/effects";
|
|
8
4
|
import { getClosestPlayer } from "../functions/players";
|
|
@@ -34,6 +30,8 @@ function hasSubscriptions() {
|
|
|
34
30
|
// ModCallback.POST_EFFECT_UPDATE (55)
|
|
35
31
|
// EffectVariant.DICE_FLOOR (76)
|
|
36
32
|
function postEffectUpdateDiceFloor(effect: EntityEffect) {
|
|
33
|
+
const diceFloor = effect as EntityEffectDiceFloor;
|
|
34
|
+
|
|
37
35
|
if (!hasSubscriptions()) {
|
|
38
36
|
return;
|
|
39
37
|
}
|
|
@@ -44,16 +42,13 @@ function postEffectUpdateDiceFloor(effect: EntityEffect) {
|
|
|
44
42
|
|
|
45
43
|
// When using the debug console to go to a dice room, the player can appear on top of the dice
|
|
46
44
|
// floor before they snap to the door.
|
|
47
|
-
if (
|
|
45
|
+
if (diceFloor.FrameCount === 0) {
|
|
48
46
|
return;
|
|
49
47
|
}
|
|
50
48
|
|
|
51
|
-
const closestPlayer = getClosestPlayer(
|
|
52
|
-
if (isCloseEnoughToTriggerDiceFloor(closestPlayer,
|
|
49
|
+
const closestPlayer = getClosestPlayer(diceFloor.Position);
|
|
50
|
+
if (isCloseEnoughToTriggerDiceFloor(closestPlayer, diceFloor)) {
|
|
53
51
|
v.room.diceRoomActivated = true;
|
|
54
|
-
postDiceRoomActivatedFire(
|
|
55
|
-
closestPlayer,
|
|
56
|
-
effect.SubType as DiceFloorSubType,
|
|
57
|
-
);
|
|
52
|
+
postDiceRoomActivatedFire(closestPlayer, diceFloor.SubType);
|
|
58
53
|
}
|
|
59
54
|
}
|
|
@@ -131,11 +131,13 @@ function preNPCCollisionSucker(
|
|
|
131
131
|
npc: EntityNPC,
|
|
132
132
|
collider: Entity,
|
|
133
133
|
): boolean | undefined {
|
|
134
|
+
const sucker = npc as EntityNPCSucker;
|
|
135
|
+
|
|
134
136
|
if (!hasSubscriptions()) {
|
|
135
137
|
return undefined;
|
|
136
138
|
}
|
|
137
139
|
|
|
138
|
-
if (
|
|
140
|
+
if (sucker.Variant !== SuckerVariant.BULB) {
|
|
139
141
|
return undefined;
|
|
140
142
|
}
|
|
141
143
|
|
|
@@ -36,7 +36,7 @@ export function postSlotDestroyedInit(mod: ModUpgraded): void {
|
|
|
36
36
|
|
|
37
37
|
mod.AddCallback(
|
|
38
38
|
ModCallback.POST_ENTITY_REMOVE,
|
|
39
|
-
|
|
39
|
+
postEntityRemoveSlot,
|
|
40
40
|
EntityType.SLOT,
|
|
41
41
|
); // 67
|
|
42
42
|
|
|
@@ -51,7 +51,8 @@ function hasSubscriptions() {
|
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
// ModCallback.POST_ENTITY_REMOVE (67)
|
|
54
|
-
|
|
54
|
+
// EntityType.SLOT (6)
|
|
55
|
+
function postEntityRemoveSlot(entity: Entity) {
|
|
55
56
|
const slot = entity as EntitySlot;
|
|
56
57
|
const ptrHash = GetPtrHash(slot);
|
|
57
58
|
const gameFrameCount = game.GetFrameCount();
|
|
@@ -31,8 +31,8 @@ import {
|
|
|
31
31
|
postNewRoomReorderedHasSubscriptions,
|
|
32
32
|
} from "./subscriptions/postNewRoomReordered";
|
|
33
33
|
|
|
34
|
-
let currentStage
|
|
35
|
-
let currentStageType
|
|
34
|
+
let currentStage: int | null = null;
|
|
35
|
+
let currentStageType: int | null = null;
|
|
36
36
|
let usedGlowingHourGlass = false;
|
|
37
37
|
let forceNewLevel = false;
|
|
38
38
|
let forceNewRoom = false;
|
|
@@ -109,7 +109,7 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
|
|
|
109
109
|
this.defaultValue = undefined;
|
|
110
110
|
this.defaultValueFactory = defaultValueOrFactoryFunction;
|
|
111
111
|
} else {
|
|
112
|
-
this.defaultValue = defaultValueOrFactoryFunction
|
|
112
|
+
this.defaultValue = defaultValueOrFactoryFunction;
|
|
113
113
|
this.defaultValueFactory = undefined;
|
|
114
114
|
}
|
|
115
115
|
}
|
package/src/core/constants.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
CollectibleType,
|
|
3
2
|
Dimension,
|
|
4
3
|
DisplayFlag,
|
|
5
4
|
ItemPoolType,
|
|
@@ -7,6 +6,7 @@ import {
|
|
|
7
6
|
} from "isaac-typescript-definitions";
|
|
8
7
|
import { getEnumLength } from "../functions/enums";
|
|
9
8
|
import { addFlag } from "../functions/flag";
|
|
9
|
+
import { asCollectibleType } from "../functions/types";
|
|
10
10
|
import { NUM_NORMAL_PILL_COLORS } from "./constantsFirstLast";
|
|
11
11
|
|
|
12
12
|
/**
|
|
@@ -64,8 +64,8 @@ export const EMPTY_PNG_PATH = "gfx/none.png";
|
|
|
64
64
|
* encountered by the player. The first TMTRAINER item takes the final possible 32 bit number. The
|
|
65
65
|
* second TMTRAINER item subtracts one from that, and so on.
|
|
66
66
|
*/
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
|
|
68
|
+
export const FIRST_GLITCHED_COLLECTIBLE_TYPE = asCollectibleType((1 << 32) - 1);
|
|
69
69
|
|
|
70
70
|
/** Game frames are what is returned by the `Game.GetFrameCount` method. */
|
|
71
71
|
export const GAME_FRAMES_PER_SECOND = 30;
|
|
@@ -9,6 +9,14 @@ import {
|
|
|
9
9
|
TrinketType,
|
|
10
10
|
} from "isaac-typescript-definitions";
|
|
11
11
|
import { getEnumLength, getLastEnumValue } from "../functions/enums";
|
|
12
|
+
import {
|
|
13
|
+
asCard,
|
|
14
|
+
asCollectibleType,
|
|
15
|
+
asNumber,
|
|
16
|
+
asPillEffect,
|
|
17
|
+
asPlayerType,
|
|
18
|
+
asTrinketType,
|
|
19
|
+
} from "../functions/types";
|
|
12
20
|
import { itemConfig } from "./cachedClasses";
|
|
13
21
|
|
|
14
22
|
// ------------
|
|
@@ -24,8 +32,9 @@ export const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
|
|
|
24
32
|
* Equal to `itemConfig.GetCollectibles().Size - 1`. (`Size` includes invalid collectibles, like
|
|
25
33
|
* 666. We subtract one to account for `CollectibleType.NULL`.)
|
|
26
34
|
*/
|
|
27
|
-
export const LAST_COLLECTIBLE_TYPE = (
|
|
28
|
-
|
|
35
|
+
export const LAST_COLLECTIBLE_TYPE = asCollectibleType(
|
|
36
|
+
itemConfig.GetCollectibles().Size - 1,
|
|
37
|
+
);
|
|
29
38
|
|
|
30
39
|
/**
|
|
31
40
|
* Calculated from the `CollectibleType` enum.
|
|
@@ -39,8 +48,9 @@ export const LAST_VANILLA_COLLECTIBLE_TYPE = getLastEnumValue(CollectibleType);
|
|
|
39
48
|
* If there are no modded collectibles, this constant will represent a collectible type that does
|
|
40
49
|
* not exist.
|
|
41
50
|
*/
|
|
42
|
-
export const FIRST_MODDED_COLLECTIBLE_TYPE =
|
|
43
|
-
(
|
|
51
|
+
export const FIRST_MODDED_COLLECTIBLE_TYPE = asCollectibleType(
|
|
52
|
+
asNumber(LAST_VANILLA_COLLECTIBLE_TYPE) + 1,
|
|
53
|
+
);
|
|
44
54
|
|
|
45
55
|
/** Calculated from the `CollectibleType` enum. `CollectibleType.NULL` is not included. */
|
|
46
56
|
export const NUM_VANILLA_COLLECTIBLE_TYPES = getEnumLength(CollectibleType) - 1;
|
|
@@ -79,7 +89,7 @@ export const FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY;
|
|
|
79
89
|
* Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
|
|
80
90
|
* `TrinketType.NULL`.)
|
|
81
91
|
*/
|
|
82
|
-
export const LAST_TRINKET_TYPE = NUM_TRINKET_TYPES
|
|
92
|
+
export const LAST_TRINKET_TYPE = asTrinketType(NUM_TRINKET_TYPES);
|
|
83
93
|
|
|
84
94
|
/** Calculated from the `TrinketType` enum. */
|
|
85
95
|
export const LAST_VANILLA_TRINKET_TYPE = getLastEnumValue(TrinketType);
|
|
@@ -87,8 +97,9 @@ export const LAST_VANILLA_TRINKET_TYPE = getLastEnumValue(TrinketType);
|
|
|
87
97
|
/**
|
|
88
98
|
* If there are no modded trinkets, this constant will represent a trinket type that does not exist.
|
|
89
99
|
*/
|
|
90
|
-
export const FIRST_MODDED_TRINKET_TYPE = (
|
|
91
|
-
|
|
100
|
+
export const FIRST_MODDED_TRINKET_TYPE = asTrinketType(
|
|
101
|
+
asNumber(LAST_VANILLA_TRINKET_TYPE) + 1,
|
|
102
|
+
);
|
|
92
103
|
|
|
93
104
|
// -----
|
|
94
105
|
// Cards
|
|
@@ -114,13 +125,13 @@ export const FIRST_CARD = Card.FOOL;
|
|
|
114
125
|
*
|
|
115
126
|
* Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
|
|
116
127
|
*/
|
|
117
|
-
export const LAST_CARD = NUM_CARDS
|
|
128
|
+
export const LAST_CARD = asCard(NUM_CARDS);
|
|
118
129
|
|
|
119
130
|
/** Calculated from the `Card` enum. */
|
|
120
131
|
export const MAX_VANILLA_CARD = getLastEnumValue(Card);
|
|
121
132
|
|
|
122
133
|
/** If there are no modded cards, this constant will represent a card that does not exist. */
|
|
123
|
-
export const FIRST_MODDED_CARD = ((MAX_VANILLA_CARD
|
|
134
|
+
export const FIRST_MODDED_CARD = asCard(asNumber(MAX_VANILLA_CARD) + 1);
|
|
124
135
|
|
|
125
136
|
// ------------
|
|
126
137
|
// Pill Effects
|
|
@@ -153,7 +164,7 @@ export const FIRST_PILL_EFFECT = PillEffect.BAD_GAS;
|
|
|
153
164
|
* Equal to `itemConfig.GetPillEffects().Size - 1`. (We subtract one to account for
|
|
154
165
|
* `PillEffect.NULL`.)
|
|
155
166
|
*/
|
|
156
|
-
export const LAST_PILL_EFFECT = NUM_PILL_EFFECTS
|
|
167
|
+
export const LAST_PILL_EFFECT = asPillEffect(NUM_PILL_EFFECTS);
|
|
157
168
|
|
|
158
169
|
/** Calculated from the `PillEffect` enum. */
|
|
159
170
|
export const LAST_VANILLA_PILL_EFFECT = getLastEnumValue(PillEffect);
|
|
@@ -162,8 +173,9 @@ export const LAST_VANILLA_PILL_EFFECT = getLastEnumValue(PillEffect);
|
|
|
162
173
|
* If there are no modded pill effects, this constant will represent a pill effect that does not
|
|
163
174
|
* exist.
|
|
164
175
|
*/
|
|
165
|
-
export const FIRST_MODDED_PILL_EFFECT = (
|
|
166
|
-
|
|
176
|
+
export const FIRST_MODDED_PILL_EFFECT = asPillEffect(
|
|
177
|
+
asNumber(LAST_VANILLA_PILL_EFFECT) + 1,
|
|
178
|
+
);
|
|
167
179
|
|
|
168
180
|
// -----------
|
|
169
181
|
// Pill Colors
|
|
@@ -207,9 +219,12 @@ export const LAST_VANILLA_CHARACTER = getLastEnumValue(PlayerType);
|
|
|
207
219
|
|
|
208
220
|
/**
|
|
209
221
|
* If there are no modded characters, this constant will represent a character that does not exist.
|
|
222
|
+
* (There is no way to determine the amount of modded characters at run-time, since there is no
|
|
223
|
+
* exposed player config.)
|
|
210
224
|
*/
|
|
211
|
-
export const FIRST_MODDED_CHARACTER = (
|
|
212
|
-
|
|
225
|
+
export const FIRST_MODDED_CHARACTER = asPlayerType(
|
|
226
|
+
asNumber(LAST_VANILLA_CHARACTER) + 1,
|
|
227
|
+
);
|
|
213
228
|
|
|
214
229
|
// ----------
|
|
215
230
|
// Room Types
|
package/src/enums/index.ts
CHANGED
|
@@ -4,6 +4,7 @@ export * from "./HealthType";
|
|
|
4
4
|
export * from "./ModCallbackCustom";
|
|
5
5
|
export * from "./PocketItemType";
|
|
6
6
|
export * from "./RockAltType";
|
|
7
|
+
export * from "./SaveDataKey";
|
|
7
8
|
export * from "./SerializationType";
|
|
8
9
|
export * from "./SlotDestructionType";
|
|
9
10
|
export * from "./StatType";
|
|
@@ -4,6 +4,7 @@ export * as HealthType from "./HealthType";
|
|
|
4
4
|
export * as ModCallbackCustom from "./ModCallbackCustom";
|
|
5
5
|
export * as PocketItemType from "./PocketItemType";
|
|
6
6
|
export * as RockAltType from "./RockAltType";
|
|
7
|
+
export * as SaveDataKey from "./SaveDataKey";
|
|
7
8
|
export * as SerializationType from "./SerializationType";
|
|
8
9
|
export * as SlotDestructionType from "./SlotDestructionType";
|
|
9
10
|
export * as StatType from "./StatType";
|
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
spawnGridEntityWithVariant,
|
|
24
24
|
} from "../functions/gridEntities";
|
|
25
25
|
import { getRoomListIndex } from "../functions/roomData";
|
|
26
|
+
import { asNumber } from "../functions/types";
|
|
26
27
|
import { isVector } from "../functions/vector";
|
|
27
28
|
import { GridEntityCustomData } from "../interfaces/GridEntityCustomData";
|
|
28
29
|
import { runNextGameFrame } from "./runInNFrames";
|
|
@@ -251,7 +252,7 @@ export function spawnCustomGridEntity(
|
|
|
251
252
|
existingGridEntity !== undefined &&
|
|
252
253
|
existingGridEntity.GetType() === GridEntityType.DECORATION &&
|
|
253
254
|
existingGridEntity.GetVariant() ===
|
|
254
|
-
(DecorationVariant.CUSTOM_GRID_ENTITY
|
|
255
|
+
asNumber(DecorationVariant.CUSTOM_GRID_ENTITY);
|
|
255
256
|
const decoration = isExistingDecoration
|
|
256
257
|
? existingGridEntity
|
|
257
258
|
: spawnGridEntityWithVariant(
|
|
@@ -131,11 +131,12 @@ function spawnWallEntity(
|
|
|
131
131
|
|
|
132
132
|
// We spawn an effect instead of simply rendering a static sprite in order to emulate how vanilla
|
|
133
133
|
// does this. (`EntityFlag.RENDER_WALL` is intended for this purpose.)
|
|
134
|
+
const seed = 1 as Seed;
|
|
134
135
|
const wallEffect = spawnEffectWithSeed(
|
|
135
136
|
BACKDROP_EFFECT_VARIANT,
|
|
136
137
|
BACKDROP_EFFECT_SUBTYPE,
|
|
137
138
|
VectorZero,
|
|
138
|
-
|
|
139
|
+
seed,
|
|
139
140
|
);
|
|
140
141
|
wallEffect.AddEntityFlags(EntityFlag.RENDER_WALL);
|
|
141
142
|
|
|
@@ -195,11 +196,12 @@ function spawnFloorEntity(customStage: CustomStage, rng: RNG) {
|
|
|
195
196
|
|
|
196
197
|
// We spawn an effect instead of simply rendering a static sprite in order to emulate how vanilla
|
|
197
198
|
// does this. (`EntityFlag.RENDER_FLOOR` is intended for this purpose.)
|
|
199
|
+
const seed = 1 as Seed;
|
|
198
200
|
const floorEffect = spawnEffectWithSeed(
|
|
199
201
|
BACKDROP_EFFECT_VARIANT,
|
|
200
202
|
0,
|
|
201
203
|
VectorZero,
|
|
202
|
-
|
|
204
|
+
seed,
|
|
203
205
|
);
|
|
204
206
|
floorEffect.AddEntityFlags(EntityFlag.RENDER_FLOOR);
|
|
205
207
|
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
getTrinkets,
|
|
16
16
|
} from "../../functions/pickupsSpecific";
|
|
17
17
|
import { calculateStageType } from "../../functions/stage";
|
|
18
|
+
import { asNumber } from "../../functions/types";
|
|
18
19
|
import { vectorEquals } from "../../functions/vector";
|
|
19
20
|
import { CustomStage } from "../../interfaces/private/CustomStage";
|
|
20
21
|
import { TrapdoorDestination } from "../../types/TrapdoorDestination";
|
|
@@ -40,7 +41,7 @@ export function setCustomDecorationGraphics(
|
|
|
40
41
|
|
|
41
42
|
// Ignore custom grid entities. (They are represented as decorations with a non-zero variant.)
|
|
42
43
|
const variant = gridEntity.GetVariant();
|
|
43
|
-
if (variant !== (DecorationVariant.VANILLA_DECORATION
|
|
44
|
+
if (variant !== asNumber(DecorationVariant.VANILLA_DECORATION)) {
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
46
47
|
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
getRoomsInsideGrid,
|
|
25
25
|
} from "../../functions/rooms";
|
|
26
26
|
import { setStage } from "../../functions/stage";
|
|
27
|
+
import { asNumber } from "../../functions/types";
|
|
27
28
|
import { CustomStage } from "../../interfaces/private/CustomStage";
|
|
28
29
|
import { getRandomCustomStageRoom } from "./customStageUtils";
|
|
29
30
|
import v, {
|
|
@@ -77,7 +78,7 @@ export function setCustomStage(
|
|
|
77
78
|
level.SetStage(LevelStage.BASEMENT_1, StageType.ORIGINAL);
|
|
78
79
|
}
|
|
79
80
|
|
|
80
|
-
let baseStage
|
|
81
|
+
let baseStage =
|
|
81
82
|
customStage.baseStage === undefined
|
|
82
83
|
? DEFAULT_BASE_STAGE
|
|
83
84
|
: customStage.baseStage;
|
|
@@ -88,11 +89,11 @@ export function setCustomStage(
|
|
|
88
89
|
const baseStageType =
|
|
89
90
|
customStage.baseStageType === undefined
|
|
90
91
|
? DEFAULT_BASE_STAGE_TYPE
|
|
91
|
-
:
|
|
92
|
+
: customStage.baseStageType;
|
|
92
93
|
|
|
93
|
-
const reseed = (stage
|
|
94
|
+
const reseed = asNumber(stage) >= baseStage;
|
|
94
95
|
|
|
95
|
-
setStage(baseStage as LevelStage, baseStageType, reseed);
|
|
96
|
+
setStage(baseStage as LevelStage, baseStageType as StageType, reseed);
|
|
96
97
|
|
|
97
98
|
setStageRoomsData(customStage, rng, verbose);
|
|
98
99
|
|
|
@@ -56,11 +56,12 @@ export function setShadows(customStage: CustomStage): void {
|
|
|
56
56
|
// We spawn an effect instead of simply rendering a static sprite so that the effect will properly
|
|
57
57
|
// slide in during a room transition animation. (It looks stupid if the shadow stays statically
|
|
58
58
|
// rendering throughout this animation.)
|
|
59
|
+
const seed = 1 as Seed;
|
|
59
60
|
const shadowEffect = spawnEffectWithSeed(
|
|
60
61
|
SHADOW_EFFECT_VARIANT,
|
|
61
62
|
SHADOW_EFFECT_SUBTYPE,
|
|
62
63
|
centerPos,
|
|
63
|
-
|
|
64
|
+
seed,
|
|
64
65
|
);
|
|
65
66
|
|
|
66
67
|
const sprite = shadowEffect.GetSprite();
|
|
@@ -40,7 +40,6 @@ import {
|
|
|
40
40
|
convertXMLGridEntityType,
|
|
41
41
|
getAllGridIndexes,
|
|
42
42
|
getGridEntities,
|
|
43
|
-
getGridEntityIDFromConstituents,
|
|
44
43
|
removeAllGridExcept,
|
|
45
44
|
removeGridEntity,
|
|
46
45
|
setGridEntityInvisible,
|
|
@@ -53,6 +52,7 @@ import { getRoomListIndex } from "../functions/roomData";
|
|
|
53
52
|
import { gridCoordinatesToWorldPosition } from "../functions/roomGrid";
|
|
54
53
|
import { setRoomCleared, setRoomUncleared } from "../functions/rooms";
|
|
55
54
|
import { spawnCollectible } from "../functions/spawnCollectible";
|
|
55
|
+
import { asCollectibleType, asNumber } from "../functions/types";
|
|
56
56
|
import { JSONRoom } from "../interfaces/JSONRoomsFile";
|
|
57
57
|
import { runNextGameFrame } from "./runInNFrames";
|
|
58
58
|
import { saveDataManager } from "./saveDataManager/exports";
|
|
@@ -462,8 +462,8 @@ function spawnAllEntities(
|
|
|
462
462
|
}
|
|
463
463
|
|
|
464
464
|
const entityTypeString = firstXMLEntity.$.type;
|
|
465
|
-
const
|
|
466
|
-
if (
|
|
465
|
+
const entityTypeNumber = tonumber(entityTypeString);
|
|
466
|
+
if (entityTypeNumber === undefined) {
|
|
467
467
|
error(
|
|
468
468
|
`Failed to convert the entity type to a number: ${entityTypeString}`,
|
|
469
469
|
);
|
|
@@ -482,31 +482,26 @@ function spawnAllEntities(
|
|
|
482
482
|
}
|
|
483
483
|
|
|
484
484
|
// Note that XML entity type 1000 is a rock, not an effect.
|
|
485
|
-
if (
|
|
485
|
+
if (entityTypeNumber >= 1000) {
|
|
486
|
+
const gridEntityXMLType = entityTypeNumber as GridEntityXMLType;
|
|
486
487
|
if (verbose) {
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
variant,
|
|
488
|
+
log(
|
|
489
|
+
`Spawning grid entity ${gridEntityXMLType}.${variant} at: (${x}, ${y})`,
|
|
490
490
|
);
|
|
491
|
-
log(`Spawning grid entity ${gridEntityID} at: (${x}, ${y})`);
|
|
492
491
|
}
|
|
493
|
-
spawnGridEntityForJSONRoom(
|
|
494
|
-
entityType as GridEntityXMLType,
|
|
495
|
-
variant,
|
|
496
|
-
x,
|
|
497
|
-
y,
|
|
498
|
-
);
|
|
492
|
+
spawnGridEntityForJSONRoom(gridEntityXMLType, variant, x, y);
|
|
499
493
|
} else {
|
|
494
|
+
const entityType = entityTypeNumber as EntityType;
|
|
500
495
|
if (verbose) {
|
|
501
496
|
const entityID = getEntityIDFromConstituents(
|
|
502
|
-
entityType
|
|
497
|
+
entityType,
|
|
503
498
|
variant,
|
|
504
499
|
subType,
|
|
505
500
|
);
|
|
506
501
|
log(`Spawning normal entity ${entityID} at: (${x}, ${y})`);
|
|
507
502
|
}
|
|
508
503
|
const entity = spawnNormalEntityForJSONRoom(
|
|
509
|
-
entityType
|
|
504
|
+
entityType,
|
|
510
505
|
variant,
|
|
511
506
|
subType,
|
|
512
507
|
x,
|
|
@@ -589,11 +584,11 @@ function spawnNormalEntityForJSONRoom(
|
|
|
589
584
|
let entity: Entity;
|
|
590
585
|
if (
|
|
591
586
|
entityType === EntityType.PICKUP &&
|
|
592
|
-
|
|
587
|
+
variant === asNumber(PickupVariant.COLLECTIBLE)
|
|
593
588
|
) {
|
|
594
589
|
const options = roomType === RoomType.ANGEL;
|
|
595
590
|
entity = spawnCollectible(
|
|
596
|
-
subType
|
|
591
|
+
asCollectibleType(subType),
|
|
597
592
|
position,
|
|
598
593
|
seed,
|
|
599
594
|
options,
|
|
@@ -605,7 +600,7 @@ function spawnNormalEntityForJSONRoom(
|
|
|
605
600
|
// For some reason, Pitfalls do not spawn with the correct collision classes.
|
|
606
601
|
if (
|
|
607
602
|
entityType === EntityType.PITFALL &&
|
|
608
|
-
|
|
603
|
+
variant === asNumber(PitfallVariant.PITFALL)
|
|
609
604
|
) {
|
|
610
605
|
entity.EntityCollisionClass = EntityCollisionClass.ENEMIES;
|
|
611
606
|
entity.GridCollisionClass = EntityGridCollisionClass.WALLS;
|
|
@@ -89,6 +89,7 @@ import { gridCoordinatesToWorldPosition } from "../../functions/roomGrid";
|
|
|
89
89
|
import { changeRoom } from "../../functions/rooms";
|
|
90
90
|
import { onSetSeed, restart, setUnseeded } from "../../functions/run";
|
|
91
91
|
import { getGoldenTrinketType } from "../../functions/trinkets";
|
|
92
|
+
import { asCard } from "../../functions/types";
|
|
92
93
|
import { irange, printConsole, printEnabled } from "../../functions/utils";
|
|
93
94
|
import { CARD_MAP } from "../../maps/cardMap";
|
|
94
95
|
import { CHARACTER_MAP } from "../../maps/characterMap";
|
|
@@ -343,12 +344,12 @@ export function cards(): void {
|
|
|
343
344
|
let cardType = 1;
|
|
344
345
|
for (let y = 0; y <= 6; y++) {
|
|
345
346
|
for (let x = 0; x <= 12; x++) {
|
|
346
|
-
if ((cardType
|
|
347
|
+
if (asCard(cardType) === LAST_CARD) {
|
|
347
348
|
return;
|
|
348
349
|
}
|
|
349
350
|
|
|
350
351
|
const position = gridCoordinatesToWorldPosition(x, y);
|
|
351
|
-
spawnCard(cardType
|
|
352
|
+
spawnCard(asCard(cardType), position);
|
|
352
353
|
cardType++;
|
|
353
354
|
}
|
|
354
355
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SaveDataKey } from "../../enums/
|
|
1
|
+
import { SaveDataKey } from "../../enums/SaveDataKey";
|
|
2
2
|
import { SerializationType } from "../../enums/SerializationType";
|
|
3
3
|
import { errorIfFeaturesNotInitialized } from "../../featuresInitialized";
|
|
4
4
|
import { deepCopy } from "../../functions/deepCopy";
|
|
@@ -227,7 +227,7 @@ export function saveDataManagerSetGlobal(): void {
|
|
|
227
227
|
*/
|
|
228
228
|
export function saveDataManagerReset(
|
|
229
229
|
key: string,
|
|
230
|
-
childObjectKey:
|
|
230
|
+
childObjectKey: SaveDataKey,
|
|
231
231
|
): void {
|
|
232
232
|
errorIfFeaturesNotInitialized(SAVE_DATA_MANAGER_FEATURE_NAME);
|
|
233
233
|
|
|
@@ -237,12 +237,12 @@ export function saveDataManagerReset(
|
|
|
237
237
|
);
|
|
238
238
|
}
|
|
239
239
|
|
|
240
|
-
const saveData = saveDataMap.get(key)
|
|
240
|
+
const saveData = saveDataMap.get(key);
|
|
241
241
|
if (saveData === undefined) {
|
|
242
242
|
error(
|
|
243
243
|
`The ${SAVE_DATA_MANAGER_FEATURE_NAME} is not managing save data for a key of: ${key}`,
|
|
244
244
|
);
|
|
245
245
|
}
|
|
246
246
|
|
|
247
|
-
restoreDefaultSaveData(key, saveData, childObjectKey
|
|
247
|
+
restoreDefaultSaveData(key, saveData, childObjectKey);
|
|
248
248
|
}
|
|
@@ -2,7 +2,7 @@ import { ModCallback } from "isaac-typescript-definitions";
|
|
|
2
2
|
import { ModUpgraded } from "../../classes/ModUpgraded";
|
|
3
3
|
import { game } from "../../core/cachedClasses";
|
|
4
4
|
import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
|
|
5
|
-
import { SaveDataKey } from "../../enums/
|
|
5
|
+
import { SaveDataKey } from "../../enums/SaveDataKey";
|
|
6
6
|
import { SerializationType } from "../../enums/SerializationType";
|
|
7
7
|
import { deepCopy } from "../../functions/deepCopy";
|
|
8
8
|
import { logError } from "../../functions/log";
|
|
@@ -61,7 +61,7 @@ function getAllSaveDataToWriteToDisk(
|
|
|
61
61
|
// that is unnecessary. Make a copy of the data and recursively convert all TypeScriptToLua
|
|
62
62
|
// Maps into Lua tables.
|
|
63
63
|
const saveDataCopy = deepCopy(
|
|
64
|
-
saveDataWithoutRoom
|
|
64
|
+
saveDataWithoutRoom,
|
|
65
65
|
SerializationType.SERIALIZE,
|
|
66
66
|
subscriberName,
|
|
67
67
|
);
|
|
@@ -37,11 +37,7 @@ export function deserializeBitSet128(
|
|
|
37
37
|
);
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
const [l, h] = getNumbersFromTable(
|
|
41
|
-
bitSet128 as LuaMap<string, unknown>,
|
|
42
|
-
OBJECT_NAME,
|
|
43
|
-
...KEYS,
|
|
44
|
-
);
|
|
40
|
+
const [l, h] = getNumbersFromTable(bitSet128, OBJECT_NAME, ...KEYS);
|
|
45
41
|
|
|
46
42
|
if (l === undefined) {
|
|
47
43
|
error(
|
package/src/functions/bosses.ts
CHANGED
|
@@ -14,6 +14,7 @@ import { getNPCs, spawnNPC } from "./entitiesSpecific";
|
|
|
14
14
|
import { getAliveNPCs } from "./npcs";
|
|
15
15
|
import { isRNG } from "./rng";
|
|
16
16
|
import { copySet } from "./set";
|
|
17
|
+
import { asNumber } from "./types";
|
|
17
18
|
import { repeat } from "./utils";
|
|
18
19
|
|
|
19
20
|
const BOSSES_THAT_REQUIRE_MULTIPLE_SPAWNS: ReadonlySet<EntityType> = new Set([
|
|
@@ -194,7 +195,7 @@ function getNumBossSegments(
|
|
|
194
195
|
|
|
195
196
|
// 69
|
|
196
197
|
case EntityType.LOKI: {
|
|
197
|
-
return
|
|
198
|
+
return variant === asNumber(LokiVariant.LOKII) ? 2 : 1;
|
|
198
199
|
}
|
|
199
200
|
|
|
200
201
|
// 237
|
package/src/functions/cards.ts
CHANGED
|
@@ -59,7 +59,7 @@ function initCardObjects() {
|
|
|
59
59
|
|
|
60
60
|
/** Helper function to get an array with every valid card sub-type. This includes modded cards. */
|
|
61
61
|
export function getAllCards(): Card[] {
|
|
62
|
-
return irange(FIRST_CARD, LAST_CARD)
|
|
62
|
+
return irange(FIRST_CARD, LAST_CARD);
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
/**
|
|
@@ -159,7 +159,7 @@ export function getModdedCards(): Card[] {
|
|
|
159
159
|
return [];
|
|
160
160
|
}
|
|
161
161
|
|
|
162
|
-
return irange(FIRST_MODDED_CARD, LAST_CARD)
|
|
162
|
+
return irange(FIRST_MODDED_CARD, LAST_CARD);
|
|
163
163
|
}
|
|
164
164
|
|
|
165
165
|
/**
|
|
@@ -216,7 +216,7 @@ export function getRandomRune(
|
|
|
216
216
|
|
|
217
217
|
/** Helper function to get an array with every valid vanilla card sub-type. */
|
|
218
218
|
export function getVanillaCards(): Card[] {
|
|
219
|
-
return irange(FIRST_CARD, MAX_VANILLA_CARD)
|
|
219
|
+
return irange(FIRST_CARD, MAX_VANILLA_CARD);
|
|
220
220
|
}
|
|
221
221
|
|
|
222
222
|
/**
|
|
@@ -389,10 +389,7 @@ export function getModdedCollectibleTypes(): CollectibleType[] {
|
|
|
389
389
|
return [];
|
|
390
390
|
}
|
|
391
391
|
|
|
392
|
-
return irange(
|
|
393
|
-
FIRST_MODDED_COLLECTIBLE_TYPE,
|
|
394
|
-
LAST_COLLECTIBLE_TYPE,
|
|
395
|
-
) as CollectibleType[];
|
|
392
|
+
return irange(FIRST_MODDED_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE);
|
|
396
393
|
}
|
|
397
394
|
|
|
398
395
|
/**
|
|
@@ -404,10 +401,7 @@ export function getModdedCollectibleTypes(): CollectibleType[] {
|
|
|
404
401
|
* should use the `getVanillaCollectibleSet` helper function instead.
|
|
405
402
|
*/
|
|
406
403
|
export function getVanillaCollectibleTypeRange(): CollectibleType[] {
|
|
407
|
-
return irange(
|
|
408
|
-
FIRST_COLLECTIBLE_TYPE,
|
|
409
|
-
LAST_VANILLA_COLLECTIBLE_TYPE,
|
|
410
|
-
) as CollectibleType[];
|
|
404
|
+
return irange(FIRST_COLLECTIBLE_TYPE, LAST_VANILLA_COLLECTIBLE_TYPE);
|
|
411
405
|
}
|
|
412
406
|
|
|
413
407
|
/** Returns true if the item type in the item config is equal to `ItemType.ITEM_ACTIVE`. */
|
package/src/functions/color.ts
CHANGED
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
isUserDefinedTSTLClass,
|
|
24
24
|
newTSTLClass,
|
|
25
25
|
} from "./tstlClass";
|
|
26
|
-
import { isNumber, isPrimitive } from "./types";
|
|
26
|
+
import { asString, isNumber, isPrimitive } from "./types";
|
|
27
27
|
import { getTraversalDescription, twoDimensionalSort } from "./utils";
|
|
28
28
|
|
|
29
29
|
const COPYABLE_ISAAC_API_CLASS_TYPES_SET = new Set<string>(
|
|
@@ -575,7 +575,7 @@ function getCopiedEntries(
|
|
|
575
575
|
const convertStringKeysToNumbers =
|
|
576
576
|
serializationType === SerializationType.DESERIALIZE &&
|
|
577
577
|
entries.some(
|
|
578
|
-
([key]) => key === (SerializationBrand.OBJECT_WITH_NUMBER_KEYS
|
|
578
|
+
([key]) => key === asString(SerializationBrand.OBJECT_WITH_NUMBER_KEYS),
|
|
579
579
|
);
|
|
580
580
|
|
|
581
581
|
const hasNumberKeys = entries.some(([key]) => isNumber(key));
|
|
@@ -8,7 +8,7 @@ import { erange } from "./utils";
|
|
|
8
8
|
* Helper function to get an array with every valid `Dimension` (not including `Dimension.CURRENT`).
|
|
9
9
|
*/
|
|
10
10
|
export function getAllDimensions(): Dimension[] {
|
|
11
|
-
return erange(NUM_DIMENSIONS)
|
|
11
|
+
return erange(NUM_DIMENSIONS);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
/**
|