1.0.4.8.2

fixed pierce detection on hard toggle button
fixed bug with pierce detection exclusion affecting packs

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.4.7"
+    tag = "1.0.4.8.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,16 +255,16 @@ def pack_selection(self):
         self.logger.debug(common.luminence(x,y))
         refresh_flag = common.luminence(x,y) < 70 
 
-        if floor == "f4" and common.element_exist("pictures/mirror/packs/f4/yield.png"):
-            self.choose_pack("pictures/mirror/packs/f4/yield.png")
+        #if floor == "f4" and common.element_exist("pictures/mirror/packs/f4/yield.png"):
+        #    self.choose_pack("pictures/mirror/packs/f4/yield.png")
 
         #elif floor == "f5" and common.element_exist("pictures/mirror/packs/f5/yield.png"):
         #    self.choose_pack("pictures/mirror/packs/f5/yield.png")
 
-        elif floor == "f5" and common.element_exist('pictures/mirror/packs/f5/lcb_check.png'):
-            self.choose_pack('pictures/mirror/packs/f5/lcb_check.png')
+        #elif floor == "f5" and common.element_exist('pictures/mirror/packs/f5/lcb_check.png'):
+        #    self.choose_pack('pictures/mirror/packs/f5/lcb_check.png')
 
-        elif self.exclusion_detection(floor) and not refresh_flag: #if pack exclusion detected and not refreshed
+        if 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)
@@ -297,6 +297,8 @@ def pack_list(self,floor, threshold=0.8):
     def choose_pack(self,pack_image, threshold=0.8):
         found = common.match_image(pack_image,threshold)
         self.logger.debug(found)
+        if pack_image == "pictures/mirror/packs/status/pierce_pack.png":
+            found = [x for x in found if x[1] > common.scale_y(1092)] #Removes poor detections
         if common.element_exist("pictures/mirror/packs/status/owned.png"):
             owned_found = common.match_image("pictures/mirror/packs/status/owned.png")
             self.logger.debug(owned_found)
@@ -596,7 +598,7 @@ def rest_shop(self):
             self.logger.info("Restshop: Not enough Cost, Exiting")
             common.click_matching("pictures/mirror/restshop/leave.png")
             if not common.element_exist("pictures/general/confirm_w.png"):
-                common.mouse_click(50,50)
+                common.mouse_move_click(50,50)
                 common.click_matching("pictures/mirror/restshop/leave.png")
             common.click_matching("pictures/general/confirm_w.png") 
 
@@ -671,7 +673,7 @@ def rest_shop(self):
         #LEAVING
         common.click_matching("pictures/mirror/restshop/leave.png")
         if not common.element_exist("pictures/general/confirm_w.png"):
-            common.mouse_click(50,50)
+            common.mouse_move_click(50,50)
             common.click_matching("pictures/mirror/restshop/leave.png")
         common.click_matching("pictures/general/confirm_w.png")
         return