Skip to content

Commit 932457a

Browse files
authored
Merge pull request #1809 from kjbranch/door-closed
Rename and Broaden h_EtecoonDoorSpawnFix
2 parents d6d6c3f + b46e7ab commit 932457a

4 files changed

Lines changed: 87 additions & 5 deletions

File tree

helpers.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,13 @@
248248
]
249249
},
250250
{
251-
"name": "h_EtecoonDoorSpawnFix",
251+
"name": "h_DoorImmediatelyClosedFix",
252252
"requires": [ "never" ],
253253
"devNote": [
254-
"In Vanilla, there is a bug placing the door at the top of the Etecoon Shaft in the wrong location.",
255-
"This primarily affects the closing animation and prevents return through the door while in direct g-mode."
254+
"In Vanilla, there is a bug placing the closing door at the top of the Etecoon Shaft in the wrong location.",
255+
"Additionally, the top right door in both Pink Brinstar Power Bomb Room and Halfie Climb Room are immediately closed.",
256+
"This affects the closing animation and prevents return through the door while in direct G-mode.",
257+
"This also prevents getting doorstuck, although that doesn't seem to be important in any of these locations."
256258
]
257259
},
258260
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3960,7 +3960,7 @@
39603960
}
39613961
},
39623962
"requires": [
3963-
"h_EtecoonDoorSpawnFix"
3963+
"h_DoorImmediatelyClosedFix"
39643964
],
39653965
"bypassesDoorShell": true,
39663966
"exitCondition": {
@@ -3981,7 +3981,7 @@
39813981
}
39823982
},
39833983
"requires": [
3984-
"h_EtecoonDoorSpawnFix"
3984+
"h_DoorImmediatelyClosedFix"
39853985
],
39863986
"bypassesDoorShell": true,
39873987
"exitCondition": {

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,46 @@
312312
"gModeRegainMobility": {},
313313
"flashSuitChecked": true
314314
},
315+
{
316+
"link": [1, 1],
317+
"name": "Carry G-Mode Back through the Door",
318+
"entranceCondition": {
319+
"comeInWithGMode": {
320+
"mode": "direct",
321+
"morphed": false
322+
}
323+
},
324+
"requires": [
325+
"h_DoorImmediatelyClosedFix"
326+
],
327+
"bypassesDoorShell": true,
328+
"exitCondition": {
329+
"leaveWithGMode": {
330+
"morphed": false
331+
}
332+
},
333+
"flashSuitChecked": true
334+
},
335+
{
336+
"link": [1, 1],
337+
"name": "Carry G-Mode Morph Back through the Door",
338+
"entranceCondition": {
339+
"comeInWithGMode": {
340+
"mode": "direct",
341+
"morphed": true
342+
}
343+
},
344+
"requires": [
345+
"h_DoorImmediatelyClosedFix"
346+
],
347+
"bypassesDoorShell": true,
348+
"exitCondition": {
349+
"leaveWithGMode": {
350+
"morphed": true
351+
}
352+
},
353+
"flashSuitChecked": true
354+
},
315355
{
316356
"id": 13,
317357
"link": [1, 4],

region/maridia/inner-pink/Halfie Climb Room.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3351,6 +3351,46 @@
33513351
},
33523352
"flashSuitChecked": true
33533353
},
3354+
{
3355+
"link": [4, 4],
3356+
"name": "Carry G-Mode Back through the Door",
3357+
"entranceCondition": {
3358+
"comeInWithGMode": {
3359+
"mode": "direct",
3360+
"morphed": false
3361+
}
3362+
},
3363+
"requires": [
3364+
"h_DoorImmediatelyClosedFix"
3365+
],
3366+
"bypassesDoorShell": true,
3367+
"exitCondition": {
3368+
"leaveWithGMode": {
3369+
"morphed": false
3370+
}
3371+
},
3372+
"flashSuitChecked": true
3373+
},
3374+
{
3375+
"link": [4, 4],
3376+
"name": "Carry G-Mode Morph Back through the Door",
3377+
"entranceCondition": {
3378+
"comeInWithGMode": {
3379+
"mode": "direct",
3380+
"morphed": true
3381+
}
3382+
},
3383+
"requires": [
3384+
"h_DoorImmediatelyClosedFix"
3385+
],
3386+
"bypassesDoorShell": true,
3387+
"exitCondition": {
3388+
"leaveWithGMode": {
3389+
"morphed": true
3390+
}
3391+
},
3392+
"flashSuitChecked": true
3393+
},
33543394
{
33553395
"id": 129,
33563396
"link": [4, 4],

0 commit comments

Comments
 (0)