1.0.5.1.2

Author: Samsterr

sirsquirrel.py

@@ -15,7 +15,7 @@
 
 def update():
     r = requests.get("https://api.github.com/repos/Samsterr/SirSquirrelAssistant/releases/latest")
-    tag = "1.0.5.1"
+    tag = "1.0.5.1.2"
     r_tag = r.json()["tag_name"]
     if r_tag != tag:
         print("A New Version is Available! Downloading it to your current folder")

src/mirror.py

@@ -255,10 +255,10 @@ def pack_selection(self):
         self.logger.debug(common.luminence(x,y))
         refresh_flag = common.luminence(x,y) < 70 
 
-        #if floor == "f5" and common.element_exist("pictures/mirror/packs/f5/nocturnal.png"):
-        #    self.choose_pack("pictures/mirror/packs/f5/nocturnal.png")
+        if floor == "f5" and common.element_exist("pictures/mirror/packs/f5/nocturnal.png"):
+            self.choose_pack("pictures/mirror/packs/f5/nocturnal.png")
 
-        if self.exclusion_detection(floor) and not refresh_flag: #if pack exclusion detected and not refreshed
+        elif self.exclusion_detection(floor) and not refresh_flag: #if pack exclusion detected and not refreshed
             self.logger.info("Pack exclusion detected, refreshing")
             common.click_matching("pictures/mirror/general/refresh.png")
             common.mouse_move(200,200)
@@ -392,12 +392,13 @@ def check_nodes(self,nodes):
         non_exist = [1,1,1]
         top = common.greyscale_match_image("pictures/mirror/general/node_1.png")
         middle = common.greyscale_match_image("pictures/mirror/general/node_2.png")
-        bottom = common.greyscale_match_image("pictures/mirror/general/node_3.png")
+        bottom = common.greyscale_match_image("pictures/mirror/general/node_3_o.png")
+        bottom_alt = common.greyscale_match_image("pictures/mirror/general/node_3.png")
         if not top:
             non_exist[0] = 0
         if not middle:
             non_exist[1] = 0
-        if not bottom:
+        if not bottom and bottom_alt:
             non_exist[2] = 0
         nodes = [y for y, exists in zip(nodes, non_exist) if exists != 0]
         return nodes