Skip to content

Commit b003658

Browse files
coderwilsoncoderwilson
authored
Merge pull request #139 from shenef/main
refactoring
2 parents 0883dc6 + 646c27f commit b003658

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3986
-3624
lines changed

‎Showcase/chocoEater.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import time
21
import memory.main
3-
import xbox
4-
import screen
52
import targetPathing
3+
import xbox
4+
65
FFXC = xbox.controllerHandle()
76

7+
88
def engage():
99
checkpoint = 0
1010
input("Confirm that CSR is running!!!")
@@ -33,6 +33,7 @@ def engage():
3333
if memory.main.diagSkipPossible():
3434
xbox.tapB()
3535

36+
3637
def battle():
3738
memory.main.waitFrames(10)
3839
chocoIndex = memory.main.actorIndex(actorNum=4200)
@@ -47,4 +48,4 @@ def battle():
4748
xbox.tapB()
4849
xbox.tapB()
4950
xbox.tapB()
50-
exit()
51+
exit()

‎area/MRR.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import time
2-
import xbox
3-
import screen
2+
3+
import battle.boss
44
import battle.main
5-
import menu
65
import logs
76
import memory.main
7+
import menu
8+
import screen
89
import targetPathing
910
import vars
11+
import xbox
12+
1013
gameVars = vars.varsHandle()
1114

1215
FFXC = xbox.controllerHandle()
@@ -257,7 +260,7 @@ def battleSite():
257260

258261

259262
def guiAndAftermath():
260-
battle.main.battleGui()
263+
battle.boss.gui()
261264

262265
checkpoint = 0
263266
while memory.main.getMap() != 93:

‎area/baaj.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import xbox
2-
import screen
1+
import battle.boss
32
import battle.main
43
import memory.main
5-
import targetPathing
64
import menu
5+
import screen
6+
import targetPathing
77
import vars
8+
import xbox
89

910
FFXC = xbox.controllerHandle()
1011
gameVars = vars.varsHandle()
@@ -114,7 +115,7 @@ def Klikk_fight():
114115
xbox.clickToBattle()
115116
battle.main.useItem(0, 'none') # Tidus self-potion
116117
screen.awaitTurn()
117-
battle.main.Klikk()
118+
battle.boss.klikk()
118119

119120

120121
def distance(n1, n2):
@@ -248,7 +249,7 @@ def ABswimming2():
248249

249250
# Tros fight
250251
xbox.clickToBattle()
251-
battle.main.Tros()
252+
battle.boss.tros()
252253

253254
FFXC.set_neutral()
254255
while memory.main.getStoryProgress() < 111:

‎area/besaid.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import xbox
2-
import screen
31
import battle.main
4-
import memory.main
52
import logs
3+
import memory.main
4+
import menu
5+
import screen
66
import targetPathing
77
import vars
8-
import menu
8+
import xbox
99

1010
FFXC = xbox.controllerHandle()
1111
gameVars = vars.varsHandle()
@@ -52,7 +52,7 @@ def Beach():
5252
checkpoint = 29
5353
elif checkpoint == 36 and memory.main.getMap() == 17:
5454
checkpoint = 37
55-
55+
5656
# Events
5757
elif memory.main.userControl():
5858
if checkpoint == 34: # Into the temple for the first time

‎area/boats.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import xbox
1+
import battle.boss
22
import battle.main
3-
import menu
3+
import logs
44
import memory.main
5+
import menu
56
import targetPathing
67
import vars
7-
import logs
8+
import xbox
9+
810
gameVars = vars.varsHandle()
911

1012
FFXC = xbox.controllerHandle()
@@ -45,9 +47,9 @@ def ssLiki():
4547
xbox.skipScene()
4648
elif memory.main.battleActive():
4749
print("Ready to start fight with Sin's Fin")
48-
battle.main.SinFin()
50+
battle.boss.sinFin()
4951
print("Sin's Fin fight complete. Waiting for next fight")
50-
battle.main.Echuilles()
52+
battle.boss.echuilles()
5153
print("Sinspawn Echuilles fight complete")
5254

5355

‎area/djose.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import xbox
21
import battle.main
3-
import menu
42
import logs
53
import memory.main
4+
import menu
65
import targetPathing
76
import vars
7+
import xbox
8+
89
gameVars = vars.varsHandle()
910

1011
FFXC = xbox.controllerHandle()

‎area/dreamZan.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
import xbox
1+
import battle.boss
22
import battle.main
3+
import battle.overdrive
4+
import logs
35
import memory.main
6+
import rngTrack
47
import targetPathing
58
import vars
6-
import logs
7-
import rngTrack
9+
import xbox
10+
811
gameVars = vars.varsHandle()
912

1013
FFXC = xbox.controllerHandle()
@@ -57,14 +60,9 @@ def NewGame(Gamestate):
5760

5861
def NewGame2():
5962
# New game selected. Next, select options.
60-
timeBuffer = 17
63+
timeBuffer = 15
6164
print("====================================")
62-
print("Countdown timer!!!")
63-
memory.main.waitFrames(timeBuffer)
64-
print("5")
65-
memory.main.waitFrames(timeBuffer)
66-
print("4")
67-
memory.main.waitFrames(timeBuffer)
65+
print("Starting in")
6866
print("3")
6967
memory.main.waitFrames(timeBuffer)
7068
print("2")
@@ -73,7 +71,7 @@ def NewGame2():
7371
memory.main.waitFrames(timeBuffer)
7472
print("GO!!! Good fortune!")
7573
print("====================================")
76-
print("Reminder seed number:", memory.main.rngSeed())
74+
print("Set seed:", memory.main.rngSeed())
7775
xbox.menuB()
7876
xbox.menuB()
7977

