Thaloria/Litcraft_Python_B
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-implement equipment with masks

Browse Source
This commit is contained in:
Thaloria
2022-05-15 10:46:57 +02:00
parent 883a6f77aa
commit a5b0f22111
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
equipment_main.py
View File

@@ -132,20 +132,12 @@ def run():
while True:
# do object detection
screenshot = capture_window.get_screenshot()
processed_screenshot = vision_stun.apply_hsv_filter(screenshot, hsvs[rer])
processed_needle = vision_stun.apply_hsv_filter(needles[rer], hsvs[rer])
trho = 0.8
mask = None
norm = False
try:
trho = tresholds[rer]
mask = masks[rer]
norm = True
except:
pass
rectangles = vision_stun.find(processed_screenshot, processed_needle, trho, 5, norm, mask)
#processed_screenshot = vision_stun.apply_hsv_filter(screenshot, hsvs[rer])
#processed_needle = vision_stun.apply_hsv_filter(needles[rer], hsvs[rer])
rectangles = vision_stun.find(screenshot, needles[rer], tresholds[rer], 5, True, masks[rer])
# draw the detection results onto the original image
output_image = vision_stun.draw_rectangles(processed_screenshot, rectangles)
output_image = vision_stun.draw_rectangles(screenshot, rectangles)
cv.imshow("output_image", output_image)
cv.waitKey(150)
@@ -158,21 +150,21 @@ def run():
points = vision_stun.get_click_points(rectangles)
check_and_move_tile(capture_window, vision_stun, config,
[70, 70, rectangles[0][0] + 70, rectangles[0][1]], needles[rer],
hsvs[rer],
hsvs[rer], tresholds[rer], masks[rer],
points[1], [points[0][0] + 70, points[0][1]])
if keyboard.is_pressed('p') == True or pause == True:
pause = True
break
check_and_move_tile(capture_window, vision_stun, config,
[70, 70, rectangles[0][0], rectangles[0][1] + 70], needles[rer],
hsvs[rer],
hsvs[rer], tresholds[rer], masks[rer],
points[2], [points[0][0], points[0][1] + 70])
if keyboard.is_pressed('p') == True or pause == True:
pause = True
break
check_and_move_tile(capture_window, vision_stun, config,
[70, 70, rectangles[0][0] + 70, rectangles[0][1] + 70],
needles[rer], hsvs[rer],
needles[rer], hsvs[rer], tresholds[rer], masks[rer],
points[3], [points[0][0] + 70, points[0][1] + 70])
move_tile(config, points[4], [points[0][0], points[0][1]])
if keyboard.is_pressed('p') == True or pause == True:
@@ -405,12 +397,12 @@ def include_mushs(needles, hsv, tresh, mask):
def include_amus(needles, hsv, tresh, mask):
needles.append(cv.imread("equip/amus/amu_1_32.jpg", cv.IMREAD_UNCHANGED))
hsv.append(HSV_DEFAULT)
tresh.append(0.93)
tresh.append(0.9)
mask.append(cv.imread("equip/amus/amu_1_32-mask.png", cv.IMREAD_COLOR))
needles.append(cv.imread("equip/amus/amu_2_32.jpg", cv.IMREAD_UNCHANGED))
hsv.append(HSV_DEFAULT)
tresh.append(0.93)
tresh.append(0.9)
mask.append(cv.imread("equip/amus/amu_2_32-mask.png", cv.IMREAD_COLOR))
needles.append(cv.imread("equip/amus/amu_3_32.jpg", cv.IMREAD_UNCHANGED))
@@ -554,7 +546,7 @@ def find_emitter(emitter_to_use, vis, screen, layer):
else:
needle = cv.imread("equip/emitters/mush_e2_32.jpg", cv.IMREAD_UNCHANGED)
mask = cv.imread("equip/emitters/mush_e2_32-mask.png", cv.IMREAD_COLOR)
return vis.find(screen, needle, 0.96, 1, True, mask)
return vis.find(screen, needle, 0.98, 1, True, mask)
elif emitter_to_use == EMITTER_AMU:
if layer == 0:
needle = cv.imread("equip/emitters/amu_e_32.jpg", cv.IMREAD_UNCHANGED)
@@ -610,11 +602,11 @@ def find_emitter(emitter_to_use, vis, screen, layer):
mask = cv.imread("equip/emitters/wand_e2_32-mask.png", cv.IMREAD_COLOR)
return vis.find(screen, needle, 0.96, 1, True, mask)
def check_and_move_tile(capture_win, visio, conf, rect, needl, hsv, point_source, point_dest):
def check_and_move_tile(capture_win, visio, conf, rect, needl, hsv, tresh, mask, point_source, point_dest):
screenshot_pos = capture_win.get_screenshot_by_area(rect)
processed_screenshot = visio.apply_hsv_filter(screenshot_pos, hsv)
processed_needle = visio.apply_hsv_filter(needl, hsv)
rectangles2 = visio.find(processed_screenshot, processed_needle, 0.7, 1)
#processed_screenshot = visio.apply_hsv_filter(screenshot_pos, hsv)
#processed_needle = visio.apply_hsv_filter(needl, hsv)
rectangles2 = visio.find(screenshot_pos, needl, tresh, 1, True, mask)
# output_by_area = vision_stun.draw_rectangles(screenshot_pos2, rectangles)
# cv.imshow("output_image_by_area", output_by_area)
# cv.waitKey(150)