Skip to content

Commit a987f39

Browse files
authored
Update for set11 encounter add one round
Not tested yet
1 parent 2ddb4b3 commit a987f39

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

game.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def game_loop(self) -> None:
132132
self.second_round()
133133
ran_round: str = self.round[0]
134134
elif self.round[0] in game_assets.ENCOUNTER_ROUNDS:
135-
print(f"\n[Encounter Round] {self.round}")
135+
print(f"\n[Encounter Round] {self.round[0]}")
136136
print(" Do nothing")
137137
self.message_queue.put("CLEAR")
138138
self.arena.check_health()
@@ -200,7 +200,7 @@ def encounter_round_setup(self) -> None:
200200

201201
def second_round(self) -> None:
202202
"""Move unknown champion to board after first carousel"""
203-
print(f"\n[Second Round] {self.round}")
203+
print(f"\n[Second Round] {self.round[0]}")
204204
self.message_queue.put("CLEAR")
205205
while True:
206206
result = arena_functions.bench_occupied_check()
@@ -213,26 +213,26 @@ def second_round(self) -> None:
213213

214214
def carousel_round(self) -> None:
215215
"""Handles tasks for carousel rounds"""
216-
print(f"\n[Carousel Round] {self.round}")
216+
print(f"\n[Carousel Round] {self.round[0]}")
217217
self.message_queue.put("CLEAR")
218-
if self.round == "3-4":
218+
if self.round[0] == "3-4":
219219
self.arena.final_comp = True
220220
self.arena.check_health()
221221
print(" Getting a champ from the carousel")
222-
game_functions.get_champ_carousel(self.round)
222+
game_functions.get_champ_carousel(self.round[0])
223223

224224
def pve_round(self) -> None:
225225
"""Handles tasks for PVE rounds"""
226-
print(f"\n[PvE Round] {self.round}")
226+
print(f"\n[PvE Round] {self.round[0]}")
227227
self.message_queue.put("CLEAR")
228228
sleep(0.5)
229-
if self.round in game_assets.AUGMENT_ROUNDS:
229+
if self.round[0] in game_assets.AUGMENT_ROUNDS:
230230
sleep(1)
231231
self.arena.augment_roll = True
232232
self.arena.pick_augment()
233233
# Can't purchase champions for a short period after choosing augment
234234
sleep(2.5)
235-
if self.round == "1-3":
235+
if self.round[0] == "1-3":
236236
sleep(1.5)
237237
self.arena.fix_unknown()
238238
self.arena.anvil_free[1:] = [True] * 8
@@ -252,32 +252,32 @@ def pve_round(self) -> None:
252252

253253
def pvp_round(self) -> None:
254254
"""Handles tasks for PVP rounds"""
255-
print(f"\n[PvP Round] {self.round}")
255+
print(f"\n[PvP Round] {self.round[0]}")
256256
self.message_queue.put("CLEAR")
257257
sleep(0.5)
258-
if self.round in game_assets.AUGMENT_ROUNDS:
258+
if self.round[0] in game_assets.AUGMENT_ROUNDS:
259259
sleep(1)
260260
self.arena.augment_roll = True
261261
self.arena.pick_augment()
262262
sleep(2.5)
263-
if self.round in ("2-1", "2-5"):
263+
if self.round[0] in ("2-1", "2-5"):
264264
self.arena.buy_xp_round()
265-
if self.round in game_assets.PICKUP_ROUNDS:
265+
if self.round[0] in game_assets.PICKUP_ROUNDS:
266266
print(" Picking up items")
267267
game_functions.pickup_items()
268268

269269
self.arena.fix_bench_state()
270270
self.arena.bench_cleanup()
271-
if self.round in game_assets.ANVIL_ROUNDS:
271+
if self.round[0] in game_assets.ANVIL_ROUNDS:
272272
self.arena.clear_anvil()
273-
self.arena.spend_gold(speedy=self.round in game_assets.PICKUP_ROUNDS)
273+
self.arena.spend_gold(speedy=self.round[0] in game_assets.PICKUP_ROUNDS)
274274
self.arena.move_champions()
275275
self.arena.replace_unknown()
276276
if self.arena.final_comp:
277277
self.arena.final_comp_check()
278278
self.arena.bench_cleanup()
279279

280-
if self.round in game_assets.ITEM_PLACEMENT_ROUNDS:
280+
if self.round[0] in game_assets.ITEM_PLACEMENT_ROUNDS:
281281
sleep(1)
282282
self.arena.place_items()
283283
self.end_round_tasks()

0 commit comments

Comments
 (0)