diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json index f930e90b4..72da0890b 100644 --- a/region/tourian/main/Metroid Room 1.json +++ b/region/tourian/main/Metroid Room 1.json @@ -36,6 +36,9 @@ ], "mapTileMask": [ [2, 2, 2, 1, 1, 1] + ], + "devNote": [ + "FIXME: Add doorunlock requirements on strats that get grabbed by metroids." ] }, { @@ -48,6 +51,9 @@ "doorEnvironments": [{"physics": "air"}], "mapTileMask": [ [1, 1, 1, 2, 2, 2] + ], + "devNote": [ + "FIXME: Add doorunlock requirements on strats that get grabbed by metroids." ] } ], diff --git a/region/tourian/main/Metroid Room 2.json b/region/tourian/main/Metroid Room 2.json index bb60c55ca..b9ee15652 100644 --- a/region/tourian/main/Metroid Room 2.json +++ b/region/tourian/main/Metroid Room 2.json @@ -332,6 +332,18 @@ "requires": [ {"metroidFrames": 80} ], + "unlocksDoors": [ + {"types": ["missiles"], "requires": [ + {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}} + ]}, + {"types": ["super"], "requires": [ + {"metroidFrames": 15} + ]}, + {"types": ["powerbomb"], "requires": []} + ], + "exitCondition": { + "leaveNormally": {} + }, "flashSuitChecked": true }, { @@ -588,6 +600,24 @@ "requires": [ {"metroidFrames": 180} ], + "unlocksDoors": [ + {"types": ["missiles"], "requires": [ + {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}, + {"ammo": {"type":"Missile", "count": 2}} + ]}, + {"types": ["super"], "requires": [ + {"or": [ + {"ammo": {"type": "Super", "count": 1}}, + "canDodgeWhileShooting" + ]} + ]}, + {"types": ["powerbomb"], "requires": [ + {"metroidFrames": 25} + ]} + ], + "exitCondition": { + "leaveNormally": {} + }, "flashSuitChecked": true }, { diff --git a/region/tourian/main/Metroid Room 3.json b/region/tourian/main/Metroid Room 3.json index 2f6121291..e6a3a9e6b 100644 --- a/region/tourian/main/Metroid Room 3.json +++ b/region/tourian/main/Metroid Room 3.json @@ -588,7 +588,24 @@ "requires": [ {"metroidFrames": 670} ], - "flashSuitChecked": true + "unlocksDoors": [ + {"types": ["missiles"], "requires": [ + {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}, + {"ammo": {"type":"Missile", "count": 2}} + ]}, + {"types": ["super"], "requires": [ + {"metroidFrames": 15}, + {"ammo": {"type": "Super", "count": 1}} + ]}, + {"types": ["powerbomb"], "requires": []} + ], + "exitCondition": { + "leaveNormally": {} + }, + "flashSuitChecked": true, + "devNote": [ + "PB at door is energy neutral." + ] }, { "id": 25, @@ -752,6 +769,24 @@ "requires": [ {"metroidFrames": 600} ], + "unlocksDoors": [ + {"types": ["missiles"], "requires": [ + {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}, + {"ammo": {"type":"Missile", "count": 2}} + ]}, + {"types": ["super"], "requires": [ + {"or": [ + {"ammo": {"type": "Super", "count": 1}}, + "canDodgeWhileShooting" + ]} + ]}, + {"types": ["powerbomb"], "requires": [ + {"metroidFrames": 25} + ]} + ], + "exitCondition": { + "leaveNormally": {} + }, "flashSuitChecked": true }, { diff --git a/region/tourian/main/Metroid Room 4.json b/region/tourian/main/Metroid Room 4.json index 3a60c8210..21da1fa76 100644 --- a/region/tourian/main/Metroid Room 4.json +++ b/region/tourian/main/Metroid Room 4.json @@ -360,9 +360,28 @@ {"metroidFrames": 240} ], "flashSuitChecked": true, + "unlocksDoors": [ + {"types": ["missiles"], "requires": [ + {"ammo": {"type": "Missile", "count": 1}}, + {"metroidFrames": 50} + ]}, + {"types": ["super"], "requires": [ + "canTrickyJump", + {"metroidFrames": 50} + ]}, + {"types": ["powerbomb"], "requires": [ + {"metroidFrames": 50} + ]} + ], + "exitCondition": { + "leaveNormally": {} + }, "note": [ "Taking a rinka hit stops the Metroid damage for a while and is less damage.", "Note that angle-down shots with a Metroid on Samus are unreliable, so it is recommended to jump and shoot down to open the door." + ], + "devNote": [ + "Power Bombs negate some of the damage taken while waiting for the door to unlock." ] }, { @@ -565,9 +584,25 @@ {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}, {"metroidFrames": 256} ], + "unlocksDoors": [ + {"types": ["missiles"], "requires": [ + {"metroidFrames": 50}, + {"ammo": {"type":"Missile", "count": 2}} + ]}, + {"types": ["super"], "requires": [ + {"ammo": {"type": "Super", "count": 1}} + ]}, + {"types": ["powerbomb"], "requires": []} + ], + "exitCondition": { + "leaveNormally": {} + }, "flashSuitChecked": true, "note": "Taking a rinka hit stops the Metroid damage for a while and is less damage.", - "devNote": "Avoiding Rinkas is more difficult than getting hit, so it is not important to know to want to get hit." + "devNote": [ + "Avoiding Rinkas is more difficult than getting hit, so it is not important to know to want to get hit.", + "Opening a door with a Power Bomb is energy neutral since you can place it early." + ] }, { "id": 27,