Retime Ghost Atomic

Author: osse101

enemies/main.json

@@ -3098,7 +3098,7 @@
       "amountOfDrops": 1,
       "drops": {
         "noDrop": 0,
-        "smallEnergy": 30,
+        "smallEnergy": 32,
         "bigEnergy": 38,
         "missile": 28,
         "super": 2,

region/wreckedship/main/Wrecked Ship East Super Room.json

@@ -418,6 +418,7 @@
       "link": [1, 1],
       "name": "Bull Farm",
       "requires": [
+        "f_DefeatedPhantoon",
         {"resetRoom": {"nodes": [1]}},
         {"or": [
           "ScrewAttack",
@@ -480,7 +481,7 @@
       "note": "There are additional requirements for killing the Bull enemy who appears when Phantoon is defeated.",
       "devNote": [
         "This is Covern farm with a reduced drop chance so as to be applicable while powered off without breaking the powered on state.",
-        "The weaponry must be able to kill a Bull and follow the dissapearing cycle of a Covern.",
+        "The weaponry must be able to kill a Bull and follow the dissappearing cycle of a Covern.",
         "Resetting the room is slower than waiting for the Covern to respawn, so it is counted as 2 drops.",
         "These Coverns have no Super or Missile drop chance."
       ]

region/wreckedship/main/Wrecked Ship Main Shaft.json

@@ -1407,28 +1407,12 @@
         {"not": "f_DefeatedPhantoon"},
         {"or": [
           {"and": [
-            {"resetRoom": {"nodes": [1]}},
-            {"cycleFrames": 1740}
-          ]},
-          {"and": [
-            {"resetRoom": {"nodes": [2]}},
-            {"cycleFrames": 2400}
-          ]},
-          {"and": [
-            {"resetRoom": {"nodes": [3]}},
-            {"cycleFrames": 2800}
-          ]},
-          {"and": [
-            {"resetRoom": {"nodes": [4]}},
-            {"cycleFrames": 2100}
-          ]},
-          {"and": [
-            {"resetRoom": {"nodes": [5]}},
-            {"cycleFrames": 2100}
+            {"resetRoom": {"nodes": [1, 2, 3, 4, 5]}},
+            {"cycleFrames": 2000}
           ]},
           {"and": [
             {"resetRoom": {"nodes": [6]}},
-            {"cycleFrames": 1830},
+            {"cycleFrames": 2000},
             "h_useMorphBombs"
           ]},
           {"and": [
@@ -1459,12 +1443,12 @@
           ]},
           {"and": [
             "Spazer",
-            {"cycleFrames": 330}
+            {"cycleFrames": 150}
           ]},
           {"and": [
             "Ice",
             "canDodgeWhileShooting",
-            {"cycleFrames": 900}
+            {"cycleFrames": 240}
           ]}
         ]},
         {"or": [
@@ -1487,7 +1471,7 @@
       "farmCycleDrops": [
         {"enemy": "Custom Covern (Atomic)", "count": 4}
       ],
-      "note": "There is additional movement expected to represent the reaching Atomics who appear when the power is on.",
+      "note": "There is additional movement expected to represent reaching the Atomics who appear when the power is on.",
       "devNote": [
         "This is Covern farm with a reduced drop chance so as to be applicable while powered off without breaking the powered on state.",
         "Cycle frames represent the slower of killing 4 atomics or killing 4 coverns.",