move boss fight logic to separate file

Author: shenef

area/MRR.py

@@ -1,5 +1,6 @@
 import time
 
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -259,7 +260,7 @@ def battleSite():
 
 
 def guiAndAftermath():
-    battle.main.battleGui()
+    battle.boss.gui()
 
     checkpoint = 0
     while memory.main.getMap() != 93:

area/baaj.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import memory.main
 import menu
@@ -114,7 +115,7 @@ def Klikk_fight():
     xbox.clickToBattle()
     battle.main.useItem(0, 'none')  # Tidus self-potion
     screen.awaitTurn()
-    battle.main.Klikk()
+    battle.boss.klikk()
 
 
 def distance(n1, n2):
@@ -248,7 +249,7 @@ def ABswimming2():
 
     # Tros fight
     xbox.clickToBattle()
-    battle.main.Tros()
+    battle.boss.tros()
 
     FFXC.set_neutral()
     while memory.main.getStoryProgress() < 111:

area/boats.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -46,9 +47,9 @@ def ssLiki():
                 xbox.skipScene()
             elif memory.main.battleActive():
                 print("Ready to start fight with Sin's Fin")
-                battle.main.SinFin()
+                battle.boss.sinFin()
                 print("Sin's Fin fight complete. Waiting for next fight")
-                battle.main.Echuilles()
+                battle.boss.echuilles()
                 print("Sinspawn Echuilles fight complete")
 
 

area/dreamZan.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import battle.overdrive
 import logs
@@ -231,7 +232,7 @@ def AfterAmmes():
         else:
             FFXC.set_neutral()
             if memory.main.turnReady():
-                battle.main.Tanker()
+                battle.boss.tanker()
             if memory.main.diagSkipPossible():
                 xbox.tapB()
             elif memory.main.cutsceneSkipPossible():

area/gagazet.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -117,7 +118,7 @@ def toTheRonso():
         else:
             FFXC.set_neutral()
             if memory.main.turnReady():
-                battle.main.biranYenke()
+                battle.boss.biranYenke()
             elif memory.main.diagSkipPossible():
                 xbox.tapB()
 
@@ -197,7 +198,7 @@ def Flux():
             FFXC.set_neutral()
             if memory.main.battleActive():
                 print("Flux battle start")
-                battle.main.seymourFlux()
+                battle.boss.seymourFlux()
                 # FFXC.set_movement(0,1)
                 memory.main.clickToControl3()
                 if gameVars.endGameVersion() != 3:
@@ -470,7 +471,7 @@ def cave():
                     xbox.tapB()
 
     xbox.clickToBattle()
-    battle.main.sKeeper()
+    battle.boss.sKeeper()
 
 
 def wrapUp():

area/kilika.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -153,7 +154,7 @@ def forest1():
                     nextBattle = rngTrack.comingBattles(area="kilika_woods", battleCount=1)[0]
                     print("################# Next Battle:", nextBattle)
                 elif checkpoint > 86:
-                    battle.main.Geneaux()
+                    battle.boss.geneaux()
                 else:
                     print("---------------This should be battle number:", kilikaBattles)
                     print("---------------Reminder (north-bound only):", nextThree)

area/luca.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -118,7 +119,7 @@ def arrival():
                 FFXC.set_movement(1, 0)
                 memory.main.awaitEvent()
                 FFXC.set_neutral()
-                battle.main.Oblitzerator(earlyHaste)
+                battle.boss.oblitzerator(earlyHaste)
                 checkpoint += 1
             elif checkpoint == 50:
                 memory.main.clickToEventTemple(4)

area/mTemple.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import memory.main
 import menu
@@ -298,7 +299,7 @@ def escape():
                 xbox.tapB()
 
     print("Done pathing. Now for the Wendigo fight.")
-    battle.main.wendigo()
+    battle.boss.wendigo()
     print("Wendigo fight over")
 
 

area/mWoods.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -122,7 +123,7 @@ def lakeRoad():
 
     FFXC.set_neutral()  # Engage Spherimorph
 
-    battle.main.spherimorph()
+    battle.boss.spherimorph()
     print("Battle is over.")
     memory.main.clickToControl()  # Jecht's memories
 
@@ -201,7 +202,7 @@ def lake():
             elif memory.main.diagSkipPossible() or memory.main.menuOpen():
                 xbox.menuB()
     xbox.clickToBattle()
-    battle.main.negator()
+    battle.boss.crawler()
 
 
 def afterCrawler():

area/miihen.py

@@ -1,3 +1,4 @@
+import battle.boss
 import battle.main
 import logs
 import memory.main
@@ -281,7 +282,7 @@ def midPoint():
             elif memory.main.battleActive():
                 FFXC.set_neutral()
                 print("Mi'ihen - ready for Chocobo Eater")
-                battle.main.chocoEater()
+                battle.boss.chocoboEater()
                 print("Mi'ihen - Chocobo Eater complete")