diff --git a/region/lowernorfair/east/Plowerhouse Room.json b/region/lowernorfair/east/Plowerhouse Room.json index 3760c61e87..6e58b8ef56 100644 --- a/region/lowernorfair/east/Plowerhouse Room.json +++ b/region/lowernorfair/east/Plowerhouse Room.json @@ -21,8 +21,7 @@ "doorEnvironments": [{"physics": "air"}], "mapTileMask": [ [2, 2, 1] - ], - "devNote": "FIXME can leave charged by charging in the acid" + ] }, { "id": 2, @@ -34,8 +33,7 @@ "doorEnvironments": [{"physics": "air"}], "mapTileMask": [ [1, 2, 2] - ], - "devNote": "FIXME can leave charged by charging in the acid" + ] }, { "id": 3, @@ -235,7 +233,7 @@ { "id": 4, "link": [1, 2], - "name": "Avoid the Holtzes", + "name": "Zebbo Damage Boost", "requires": [ "canTrickyJump", "canHorizontalDamageBoost", @@ -248,6 +246,50 @@ "Damage from a Zebbo from the right farm to gain invulnerability frames, then jump through the last two Holtzes." ] }, + { + "link": [1, 2], + "name": "Cross While Farming", + "requires": [ + "canFarmWhileShooting", + {"or": [ + {"and": [ + {"heatFramesWithEnergyDrops": { + "frames": 120, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFramesWithEnergyDrops": { + "frames": 130, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFramesWithEnergyDrops": { + "frames": 140, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFrames": 100} + ]}, + {"and": [ + {"or": [ + "Spazer", + "Wave", + "Plasma" + ]}, + {"heatFramesWithEnergyDrops": { + "frames": 100, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFramesWithEnergyDrops": { + "frames": 100, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFramesWithEnergyDrops": { + "frames": 130, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFrames": 100} + ]} + ]} + ] + }, { "id": 38, "link": [1, 2], @@ -470,7 +512,7 @@ { "id": 12, "link": [2, 1], - "name": "Quick Run Through", + "name": "Zebbo Damage Boost", "requires": [ "canTrickyJump", "canHorizontalDamageBoost", @@ -479,6 +521,38 @@ ], "flashSuitChecked": true }, + { + "link": [2, 1], + "name": "Tricky Dodge", + "requires": [ + "canTrickyDodgeEnemies", + {"or": [ + "canInsaneJump", + "canPreciseWalljump" + ]}, + {"heatFrames": 310} + ] + }, + { + "link": [2, 1], + "name": "Cross While Farming", + "requires": [ + "canFarmWhileShooting", + {"heatFramesWithEnergyDrops": { + "frames": 100, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFramesWithEnergyDrops": { + "frames": 125, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFramesWithEnergyDrops": { + "frames": 125, + "drops": [{"enemy": "Zebbo", "count": 1}] + }}, + {"heatFrames": 130} + ] + }, { "id": 42, "link": [2, 1],