dungeon.py

@@ -70,43 +70,42 @@ while True:
 
         name, locations = look_for_templates(templates)
         if name is not None:
-            if name in ["to_battle", "auto_battle", "ok", "lock", "collect"]:
-                if name in ["auto_battle"]:
-                    dead = first_template(tpl_dead)
-                    if dead:
-                        print("++++++++ at least one titan is dead. stopping")
-                        break
-                    if is_mixed:
-                        moloch = first_template(tpl_moloch)
-                        if moloch and moloch[1] < 1000 and low_health(moloch, "moloch"):
-                            angus = first_template(tpl_angus2)
-                            if angus:
-                                tap(angus)
+            if name in ["to_battle", "ok", "lock", "collect"]:
+                tap(*locations[0])
+                continue
+            if name in ["auto_battle"]:
+                dead = first_template(tpl_dead)
+                if dead:
+                    print("++++++++ at least one titan is dead. stopping")
+                    break
+                if is_mixed:
+                    moloch = first_template(tpl_moloch)
+                    if moloch and moloch[1] < 1000 and low_health(moloch, "moloch"):
+                        angus = first_template(tpl_angus2)
+                        if angus:
+                            tap(angus)
+                            time.sleep(0.5)
+                            tap(angus[0] + 500, angus[1])
+                        else:
+                            print(
+                                "######### seems like angus is dead already. stopping"
+                            )
+                            break
+                    else:
+                        angus = first_template(tpl_angus)
+                        if angus and angus[1] < 1000 and low_health(angus, "angus"):
+                            moloch = first_template(tpl_moloch2)
+                            if moloch:
+                                tap(moloch)
                                 time.sleep(0.5)
-                                tap(angus[0] + 500, angus[1])
+                                tap(moloch[0] - 500, moloch[1])
                             else:
                                 print(
-                                    "######### seems like angus is dead already. stopping"
+                                    "######### seems like moloch is dead already. stopping"
                                 )
                                 break
-                        else:
-                            angus = first_template(tpl_angus)
-                            if angus and angus[1] < 1000 and low_health(angus, "angus"):
-                                moloch = first_template(tpl_moloch2)
-                                if moloch:
-                                    tap(moloch)
-                                    time.sleep(0.5)
-                                    tap(moloch[0] - 500, moloch[1])
-                                else:
-                                    print(
-                                        "######### seems like moloch is dead already. stopping"
-                                    )
-                                    break
-                        time.sleep(0.5)
                 tap(*locations[0])
-                if name in ["auto_battle", "ok"]:
-                    time.sleep(1.5)
-                    continue
+                continue
             if name == "attack":
                 if len(locations) == 1:
                     element = first_template(tpl_mixed)