Skip to content

Commit 756b9a1

Browse files
shenefshenef
committed
renamed battle/main.py variables
1 parent caf9b60 commit 756b9a1

File tree

7 files changed

+873
-819
lines changed

7 files changed

+873
-819
lines changed

‎battle/boss.py

Lines changed: 72 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
import logging
2+
13
import battle.main
24
import logs
35
import memory.main
46
import screen
57
import vars
68
import xbox
7-
import logging
89

910
FFXC = xbox.controller_handle()
1011
game_vars = vars.vars_handle()
1112

1213
logger = logging.getLogger(__name__)
1314

15+
1416
def ammes():
1517
BattleComplete = 0
1618
countAttacks = 0
@@ -65,7 +67,7 @@ def klikk():
6567
logger.info("Fight start: Klikk")
6668
klikkAttacks = 0
6769
klikkRevives = 0
68-
stealCount = 0
70+
steal_count = 0
6971
while not memory.main.battle_complete(): # AKA end of battle screen
7072
if memory.main.turn_ready():
7173
BattleHP = memory.main.get_battle_hp()
@@ -79,7 +81,7 @@ def klikk():
7981
battle.main.attack("none")
8082
klikkAttacks += 1
8183
elif screen.turn_rikku():
82-
grenadeCount = memory.main.get_item_count_slot(
84+
gregrenade_count = memory.main.get_item_count_slot(
8385
memory.main.get_item_slot(35)
8486
)
8587
if (
@@ -95,12 +97,12 @@ def klikk():
9597
elif memory.main.get_enemy_current_hp()[0] < 58:
9698
battle.main.attack("none")
9799
klikkAttacks += 1
98-
elif grenadeCount < 6 and memory.main.next_steal(
99-
steal_count=stealCount
100+
elif gregrenade_count < 6 and memory.main.next_steal(
101+
steal_count=steal_count
100102
):
101103
logger.info("Attempting to steal from Klikk")
102104
battle.main.steal()
103-
stealCount += 1
105+
steal_count += 1
104106
else:
105107
battle.main.attack("none")
106108
klikkAttacks += 1
@@ -168,20 +170,20 @@ def tros():
168170
Revives += 1
169171
elif screen.turn_rikku():
170172
logger.debug("Rikku turn")
171-
grenadeSlot = memory.main.get_item_slot(35)
172-
grenadeCount = memory.main.get_item_count_slot(grenadeSlot)
173+
grenade_slot = memory.main.get_item_slot(35)
174+
gregrenade_count = memory.main.get_item_count_slot(grenade_slot)
173175
logger.debug("------------------------------")
174-
logger.debug(f"Current grenade count: {grenadeCount}")
176+
logger.debug(f"Current grenade count: {gregrenade_count}")
175177
logger.debug(f"Grenades used: {Grenades}")
176178
logger.debug("------------------------------")
177-
totalNades = grenadeCount + Grenades
179+
totalNades = gregrenade_count + Grenades
178180
if totalNades < 6:
179181
if trosPos == 1:
180182
battle.main.defend()
181183
else:
182184
battle.main.steal()
183185
Steals += 1
184-
elif grenadeCount == 0:
186+
elif gregrenade_count == 0:
185187
if trosPos == 1:
186188
battle.main.defend()
187189
else:
@@ -192,8 +194,8 @@ def tros():
192194
battle.main.steal()
193195
Steals += 1
194196
else:
195-
grenadeSlot = memory.main.get_use_items_slot(35)
196-
battle.main.use_item(grenadeSlot, "none")
197+
grenade_slot = memory.main.get_use_items_slot(35)
198+
battle.main.use_item(grenade_slot, "none")
197199
Grenades += 1
198200
elif screen.turn_tidus():
199201
logger.debug("Tidus turn")
@@ -217,7 +219,7 @@ def sin_fin():
217219
logger.info("Fight start: Sin's Fin")
218220
screen.await_turn()
219221
finTurns = 0
220-
kimTurn = False
222+
kim_turn = False
221223
complete = False
222224
while not complete:
223225
if memory.main.turn_ready():
@@ -231,27 +233,27 @@ def sin_fin():
231233
battle.main.thunder_target(target=23, direction="r")
232234
elif screen.turn_kimahri():
233235
battle.main.lancet_target(target=23, direction="r")
234-
kimTurn = True
236+
kim_turn = True
235237
elif screen.turn_lulu():
236238
battle.main.thunder_target(target=23, direction="r")
237239
else:
238240
battle.main.defend()
239-
if finTurns >= 3 and kimTurn:
241+
if finTurns >= 3 and kim_turn:
240242
complete = True
241243

242244
logger.info("First few turns are complete. Now for the rest of the fight.")
243245
# After the first two turns, the rest of the fight is pretty much scripted.
244-
turnCounter = 0
246+
turn_counter = 0
245247
while not memory.main.battle_complete():
246248
if memory.main.turn_ready():
247-
turnCounter += 1
249+
turn_counter += 1
248250
if screen.turn_kimahri():
249251
screen.await_turn()
250252
battle.main.lancet_target(23, "r")
251253
elif screen.turn_lulu():
252254
battle.main.thunder_target(23, "r")
253255
elif screen.turn_tidus():
254-
if turnCounter < 4:
256+
if turn_counter < 4:
255257
battle.main.defend()
256258
memory.main.wait_frames(30 * 0.2)
257259
else:
@@ -460,7 +462,7 @@ def chocobo_eater():
460462
else:
461463
battle.main.buddy_swap_auron()
462464
battle.main.revive()
463-
# elif 0 not in memory.main.getActiveBattleFormation():
465+
# elif 0 not in memory.main.getActivebattle_formation():
464466
# Doesn't work - it still hits Tidus if he swapped out and back in (instead of Yuna).
465467
# buddySwapTidus()
466468
elif (
@@ -493,15 +495,17 @@ def gui():
493495
logger.info("Fight start: Sinspawn Gui")
494496
xbox.click_to_battle()
495497
logger.info("Engaging Gui")
496-
logger.debug(f"##### Expecting crit: {memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)}")
498+
logger.debug(
499+
f"##### Expecting crit: {memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)}"
500+
)
497501
wakkaTurn = False
498502
yunaTurn = False
499503
auronTurn = False
500-
tidusTurn = False
501-
aeonTurn = False
504+
tidus_turn = False
505+
aeon_turn = False
502506
kimahriCrit = False
503507

504-
while not aeonTurn:
508+
while not aeon_turn:
505509
if memory.main.turn_ready():
506510
if screen.turn_yuna():
507511
if not yunaTurn:
@@ -515,7 +519,9 @@ def gui():
515519
wakkaTurn = True
516520
else:
517521
battle.main.buddy_swap_kimahri()
518-
logger.debug(f"##### Expecting crit: {memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)}")
522+
logger.debug(
523+
f"##### Expecting crit: {memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)}"
524+
)
519525
elif screen.turn_kimahri():
520526
dmgBefore = memory.main.get_enemy_current_hp()[0]
521527
battle.overdrive.kimahri(2)
@@ -530,9 +536,9 @@ def gui():
530536
else:
531537
logs.write_stats("False")
532538
elif screen.turn_tidus():
533-
if not tidusTurn:
539+
if not tidus_turn:
534540
battle.main.defend()
535-
tidusTurn = True
541+
tidus_turn = True
536542
elif screen.faint_check() > 0:
537543
battle.main.buddy_swap_kimahri()
538544
else:
@@ -547,7 +553,7 @@ def gui():
547553
battle.main.defend()
548554
elif screen.turn_aeon():
549555
battle.overdrive.valefor()
550-
aeonTurn = True
556+
aeon_turn = True
551557

552558
screen.await_turn()
553559
nextHP = memory.main.get_battle_hp()[0]
@@ -718,10 +724,10 @@ def spherimorph():
718724
FFXC.set_neutral()
719725

720726
spellNum = 0
721-
tidusturns = 0
727+
tidus_turns = 0
722728
rikkuturns = 0
723729
yunaTurn = False
724-
kimTurn = False
730+
kim_turn = False
725731
while not memory.main.turn_ready():
726732
pass
727733
while memory.main.battle_active(): # AKA end of battle screen
@@ -731,13 +737,13 @@ def spherimorph():
731737
turnchar = memory.main.get_battle_char_turn()
732738
party_hp = memory.main.get_battle_hp()
733739
if turnchar == 0:
734-
if tidusturns == 0:
740+
if tidus_turns == 0:
735741
battle.main.equip_in_battle(equip_type="armor", ability_num=0x8028)
736-
elif tidusturns == 1:
742+
elif tidus_turns == 1:
737743
battle.main.defend()
738744
else:
739745
battle.main.buddy_swap_rikku()
740-
tidusturns += 1
746+
tidus_turns += 1
741747
elif turnchar == 1:
742748
rikkuslotnum = memory.main.get_battle_char_slot(6)
743749
if rikkuslotnum < 3 and party_hp[rikkuslotnum] == 0:
@@ -762,9 +768,11 @@ def spherimorph():
762768
rikkuslotnum = memory.main.get_battle_char_slot(6)
763769
if rikkuslotnum < 3 and party_hp[rikkuslotnum] == 0:
764770
battle.main.revive()
765-
kimTurn = True
766-
elif not kimTurn:
767-
logger.debug(f"RNG11 before Spherimorph: {memory.main.rng_array_from_index(index=11, array_len=30)}")
771+
kim_turn = True
772+
elif not kim_turn:
773+
logger.debug(
774+
f"RNG11 before Spherimorph: {memory.main.rng_array_from_index(index=11, array_len=30)}"
775+
)
768776
logs.write_rng_track("RNG11 before Spherimorph")
769777
logs.write_rng_track(
770778
memory.main.rng_array_from_index(index=11, array_len=30)
@@ -775,7 +783,7 @@ def spherimorph():
775783
# _steal()
776784
# else:
777785
battle.main.defend()
778-
kimTurn = True
786+
kim_turn = True
779787
elif 6 not in memory.main.get_active_battle_formation():
780788
battle.main.buddy_swap_rikku()
781789
elif 5 not in memory.main.get_active_battle_formation():
@@ -859,7 +867,7 @@ def crawler():
859867
# One each for two Negators, Crawler, and guados.
860868
battle.main.negator_with_steal()
861869
else:
862-
tidusturns = 0
870+
tidus_turns = 0
863871
rikkuturns = 0
864872
kimahriturns = 0
865873
luluturns = 0
@@ -872,12 +880,12 @@ def crawler():
872880
if memory.main.turn_ready():
873881
turnchar = memory.main.get_battle_char_turn()
874882
if turnchar == 0:
875-
if tidusturns == 0:
883+
if tidus_turns == 0:
876884
logger.debug("Swapping Tidus for Rikku")
877885
battle.main.buddy_swap_rikku()
878886
else:
879887
battle.main.defend()
880-
tidusturns += 1
888+
tidus_turns += 1
881889
elif turnchar == 6:
882890
if luluturns < 2:
883891
logger.debug("Using Lightning Marble")
@@ -1004,7 +1012,9 @@ def wendigo():
10041012
)
10051013
if battle.main.fullheal(target=0, direction="l") == 0:
10061014
if screen.faint_check():
1007-
logger.debug("No healing items so revive someone instead")
1015+
logger.debug(
1016+
"No healing items so revive someone instead"
1017+
)
10081018
battle.main.revive()
10091019
else:
10101020
logger.debug("No healing items so just go face")
@@ -1046,8 +1056,8 @@ def wendigo():
10461056
):
10471057
battle.main.steal()
10481058
guadosteal = True
1049-
# elif memory.main.get_enemy_current_hp().count(0) == 2 and not 5 in memory.main.getActiveBattleFormation():
1050-
# buddySwapLulu()
1059+
# elif memory.main.get_enemy_current_hp().count(0) == 2 and not 5 in memory.main.getActivebattle_formation():
1060+
# buddy_swap_lulu()
10511061
else:
10521062
battle.main.defend()
10531063
elif turnchar == 2:
@@ -1114,9 +1124,9 @@ def evrae():
11141124
kimahriTurns = 0
11151125
lunarCurtain = False
11161126
if memory.main.rng_seed() == 31:
1117-
stealCount = 2
1127+
steal_count = 2
11181128
else:
1119-
stealCount = 0
1129+
steal_count = 0
11201130
FFXC.set_neutral()
11211131
# This gets us past the tutorial and all the dialog.
11221132
xbox.click_to_battle()
@@ -1201,20 +1211,20 @@ def evrae():
12011211
logger.debug("Heal should be successful.")
12021212
elif game_vars.skip_kilika_luck():
12031213
if memory.main.get_use_items_slot(32) != 255:
1204-
throwSlot = memory.main.get_use_items_slot(32)
1214+
throw_slot = memory.main.get_use_items_slot(32)
12051215
elif memory.main.get_use_items_slot(24) != 255:
1206-
throwSlot = memory.main.get_use_items_slot(24)
1216+
throw_slot = memory.main.get_use_items_slot(24)
12071217
elif memory.main.get_use_items_slot(27) != 255:
1208-
throwSlot = memory.main.get_use_items_slot(27)
1218+
throw_slot = memory.main.get_use_items_slot(27)
12091219
else:
1210-
throwSlot = memory.main.get_use_items_slot(30)
1211-
if throwSlot == 255:
1220+
throw_slot = memory.main.get_use_items_slot(30)
1221+
if throw_slot == 255:
12121222
battle.main.steal()
12131223
else:
1214-
battle.main.use_item(throwSlot)
1224+
battle.main.use_item(throw_slot)
12151225
else:
12161226
battle.main.steal()
1217-
stealCount += 1
1227+
steal_count += 1
12181228
elif turnchar == 3:
12191229
logger.debug("Registering Kimahri's turn")
12201230
if not game_vars.get_blitz_win() and not lunarCurtain:
@@ -1234,20 +1244,20 @@ def evrae():
12341244
logger.debug("Heal should be successful.")
12351245
elif game_vars.skip_kilika_luck():
12361246
if memory.main.get_use_items_slot(32) != 255:
1237-
throwSlot = memory.main.get_use_items_slot(32)
1247+
throw_slot = memory.main.get_use_items_slot(32)
12381248
elif memory.main.get_use_items_slot(24) != 255:
1239-
throwSlot = memory.main.get_use_items_slot(24)
1249+
throw_slot = memory.main.get_use_items_slot(24)
12401250
elif memory.main.get_use_items_slot(27) != 255:
1241-
throwSlot = memory.main.get_use_items_slot(27)
1251+
throw_slot = memory.main.get_use_items_slot(27)
12421252
else:
1243-
throwSlot = memory.main.get_use_items_slot(30)
1244-
if throwSlot == 255:
1253+
throw_slot = memory.main.get_use_items_slot(30)
1254+
if throw_slot == 255:
12451255
battle.main.steal()
12461256
else:
1247-
battle.main.use_item(throwSlot)
1257+
battle.main.use_item(throw_slot)
12481258
else:
12491259
battle.main.steal()
1250-
stealCount += 1
1260+
steal_count += 1
12511261
elif memory.main.diag_skip_possible():
12521262
xbox.tap_b()
12531263

@@ -1505,6 +1515,7 @@ def seymour_flux():
15051515
logger.info("-----------------------------")
15061516
# time.sleep(60) #Testing only
15071517

1518+
15081519
def s_keeper_bahamut_crit() -> int:
15091520
bahamut_crit = memory.main.next_crit(character=7, char_luck=17, enemy_luck=15)
15101521
logger.debug(f"Next Aeon Crit: {bahamut_crit}")
@@ -1754,8 +1765,8 @@ def yu_yevon():
17541765
xbox.tap_down()
17551766
while memory.main.main_battle_menu():
17561767
xbox.tap_b()
1757-
itemPos = memory.main.get_throw_items_slot(itemNum)
1758-
battle.main._navigate_to_position(itemPos)
1768+
item_pos = memory.main.get_throw_items_slot(itemNum)
1769+
battle.main._navigate_to_position(item_pos)
17591770
while memory.main.other_battle_menu():
17601771
xbox.tap_b()
17611772
while not memory.main.enemy_targetted():

0 commit comments

Comments
 (0)