From 93ec5b75522e62ea7065950f89b01e57e2f42900 Mon Sep 17 00:00:00 2001 From: Enterly <36875936+anthony5301@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:31:12 +0800 Subject: [PATCH 1/4] Fix pick_augment did the exactly opposite thing in last change and add string error tolerance --- arena.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arena.py b/arena.py index 31a6800..b18a748 100644 --- a/arena.py +++ b/arena.py @@ -467,14 +467,15 @@ def pick_augment(self) -> None: " [!] No priority or backup augment found, undefined behavior may occur for the rest of the round" ) - for augment in augments: - if augment in comps.AVOID_AUGMENTS: - mk_functions.left_click( - screen_coords.AUGMENT_LOC[augments.index(augment)].get_coords() - ) - break - else: - mk_functions.left_click(screen_coords.AUGMENT_LOC[0].get_coords()) + for potential in comps.AVOID_AUGMENTS: + for augment in augments: + if potential in augment: + mk_functions.left_click( + screen_coords.AUGMENT_LOC[augments.index(augment)].get_coords() + ) + break + else: + mk_functions.left_click(screen_coords.AUGMENT_LOC[0].get_coords()) def check_health(self) -> None: """Checks if current health is below 30 and conditionally activates spam roll""" From f67902dd8fe29655a486857d3e1ae72cf46d4c2f Mon Sep 17 00:00:00 2001 From: Enterly <36875936+anthony5301@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:38:10 +0800 Subject: [PATCH 2/4] Update docstring --- comps.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/comps.py b/comps.py index f443aac..b2987fb 100644 --- a/comps.py +++ b/comps.py @@ -85,6 +85,8 @@ # No logic for certain augments meaning the bot won't know what to do if they are included in here # (Anything that changes gameplay or adds something to the bench). # The ones on the top will be prioritized for selection. +# For those augment names followed by I II III, like "Cybernetic Uplink II" +# You can just add "Cybernetic Uplink" into the list and it will conclude all three tiers. AUGMENTS: list[str] = [ "That's Jazz Baby!", "You Have My Bow", From fb27a8bc04ef4de7448a26698a7d6b03d42d4092 Mon Sep 17 00:00:00 2001 From: Enterly <36875936+anthony5301@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:40:31 +0800 Subject: [PATCH 3/4] Update docstring --- comps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/comps.py b/comps.py index b2987fb..65052c0 100644 --- a/comps.py +++ b/comps.py @@ -85,8 +85,8 @@ # No logic for certain augments meaning the bot won't know what to do if they are included in here # (Anything that changes gameplay or adds something to the bench). # The ones on the top will be prioritized for selection. -# For those augment names followed by I II III, like "Cybernetic Uplink II" -# You can just add "Cybernetic Uplink" into the list and it will conclude all three tiers. +# "For those augments names with suffixes like I, II, III, such as 'Cybernetic Uplink II', +# You only need to add 'Cybernetic Uplink' in the list to cover all three levels. AUGMENTS: list[str] = [ "That's Jazz Baby!", "You Have My Bow", From ce2498e94d66c1055b56d683e42366aae3107634 Mon Sep 17 00:00:00 2001 From: Enterly <36875936+anthony5301@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:41:34 +0800 Subject: [PATCH 4/4] Update docstring --- comps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comps.py b/comps.py index 65052c0..ffb8cd0 100644 --- a/comps.py +++ b/comps.py @@ -85,7 +85,7 @@ # No logic for certain augments meaning the bot won't know what to do if they are included in here # (Anything that changes gameplay or adds something to the bench). # The ones on the top will be prioritized for selection. -# "For those augments names with suffixes like I, II, III, such as 'Cybernetic Uplink II', +# For those augments names with suffixes like I, II, III, such as 'Cybernetic Uplink II', # You only need to add 'Cybernetic Uplink' in the list to cover all three levels. AUGMENTS: list[str] = [ "That's Jazz Baby!",