@@ -171,7 +169,7 @@ def ammesBattle():
171169
lastHit = memory.main.lastHitCheckChange()
172170
while lastHit == 9999:
173171
lastHit = memory.main.lastHitCheckChange()
174-
print("Confirm - last hit: ", lastHit)
172+
print("Confirm - last hit:", lastHit)
175173
hitsArray.append(lastHit)
176174
print(hitsArray)
177175
print("#####################################")
@@ -182,7 +180,7 @@ def ammesBattle():
182180
print("### Corrected RNG seed:", correctSeed)
183181
if correctSeed != "Err_seed_not_found":
184182
gameVars.setConfirmedSeed(correctSeed)
185-
print("Confirming RNG seed: ", memory.main.rngSeed())
183+
print("Confirming RNG seed:", memory.main.rngSeed())
186184
print("#####################################")
187185
print("Done Killing Sinspawn")
188186
memory.main.waitFrames(6) # Just for no overlap
@@ -191,7 +189,7 @@ def ammesBattle():
191189
print("Waiting for Auron's Turn")
192190
print("At Overdrive")
193191
# Auron overdrive tutorial
194-
battle.main.auronOD()
192+
battle.overdrive.auron()
195193

196194

197195
def AfterAmmes():
@@ -229,7 +227,7 @@ def AfterAmmes():
229227
else:
230228
FFXC.set_neutral()
231229
if memory.main.turnReady():
232-
battle.main.Tanker()
230+
battle.boss.tanker()
233231
if memory.main.diagSkipPossible():
234232
xbox.tapB()
235233
elif memory.main.cutsceneSkipPossible():

‎area/gagazet.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import xbox
2-
import screen
1+
import battle.boss
32
import battle.main
4-
import menu
53
import logs
64
import memory.main
5+
import menu
6+
import rngTrack
7+
import screen
78
import targetPathing
89
import vars
9-
import rngTrack
10+
import xbox
11+
1012
gameVars = vars.varsHandle()
1113

1214
FFXC = xbox.controllerHandle()
@@ -116,7 +118,7 @@ def toTheRonso():
116118
else:
117119
FFXC.set_neutral()
118120
if memory.main.turnReady():
119-
battle.main.biranYenke()
121+
battle.boss.biranYenke()
120122
elif memory.main.diagSkipPossible():
121123
xbox.tapB()
122124

@@ -196,7 +198,7 @@ def Flux():
196198
FFXC.set_neutral()
197199
if memory.main.battleActive():
198200
print("Flux battle start")
199-
battle.main.seymourFlux()
201+
battle.boss.seymourFlux()
200202
# FFXC.set_movement(0,1)
201203
memory.main.clickToControl3()
202204
if gameVars.endGameVersion() != 3:
@@ -469,7 +471,7 @@ def cave():
469471
xbox.tapB()
470472

471473
xbox.clickToBattle()
472-
battle.main.sKeeper()
474+
battle.boss.sKeeper()
473475

474476

475477
def wrapUp():

‎area/guadosalam.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import time
2-
import xbox
2+
33
import memory.main
44
import targetPathing
55
import vars
6+
import xbox
7+
68
gameVars = vars.varsHandle()
79

810
FFXC = xbox.controllerHandle()
@@ -53,7 +55,7 @@ def arrival():
5355
xbox.tapB()
5456
FFXC.set_neutral()
5557
memory.main.clickToControl3()
56-
58+
5759
while not targetPathing.setMovement([4, -114]):
5860
pass
5961
print("Mark1")
@@ -62,7 +64,7 @@ def arrival():
6264
xbox.tapB()
6365
FFXC.set_neutral()
6466
memory.main.clickToControl3()
65-
67+
6668
else:
6769
while not targetPathing.setMovement([4, -114]):
6870
pass
@@ -90,11 +92,11 @@ def arrival():
9092
xbox.tapB()
9193
FFXC.set_neutral()
9294
memory.main.clickToControl3()
93-
95+
9496
# Line up for Rikku/Yuna
9597
while not targetPathing.setMovement([15, -52]):
9698
pass
97-
99+
98100
while not targetPathing.setMovement([22, -25]):
99101
pass
100102
print("Mark5")
@@ -112,7 +114,7 @@ def arrival():
112114
xbox.tapB()
113115
FFXC.set_neutral()
114116
memory.main.clickToControl3()
115-
117+
116118
if not gameVars.csr():
117119
while not memory.main.cutsceneSkipPossible():
118120
xbox.tapB()

‎area/home.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import xbox
1+
import math
2+
23
import battle.main
3-
import menu
44
import memory.main
5+
import menu
56
import targetPathing
67
import vars
7-
import math
8+
import xbox
9+
810
gameVars = vars.varsHandle()
911

1012
FFXC = xbox.controllerHandle()

0 commit comments

Comments
 (0)