Skip to content

Commit 7404d7c

Browse files
kjbranchkjbranch
authored
Merge pull request #1824 from kjbranch/spawn-at-6
Remove spawnAt: West Ocean, Fast Pillar, Ice Gate
2 parents 3828d4a + 3391840 commit 7404d7c

5 files changed

Lines changed: 261 additions & 177 deletions

File tree

‎region/crateria/east/West Ocean.json‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
"nodeAddress": "0x0018a06",
4444
"doorOrientation": "right",
4545
"doorEnvironments": [{"physics": "air"}],
46+
"useImplicitComeInNormally": false,
47+
"useImplicitCarryGModeBackThrough": false,
48+
"useImplicitCarryGModeMorphBackThrough": false,
49+
"useImplicitComeInWithMockball": false,
4650
"locks": [
4751
{
4852
"name": "West Ocean Ship Exit Gray Lock (to Gravity Suit Room)",
@@ -56,8 +60,7 @@
5660
}
5761
]
5862
}
59-
],
60-
"spawnAt": 5
63+
]
6164
},
6265
{
6366
"id": 5,
@@ -821,20 +824,33 @@
821824
{
822825
"id": 28,
823826
"link": [4, 4],
824-
"name": "Prepared Entry",
827+
"name": "Land in Door Frame",
825828
"entranceCondition": {
826829
"comeInNormally": {}
827830
},
828831
"requires": [
829832
"canPrepareForNextRoom",
830-
{"or": [
831-
"canCarefulJump",
832-
"canStationarySpinJump"
833-
]}
833+
"canCarefulJump",
834+
{"doorUnlockedAtNode": 4}
834835
],
835836
"unlocksDoors": [
836-
{"types": ["super"], "requires": []},
837+
{"types": ["super"], "requires": ["canInsaneJump"]},
837838
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
839+
],
840+
"note": "Jump through the door and shoot it open as you enter, landing on the door frame to avoid falling."
841+
},
842+
{
843+
"link": [4, 4],
844+
"name": "Door Stuck, Open Door",
845+
"entranceCondition": {
846+
"comeInWithDoorStuckSetup": {}
847+
},
848+
"requires": [
849+
"canPrepareForNextRoom",
850+
{"doorUnlockedAtNode": 4}
851+
],
852+
"unlocksDoors": [
853+
{"types": ["ammo"], "requires": []}
838854
]
839855
},
840856
{
@@ -1086,6 +1102,21 @@
10861102
"id": 40,
10871103
"link": [4, 5],
10881104
"name": "Base",
1105+
"entranceCondition": {
1106+
"comeInNormally": {}
1107+
},
1108+
"requires": []
1109+
},
1110+
{
1111+
"link": [4, 5],
1112+
"name": "Fall Into Room With Mockball",
1113+
"entranceCondition": {
1114+
"comeInWithMockball": {
1115+
"adjacentMinTiles": 0,
1116+
"remoteAndLandingMinTiles": [[0, 0]],
1117+
"speedBooster": "any"
1118+
}
1119+
},
10891120
"requires": []
10901121
},
10911122
{

‎region/lowernorfair/east/Fast Pillars Setup Room.json‎

Lines changed: 97 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,14 @@
4343
"nodeAddress": "0x00198ee",
4444
"doorOrientation": "right",
4545
"doorEnvironments": [{"physics": "air"}],
46-
"spawnAt": 6
46+
"useImplicitComeInNormally": false,
47+
"useImplicitComeInWithMockball": false
4748
},
4849
{
4950
"id": 5,
5051
"name": "Bottom Junction",
5152
"nodeType": "junction",
5253
"nodeSubType": "junction"
53-
},
54-
{
55-
"id": 6,
56-
"name": "Top Right Door Spawn At Junction",
57-
"nodeType": "junction",
58-
"nodeSubType": "junction"
5954
}
6055
],
6156
"obstacles": [
@@ -132,13 +127,6 @@
132127
{"id": 3},
133128
{"id": 5}
134129
]
135-
},
136-
{
137-
"from": 6,
138-
"to": [
139-
{"id": 1},
140-
{"id": 4}
141-
]
142130
}
143131
],
144132
"strats": [
@@ -1424,6 +1412,47 @@
14241412
],
14251413
"flashSuitChecked": true
14261414
},
1415+
{
1416+
"id": 63,
1417+
"link": [4, 1],
1418+
"name": "Base",
1419+
"entranceCondition": {
1420+
"comeInNormally": {}
1421+
},
1422+
"requires": [
1423+
{"or": [
1424+
"canCarefulJump",
1425+
{"enemyDamage": {
1426+
"enemy": "Yellow Space Pirate (wall)",
1427+
"type": "contact",
1428+
"hits": 1
1429+
}}
1430+
]},
1431+
{"or": [
1432+
"canTrickyJump",
1433+
{"heatFrames": 20}
1434+
]},
1435+
{"heatFrames": 115}
1436+
],
1437+
"flashSuitChecked": true,
1438+
"note": ["Falling to the right of the floating platform is faster."]
1439+
},
1440+
{
1441+
"link": [4, 1],
1442+
"name": "Fall Into Room With Mockball",
1443+
"entranceCondition": {
1444+
"comeInWithMockball": {
1445+
"adjacentMinTiles": 0,
1446+
"remoteAndLandingMinTiles": [[0, 0]],
1447+
"speedBooster": "any"
1448+
}
1449+
},
1450+
"requires": [
1451+
{"heatFrames": 135}
1452+
],
1453+
"flashSuitChecked": true,
1454+
"note": ["Falling to the right of the floating platform is faster."]
1455+
},
14271456
{
14281457
"id": 85,
14291458
"link": [4, 1],
@@ -1605,45 +1634,74 @@
16051634
"flashSuitChecked": true
16061635
},
16071636
{
1608-
"id": 52,
1637+
"id": 64,
16091638
"link": [4, 4],
1610-
"name": "Carry G-Mode Back Through",
1639+
"name": "Base",
16111640
"entranceCondition": {
1612-
"comeInWithGMode": {
1613-
"mode": "direct",
1614-
"morphed": false
1615-
}
1641+
"comeInNormally": {}
16161642
},
1617-
"requires": [],
1618-
"exitCondition": {
1619-
"leaveWithGMode": {
1620-
"morphed": false
1621-
}
1643+
"requires": [
1644+
{"or": [
1645+
"canCarefulJump",
1646+
{"enemyDamage": {
1647+
"enemy": "Yellow Space Pirate (wall)",
1648+
"type": "contact",
1649+
"hits": 1
1650+
}}
1651+
]},
1652+
{"heatFrames": 275}
1653+
],
1654+
"flashSuitChecked": true,
1655+
"note": "Fall onto the platform, then wait for the pirate to jump back to the right before returning through the door."
1656+
},
1657+
{
1658+
"id": 65,
1659+
"link": [4, 4],
1660+
"name": "Land in Door Frame",
1661+
"entranceCondition": {
1662+
"comeInNormally": {}
16221663
},
1623-
"bypassesDoorShell": true,
1624-
"flashSuitChecked": true
1664+
"requires": [
1665+
"canPrepareForNextRoom",
1666+
"canInsaneJump",
1667+
{"heatFrames": 55},
1668+
{"doorUnlockedAtNode": 4}
1669+
],
1670+
"unlocksDoors": [
1671+
{"types": ["super"], "requires": []},
1672+
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
1673+
]
16251674
},
16261675
{
1627-
"id": 53,
16281676
"link": [4, 4],
1629-
"name": "Carry G-Mode Morph Back Through",
1677+
"name": "Door Stuck, Open Door",
16301678
"entranceCondition": {
1631-
"comeInWithGMode": {
1632-
"mode": "direct",
1633-
"morphed": true
1634-
}
1679+
"comeInWithDoorStuckSetup": {}
16351680
},
16361681
"requires": [
1637-
"canArtificialMorph"
1682+
"canPrepareForNextRoom",
1683+
{"heatFrames": 55},
1684+
{"doorUnlockedAtNode": 4}
16381685
],
1639-
"exitCondition": {
1640-
"leaveWithGMode": {
1641-
"morphed": true
1686+
"unlocksDoors": [
1687+
{"types": ["ammo"], "requires": []}
1688+
]
1689+
},
1690+
{
1691+
"link": [4, 4],
1692+
"name": "Fall Into Room With Mockball",
1693+
"entranceCondition": {
1694+
"comeInWithMockball": {
1695+
"adjacentMinTiles": 0,
1696+
"remoteAndLandingMinTiles": [[0, 0]],
1697+
"speedBooster": "any"
16421698
}
16431699
},
1644-
"bypassesDoorShell": true,
1700+
"requires": [
1701+
{"heatFrames": 275}
1702+
],
16451703
"flashSuitChecked": true,
1646-
"devNote": "Artificial morph will allow Samus not to fall; real Morph is not sufficient."
1704+
"note": "Fall onto the platform, then wait for the pirate to jump back to the right before returning through the door."
16471705
},
16481706
{
16491707
"id": 54,
@@ -1873,63 +1931,6 @@
18731931
"Destroying obstacle A from above would kill the Violas prematurely.",
18741932
"FIXME: It is possible to get past their drops from above to still be able to use them; find out if there is a consistent setup for this."
18751933
]
1876-
},
1877-
{
1878-
"id": 63,
1879-
"link": [6, 1],
1880-
"name": "Base",
1881-
"requires": [
1882-
{"or": [
1883-
"canCarefulJump",
1884-
{"enemyDamage": {
1885-
"enemy": "Yellow Space Pirate (wall)",
1886-
"type": "contact",
1887-
"hits": 1
1888-
}}
1889-
]},
1890-
{"or": [
1891-
"canTrickyJump",
1892-
{"heatFrames": 20}
1893-
]},
1894-
{"heatFrames": 115}
1895-
],
1896-
"flashSuitChecked": true,
1897-
"note": ["Falling to the right of the floating platform is faster."]
1898-
},
1899-
{
1900-
"id": 64,
1901-
"link": [6, 4],
1902-
"name": "Base",
1903-
"requires": [
1904-
{"or": [
1905-
"canCarefulJump",
1906-
{"enemyDamage": {
1907-
"enemy": "Yellow Space Pirate (wall)",
1908-
"type": "contact",
1909-
"hits": 1
1910-
}}
1911-
]},
1912-
{"heatFrames": 275}
1913-
],
1914-
"flashSuitChecked": true,
1915-
"note": "Fall onto the platform, then Wait for the pirate to jump back to the right before returning through the door."
1916-
},
1917-
{
1918-
"id": 65,
1919-
"link": [6, 4],
1920-
"name": "Prepared Entry",
1921-
"requires": [
1922-
"canPrepareForNextRoom",
1923-
{"or": [
1924-
"canTrickyJump",
1925-
"canStationarySpinJump"
1926-
]},
1927-
{"heatFrames": 80}
1928-
],
1929-
"unlocksDoors": [
1930-
{"types": ["super"], "requires": []},
1931-
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
1932-
]
19331934
}
19341935
],
19351936
"nextStratId": 88,

‎region/lowernorfair/roomDiagrams/east_FastPillarsSetupRoom_133.png‎

-1.43 KB
Loading

‎region/norfair/roomDiagrams/west_IceBeamGateRoom_106.png‎

304 Bytes
Loading

0 commit comments

Comments
 (0)