From 820a476d6bcc803fce57680b206112fa4cf3ce26 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Thu, 3 Oct 2024 10:11:12 -0600 Subject: [PATCH] misc fixes --- .../west/Gauntlet Energy Tank Room.json | 3 + .../east/Lower Norfair Fireflea Room.json | 6 +- .../Northwest Maridia Bug Room.json | 68 ++++++++++++++++--- region/norfair/west/Crocomire Escape.json | 1 + .../norfair/west/Ice Beam Tutorial Room.json | 39 ++++++----- 5 files changed, 85 insertions(+), 32 deletions(-) diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index daa56b29f..7b057a425 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -442,6 +442,7 @@ "link": [1, 3], "name": "Blue Suit", "requires": [ + {"notable": "Gauntlet E-Tank R-Mode Blue Suit"}, {"obstaclesCleared": ["D"]}, "Morph", {"or": [ @@ -922,6 +923,7 @@ "link": [3, 1], "name": "Blue Suit", "requires": [ + {"notable": "Gauntlet E-Tank R-Mode Blue Suit"}, {"obstaclesCleared": ["D"]}, "Morph", {"or": [ @@ -943,6 +945,7 @@ "link": [3, 2], "name": "Leave Shinecharged, Blue Suit", "requires": [ + {"notable": "Gauntlet E-Tank R-Mode Blue Suit"}, {"obstaclesCleared": ["D"]} ], "exitCondition": { diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json index d2052791f..618ce72f8 100644 --- a/region/lowernorfair/east/Lower Norfair Fireflea Room.json +++ b/region/lowernorfair/east/Lower Norfair Fireflea Room.json @@ -461,7 +461,11 @@ ]} ], "flashSuitChecked": true, - "note": "Bomb diagonally to get over the Fune. Or land on a fireball to boost up." + "note": [ + "Place a bomb just a bit left of the Fune and have it boost Samus horizontally to get over the Fune.", + "The bomb can be placed at a similar time to when the Fune shoots a fireball.", + "Alternatively, it is possible to land on a fireball to be boosted up." + ] }, { "id": 18, diff --git a/region/maridia/inner-yellow/Northwest Maridia Bug Room.json b/region/maridia/inner-yellow/Northwest Maridia Bug Room.json index 796e58947..c0e79a635 100644 --- a/region/maridia/inner-yellow/Northwest Maridia Bug Room.json +++ b/region/maridia/inner-yellow/Northwest Maridia Bug Room.json @@ -520,23 +520,69 @@ { "id": 23, "link": [3, 1], - "name": "Base", + "name": "Space Jump", "requires": [ + "SpaceJump", {"or": [ + "canCarefulJump", + "h_canUsePowerBombs", + "ScrewAttack", + "Plasma", {"and": [ - "HiJump", - {"or": [ - "canCrouchJump", - "canDownGrab", - "canWalljump", - "SpeedBooster" - ]} + "Ice", + "Wave", + "Spazer" ]}, - "SpaceJump", - "canTrickyDashJump" + {"enemyDamage": { + "enemy": "Menu", + "type": "contact", + "hits": 2 + }} ]} ], - "devNote": "The menus don't really matter with these strats." + "note": "Quickly Space Jump up while waiting to lure the Menus as long as possible.", + "devNote": "Getting hit by a Menu will cause Samus to fall and likely get hit again." + }, + { + "id": 23, + "link": [3, 1], + "name": "HiJump", + "requires": [ + "HiJump", + {"or": [ + "canCarefulJump", + "h_canUsePowerBombs", + "ScrewAttack", + "Plasma", + {"and": [ + "Ice", + "Wave", + "Spazer" + ]}, + {"enemyDamage": { + "enemy": "Menu", + "type": "contact", + "hits": 2 + }} + ]}, + {"or": [ + "canCarefulJump", + "canCrouchJump", + "canDownGrab", + "canWalljump" + ]} + ], + "note": "Spin jump directly from the safety to the right up to the ledge.", + "devNote": "Without knowing how to jump up directly, Samus will need to kill or tank the Menus." + }, + { + "link": [3, 1], + "name": "Speedy Jump", + "requires": [ + "SpeedBooster", + "canTrickyJump" + ], + "note": "Use the full runway to jump up to the higher ledge." }, { "id": 24, diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index c241cb935..009167854 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/region/norfair/west/Crocomire Escape.json @@ -365,6 +365,7 @@ "name": "Croc Escape Jump IBJ", "requires": [ "canJumpIntoIBJ", + "canBombHorizontally", {"heatFrames": 1650} ] }, diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json index 9f0d07780..dc22c15a5 100644 --- a/region/norfair/west/Ice Beam Tutorial Room.json +++ b/region/norfair/west/Ice Beam Tutorial Room.json @@ -156,34 +156,33 @@ {"heatFrames": 350} ] }, - { - "id": 8, - "link": [1, 2], - "name": "Boyon Hit", - "requires": [ - "canMidAirMorph", - "canNeutralDamageBoost", - {"enemyDamage": { - "enemy": "Boyon", - "type": "contact", - "hits": 1 - }}, - {"heatFrames": 350} - ], - "note": [ - "It's possible to get into the passage by a non-mockball mid-air morph.", - "It just needs to be fairly late. The Boyon will then push Samus into the passage." - ] - }, { "id": 9, "link": [1, 2], "name": "Lateral Mid-Air Morph", "requires": [ "canLateralMidAirMorph", + {"or": [ + "canTrickyJump", + {"and": [ + "canNeutralDamageBoost", + {"enemyDamage": { + "enemy": "Boyon", + "type": "contact", + "hits": 1 + }} + ]} + ]}, {"heatFrames": 350} ], - "note": "A well-executed lateral mid-air morph can get into the passage without taking a hit." + "note": [ + "A well-executed lateral mid-air morph can get into the passage without taking a hit.", + "Otherwise, the Boyon can be used to push Samus into the passage." + ], + "devNote": [ + "It's possible to get into the passage by a non-mockball mid-air morph, it just needs to be fairly late.", + "Due to its risk and not really being easier, it's not included here" + ] }, { "id": 10,