From b1fc655c0b0ef70ed9ec204884f36f692b513db6 Mon Sep 17 00:00:00 2001
From: Thaloria <thaloria@web.de>
Date: Sun, 6 Aug 2023 16:12:13 +0200
Subject: [PATCH] update menti

---
 menti_words.py    |  17 +++++++++++++----
 menti_words/p.jpg | Bin 1736 -> 1903 bytes
 utils.py          |  12 +++++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/menti_words.py b/menti_words.py
index 1406bec..f2bbb9f 100644
--- a/menti_words.py
+++ b/menti_words.py
@@ -4,6 +4,7 @@ import pydirectinput
 from nltk.corpus import words
 from pytesseract import pytesseract
 
+import utils
 from utils import mse
 from game_base_class import GameBase
 import random
@@ -126,7 +127,7 @@ class MentiWords(GameBase):
 
         #screenshot = cv.imread("menti_words/screenshot.jpg")
         screenshot = self.capture_window.get_screenshot()
-        screenshot = screenshot[870:1270, 1080:1480]
+        screenshot = utils.scale_screenshot(screenshot[870:1270, 1080:1480], 200, False)
 
         #cv.imshow("screenshot", screenshot)
         #cv.waitKey(150)
@@ -134,19 +135,27 @@ class MentiWords(GameBase):
         for needle_key in self.needles.keys():
             # gray_needle = cv.cvtColor(self.needles[needle_key], cv.COLOR_BGR2GRAY)
             # thresh_needle = cv.threshold(gray_needle, 0, 255, cv.THRESH_BINARY_INV + cv.THRESH_OTSU)[1]
-            rectangles = self.vision_stun.find(screenshot, self.needles[needle_key], 0.85, 1)
+
+            thresh_needle = utils.scale_screenshot(self.needles[needle_key], 200, False)
+            rectangles = self.vision_stun.find(screenshot, thresh_needle , 0.85, 1)
             #rectangles = self.vision_stun.find(screenshot, self.needles[needle_key], 0.95, 1 ,True, self.masks[needle_key])
             if len(rectangles) == 0:
                 continue
+            points = self.vision_stun.get_click_points(rectangles)
+            self.current_letters.append(needle_key)
+            self.letter_coords[needle_key] = points[0]
+            '''
             cropped1 = self.vision_stun.draw_display_picture(screenshot, rectangles, 10)
-
+            #cropped1 = utils.scale_screenshot(cropped1)
+            cv.imshow("cropped1", cropped1)
+            cv.waitKey(150)
             text_1 = pytesseract.image_to_string(cropped1, lang='eng', config='--psm 6').strip()
             if str.isalpha(text_1):
                 #cv.imshow("cropped1", cropped1)
                 #cv.waitKey(150)
                 points = self.vision_stun.get_click_points(rectangles)
                 self.current_letters.append(text_1)
-                self.letter_coords[text_1] = points[0]
+                self.letter_coords[text_1] = points[0]'''
             if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
                 return
 
