Artifact using in push functions and some small bugfixes

Author: w-zz-w-zz-w

AutoAFK.py

@@ -43,7 +43,7 @@
     latest_release = 'Cannot retrieve!'
 
 
-version = "0.15.2"
+version = "0.15.3"
 
 #Main Window
 class App(customtkinter.CTk):
@@ -771,23 +771,23 @@ def activityManager():
     if app.activityFormationDropdown.get() == "Fight of Fates":
         buttonState('disabled')
         connect_device()
-        handleFightOfFates(config.getint('EVENTS', 'activitybattles'))
+        handleFightOfFates(config.getint('ACTIVITY', 'activitybattles'))
         buttonState('normal')
         print('')
         return
 
     if app.activityFormationDropdown.get() == "Battle of Blood":
         buttonState('disabled')
         connect_device()
-        handleBattleofBlood(config.getint('EVENTS', 'activitybattles'))
+        handleBattleofBlood(config.getint('ACTIVITY', 'activitybattles'))
         buttonState('normal')
         print('')
         return
 
     if app.activityFormationDropdown.get() == "Arena of Heroes":
         buttonState('disabled')
         connect_device()
-        handleArenaOfHeroes(config.getint('EVENTS', 'activitybattles'), config.getint('ARENA', 'arenaopponent'))
+        handleArenaOfHeroes(config.getint('ACTIVITY', 'activitybattles'), config.getint('ARENA', 'arenaopponent'))
         buttonState('normal')
         print('')
         return
@@ -837,7 +837,6 @@ def serverCheck():
 def dailies():
     connect_device()
     serverCheck() # Change server slot if defined before doing dailies
-    useBagConsumables()
     if config.getboolean('DAILIES', 'collectrewards') is True:
         collectAFKRewards()
     if config.getboolean('DAILIES', 'collectmail') is True:
@@ -900,7 +899,6 @@ def push():
             pushCampaign(formation=formation, duration=int(config.get('PUSH', 'victoryCheck')))
     else:
         printBlue('Auto-Pushing ' + str(app.pushLocationDropdown.get()) + ' using using the ' + str(app.pushFormationDropdown.get()) + ' formation')
-        # openTower(app.pushLocationDropdown.get())
         if str(app.pushFormationDropdown.get()) != config.get('PUSH', 'formation'):
             config.set('PUSH', 'formation', app.pushFormationDropdown.get())
         updateSettings()

activities.py

@@ -322,9 +322,9 @@ def useBagConsumables():
                 click('buttons/back', region=boundaries['backMenu'])
                 click('buttons/back', region=boundaries['backMenu'])
                 return
-        clickXY(550, 1800)
-        clickXY(950, 1750)
-        click('buttons/back', region=boundaries['backMenu'])
+        clickXY(550, 1800) # Use
+        clickXY(950, 1700) # 'All' Bag button to clear loot
+        click('buttons/back', region=boundaries['backMenu'], suppress=True)
         printGreen('    Bag consumables used!')
     else:
         printError('    Bag not found, attempting to recover')
@@ -463,6 +463,8 @@ def pushCampaign(formation=3, duration=1):
         recover()
 
 def configureBattleFormation(formation):
+    artifacts = None
+    counter = 0
     if config.getboolean('ADVANCED', 'ignoreformations') is True:
         printWarning('ignoreformations enabled, skipping formation selection')
         click('buttons/autobattle', suppress=True, retry=3, region=boundaries['autobattle'])  # So we don't hit it in the background while autobattle is active
@@ -473,9 +475,20 @@ def configureBattleFormation(formation):
         clickXY(800, 1650, seconds=2)  # Change to 'Popular' tab
         clickXY(850, 425 + (formation * 175), seconds=2)
         click('buttons/use', retry=3, region=boundaries['useAB'], seconds=2)
-        artifacts = isVisible('buttons/checkbox_checked', region=(230, 1100, 80, 80), confidence=0.85) # Check checkbox status
-        if artifacts != config.getboolean('PUSH', 'useartifacts'):
+
+        # Configure Artifacts
+        while artifacts is None and counter <= 5: # loop because sometimes isVisible returns None here
+            artifacts = isVisible('buttons/checkbox_checked', region=(230, 1100, 80, 80)) # Check checkbox status
+            counter += 1
+        if counter >= 5: # If still None after 5 tries give error and contiue without configuring
+            printError('Couldn\'t read artifact status')
+        if artifacts is not config.getboolean('PUSH', 'useartifacts') and artifacts is not None:
+            if config.getboolean('PUSH', 'useartifacts'):
+                printBlue('Enabling Artifact copying')
+            else:
+                printBlue('Disabling Artifact copying')
             clickXY(275, 1150) # clickXY not ideal here but my brain is fried so it'll do for now
+
         click('buttons/confirm_small', retry=3, region=boundaries['confirmAB'])
         click('buttons/autobattle', retry=3, region=boundaries['autobattle'])  # So we don't hit it in the background while autobattle is active
         clickSecure('buttons/activate', 'labels/autobattle', region=boundaries['activateAB'], secureregion=boundaries['autobattleLabel'])
@@ -781,6 +794,7 @@ def handleTwistedRealm():
             printError('    Challenge button not found, attempting to recover')
     else:
         printError('    Error opening Twisted Realm, attempting to recover')
+        # TODO Add 'Calculating' confirmation to exit safely
         recover()
 
 # Opens a Fight of Fates battle and then cycles between dragging heroes and dragging skills until we see the battle end screen
@@ -1385,3 +1399,6 @@ def returnBattleResults(type, firstOfMulti=False):
             return False
         else:
             return 'Unknown'
+
+def handleHeroesofEsperia():
+    print('soon')

img/buttons/confirm_stageexit.png

@@ -56,7 +56,7 @@ gold_emblem = False
 poe = True
 
 [PUSH]
-formation = 5th
+formation = 2nd
 victorycheck = 1
 suppressspam = True
 useartifacts = False

settings.ini

@@ -211,7 +211,7 @@ def waitUntilGameActive():
         loaded = 1
 
     while loadingcounter < loaded:
-        clickXY(400, 50) # Neutral location for closing reward pop ups etc, should never be an in game button here
+        clickXY(420, 50) # Neutral location for closing reward pop ups etc, should never be an in game button here
         buttons = [os.path.join('buttons', 'campaign_unselected'), os.path.join('buttons', 'exitmenu_trial'), os.path.join('buttons', 'back')]
         for button in buttons:
             click(button, seconds=0, suppress=True)
@@ -517,9 +517,10 @@ def recover():
         click('buttons/back', suppress=True, seconds=0.5, region=(0, 1500, 250, 419))
         click('buttons/exitmenu', suppress=True, seconds=0.5, region=(700, 0, 379, 500))
         click('buttons/confirm_small', suppress=True, seconds=0.5, region=(200, 750, 600, 649))
+        click('buttons/confirm_stageexit', suppress=True, seconds=0.5, region=(200, 750, 600, 649))
         click('buttons/exit', suppress=True, seconds=0.5, region=(578, 1250, 290, 88))
         click('buttons/campaign_unselected', suppress=True, seconds=0.5, region=(424, 1750, 232, 170))
-        clickXY(400, 50) # Neutral location for closing reward pop ups etc, should never be an in game button here
+        clickXY(420, 50) # Neutral location for closing reward pop ups etc, should never be an in game button here
         recoverCounter += 1
         if recoverCounter > 8:
             break