Skip to content

Commit d3b7652

Browse files
osse101osse101
committed
Change moonfall speed units from tiles to pixels and add numerics
1 parent 79fff5a commit d3b7652

59 files changed

Lines changed: 377 additions & 329 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎numerics.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@
5858
"value": 8,
5959
"minimum": 0,
6060
"note": "Number of failed attempts expected before a successful elevator Crystal Flash attempt."
61+
},
62+
{
63+
"name": "n_moondanceSpeedPixelsOneTile",
64+
"value": 65510,
65+
"minimum": 0,
66+
"note": "The vertical speed to fall through one tile on the next moonfall."
67+
},
68+
{
69+
"name": "n_moondanceSpeedPixelsTwoTiles",
70+
"value": 65494,
71+
"minimum": 0,
72+
"note": "The vertical speed to fall through two tiles on the next moonfall."
73+
},
74+
{
75+
"name": "n_jumpStorageSpeedPixels",
76+
"value": 4,
77+
"minimum": 0,
78+
"note": "The highest vertical speed when springballing in air physics."
79+
},
80+
{
81+
"name": "n_jumpStorageHiJumpSpeedPixels",
82+
"value": 5,
83+
"minimum": 0,
84+
"note": "The highest vertical speed when springballing in air physics with HiJump."
6185
}
6286
]
6387
},

‎region/brinstar/blue/Construction Zone.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
],
213213
"exitCondition": {
214214
"leaveWithStoredFallSpeed": {
215-
"fallSpeedInTiles": 1
215+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
216216
}
217217
},
218218
"flashSuitChecked": false,
@@ -638,7 +638,7 @@
638638
],
639639
"exitCondition": {
640640
"leaveWithStoredFallSpeed": {
641-
"fallSpeedInTiles": 1
641+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
642642
}
643643
},
644644
"flashSuitChecked": true,

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
],
327327
"exitCondition": {
328328
"leaveWithStoredFallSpeed": {
329-
"fallSpeedInTiles": 1
329+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
330330
}
331331
},
332332
"flashSuitChecked": true,
@@ -346,7 +346,7 @@
346346
],
347347
"exitCondition": {
348348
"leaveWithStoredFallSpeed": {
349-
"fallSpeedInTiles": 2
349+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
350350
}
351351
},
352352
"flashSuitChecked": true,
@@ -626,7 +626,7 @@
626626
],
627627
"exitCondition": {
628628
"leaveWithStoredFallSpeed": {
629-
"fallSpeedInTiles": 1
629+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
630630
}
631631
},
632632
"flashSuitChecked": true,
@@ -646,7 +646,7 @@
646646
],
647647
"exitCondition": {
648648
"leaveWithStoredFallSpeed": {
649-
"fallSpeedInTiles": 2
649+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
650650
}
651651
},
652652
"flashSuitChecked": true,
@@ -2298,7 +2298,7 @@
22982298
],
22992299
"exitCondition": {
23002300
"leaveWithStoredFallSpeed": {
2301-
"fallSpeedInTiles": 1
2301+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
23022302
}
23032303
},
23042304
"flashSuitChecked": true,
@@ -2319,7 +2319,7 @@
23192319
],
23202320
"exitCondition": {
23212321
"leaveWithStoredFallSpeed": {
2322-
"fallSpeedInTiles": 2
2322+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
23232323
}
23242324
},
23252325
"flashSuitChecked": true,
@@ -2830,7 +2830,7 @@
28302830
],
28312831
"exitCondition": {
28322832
"leaveWithStoredFallSpeed": {
2833-
"fallSpeedInTiles": 1
2833+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
28342834
}
28352835
},
28362836
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
@@ -2856,7 +2856,7 @@
28562856
],
28572857
"exitCondition": {
28582858
"leaveWithStoredFallSpeed": {
2859-
"fallSpeedInTiles": 2
2859+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
28602860
}
28612861
},
28622862
"unlocksDoors": [{"types": ["ammo"], "requires": []}],

