Skip to content

Commit dfd7288

Browse files
kjbranchkjbranch
committed
Merge remote-tracking branch 'upstream/master' into g-setups
2 parents 5943a95 + 1af94b2 commit dfd7288

63 files changed

Lines changed: 1603 additions & 189 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.

region/brinstar/green/Green Brinstar Main Shaft Save Room.json renamed to region/brinstar/green/Green Brinstar Save Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 314,
4-
"name": "Green Brinstar Main Shaft Save Room",
4+
"name": "Green Brinstar Save Room",
55
"area": "Brinstar",
66
"subarea": "Green",
77
"roomAddress": "0x7A201",

region/brinstar/pink/Pink Brinstar Power Bomb Room.json renamed to region/brinstar/pink/Mission Impossible Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 60,
4-
"name": "Pink Brinstar Power Bomb Room",
4+
"name": "Mission Impossible Room",
55
"area": "Brinstar",
66
"subarea": "Pink",
77
"roomAddress": "0x79E11",

region/brinstar/pink/Pink Brinstar Hopper Room.json renamed to region/brinstar/pink/Pink Brinstar Wave Gate Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 61,
4-
"name": "Pink Brinstar Hopper Room",
4+
"name": "Pink Brinstar Wave Gate Room",
55
"area": "Brinstar",
66
"subarea": "Pink",
77
"roomAddress": "0x7A130",

region/brinstar/pink/Hopper Energy Tank Room.json renamed to region/brinstar/pink/Wave Gate Energy Tank Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 62,
4-
"name": "Hopper Energy Tank Room",
4+
"name": "Wave Gate Energy Tank Room",
55
"area": "Brinstar",
66
"subarea": "Pink",
77
"roomAddress": "0x7A15B",

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,10 @@
12001200
}
12011201
},
12021202
"requires": [
1203-
"h_artificialMorphIBJ"
1203+
{"or": [
1204+
"h_artificialMorphIBJ",
1205+
"h_artificialMorphSpringBallBombJump"
1206+
]}
12041207
],
12051208
"flashSuitChecked": true
12061209
},
@@ -1244,7 +1247,17 @@
12441247
}
12451248
},
12461249
"requires": [
1247-
"h_artificialMorphIBJ"
1250+
{"or": [
1251+
"h_artificialMorphIBJ",
1252+
{"and": [
1253+
"h_artificialMorphSpringBallBombJump",
1254+
"h_additionalBomb"
1255+
]},
1256+
{"and": [
1257+
"h_artificialMorphSpringBallBombJump",
1258+
"h_crouchJumpDownGrab"
1259+
]}
1260+
]}
12481261
],
12491262
"exitCondition": {
12501263
"leaveWithGMode": {

region/brinstar/red/Bat Room.json renamed to region/brinstar/red/Skree Boost Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 69,
4-
"name": "Bat Room",
4+
"name": "Skree Boost Room",
55
"area": "Brinstar",
66
"subarea": "Red",
77
"roomAddress": "0x7A3DD",

region/crateria/central/The Final Missile.json renamed to region/crateria/central/230 Missile Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 17,
4-
"name": "The Final Missile",
4+
"name": "230 Missile Room",
55
"area": "Crateria",
66
"subarea": "Central",
77
"roomAddress": "0x79A90",

region/crateria/central/Crateria Super Room.json renamed to region/crateria/central/Climb Supers Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../../schema/m3-room.schema.json",
33
"id": 29,
4-
"name": "Crateria Super Room",
4+
"name": "Climb Supers Room",
55
"area": "Crateria",
66
"subarea": "Central",
77
"roomAddress": "0x799F9",

‎region/crateria/east/Crab Maze.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,22 +189,25 @@
189189
"link": [1, 1],
190190
"name": "G-Mode Setup - Frozen Sciser",
191191
"requires": [
192+
"Morph",
193+
"canCameraManip",
192194
"canUpwardGModeSetup",
193195
"canTrickyUseFrozenEnemies",
194-
"h_useSpringBall",
195-
"canBePatient"
196+
"canBeVeryPatient"
196197
],
197198
"exitCondition": {
198199
"leaveWithGModeSetup": {}
199200
},
200201
"flashSuitChecked": true,
201202
"note": [
202203
"The nearby Global crab can be used to exit on the left side of the door.",
203-
"Exiting on the right will require travelling the Morph maze to find a local crab or two."
204+
"Exiting on the right will require travelling the Morph maze to find a local crab or two from the far left side of the room.",
205+
"Without Spring Ball, freeze the crab as low as possible to where Samus can still spin jump onto it.",
206+
"land on the edge of it, X-Ray turnaround or crouch, then press forward when it is about to thaw to trigger the transition."
204207
],
205208
"devNote": [
206-
"There is a Morphless way to jump on the crab with aim down but it feels too precise to include.",
207-
"Global Crab (left side) takes 40 seconds, local crab (Right side) is 180. Finding two left side crabs to use together is faster."
209+
"Global Crab (left side) takes 40 seconds, local crab (Right side) is 140. Finding two left side crabs to use together is faster.",
210+
"FIXME: Adding a variant that can only be done on the left side of the door would remove many of these requirements."
208211
]
209212
},
210213
{

‎region/crateria/east/Crateria Kihunter Room.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,9 @@
492492
},
493493
"flashSuitChecked": true,
494494
"note": [
495-
"Run from the ledge into the open doorway while hitting the frozen Crab as it thaws and the door transition simultaneously.",
496-
"Note that this requires a pixel perfect freeze, a small pixel starting window, and has tight timing. It then has a 50% success rate due to collision oscillation."
495+
"Run from the ledge into the open doorway while hitting the frozen crab and the door transition simultaneously, just as the crab thaws and touches Samus during the transition.",
496+
"Note that this requires a precise freeze (2 pixel window), a small pixel starting window (approximately 2 pixel window), precise thaw timing, and a 50% success rate due to collision oscillation.",
497+
"The positioning of the crab is where its hitbox is one or two pixels away from the edge of the door frame, so that Samus can clip into the wall and stand as she touches the transition."
497498
]
498499
},
499500
{

0 commit comments

Comments
 (0)