feedback updates

Author: blkerby

region/crateria/west/Green Pirates Shaft.json

@@ -391,10 +391,8 @@
       "link": [2, 2],
       "name": "Pirate Farm",
       "requires": [
-        {"and": [
-          {"resetRoom": {"nodes": [2, 3, 4]}},
-          {"cycleFrames": 850}
-        ]},
+        {"resetRoom": {"nodes": [2, 3, 4]}},
+        {"cycleFrames": 850},
         {"or": [
           "ScrewAttack",
           "Wave",

region/lowernorfair/east/Ridley's Room.json

@@ -832,23 +832,25 @@
       "name": "IBJ",
       "requires": [
         "h_heatProof",
-        {"and": [
-          "canJumpIntoIBJ",
-          "canTrickyJump",
-          {"or": [
-            "canLongIBJ",
-            "HiJump"
-          ]}
-        ]},
-        {"and": [
-          "f_DefeatedRidley",
-          {"or": [
-            "canLongIBJ",
-            {"and": [
-              "canJumpIntoIBJ",
+        {"or": [
+          {"and": [
+            "canJumpIntoIBJ",
+            "canTrickyJump",
+            {"or": [
+              "canLongIBJ",
               "HiJump"
             ]}
-          ]}
+          ]},
+          {"and": [
+            "f_DefeatedRidley",
+            {"or": [
+              "canLongIBJ",
+              {"and": [
+                "canJumpIntoIBJ",
+                "HiJump"
+              ]}
+            ]}
+          ]}  
         ]}
       ]
     },

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

@@ -1416,18 +1416,16 @@
           }},
           {"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
         ]},
-        {"and": [
-          "canPlayInSand",
-          {"or": [
-            "canWalljump",
-            "HiJump",
-            "canUseFrozenEnemies",
-            "canGravityJump",
-            {"and": [
-              "canTrickyJump",
-              "can4HighMidAirMorph",
-              "canTrickySpringBallJump"
-            ]}
+        "canPlayInSand",
+        {"or": [
+          "canWalljump",
+          "HiJump",
+          "canUseFrozenEnemies",
+          "canGravityJump",
+          {"and": [
+            "canTrickyJump",
+            "can4HighMidAirMorph",
+            "canTrickySpringBallJump"
           ]}
         ]}
       ]

region/maridia/inner-yellow/Kassiuz Room.json

@@ -152,7 +152,7 @@
           ]},
           {"and": [
             "canTrickySpringBallJump",
-            {"cycleFrames": 520},
+            {"cycleFrames": 320},
             "h_doubleEquipmentScreenCycleFrames",
             "h_doubleEquipmentScreenCycleFrames",
             "h_doubleEquipmentScreenCycleFrames"
@@ -182,7 +182,7 @@
           ]},
           {"cycleFrames": 2040}
         ]},
-        {"and": [
+        {"or": [
           "canFarmWhileShooting",
           {"cycleFrames": 500}
         ]}

region/maridia/inner-yellow/Maridia Elevator Room.json

@@ -241,6 +241,7 @@
       "link": [1, 1],
       "name": "Owtch Farm",
       "requires": [
+        "canDodgeWhileShooting",
         {"or": [
           {"and": [
             {"resetRoom": {"nodes": [1]}},
@@ -271,7 +272,9 @@
       "devNote": [
         "The extra 300 frames is for waiting a random amount of time for the Owtch to go left.",
         "The Owtch can also be killed with Screw Attack,",
-        "but farming the Rippers would make more sense in that case."
+        "but farming the Rippers would make more sense in that case.",
+        "FIXME: A more specific enemy-knowledge tech should ideally be required,",
+        "for understanding how to kill the Owtch."
       ]
     },
     {

tests/asserts/keywords.py

@@ -1105,10 +1105,15 @@ def make_or(reqs):
                             for platform in strat["entranceCondition"]["comeInWithSidePlatform"]["platforms"]:
                                 reqs.append(make_and(platform.get("requires", [])))
                             requires.append(make_or(reqs))
+                            if len(requires) == 1 and isinstance(requires[0], dict) and "and" in requires[0]:
+                                requires = requires[0]["and"]
 
-                        for req in strat["requires"]:
+                        for req in requires:
                             check_and_or(req, strat_err_fn)
-                        if heated and not check_heat_req({"and": strat["requires"]}):
+                            if isinstance(req, dict) and "and" in req:
+                                strat_err_fn("'and' not allowed at top level.")
+                        
+                        if heated and not check_heat_req({"and": requires}):
                             if fromNode == toNode and "leaveWithRunway" in strat.get("exitCondition", []):
                                 # Ok since there is implicit heat frames in leavesWithRunway, and it is normal
                                 # if no explicit ones to be present for a strat going from the door to itself.