From ecb3f5df9ea71859baab153481234cd3ee82ba06 Mon Sep 17 00:00:00 2001 From: Thaloria Date: Wed, 4 May 2022 01:51:45 +0200 Subject: [PATCH] refactor dig --- config_file.py | 10 +++++++++ dig_overlay.py | 34 +++++++++++++++++++++++++++++ digging_main2.py | 14 +++++++----- equip/chest_1_32.jpg | Bin 2781 -> 0 bytes equip/chest_2_32.jpg | Bin 2775 -> 0 bytes equip/chest_3_32.jpg | Bin 2671 -> 0 bytes equip/key_1_32.jpg | Bin 2363 -> 0 bytes equip/key_2_32.jpg | Bin 2906 -> 0 bytes equip/key_3_32.jpg | Bin 2233 -> 2478 bytes equipment_main.py | 51 ++++++++++++++++++++++++++++++++++++++----- 10 files changed, 99 insertions(+), 10 deletions(-) create mode 100644 dig_overlay.py delete mode 100644 equip/chest_1_32.jpg delete mode 100644 equip/chest_2_32.jpg delete mode 100644 equip/chest_3_32.jpg delete mode 100644 equip/key_1_32.jpg delete mode 100644 equip/key_2_32.jpg diff --git a/config_file.py b/config_file.py index 219da36..0350035 100644 --- a/config_file.py +++ b/config_file.py @@ -79,6 +79,16 @@ class UserConfigs: else: pass + def returnEnemyPlayerOverlayPos(self): + if self.user == self.THALOUSER: + return '1440x1150+570+22' + elif self.user == self.ADWAUSER: + return '160x160+-900+600' + elif self.user == self.EDDIEUSER: + return '330x45+-900+920' + else: + pass + def return_database_ip(self): if self.user == self.THALOUSER: return "192.168.178.201" diff --git a/dig_overlay.py b/dig_overlay.py new file mode 100644 index 0000000..b80a909 --- /dev/null +++ b/dig_overlay.py @@ -0,0 +1,34 @@ +# Run tkinter code in another thread +import threading +import tkinter as tk + + +class DiggingOverlay(threading.Thread): + EMPTYENEMYLABELNAME = "no enemy selected" + + def __init__(self, config): + threading.Thread.__init__(self) + self.root = tk.Tk + self.EnemyLabel = tk.Label + self.TkPosition = config.returnEnemyPlayerOverlayPos() + self.start() + + def run(self): + self.root = tk.Tk() + #self.EnemyLabel = tk.Label(self.root, text = "this", borderwidth=6, relief="solid") + #self.EnemyLabel.pack() + + self.root.geometry(self.TkPosition) + self.root.overrideredirect(1) # fenster ohne aussen rum :-) + self.root.attributes('-alpha', 0.5) # fenster transparent + self.root.attributes('-topmost', 1) # fenster immer im vordergrund + self.root.resizable(False, False) + #self.root.attributes('-borderwith', 6) # fenster immer im vordergrund + self.root.wm_attributes("-disabled", True) + #self.root.configure(background='black') + self.root.mainloop() + + def hide_window(self): + self.root.attributes('-alpha', 0.0) + def show_window(self): + self.root.attributes('-alpha', 0.2) \ No newline at end of file diff --git a/digging_main2.py b/digging_main2.py index 08f156d..406f631 100644 --- a/digging_main2.py +++ b/digging_main2.py @@ -3,6 +3,7 @@ import keyboard from utils import dig_point, check_for_ok_button from window_capture import WindowCapture from vision import Vision +from dig_overlay import DiggingOverlay def run(): # initialize the user-class @@ -12,7 +13,7 @@ def run(): capture_window = WindowCapture(None, "screen_conf", capture_config) # initialize the StunVision class vision_stun = Vision() - + dig_overlay = DiggingOverlay(config) pause = True @@ -32,15 +33,18 @@ def run(): print('o pressed') if pause: # cv.waitKey(500) + dig_overlay.show_window() print("pausing") continue + dig_overlay.hide_window() if level == 3: width = 30 if level == 17: - DIG_TIME = 1850 + DIG_TIME = 150 - plot_size = plot_size - level + if level % 3 == 0: + plot_size = plot_size - level @@ -100,9 +104,9 @@ def run(): for r in range(0, e, 1): # down click tp2 = tp2 + plot_size - if tp2 >= config.returnDiggingWindowPos2()[1] + plot_size: + if tp2 >= config.returnDiggingWindowPos2()[1] + (plot_size / 2): continue - if tp2 <= config.returnDiggingWindowPos2()[3] + plot_size: + if tp2 <= config.returnDiggingWindowPos2()[3] + (plot_size / 2): continue dig_point(tp1, tp2, DIG_TIME) #cv.circle(screenshot, (tp1, tp2), 7, (255, 0, 127), -1) diff --git a/equip/chest_1_32.jpg b/equip/chest_1_32.jpg deleted file mode 100644 index 3a4391ace103bb8d08cebc28cc7479ee3f25a1d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2781 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 L4-woiDE9E5w^88v diff --git a/equip/key_1_32.jpg b/equip/key_1_32.jpg deleted file mode 100644 index d222d1e1ed05b8b16bb9bab9bf1977cf4f7f7501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2363 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 diff --git a/equip/key_3_32.jpg b/equip/key_3_32.jpg index bda5ccbfde172873c789849b8dc0155914532519..4299f1185e92073632487f9dd9252dfd902a0a18 100644 GIT binary patch delta 1847 zcmV-72gvxj5v~)E$OA3_J+aHl0e^ziU^E!FZe0P#Se<#7Ilcc6{z^O&r8>DUL7Aq zvWYHkyrNhEjgm-aZJ_OhsE;K>Gb4f4d^i1<{{U%^1Wf)r&|BhWm#RyfiQ~N2ZErmE z&ft<-NKBF(V=Kl;&eh>oAAi{&_MP}w{{RH~&^|JFTU5W(to|uk>UXK5>md^U-&eCE zHf;>3<#spAD`bF7fH7u_s(OFJKlm&}GyD*^veYjA)$tS0x`iaVu@=_wBypqpxL^4A zAhRkgXr@yc0Wq)HXkEQAwABsF1bZqXXhRK<4g39ohHp`iyb#%iAK&N^XEE|u0_)q&pcu(WRH_~`p zSWQd&F_mtR!6Y(6zjo4AMN(C^J{V*jrw5AsfAL-KjlKqaR*&L#kKx}Qc!NsS?i%w} z)GsUrtT&L$Ch6jFD}QfgDlwTAIX$>F_YeFL{{UXnJ|#EBZxd;j?WEh@YSwmE`aIVn z=HlAgC|*Rkc@V)>P(~Ew_98_5BVk!vjVX-B@1wZMT{C zK9?+ic^$D-*~%Pj(-Uwht7*mw27|u8@0&; z%C?L&kCHK*ZO>9G-3 z_OlX@3z@%tcz@&mS-}v?%^}FbMy$k9emeY4{kpX)zlS~n_;;vW_&05( z>~dsc+F2t@k-39gMI#9~wFNJ;+*RQYjY}?%Y zNBD^E651lO$GX}eeAg+rjk6pE+V3{m}foXB$&x_v@wT}=Z@04jb zsitX2uQYSX3R)t0YZ-LT6e48q^7mxdol>SMx@wwHUV69rFS_TYPM#kPE7W(F_cYTpt(0^bgNEB%+@{{RqaEdC|bbx9<&w);JexPW<*+{nu8f@}qhBLL^j z%JS9qPk-!L@MGew&xsqw-w!p7KIch?U40{3)NeH_Ic{}3h;E^4i@d{XQd=f~%^YwE zU6t7-Np|H=tbWnI@JTH%LDV$=02=%P`!9q1eWKdSX)Ugyb3Nvp;u}dLWRlY1WoP+a zS=X>T&Pe;i=KVii`2Fz1#h3Q_f5HC%j2{kfZhx5){?owPR63@CbvFw0!hHBr5LG}Q zEbIc0-VuO2_~B|{>#52ut8TlU(#1m&O{#4#C;FeD-?k5mt+d~R`lpAMIJGTn#!wv+ z+fVbAWM#TniKHVTwuSRCfJ-n60VcjC{{Vu1{?8X*6!mY27QYWQy;H+}9Pqu>o|td# z<$sl}^?R+7NpZ4G*pNdchA`onGVE}0^~!u|{hEJjkBB-Yo}p*qEqd2U)+e{K)LQ3O zw!YS-x0*zbM}5b9TZ8S8c~7=5;JAsU4f;v@CHw)?e`Nmvfcg)Dbk;}y&4e}F>N0Nb zU*?uV$L4IYAQsDQ3JEx_+EnV|aUR;T<$sD=FZ2HZfN;)G!r}QTNlD4;v;P1;>r>!g z+biL(#V^@^#oG3#;hhge@MnT=HAwv59@ttoyW)GKxNn@t=Sbq!)td#>K+MHRcK#fH z1pdZe5B-Y2X?tIaSAG+|__y$q-dNp2vs+68hl*I(0<4TUDnSGh!3MR|G_d^L zPo;T}?2r35kJ)eF&98&o#G0pyqqCYxV!6JGILr$8CMeYh%NT9U12eEL-!?D@q{$;& z4XgY|y?SwNrG3vPNhZ>FM2Q|7o}WsRcFcI`k4md8=E%F#Rz`2$7j3p|h;D;39&=Q-xi{9w|JgCk!Rr73 delta 1600 zcmV-G2EX~P6S)zP$OA9{Ke5Zn0e?)QiYxH*^#G>NJa*7YEV4%oQ7L&Ob_%hm87xWQ z00AVPf}LMF{{X>Md}DjzPuSO3wz0Z4GI*C$)AT8>2mG>vdxi6}?9r5?(h|~yPeNCZ!5zP^_;O;?S45w( z_xu!N#5#Ay>;C|TKNmEeNm{f(jP@Z9Sg42xwf65Gz|2I5s@Ro#Kf#&9{W$S&o#c2t+_UHylXJP>S>*g;M{{X>GZ2ln0 zsaX6S(EkA8DE`e-*S;y%%W1wD(&Or8d0T79pb&BUut6U;BRsIDDQtt8TIbal_xAct zgx6Pd!)t49rRAP!1aZWpsb*{i9^}`+U+_~8_$UUG@ejZkzkdz<1EJaY`%LjAo56Xl zv@|rOyk;l@zp@vkSHCC6e`7M6?5$!p&iSfVe@uaSwq3hoc z+rjfm@k>=P=voD?r)4F^sbg?%T_uJESpr1rPGmAE3cHBf*=F}ohMxvLB!9wvCFY&s zC_Gi;4-8t{KCf#Zg|xeSZ3^0W8SLY;isnHS@<>z{eSeYcT(Ucz%U;p(L;eXVt9Up5 z5#Na)4SZ><-+XZJh0^N6`&oFJ&tJMYY5c`2mGf8}i5-Cq%Eyw`;JSD1lE1S50FG`N z$HKbz?Ee7c8G*Og^etOQ)HRI{R4KTmu+I!r$<>b3FrY;|OyH1o=W}oh=K*JTliA=FXqdUKOxl|03z~;X`{{Uz2 zgpzn)_Vmy!d^0`%iQ`WaTk9Sq)Ge-9H}(azpm|%sU)_mXNl+oqJhX0(q+$G7{ja_& zd{X#rd9P@G9q~8BX{=z9b0c_q<4@6GILHYYUw=A4qiMsWVa{^lR0jHk{t09IJ>Pgo z;qI;RKgAbUTDOcoC%Rsn>)3)^3ji|++m`af=YGJ&K-dNV0CK8wgj}WR^Zx*VUtJFo z{knc6YF`5WDtLnHR`4&0ekE%*G8?TwTk*E5_74SUkjl(qFv9^;J0g`IS`rw;tRx!QJ y2QJe@sI#hx0>~pdK-}#<-jv21Qq-+Ll+4E;JAA!9Zj{IQj(XE+$~MukAOG3A6GNr| diff --git a/equipment_main.py b/equipment_main.py index 63726fa..d14751b 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -20,7 +20,7 @@ def run(): EMITTER_MUSH = "mushroom" EMITTER_AMU = "amulett" - EMITTER_TO_USE = EMITTER_MUSH + EMITTER_TO_USE = EMITTER_MAIN # initialize the StunWindowCapture class try: @@ -73,7 +73,9 @@ def run(): if EMITTER_TO_USE == EMITTER_MUSH: spawn_1 = vision_stun.find(screenshot, cv.imread("equip/mush_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) elif EMITTER_TO_USE == EMITTER_AMU: - spawn_1 = vision_stun.find(screenshot, cv.imread("equip/amu_e2_32.jpg_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) + spawn_1 = vision_stun.find(screenshot, cv.imread("equip/amu_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) + elif EMITTER_TO_USE == EMITTER_MAIN: + spawn_1 = vision_stun.find(screenshot, cv.imread("equip/main_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) else: break #spawn_1 = vision_stun.find(screenshot, cv.imread("equip/main_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) @@ -91,10 +93,12 @@ def run(): print('q pressed') break else: - if EMITTER_TO_USE == EMITTER_AMU: + if EMITTER_TO_USE == EMITTER_MUSH: spawn_0 = vision_stun.find(screenshot, cv.imread("equip/mush_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) elif EMITTER_TO_USE == EMITTER_AMU: spawn_0 = vision_stun.find(screenshot, cv.imread("equip/amu_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) + elif EMITTER_TO_USE == EMITTER_MAIN: + spawn_0 = vision_stun.find(screenshot, cv.imread("equip/main_e1_32.jpg", cv.IMREAD_UNCHANGED), 0.8, 1) else: break points = vision_stun.get_click_points(spawn_0) @@ -112,7 +116,7 @@ def run(): needles = [] hsv = [] if EMITTER_TO_USE == EMITTER_MUSH: - needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/book_1_32.jpg", cv.IMREAD_UNCHANGED)) needles.append(cv.imread("equip/book_2_32.jpg", cv.IMREAD_UNCHANGED)) needles.append(cv.imread("equip/book_3_32.jpg", cv.IMREAD_UNCHANGED)) @@ -146,7 +150,6 @@ def run(): #needles.append(cv.imread("equip/book_6_32.jpg", cv.IMREAD_UNCHANGED)) #needles.append(cv.imread("equip/book_7_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(14, 0, 0, 179, 255, 255, 0, 0, 0, 0)) hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0)) hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0)) hsv.append(HsvFilter(0, 0, 0, 179, 255, 196, 0, 0, 0, 0)) @@ -177,6 +180,40 @@ def run(): #needles.append(cv.imread("equip/book_6_32.jpg", cv.IMREAD_UNCHANGED)) #needles.append(cv.imread("equip/book_7_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0)) + hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + hsv.append(HsvFilter(0, 0, 0, 179, 255, 196, 0, 0, 0, 0)) + hsv.append(HsvFilter(0, 156, 0, 179, 255, 255, 0, 0, 0, 0)) + hsv.append(HsvFilter(0, 95, 137, 179, 255, 255, 0, 0, 0, 0)) + + elif EMITTER_TO_USE == EMITTER_MAIN: + needles.append(cv.imread("equip/book_1_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/book_2_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/book_3_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/book_4_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/book_5_32.jpg", cv.IMREAD_UNCHANGED)) + + needles.append(cv.imread("equip/chest_1_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/chest_3_32.jpg", cv.IMREAD_UNCHANGED)) + + needles.append(cv.imread("equip/key_1_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/key_2_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/key_3_32.jpg", cv.IMREAD_UNCHANGED)) + + needles.append(cv.imread("equip/pot_1_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/pot_2_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/pot_3_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/pot_4_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/pot_5_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/pot_6_32.jpg", cv.IMREAD_UNCHANGED)) + + needles.append(cv.imread("equip/bag_1_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/bag_2_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/bag_3_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/bag_4_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/bag_5_32.jpg", cv.IMREAD_UNCHANGED)) + needles.append(cv.imread("equip/bag_6_32.jpg", cv.IMREAD_UNCHANGED)) hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0)) hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0)) @@ -184,6 +221,10 @@ def run(): hsv.append(HsvFilter(0, 156, 0, 179, 255, 255, 0, 0, 0, 0)) hsv.append(HsvFilter(0, 95, 137, 179, 255, 255, 0, 0, 0, 0)) + hsv.append(HsvFilter(13, 40, 85, 135, 255, 255, 0, 0, 55, 53)) + hsv.append(HsvFilter(14, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + + for op in range(1, 50, 1): hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0))