feedback updates

Author: blkerby

region/brinstar/green/Early Supers Room.json

@@ -816,6 +816,10 @@
             "Plasma",
             {"cycleFrames": 600}
           ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 700}
+          ]},
           {"and": [
             {"or": [
               "Wave",

region/brinstar/green/Green Brinstar Beetom Room.json

@@ -190,6 +190,19 @@
             "Ice",
             "h_useMorphBombs",
             {"cycleFrames": 300}
+          ]},
+          {"and": [
+            {"or": [
+              "Ice",
+              "canTrickyDodgeEnemies",
+              {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
+            ]},
+            {"or": [
+              {"resourceAvailable": [{"type": "Energy", "count": 50}]},
+              {"resourceAvailable": [{"type": "PowerBomb", "count": 4}]}
+            ]},
+            "h_usePowerBomb",
+            {"cycleFrames": 210}
           ]}
         ]}
       ],

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -5042,6 +5042,35 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [12, 12],
+      "name": "Ripper Farm",
+      "requires": [
+        "ScrewAttack",
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [2, 3]}},
+            {"cycleFrames": 375}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            {"cycleFrames": 445}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [5, 6]}},
+            {"cycleFrames": 600}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"cycleFrames": 1530}
+          ]}
+        ]}
+      ],
+      "resetsObstacles": ["A"],
+      "farmCycleDrops": [
+        {"enemy": "Ripper 2 (red)", "count": 2}
+      ]
+    },
     {
       "id": 229,
       "link": [12, 12],

region/brinstar/green/Green Hill Zone.json

@@ -1470,7 +1470,8 @@
           {"and": [
             {"or": [
               "Spazer",
-              "Wave"
+              "Wave",
+              "ScrewAttack"
             ]},
             {"cycleFrames": 300}
           ]},

region/brinstar/green/Noob Bridge.json

@@ -219,24 +219,19 @@
       "link": [1, 1],
       "name": "Cacatac and Zeela Farm",
       "requires": [
-        {"or": [
-          {"and": [
-            {"resetRoom": {
-              "nodes": [1]
-            }},
-            {"cycleFrames": 560}
-          ]},
-          {"and": [
-            {"resetRoom": {
-              "nodes": [2]
-            }},
-            {"cycleFrames": 1100}
-          ]}
-        ]},
+        {"resetRoom": {
+          "nodes": [1]
+        }},
+        {"cycleFrames": 560},
         {"or": [
           "Plasma",
           "Spazer",
           "Wave",
+          "Grapple",
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 200}
+          ]},
           {"cycleFrames": 370}
         ]}
       ],
@@ -343,6 +338,35 @@
       "bypassesDoorShell": true,
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "Cacatac and Zeela Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [2]
+        }},
+        {"cycleFrames": 1000},
+        {"or": [
+          "Plasma",
+          "Spazer",
+          "Wave",
+          {"and": [
+            "Grapple",
+            {"cycleFrames": 60}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 200}
+          ]},
+          {"cycleFrames": 370}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Zeela", "count": 4},
+        {"enemy": "Cacatac", "count": 4}
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 18,
       "link": [2, 2],

region/brinstar/green/Spore Spawn Kihunter Room.json

@@ -224,7 +224,8 @@
             {"or": [
               "Plasma",
               "Spazer",
-              "Wave"
+              "Wave",
+              "ScrewAttack"
             ]},
             {"cycleFrames": 500}
           ]},