‎region/brinstar/green/Green Brinstar Beetom Room.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
],
229229
"exitCondition": {
230230
"leaveWithStoredFallSpeed": {
231-
"fallSpeedInTiles": 1
231+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
232232
}
233233
},
234234
"flashSuitChecked": true,
@@ -264,7 +264,7 @@
264264
],
265265
"exitCondition": {
266266
"leaveWithStoredFallSpeed": {
267-
"fallSpeedInTiles": 1
267+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
268268
}
269269
},
270270
"flashSuitChecked": true,
@@ -289,7 +289,7 @@
289289
],
290290
"exitCondition": {
291291
"leaveWithStoredFallSpeed": {
292-
"fallSpeedInTiles": 2
292+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
293293
}
294294
},
295295
"flashSuitChecked": true,
@@ -1012,7 +1012,7 @@
10121012
],
10131013
"exitCondition": {
10141014
"leaveWithStoredFallSpeed": {
1015-
"fallSpeedInTiles": 1
1015+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
10161016
}
10171017
},
10181018
"flashSuitChecked": true,
@@ -1048,7 +1048,7 @@
10481048
],
10491049
"exitCondition": {
10501050
"leaveWithStoredFallSpeed": {
1051-
"fallSpeedInTiles": 1
1051+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
10521052
}
10531053
},
10541054
"flashSuitChecked": true,
@@ -1073,7 +1073,7 @@
10731073
],
10741074
"exitCondition": {
10751075
"leaveWithStoredFallSpeed": {
1076-
"fallSpeedInTiles": 2
1076+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
10771077
}
10781078
},
10791079
"flashSuitChecked": true,

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@
14101410
"name": "Stored Moonfall Clip",
14111411
"entranceCondition": {
14121412
"comeInWithStoredFallSpeed": {
1413-
"fallSpeedInTiles": 2
1413+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
14141414
}
14151415
},
14161416
"requires": [],
@@ -2868,13 +2868,13 @@
28682868
"name": "Transition with Stored Fall Speed",
28692869
"entranceCondition": {
28702870
"comeInWithStoredFallSpeed": {
2871-
"fallSpeedInTiles": 1
2871+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
28722872
}
28732873
},
28742874
"requires": [],
28752875
"exitCondition": {
28762876
"leaveWithStoredFallSpeed": {
2877-
"fallSpeedInTiles": 1
2877+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
28782878
}
28792879
},
28802880
"unlocksDoors": [
@@ -2890,13 +2890,13 @@
28902890
"name": "Transition with Stored Fall Speed (more speed)",
28912891
"entranceCondition": {
28922892
"comeInWithStoredFallSpeed": {
2893-
"fallSpeedInTiles": 2
2893+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
28942894
}
28952895
},
28962896
"requires": [],
28972897
"exitCondition": {
28982898
"leaveWithStoredFallSpeed": {
2899-
"fallSpeedInTiles": 2
2899+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
29002900
}
29012901
},
29022902
"unlocksDoors": [
@@ -3006,7 +3006,7 @@
30063006
"name": "Stored Moonfall Clip",
30073007
"entranceCondition": {
30083008
"comeInWithStoredFallSpeed": {
3009-
"fallSpeedInTiles": 1
3009+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
30103010
}
30113011
},
30123012
"requires": [],
@@ -3019,7 +3019,7 @@
30193019
"name": "Stored Moonfall Clip (more speed)",
30203020
"entranceCondition": {
30213021
"comeInWithStoredFallSpeed": {
3022-
"fallSpeedInTiles": 2
3022+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
30233023
}
30243024
},
30253025
"requires": [],
@@ -3424,13 +3424,13 @@
34243424
"name": "Transition with Stored Fall Speed",
34253425
"entranceCondition": {
34263426
"comeInWithStoredFallSpeed": {
3427-
"fallSpeedInTiles": 1
3427+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
34283428
}
34293429
},
34303430
"requires": [],
34313431
"exitCondition": {
34323432
"leaveWithStoredFallSpeed": {
3433-
"fallSpeedInTiles": 1
3433+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
34343434
}
34353435
},
34363436
"unlocksDoors": [
@@ -3446,13 +3446,13 @@
34463446
"name": "Transition with Stored Fall Speed (more speed)",
34473447
"entranceCondition": {
34483448
"comeInWithStoredFallSpeed": {
3449-
"fallSpeedInTiles": 2
3449+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
34503450
}
34513451
},
34523452
"requires": [],
34533453
"exitCondition": {
34543454
"leaveWithStoredFallSpeed": {
3455-
"fallSpeedInTiles": 2
3455+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
34563456
}
34573457
},
34583458
"unlocksDoors": [
@@ -3677,7 +3677,7 @@
36773677
"name": "Stored Moonfall Clip",
36783678
"entranceCondition": {
36793679
"comeInWithStoredFallSpeed": {
3680-
"fallSpeedInTiles": 1
3680+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
36813681
}
36823682
},
36833683
"requires": [],
@@ -3690,7 +3690,7 @@
36903690
"name": "Stored Moonfall Clip (more speed)",
36913691
"entranceCondition": {
36923692
"comeInWithStoredFallSpeed": {
3693-
"fallSpeedInTiles": 2
3693+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
36943694
}
36953695
},
36963696
"requires": [],

‎region/brinstar/green/Spore Spawn Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"name": "Moondance Clip",
172172
"entranceCondition": {
173173
"comeInWithStoredFallSpeed": {
174-
"fallSpeedInTiles": 2
174+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
175175
}
176176
},
177177
"requires": [

‎region/brinstar/kraid/Warehouse Energy Tank Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
],
305305
"exitCondition": {
306306
"leaveWithStoredFallSpeed": {
307-
"fallSpeedInTiles": 1
307+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
308308
}
309309
},
310310
"flashSuitChecked": true,
@@ -328,7 +328,7 @@
328328
],
329329
"exitCondition": {
330330
"leaveWithStoredFallSpeed": {
331-
"fallSpeedInTiles": 2
331+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
332332
}
333333
},
334334
"flashSuitChecked": true,

‎region/brinstar/kraid/Warehouse Entrance.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
],
167167
"exitCondition": {
168168
"leaveWithStoredFallSpeed": {
169-
"fallSpeedInTiles": 1
169+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
170170
}
171171
},
172172
"flashSuitChecked": true,
@@ -192,7 +192,7 @@
192192
],
193193
"exitCondition": {
194194
"leaveWithStoredFallSpeed": {
195-
"fallSpeedInTiles": 2
195+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
196196
}
197197
},
198198
"flashSuitChecked": true,

‎region/brinstar/kraid/Warehouse Zeela Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
],
432432
"exitCondition": {
433433
"leaveWithStoredFallSpeed": {
434-
"fallSpeedInTiles": 1
434+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile"
435435
}
436436
},
437437
"flashSuitChecked": true,
@@ -565,7 +565,7 @@
565565
"name": "Stored Moonfall Clip",
566566
"entranceCondition": {
567567
"comeInWithStoredFallSpeed": {
568-
"fallSpeedInTiles": 2
568+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
569569
}
570570
},
571571
"requires": [

‎region/brinstar/pink/Big Pink.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@
12771277
"name": "Extended Moondance Clip",
12781278
"entranceCondition": {
12791279
"comeInWithStoredFallSpeed": {
1280-
"fallSpeedInTiles": 2
1280+
"verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles"
12811281
}
12821282
},
12831283
"requires": [

0 commit comments

Comments
 (0)