Merge pull request #12 from Walofz/upstream

20200118.2
Walofz · Jan 18, 2020 · 44595f8 · 44595f8
2 parents 931161a + e91c532
commit 44595f8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ALAuto.py b/ALAuto.py
@@ -210,7 +210,7 @@ def print_cycle_stats(self):
 try:
     while True:
         Utils.wait_update_screen(1)
-        # temporal solution to event alerts        
+        # temporal solution to event alerts      
         if Utils.find("menu/azurlane"):
             Logger.log_msg("Found Azurlane Screen")
             for x in range(2):

diff --git a/modules/combat.py b/modules/combat.py
@@ -75,7 +75,7 @@ def combat_logic_wrapper(self):
                 Utils.touch_randomly(self.region['close_info_dialog'])
                 self.exit = 2
                 break
-            if Utils.find("commission/button_confirm"):
+            if Utils.find("menu/button_confirm"):
                 Logger.log_msg("Found commission info message.")
                 Utils.touch_randomly(self.region["combat_com_confirm"])
                 continue

diff --git a/util/utils.py b/util/utils.py
@@ -150,7 +150,7 @@ def check_oil(cls, limit=0):
             return True
 
         cls.menu_navigate("menu/button_battle")
-
+        
         while len(oil) < 5:
             _res = int(cls.read_numbers(970, 38, 101, 36))
             if last_ocr == '' or abs(_res - last_ocr) < 600:

diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
 0.0.5
-20200117.06
+20200118.02