Add Draygon Turret Logic and Dodge Requirements (#2699)

Author: osse101

region/maridia/inner-pink/Draygon's Room.json

@@ -279,18 +279,59 @@
       "requires": [
         {"notable": "Grapple Kill"},
         "h_navigateUnderwater",
+        {"or": [
+          {"and": [
+            "h_breakThreeDraygonTurrets",
+            {"or": [
+              "Gravity",
+              "canTrickyJump",
+              {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+            ]},
+            {"or": [
+              "Gravity",
+              "Morph",
+              "canTrickyJump",
+              {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 1}}
+            ]}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"or": [
+              "Gravity",
+              "canTrickyJump",
+              {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 3}}
+            ]},
+            {"or": [
+              "Gravity",
+              {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 2}}
+            ]},
+            {"or": [
+              "Morph",
+              {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 2}}
+            ]},
+            {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 2}}
+          ]},
+          {"and": [
+            "canTrickyDodgeEnemies",
+            "canBeLucky",
+            {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+          ]}
+        ]},
         "canUseGrapple",
         {"draygonElectricityFrames": 240},
-        {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 5}}
+        {"or": [
+          {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 4}},
+          {"and": [
+            "canBeLucky",
+            {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 2}}
+          ]}
+        ]}
       ],
       "setsFlags": ["f_DefeatedDraygon"],
       "flashSuitChecked": true,
       "note": [
         "Kill Draygon by grappling to the top left turret.",
-        "Number of Draygon hits varies; 5 hits are assumed, which is close to a worst-case scenario."
-      ],
-      "devNote": [
-        "FIXME: Should this include requirements for breaking the turrets or dodging their shots?"
+        "Number of Draygon and turret hits varies; Close to a worst-case scenario is assumed."
       ]
     },
     {
@@ -301,15 +342,50 @@
         {"notable": "Grapple Quick Kill"},
         "h_navigateUnderwater",
         "canPreciseGrapple",
-        "h_breakOneDraygonTurret",
+        {"or": [
+          "Gravity",
+          "Morph",
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 2}}
+        ]},
+        {"or": [
+          "Gravity",
+          "canTrickyJump",
+          {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+        ]},
+        {"or": [
+          "h_breakThreeDraygonTurrets",
+          {"and": [
+            {"or": [
+              "canTrickyDodgeEnemies",
+              {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 2}}
+            ]},
+            "h_breakOneDraygonTurret"
+          ]},
+          {"and": [
+            "Gravity",
+            "canTrickyDodgeEnemies",
+            {"or": [
+              "canBeLucky",
+              {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+            ]},
+            {"or": [
+              "canWalljump",
+              "canGravityJump"
+            ]}
+          ]}
+        ]},
         {"draygonElectricityFrames": 240},
         "h_complexToCarryFlashSuit"
       ],
       "setsFlags": ["f_DefeatedDraygon"],
       "flashSuitChecked": true,
       "note": [
-        "Kill Draygon by grappling to a bottom turret as you get grabbed.",
-        "Avoids taking all the hits from Draygon."
+        "Kill Draygon by grappling to an exposed turret as you get grabbed.",
+        "This avoids taking damage from Draygon once grabbed."
+      ],
+      "devNote": [
+        "FIXME: HiJump + canDoubleSpringBallJumpMidAir can work but needs to be looked into more."
       ]
     },
     {
@@ -322,7 +398,14 @@
         "canMidairShinespark",
         "canShinechargeMovementComplex",
         {"or": [
-          "canShinechargeMovementTricky",
+          {"and": [
+            "canShinechargeMovementTricky",
+            {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 3}}
+          ]},
+          {"and": [
+            "canShinechargeMovementTricky",
+            "canBeLucky"
+          ]},
           "h_breakThreeDraygonTurrets"
         ]},
         {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
@@ -361,17 +444,18 @@
       "name": "Gravity Draygon",
       "requires": [
         "Gravity",
+        {"or": [
+          "canInsaneJump",
+          "h_breakOneDraygonTurret"
+        ]},
         {"enemyKill": {
           "enemies": [["Draygon"]],
           "farmableAmmo": ["Missile", "Super"]
         }},
         "h_complexToCarryFlashSuit"
       ],
       "setsFlags": ["f_DefeatedDraygon"],
-      "flashSuitChecked": true,
-      "devNote": [
-        "FIXME: Should this include requirements for breaking the turrets or dodging their shots?"
-      ]
+      "flashSuitChecked": true
     },
     {
       "id": 49,
@@ -381,6 +465,10 @@
         {"notable": "Suitless Fight"},
         "canSuitlessMaridia",
         "Morph",
+        {"or": [
+          "canTrickyJump",
+          {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+        ]},
         "h_breakThreeDraygonTurrets",
         {"enemyKill": {
           "enemies": [["Draygon"]],
@@ -399,6 +487,11 @@
       "name": "Microwave Fight",
       "requires": [
         "h_navigateUnderwater",
+        {"or": [
+          "Gravity",
+          "canTrickyJump",
+          {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+        ]},
         {"or": [
           {"and": [
             "canTrickyDodgeEnemies",