diff --git a/menti_words/p.jpg b/menti_words/p.jpg
index e964f0359dc474784644fff2176f55f13326c41e..bd27120c7adbd047c502464e30ed5c36a8e3c4ad 100644
GIT binary patch
delta 1305
zcmV+!1?Kw54et(+6(QjOB1L#<W&i+9O#mtY000O80Ra*K0{{R30RRC20001y5|RTp
z04%Ym$N_))L;ea${{RJ<_^taQ{?_{UfqXBe_$KQ{((UafhD}Ds;#-1cw~j{K$vQ9I
zV~i-{*1RA7A~E>w{{TQghQIhMyZ->>s^EX%xjcWtN4#PG0A5;e{*gmoNBao=&st~g
zRr^)=Q@~oq?e?Fh>(Wk>Tv_e&qX`6(jk|#zP!4}bLtl{N^L)wXH89jFwePs4e>)@e
z>>gKuSQuBUO?)Z0^1D8pAMkOH$54Od2k_Vb00ozS{FPc-H~bub@q*e_H{KKYe|VkN
zC@!HV@iVo31b^V%e}(wt#{N3|?SJ^yeDnVR1rPrKf+bmg$$tU04~QNW@s;+oW1`6r
zzp#JQt&t`2<aLZZav{MXnR2B^1f21M--yHUCLWuuIlDz&>Ykp59SYeMYKoL#uJl?p
zsr1k6mHz+-1^6@LFN!RDKjZBJZvpCBgz0Yvp&j4awAXgvd5l$F5Lkhd8AnpUSLhOI
zO(KR<xmaWnde`#1U(s*;6KCQb_r*WhPvL)lwW-Ya7t?5w+f6H+w8jQ#H?i)-MhQL1
zHSF-7e~8A)SbR>cE2nE|v%R$Jd0b19(ZWVGu=*zK*8X~aC*)`R7bpHwKjRPj^3#9x
ziYmhY0D?Dv%18bi{{Yu}zx^Vfw}0TdKk||P02qJQmYe?oq)}Ih{>R_6Y@f1c?G=CF
z&xjFeDXz)k_m#zqT>YF+=0fp({jIkf^Y>3m_?%T}($1w;dMMSq^in>z4^CAwnA3*t
zotLYL{U}$=AMja2kN77S#BciLY5xGFkXOiO{ti~uamT^?FZ?N6{{WGz=g-@p{tFx9
zuiIPU!+1HgO((*B8MvJ%yMoeJxSoIaVcdxFFauy<8w#M3qbD3!+-96rmsG-3r%G;8
zlv+y7ZmrcL<TCyo$3qhel_HXhP3pQk^lbSCzo6gvBxfJ+PG5z;_79)`07~bt=lej=
zZ+ug(S?RiMtoPc6p)y<BTf&9po<<>6RYxR}Kmb?tjr$#Z8JG5X{g(U(;Jbf@R=m(O
zXdt^Q_kPe<eAxE$8S(9k@VE|?o+hPBXrphNYy6L6jH*Rp;ZLiT{^b7v%=~Bn0D|QI
z0Ln-FVgCSLT5tZ5MP4cU8vf2d@YcVyhlc(i9b^6x{{Z+%9%TD}**?|we=Zp%{{UCL
zH)m!(@WylPUf2Hs1<C&al#hS-!~VRq-~A$ru)pAq-|~_F0EYhn_1^FQ07$2=6BSAo
zbGcHeuBBGb(a81i^(9X!jYw{(-Fm2>S}*(?M;Jdh#)l)@!dU+R+sfVW-~1bC;af?R
z>i+-~b^GZ1t)`O|sXvQJC-Se->MQi9@TOFq)i1_h=6npelQC+}r{RAe@;-U}lfU4X
zp9p_r%jh*f4d^oJUL=4v-EUWy?N^DBgR_N>J_#8_Qb8b-Uqewvdw6^;EId7(7^tqv
zSn_M)D%PJpSvfxJ_&fIH{{Vs|f5T_~(fY^4ANX0H@QwcfYeQ`h*gxSN`)8Hp!jWgp
z`&4<(-2Ksv<DRuc_BUn!0D>5Q!zBLE{u}s%{{Rb1{t^%PN1kW<2mB*{Wcx>%43U4V
z`%~@4{Qc9MW8R7@%zQhSyhqlZKYskzytlpYYukS-9)iy?s*lzA{o7jBTUyq=ud(_8
PMHE-Gc_Bp<PzV3n8}_)8

delta 1139
zcmV-(1dRLd4#*9V6_GiQ12_OJvCGH-fBC2O$dSL{uRbbrf8=o0`~Lvb?A7M}V|t&?
zy&Lw({{WM`_^JN@V}`H)0Hw26bN>JYy7*7w?~VTew-18+Gvci-4QE2sn&e#B%*?4S
z+i6{LRD;7PJ$qN+PK2xDJ&bpht@pF`g;`R<`&n%m-|k0%d9D59`PQa`<Gpjjf3t~n
z&1Y59q+V6+ZsdiB;-pva-~2jT_H_RMqFJH;0N?wc{yAJ1#}D`-H^4s`cpp{%#PGGp
zg*Aa~BU@hBYF8{HkSQuma>(dcJwO2Cy?s2mBOe9L3B|ux{zuQpi?DKhvW&jv{%7S^
z!aw*bKgXYgH?Ya4d`a;ZqXZ;>f1>Lb2U3NA{t_nKK>871u)pw4&-f_ToBMNo9JthP
z;J47cQJ_g3uCZvce&wCil$s)W*!x@MIVx0)oMiq0-`blC>7XYj85%NuaB*IN@B`zP
zz3^lETl*6Bdr$2zC(iQRuKk{7+~fW8`PZG2aTX&7TlbQ3hg9AE?#FIzf059|QoJIg
zKI`=z`(%H~-h5R50I|bY{{Yh2tJePj;EccWk<W*}@7{muB-P}fwnzM(=fzL^95sLa
zEt<6d0Aa7%I?wh@{ipmj<LyIDxz+77CY-&cyo!=b=0fp|7UP2X{43AH)r~C5H74wo
z?)?;w+SKJ!0O198;cvkHe~@aQh)y&M@A~(X{{TTX`N{tP5hM6F{)w-N{{Zkl5Ad%s
z{iT24;mu#-7sJg<Lhv7g2ZrvoI9lEHT|)d^%WoS37{?N#fcQKyVh8t4eyLlE^2kBS
zRJ-hx{{SQNs$4mkN@+M-)vxnEIebKO;tTKk_>=ztLN#N<Lq2!>e+T;3Te*?TF(sJf
zlib(apYTc#_$P$Fwa<h6U#{PYEp*!(t7|(siu|+47Dki;dhG@;`|7_Vz~JiQtEx0r
z+qwE?GZRk@Mb)bGRz7O|vOnbSJ}Q6M;j8}u>1@@J@Dt!yh<|BMin?EeJSzpg&bzD^
z7SYc-!i}*SM$5MYf8|qJ{{Xf}{GI2;Px~A-fBh|*y>I>q%l`l=9Qb?w{pbFYO<Pi-
z8rg!QJ*7K8n=+kQQo%a0-A4ZaaynuE00bWWq6z;1kQax)@OKCJ)~<*D00#d6e0$ZU
z3vvGd2ws>8<*s#hV88e7H$SC*-%($rt_aJQS$*sLkAi$#e~y34_kY1ZFa84m0KvG{
zI(^I+e-eCn+JI6Fnr?$^VvW6x#Gf%ANYwk+==Z{(g&rRGA@KhIP4K^kw7YE|L(*ap
z+giZ53OlhqS&7Lka!DkUlU)@R?`8Q$69m86p=SE-{`PqI+|Lt>{yeU`bU&Pb+W!FI
zr-<)=Yfp+ZVMF2lZdj%9cC6^>V=F7Eyp)0nTo6TixBL;`;r_j%{{X>5`~h=$qH6Y*
z@x9*pX0wtsT-r=IBw$fRepQ3R#b$7q_t*ZEev65(FQ`d>asEf|6%<ilv!9iP6j4AQ
F|JfaGaoPX?

diff --git a/utils.py b/utils.py
index 4d1f8c4..a769109 100644
--- a/utils.py
+++ b/utils.py
@@ -61,18 +61,20 @@ def check_for_bl_line(line_item, black_list):
     return False
 
 
-def scale_screenshot(screenshot):
-    scale_percent = 200  # percent of original size
+def scale_screenshot(screenshot, percent = 200, thresh_mode = True):
+    scale_percent = percent  # percent of original size
     width = int(screenshot.shape[1] * scale_percent / 100)
     height = int(screenshot.shape[0] * scale_percent / 100)
     dim = (width, height)
     resized_img = cv.resize(screenshot, dim, interpolation=4)
 
-    gray = cv.cvtColor(resized_img, cv.COLOR_BGR2GRAY)
-    thresh = cv.threshold(gray, 0, 255, cv.THRESH_BINARY_INV + cv.THRESH_OTSU)[1]
+    if thresh_mode:
+        gray = cv.cvtColor(resized_img, cv.COLOR_BGR2GRAY)
+        thresh = cv.threshold(gray, 0, 255, cv.THRESH_BINARY_INV + cv.THRESH_OTSU)[1]
+        return thresh
     # cv.imshow("Tresh", thresh)
     # cv.waitKey(1000)
-    return thresh
+    return resized_img
 
 
 def save_line_item_npy_jpg(short_pic_list):