fixed critical bugs

cards/Combat.py

@@ -1,3 +1,4 @@
+import time
 from extra.find_servant import get_servant
 from extra.matching import matching
 from config import script_mode
@@ -19,13 +20,11 @@ def __init__(self):
         self.card_crd = self.get_np()
 
     def get_np(self):
+        time.sleep(0.7)
         if not self.turns:
             return self.get_arrangement()
         a = self.turns[0]
-        if len(self.turns) == 3:
-            b = self.turns[2]
-        else:
-            b = self.turns[1]
+        b = self.turns[len(self.turns)-1]
         npcrd = []
         if float(a) / float(b) == 1:
             nps = match_np()

phantasms/detection.py

@@ -35,8 +35,7 @@ def match_servants():
         templ = f"./temp/servant{servant}.png"
         for i in range(3):
             img = f"./temp/np{i}.png"
-            if check(img, templ, 0.7) == 1:
-                nobles[i].ready = 1
+            if check(img, templ, 0.75) == 1:
                 x = orgx + i * length
                 y = exacty
                 nobles[i].crd = [x, y]
@@ -66,6 +65,6 @@ def match_np():
     match_servants()
 
     for i in range(len(nobles)):
-        print(nobles[i].crd)
+        print("npcrd: ", nobles[i].crd)
 
     return nobles

util/anti.py

@@ -11,8 +11,8 @@ def long_tap(x, y):  # random length tap
 
 
 def tap_card(x, y):  # tap on random location of the card
-    x0 = x + random.uniform(0, 100)
-    y0 = y + random.uniform(-150, 0)
+    x0 = x + random.uniform(0, 75)
+    y0 = y + random.uniform(-90, 0)
     x0 = int(x0)
     y0 = int(y0)
     tap(x0, y0)