Apply suggestions from code review

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>

Author: blkerby

region/brinstar/pink/Waterway Energy Tank Room.json

@@ -186,24 +186,21 @@
               ]},
               {"and": [
                 "Grapple",
-                {"cycleFrames": 400}
+                {"cycleFrames": 360}
               ]},
-              {"cycleFrames": 530}
+              {"cycleFrames": 420}
             ]}
           ]},
           {"and": [
             {"or": [
+              "Charge",
               "Wave",
               "Spazer",
               "Plasma"
             ]},
             {"cycleFrames": 690}
           ]},
-          {"and": [
-            "Grapple",
-            {"cycleFrames": 760}
-          ]},
-          {"cycleFrames": 840}
+          {"cycleFrames": 780}
         ]}
       ],
       "farmCycleDrops": [