Skip to content

Commit c33fbc6

Browse files
authored
Improve encounter round shop delay
1 parent d6a0b14 commit c33fbc6

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

arena.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,13 @@ def spend_gold(self, speedy=False) -> None:
362362
mk_functions.reroll()
363363
print(" Rerolling shop")
364364
shop: list = arena_functions.get_shop()
365-
print(f" Shop: {shop}")
366365

367366
# For set 11 encounter round shop delay and choose items popup
368367
for _ in range(15):
369368
if speedy:
370369
return
371370
if all(champ[1] == "" for champ in shop):
371+
print(" Waiting encounter round animation ends")
372372
sleep(1)
373373
anvil_msg: str = ocr.get_text(
374374
screenxy=screen_coords.ANVIL_MSG_POS.get_coords(),
@@ -377,6 +377,7 @@ def spend_gold(self, speedy=False) -> None:
377377
whitelist=ocr.ALPHABET_WHITELIST,
378378
)
379379
if anvil_msg in ["ChooseOne", "Feelinglucky"]:
380+
sleep(2)
380381
print(" Choosing item")
381382
mk_functions.left_click(screen_coords.BUY_LOC[2].get_coords())
382383
sleep(1.5)
@@ -386,6 +387,7 @@ def spend_gold(self, speedy=False) -> None:
386387
else:
387388
break
388389

390+
print(f" Shop: {shop}")
389391
for champion in shop:
390392
if (
391393
self.champs_to_buy.get(champion[1], -1) >= 0

comps.py

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,66 @@
22
Team composition used by the bot
33
Comps come from https://tftactics.gg/tierlist/team-comps
44
Items are in camel case and a-Z
5-
The "headliner" tag represents a trait from bottom to top.
6-
Set to True if you want it in your team.
7-
Only final comp champion will become headliner and need to set the corresponding 'headliner' tag to True.
8-
e.g. Only want "Sentinel" Ekko, set it to "headliner": [True, False, False]
9-
e.g.2 want either "Sentinel" or "True Damage" Ekko, set it to "headliner": [True, False, True]
5+
Items will be placed on the top champion first, and prioritize building items on the left.
106
"""
117

128
COMP = {
13-
"Irelia": {
9+
"Tristana": {
1410
"board_position": 6,
15-
"items": ["GiantSlayer", "GuinsoosRageblade", "InfinityEdge"],
11+
"items": ["GuinsoosRageblade", "InfinityEdge", "LastWhisper"],
1612
"level": 3,
1713
"final_comp": True
1814
},
19-
"Galio": {
20-
"board_position": 25,
21-
"items": ["BrambleVest", "DragonsClaw", "WarmogsArmor"],
15+
"Volibear": {
16+
"board_position": 27,
17+
"items": ["Bloodthirster", "TitansResolve", "WarmogsArmor"],
2218
"level": 3,
2319
"final_comp": True
2420
},
25-
"Sivir": {
26-
"board_position": 5,
21+
"Irelia": {
22+
"board_position": 0,
2723
"items": ["GiantSlayer", "GuinsoosRageblade", "InfinityEdge"],
2824
"level": 2,
2925
"final_comp": True
3026
},
31-
"Zoe": {
32-
"board_position": 4,
33-
"items": ["JeweledGauntlet","RabadonsDeathcap","SpearofShojin"],
27+
"Wukong": {
28+
"board_position": 22,
29+
"items": ["HandofJustice"],
3430
"level": 2,
3531
"final_comp": True
3632
},
37-
"Illaoi": {
38-
"board_position": 23,
39-
"items": ["BrambleVest", "DragonsClaw", "WarmogsArmor"],
33+
"LeeSin": {
34+
"board_position": 25,
35+
"items": [],
4036
"level": 2,
4137
"final_comp": True
4238
},
43-
"Zyra": {
44-
"board_position": 1,
45-
"items": [],
39+
"Diana": {
40+
"board_position": 26,
41+
"items": ["BrambleVest", "DragonsClaw", "WarmogsArmor"],
4642
"level": 2,
4743
"final_comp": True
4844
},
49-
"Riven": {
50-
"board_position": 27,
51-
"items": ["ThiefsGloves"],
45+
"Qiyana": {
46+
"board_position": 24,
47+
"items": [],
5248
"level": 2,
5349
"final_comp": True
5450
},
55-
"Garen": {
56-
"board_position": 21,
51+
"Darius": {
52+
"board_position": 23,
5753
"items": [],
5854
"level": 2,
5955
"final_comp": True
6056
},
61-
"Kobuko": {
62-
"board_position": 22,
57+
"Yorick": {
58+
"board_position": 20,
6359
"items": [],
6460
"level": 2,
6561
"final_comp": False
6662
},
67-
"Teemo": {
68-
"board_position": 13,
63+
"Yasuo": {
64+
"board_position": 19,
6965
"items": [],
7066
"level": 2,
7167
"final_comp": False
@@ -78,7 +74,9 @@
7874
# For those augments names with suffixes like I, II, III, such as 'Cybernetic Uplink II',
7975
# You only need to add 'Cybernetic Uplink' in the list to cover all three levels.
8076
AUGMENTS: list[str] = [
81-
"That's Jazz Baby!",
77+
"Tiny but Deadly",
78+
"Pumping up",
79+
"Extended Duel",
8280
"You Have My Bow",
8381
"Blistering Strikes",
8482
"Buried Treasures",
@@ -133,7 +131,8 @@
133131
"Scapegoat",
134132
"Wandering Trainer",
135133
"Recombobulator",
136-
"Forge"
134+
"Forge",
135+
"Crest Test Dummies"
137136
]
138137

139138

0 commit comments

Comments
 (0)