3 files changed, 49 insertions, 76 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..483de3d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.venv
+.idea
diff --git a/bot.py b/bot.py
index e8f7a3c..c419bbc 100644
--- a/bot.py
+++ b/bot.py
@@ -1,89 +1,54 @@
-import pyautogui as pg
-from time import sleep
-
+import time
 
-def move(_pos, _now):
-    if _pos == 'left' and _now == 'left':
-        pg.typewrite(['left'])
-        pg.typewrite(['left'])
-    elif _pos == 'left' and _now == 'right':
-        pg.typewrite(['right'])
-        pg.typewrite(['right'])
-    elif _pos == 'right' and _now == 'right':
-        pg.typewrite(['right'])
-        pg.typewrite(['right'])
-    elif _pos == 'right' and _now == 'left':
-        pg.typewrite(['left'])
-        pg.typewrite(['left'])
+import mss
+import pyautogui as pg
+from numpy import array, uint8
 
-width, height = pg.size()
-width *= 0.5
-pg.moveTo(333, 600)
-pg.click()
+#from keyboard import send
 
-posY = [360, 260, 160]
-posX = [276, 398]
+from pynput.keyboard import Key, Controller
+keyboard = Controller()
 
-q = ['left', 'left', 'left']
+def begin():
+    pg.click(440, 900, 2)
 
-im = pg.screenshot(region=(0, 0, width, height))
-l0 = im.getpixel((posX[0], posY[0]))
-l1 = im.getpixel((posX[0], posY[1]))
-l2 = im.getpixel((posX[0], posY[2]))
 
-r0 = im.getpixel((posX[1], posY[0]))
-r1 = im.getpixel((posX[1], posY[1]))
-r2 = im.getpixel((posX[1], posY[2]))
+TREE = uint8([56, 116, 161])
 
-if l0[0] == 161 and l0[1] == 116 and l0[2] == 56:
-    q[0] = 'right'
-    pos = 'right'
-else:
-    pos = 'left'
-if l1[0] == 161 and l1[1] == 116 and l1[2] == 56:
-    q[1] = 'right'
-if l2[0] == 161 and l2[1] == 116 and l2[2] == 56:
-    q[2] = 'right'
+# from left to right
+posY = [360, 460]
+# from bottom to up
+posX = [640, 540, 440, 340, 240, 140]
 
-qlen = 3
 
-while True:
-    if qlen == 3:
-        now = q[0]
-        move(pos, now)
-        now = q[1]
-        move(pos, now)
-        now = q[2]
-        move(pos, now)
-        qlen = 0
-    elif qlen == 0:
-        im = pg.screenshot(region=(0, 0, width, height))
-        l0 = im.getpixel((posX[0], posY[0]))
-        l1 = im.getpixel((posX[0], posY[1]))
-        l2 = im.getpixel((posX[0], posY[2]))
+def is_tree(c1):
+    if c1[0] == TREE[0] and c1[1] == TREE[1] and c1[2] == TREE[2]:
+        return True
+    else:
+        return False
 
-        r0 = im.getpixel((posX[1], posY[0]))
-        r1 = im.getpixel((posX[1], posY[1]))
-        r2 = im.getpixel((posX[1], posY[2]))
 
-        if l0[0] == 161 and l0[1] == 116 and l0[2] == 56:
-            q[0] = 'right'
-        else:
-            q[0] = 'left'
-        if l1[0] == 161 and l1[1] == 116 and l1[2] == 56:
-            q[1] = 'right'
-        else:
-            q[1] = 'left'
-        if l2[0] == 161 and l2[1] == 116 and l2[2] == 56:
-            q[2] = 'right'
-        else:
-            q[2] = 'left'
+with mss.mss() as sct:
+    screen = sct.monitors[1]
+    screen["width"] = screen["width"] / 2.0
+    begin()
 
-        now = q[0]
-        move(pos, now)
-        now = q[1]
-        move(pos, now)
-        now = q[2]
-        move(pos, now)
+    while True:
+        img = array(sct.grab(screen))
+        moves = list()
+        left = [img[x, posY[0]] for x in posX]
+        for i in range(6):
+            if is_tree(left[i]):
+                keyboard.press(Key.right)
+                keyboard.release(Key.right)
+                time.sleep(0.014)
+                keyboard.press(Key.right)
+                keyboard.release(Key.right)
+            else:
+                keyboard.press(Key.left)
+                keyboard.release(Key.left)
+                time.sleep(0.014)
+                keyboard.press(Key.left)
+                keyboard.release(Key.left)
+        time.sleep(0.17)
 
-    sleep(0.095)
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..f30d3d3
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,6 @@
+keyboard==0.11.0
+mss==3.1.1
+numpy==1.13.3
+PyAutoGUI==0.9.36
+pyobjc==4.1
+pyobjc-core==4.1