more feedback updates

Author: blkerby

region/maridia/inner-green/East Sand Hall.json

@@ -1085,6 +1085,7 @@
           ]},
           {"and": [
             "Wave",
+            {"disableEquipment": "Ice"},
             "canFarmWhileShooting",
             {"cycleFrames": 420}
           ]}
@@ -1105,26 +1106,38 @@
     },
     {
       "link": [2, 2],
-      "name": "Evir Farm (1 Evir, Gravity, Screw Attack)",
+      "name": "Evir Farm (1 Evir, Gravity, Strong Weapon)",
       "requires": [
         {"resetRoom": {"nodes": [2]}},
         "Gravity",
-        "ScrewAttack",
+        {"or": [
+          "ScrewAttack",
+          {"and": [
+            "Plasma",
+            "Wave"
+          ]}
+        ]},
         "canCarefulJump",
         {"cycleFrames": 290},
         {"or": [
-          "canWalljump",
-          "HiJump",
+          "SpaceJump",
           {"and": [
-            "canGravityJump",
-            "h_doubleEquipmentScreenCycleFrames"
+            "canPlayInSand",
+            {"or": [
+              "HiJump",
+              "canWalljump",
+              {"and": [
+                "canGravityJump",
+                "h_doubleEquipmentScreenCycleFrames"
+              ]}
+            ]}
           ]}
         ]}
       ],
       "farmCycleDrops": [{"enemy": "Evir", "count": 1}],
       "devNote": [
         "Other ways of farming Evirs with Gravity are covered in the 3 Evir farm strat.",
-        "The Screw Attack case is unique in that farming just the first Evir can be done at significantly lower difficulty."
+        "These strong weapon cases are unique in that farming just the first Evir can be done at significantly lower difficulty."
       ]
     },
     {
@@ -1135,13 +1148,21 @@
         "Gravity",
         "canDodgeWhileShooting",
         "canPlayInSand",
+        {"or": [
+          {"and": [
+            "Plasma",
+            "Wave"
+          ]},
+          "canTrickyJump"
+        ]},
         {"or": [
           {"and": [
             "Plasma",
             {"cycleFrames": 900}
           ]},
           {"and": [
             "Wave",
+            {"disableEquipment": "Ice"},
             {"cycleFrames": 1320}
           ]},
           {"and": [
@@ -1151,6 +1172,7 @@
           ]},
           {"and": [
             "Spazer",
+            {"disableEquipment": "Ice"},
             "canFarmWhileShooting",
             {"cycleFrames": 1360}
           ]}

region/maridia/inner-green/West Sand Hall.json

@@ -602,6 +602,7 @@
           ]},
           {"and": [
             "Wave",
+            {"disableEquipment": "Ice"},
             "canInsaneJump",
             "canBeVeryPatient",
             {"cycleFrames": 680}
@@ -625,7 +626,13 @@
       "name": "Evir Farm (3 Evirs)",
       "requires": [
         "canPlayInSand",
-        "canFarmWhileShooting",
+        {"or": [
+          "canFarmWhileShooting",
+          {"and": [
+            "Plasma",
+            "Wave"
+          ]}
+        ]},
         {"or": [
           {"resetRoom": {"nodes": [2]}},
           {"and": [
@@ -653,6 +660,7 @@
           ]},
           {"and": [
             "Wave",
+            {"disableEquipment": "Ice"},
             {"cycleFrames": 1200}
           ]}
         ]}
@@ -691,6 +699,7 @@
         "canTrickyDodgeEnemies",
         "canInsaneJump",
         "Spazer",
+        {"disableEquipment": "Ice"},
         {"cycleFrames": 1440}
       ],
       "farmCycleDrops": [{"enemy": "Evir", "count": 2}],