Skip to content

Commit 72c9154

Browse files
kjbranchkjbranch
committed
Elevator Implicit Strats, Remove Heated spawnAts
1 parent 72b482e commit 72c9154

17 files changed

Lines changed: 397 additions & 269 deletions

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
"nodeType": "door",
4141
"nodeSubType": "elevator",
4242
"nodeAddress": "0x0018eb6",
43-
"doorOrientation": "up"
43+
"doorOrientation": "up",
44+
"useImplicitCarryGModeMorphBackThrough": false,
45+
"useImplicitCarryGModeBackThrough": false
4446
},
4547
{
4648
"id": 3,
@@ -773,6 +775,23 @@
773775
},
774776
"flashSuitChecked": true
775777
},
778+
{
779+
"link": [2, 2],
780+
"name": "Carry G-Mode Back Up the Elevator",
781+
"entranceCondition": {
782+
"comeInWithGMode": {
783+
"mode": "any",
784+
"morphed": false
785+
}
786+
},
787+
"requires": [],
788+
"exitCondition": {
789+
"leaveWithGMode": {
790+
"morphed": false
791+
}
792+
},
793+
"flashSuitChecked": true
794+
},
776795
{
777796
"id": 32,
778797
"link": [2, 3],

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
"nodeType": "door",
1414
"nodeSubType": "elevator",
1515
"nodeAddress": "0x0018ca6",
16-
"doorOrientation": "up"
16+
"doorOrientation": "up",
17+
"useImplicitCarryGModeMorphBackThrough": false,
18+
"useImplicitCarryGModeBackThrough": false
1719
},
1820
{
1921
"id": 2,
@@ -181,6 +183,7 @@
181183
{
182184
"from": 1,
183185
"to": [
186+
{"id": 1},
184187
{"id": 12},
185188
{"id": 13}
186189
]
@@ -374,6 +377,23 @@
374377
}
375378
],
376379
"strats": [
380+
{
381+
"link": [1, 1],
382+
"name": "Carry G-Mode Back Up the Elevator",
383+
"entranceCondition": {
384+
"comeInWithGMode": {
385+
"mode": "any",
386+
"morphed": false
387+
}
388+
},
389+
"requires": [],
390+
"exitCondition": {
391+
"leaveWithGMode": {
392+
"morphed": false
393+
}
394+
},
395+
"flashSuitChecked": true
396+
},
377397
{
378398
"id": 1,
379399
"link": [1, 12],

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"nodeType": "door",
2323
"nodeSubType": "elevator",
2424
"nodeAddress": "0x0019246",
25-
"doorOrientation": "down"
25+
"doorOrientation": "down",
26+
"useImplicitCarryGModeMorphBackThrough": false,
27+
"useImplicitCarryGModeBackThrough": false
2628
},
2729
{
2830
"id": 3,
@@ -376,6 +378,23 @@
376378
"flashSuitChecked": true,
377379
"note": "In order to align and place a Power Bomb at the correct pixel, jump and morph before hitting the ceiling."
378380
},
381+
{
382+
"link": [2, 2],
383+
"name": "Carry G-Mode Back Down the Elevator",
384+
"entranceCondition": {
385+
"comeInWithGMode": {
386+
"mode": "any",
387+
"morphed": false
388+
}
389+
},
390+
"requires": [],
391+
"exitCondition": {
392+
"leaveWithGMode": {
393+
"morphed": false
394+
}
395+
},
396+
"flashSuitChecked": true
397+
},
379398
{
380399
"id": 17,
381400
"link": [2, 4],

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
"nodeType": "door",
5959
"nodeSubType": "elevator",
6060
"nodeAddress": "0x00190ba",
61-
"doorOrientation": "up"
61+
"doorOrientation": "up",
62+
"useImplicitCarryGModeMorphBackThrough": false,
63+
"useImplicitCarryGModeBackThrough": false
6264
},
6365
{
6466
"id": 7,
@@ -152,6 +154,7 @@
152154
"from": 6,
153155
"to": [
154156
{"id": 1},
157+
{"id": 6},
155158
{"id": 7}
156159
]
157160
},
@@ -1922,6 +1925,23 @@
19221925
],
19231926
"flashSuitChecked": true
19241927
},
1928+
{
1929+
"link": [6, 6],
1930+
"name": "Carry G-Mode Back Up the Elevator",
1931+
"entranceCondition": {
1932+
"comeInWithGMode": {
1933+
"mode": "any",
1934+
"morphed": false
1935+
}
1936+
},
1937+
"requires": [],
1938+
"exitCondition": {
1939+
"leaveWithGMode": {
1940+
"morphed": false
1941+
}
1942+
},
1943+
"flashSuitChecked": true
1944+
},
19251945
{
19261946
"id": 95,
19271947
"link": [6, 7],

‎region/ceres/main/Ceres Elevator Room.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
]
2828
}
2929
],
30-
"devNote": "FIXME Do we need a nodeaddress here?"
30+
"devNote": [
31+
"FIXME Do we need a nodeaddress here?",
32+
"If this were to behave like a normal elevator, it would need G-mode return strats and 2->1 strats added"
33+
]
3134
},
3235
{
3336
"id": 2,

‎region/crateria/central/Blue Brinstar Elevator Room.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"nodeType": "door",
2323
"nodeSubType": "elevator",
2424
"nodeAddress": "0x0018b9e",
25-
"doorOrientation": "down"
25+
"doorOrientation": "down",
26+
"useImplicitCarryGModeMorphBackThrough": false,
27+
"useImplicitCarryGModeBackThrough": false
2628
}
2729
],
2830
"enemies": [],
@@ -211,7 +213,7 @@
211213
{
212214
"id": 12,
213215
"link": [2, 2],
214-
"name": "Carry G-Mode Down Elevator",
216+
"name": "Carry G-Mode Back Down the Elevator",
215217
"entranceCondition": {
216218
"comeInWithGMode": {
217219
"mode": "any",

‎region/crateria/east/Forgotten Highway Elevator.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"nodeType": "door",
2323
"nodeSubType": "elevator",
2424
"nodeAddress": "0x0018a5a",
25-
"doorOrientation": "down"
25+
"doorOrientation": "down",
26+
"useImplicitCarryGModeMorphBackThrough": false,
27+
"useImplicitCarryGModeBackThrough": false
2628
}
2729
],
2830
"enemies": [],
@@ -211,7 +213,7 @@
211213
{
212214
"id": 11,
213215
"link": [2, 2],
214-
"name": "Carry G-Mode Down Elevator",
216+
"name": "Carry G-Mode Back Down the Elevator",
215217
"entranceCondition": {
216218
"comeInWithGMode": {
217219
"mode": "any",

‎region/crateria/east/Red Brinstar Elevator Room.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"nodeType": "door",
2323
"nodeSubType": "elevator",
2424
"nodeAddress": "0x0018b02",
25-
"doorOrientation": "down"
25+
"doorOrientation": "down",
26+
"useImplicitCarryGModeMorphBackThrough": false,
27+
"useImplicitCarryGModeBackThrough": false
2628
}
2729
],
2830
"enemies": [],
@@ -211,7 +213,7 @@
211213
{
212214
"id": 11,
213215
"link": [2, 2],
214-
"name": "Carry G-Mode Down Elevator",
216+
"name": "Carry G-Mode Back Down the Elevator",
215217
"entranceCondition": {
216218
"comeInWithGMode": {
217219
"mode": "any",

‎region/crateria/west/Green Brinstar Elevator Room.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"nodeType": "door",
2323
"nodeSubType": "elevator",
2424
"nodeAddress": "0x0018c0a",
25-
"doorOrientation": "down"
25+
"doorOrientation": "down",
26+
"useImplicitCarryGModeMorphBackThrough": false,
27+
"useImplicitCarryGModeBackThrough": false
2628
}
2729
],
2830
"enemies": [],
@@ -209,7 +211,7 @@
209211
{
210212
"id": 12,
211213
"link": [2, 2],
212-
"name": "Carry G-Mode Down Elevator",
214+
"name": "Carry G-Mode Back Down the Elevator",
213215
"entranceCondition": {
214216
"comeInWithGMode": {
215217
"mode": "any",

‎region/crateria/west/Statues Room.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
"nodeType": "door",
3535
"nodeSubType": "elevator",
3636
"nodeAddress": "0x0019222",
37-
"doorOrientation": "down"
37+
"doorOrientation": "down",
38+
"useImplicitCarryGModeMorphBackThrough": false,
39+
"useImplicitCarryGModeBackThrough": false
3840
}
3941
],
4042
"enemies": [],
@@ -381,7 +383,7 @@
381383
{
382384
"id": 12,
383385
"link": [2, 2],
384-
"name": "Carry G-Mode Down the Elevator",
386+
"name": "Carry G-Mode Back Down the Elevator",
385387
"entranceCondition": {
386388
"comeInWithGMode": {
387389
"mode": "any",

0 commit comments

Comments
 (0)