feedback updates

Author: blkerby

region/crateria/central/Parlor and Alcatraz.json

@@ -2869,7 +2869,7 @@
       "name": "Geemer Farm",
       "requires": [
         "h_ZebesIsAwake",
-        {"cycleFrames": 2400},
+        {"cycleFrames": 1860},
         {"or": [
           {"resetRoom": {
             "nodes": [3, 4, 6, 7]
@@ -2878,6 +2878,7 @@
             {"resetRoom": {
               "nodes": [1]
             }},
+            {"cycleFrames": 420},
             {"or": [
               "ScrewAttack",
               "h_useMorphBombs",
@@ -2896,13 +2897,15 @@
             {"resetRoom": {
               "nodes": [2]
             }},
+            {"cycleFrames": 240},
             "Morph"
           ]},
           {"and": [
             "Morph",
             {"resetRoom": {
               "nodes": [5]
             }},
+            {"cycleFrames": 420},
             {"or": [
               "h_bombThings",
               {"and": [

region/crateria/central/Pre-Map Flyway.json

@@ -155,7 +155,6 @@
       "link": [1, 1],
       "name": "Mellow and Reo Farm",
       "requires": [
-        {"cycleFrames": 360},
         {"or": [
           {"resetRoom": {"nodes": [1]}},
           {"and": [
@@ -164,20 +163,23 @@
           ]}
         ]},
         {"or": [
-          "Plasma",
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 360}
+          ]},
           {"and": [
             "Wave",
-            {"cycleFrames": 20}
+            {"cycleFrames": 380}
           ]},
           {"and": [
             "ScrewAttack",
-            {"cycleFrames": 30}
+            {"cycleFrames": 390}
           ]},
           {"and": [
             "Spazer",
-            {"cycleFrames": 60}
+            {"cycleFrames": 420}
           ]},
-          {"cycleFrames": 140}
+          {"cycleFrames": 500}
         ]}
       ],
       "farmCycleDrops": [

region/crateria/east/West Ocean.json

@@ -2865,6 +2865,7 @@
       "name": "Ripper2 Farm",
       "requires": [
         "ScrewAttack",
+        "canCarefulJump",
         {"or": [
           {"and": [
             {"resetRoom": {
@@ -2876,8 +2877,16 @@
             {"resetRoom": {
               "nodes": [4]
             }},
-            "canWalljump",
-            {"cycleFrames": 380}
+            {"or": [
+              {"and": [
+                "canWalljump",
+                {"cycleFrames": 380}  
+              ]},
+              {"and": [
+                "SpaceJump",
+                {"cycleFrames": 320}
+              ]}
+            ]}
           ]},
           {"and": [
             {"resetRoom": {
@@ -2896,10 +2905,60 @@
       "link": [13, 13],
       "name": "Skultera Farm",
       "requires": [
-        {"cycleFrames": 790},
         {"or": [
-          "Gravity",
-          {"cycleFrames": 590}
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"or": [
+              {"and": [
+                "Gravity",
+                {"cycleFrames": 790}    
+              ]},
+              {"cycleFrames": 1380}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            {"or": [
+              {"and": [
+                "Gravity",
+                "SpaceJump",
+                {"cycleFrames": 750}
+              ]},
+              {"and": [
+                "Gravity",
+                "canWalljump",
+                {"cycleFrames": 1020}
+              ]},
+              {"and": [
+                "SpaceJump",
+                {"cycleFrames": 1390}
+              ]},
+              {"and": [
+                "canWalljump",
+                {"cycleFrames": 1420}
+              ]}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [5]}},
+            {"or": [
+              {"and": [
+                "Gravity",
+                "SpaceJump",
+                {"cycleFrames": 690}
+              ]},
+              {"and": [
+                "Gravity",
+                "canWalljump",
+                {"cycleFrames": 820}
+              ]},
+              {"and": [
+                "Gravity",
+                {"cycleFrames": 1110}
+              ]},
+              {"cycleFrames": 1600}
+            ]}
+          ]}
         ]},
         {"or": [
           {"and": [
@@ -2931,7 +2990,8 @@
       ],
       "farmCycleDrops": [
         {"enemy": "Skultera", "count": 2}
-      ]
+      ],
+      "resetsObstacles": ["A", "B"]
     },
     {
       "id": 126,

region/crateria/west/Terminator Room.json

@@ -127,10 +127,28 @@
       "link": [1, 1],
       "name": "Geemer and Waver Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2]
-        }},
-        {"cycleFrames": 900}
+        {"or": [
+          {"resetRoom": {
+            "nodes": [1]
+          }},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [2]
+            }},
+            {"cycleFrames": 60}              
+          ]}
+        ]},
+        {"or": [
+          {"and": [
+            {"or": [
+              "Wave",
+              "Spazer",
+              "Plasma"
+            ]},
+            {"cycleFrames": 960}
+          ]},
+          {"cycleFrames": 1110}
+        ]}
       ],
       "farmCycleDrops": [
         {"enemy": "Geemer (blue)", "count": 6},