update farm for 4.0

This commit is contained in:
Thaloria@web.de
2023-05-05 19:17:40 +02:00
parent c7deaaf6c7
commit a9e25527f5
3 changed files with 22 additions and 17 deletions

17
farm.py
View File

@@ -31,6 +31,8 @@ class Farm(GameBase):
def __init__(self, overlay):
super().__init__(overlay)
self.farm_reset_board = cv.imread("control_elements/farm_reset_button.jpg", cv.IMREAD_COLOR)
self.colors.append(PINK)
self.fill_data_coordinates()
@@ -78,7 +80,7 @@ class Farm(GameBase):
return
elif self.reset_counter >= 3:
screenshot = self.capture_window.get_screenshot()
if self.check_for_button_and_execute(screenshot, self.reset_board):
if self.check_for_button_and_execute(screenshot, self.farm_reset_board):
cv.waitKey(500)
screenshot = self.capture_window.get_screenshot()
if self.check_for_button_and_execute(screenshot, self.reset_confirm):
@@ -97,21 +99,22 @@ class Farm(GameBase):
# get an updated image of the game
screenshot = self.capture_window.get_screenshot()
# screenshot = cv.imread("field_farm.jpg")
screenshot = screenshot[58:1134, 230:2113] # 1883,1076
screenshot = screenshot[190:1230, 260:2090] # 1883,1076
# gray = cv.cvtColor(screenshot, cv.COLOR_BGR2GRAY)
# thresh = cv.threshold(gray, 0, 255, cv.THRESH_BINARY_INV + cv.THRESH_OTSU)[1]
if self.check_for_next_level(screenshot, self.next_level):
cv.waitKey(500)
screenshot = self.capture_window.get_screenshot()
screenshot = screenshot[58:1134, 230:2113]
screenshot = screenshot[190:1230, 260:2090]
if self.check_for_next_level(screenshot, self.next_level_x):
cv.waitKey(500)
screenshot = self.capture_window.get_screenshot()
screenshot = screenshot[58:1134, 230:2113]
screenshot = screenshot[190:1230, 260:2090]
# cv.imshow("screenshot", screenshot)
# cv.waitKey(150)
# continue
#cv.imshow("screenshot", screenshot)
#cv.waitKey(150)
#return
#continue
data_coords = np.zeros((8, 14), dtype=object)
# field = Field()
for needle_key in self.needles.keys():