Fixing noble collection

Fortigate · Dec 30, 2024 · 4fd19a0 · 4fd19a0
1 parent 010f4d5
commit 4fd19a0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/AutoAFK2.py b/AutoAFK2.py
@@ -24,7 +24,7 @@
 first_stage_won = False
 
 # placeholder gets replaced during build process with release tag.
-version = '<DEVELOPMENT_VERSION>'
+version = '0.9.14'
 
 # Current time in UTC for tracking which towers/events are open
 currenttimeutc = datetime.now(timezone.utc)
@@ -645,27 +645,27 @@ def noble_path():
     def claim_and_collect(italics=True):
         # This will claim quests/collet rewards
         clickXY(750, 450) # Click Quests
-        if isVisible('buttons/claim_all_italics', click=True, region=regions['bottom_third']):
-            clickXY(1000, 1800) # Clear Loot
-        # Travelogue
-        clickXY(350, 450) # Click Trek
-        if isVisible('buttons/claim_all_italics', click=True, region=regions['bottom_third']):
+        if isVisible('buttons/quick_claim', click=True, region=regions['bottom_third'], seconds=5): # Can also be 'claim_all_italics'
             clickXY(1000, 1800) # Clear Loot
+        # # Travelogue
+        # clickXY(350, 450) # Click Trek
+        # if isVisible('buttons/claim_all_italics', click=True, region=regions['bottom_third']):
+        #     clickXY(1000, 1800) # Clear Loot
 
     # Fabled Road
     logger.info('    Checking Fabled Road')
     if isVisible('buttons/fabled_road_active', region=regions['bottom_third'], seconds=2, grayscale=True) or isVisible('buttons/fabled_road_inactive', region=regions['bottom_third'], click=True, seconds=2, grayscale=True):
         claim_and_collect()
 
-    # Seasonal Noble Path
-    logger.info('    Checking Season Noble Path')
-    if isVisible('buttons/noble_season_active', region=regions['bottom_third'], seconds=2, grayscale=True) or isVisible('buttons/noble_season_inactive', region=regions['bottom_third'], click=True, seconds=2, grayscale=True):
-        claim_and_collect()
-
-    # Noble Path
-    logger.info('    Checking Noble Path')
-    if isVisible('buttons/noble_path_active', region=regions['bottom_third'], seconds=2, grayscale=True) or isVisible('buttons/noble_path_inactive', region=regions['bottom_third'], click=True, seconds=2, grayscale=True):
-        claim_and_collect()
+    # # Seasonal Noble Path
+    # logger.info('    Checking Season Noble Path')
+    # if isVisible('buttons/noble_season_active', region=regions['bottom_third'], seconds=2, grayscale=True) or isVisible('buttons/noble_season_inactive', region=regions['bottom_third'], click=True, seconds=2, grayscale=True):
+    #     claim_and_collect()
+    #
+    # # Noble Path
+    # logger.info('    Checking Noble Path')
+    # if isVisible('buttons/noble_path_active', region=regions['bottom_third'], seconds=2, grayscale=True) or isVisible('buttons/noble_path_inactive', region=regions['bottom_third'], click=True, seconds=2, grayscale=True):
+    #     claim_and_collect()
 
     if safe_open_and_close(name=inspect.currentframe().f_code.co_name, state='close'):
         logger.info('Noble path collected!\n')
@@ -1181,7 +1181,7 @@ def emit(self, record):
     blind_push('dream_realm')
 
 if args['test']:
-    claim_events()
+    noble_path()
 
 if args['charms']:
     handle_charms()

diff --git a/settings.ini b/settings.ini
@@ -3,15 +3,15 @@ claim_afk = True
 friend_points = True
 mail_collect = True
 emporium_purchases = True
-arena_battles = 7
+arena_battles = 3
 dream_realm = True
 collect_quests = True
-fast_rewards = 5
+fast_rewards = 4
 noble_path = True
-farm_affinity = False
+farm_affinity = True
 claim_events = True
 push_towers = True
-push_dream_realm = True
+push_dream_realm = False
 single_recruit = True
 teamup_limit = 0
 level_up = True