From 58bc20ce0ead4bb91cecd7d312217cc862a501c8 Mon Sep 17 00:00:00 2001 From: Randi Date: Thu, 20 Jun 2024 19:50:53 -0400 Subject: [PATCH] Made fixes to anya shop for shopping 3/20 jav gloves as previous implementation used old font which didn't work. --- assets/shop/gloves/gg_gloves.jpg | Bin 0 -> 6470 bytes assets/shop/gloves/ias_gloves.jpg | Bin 0 -> 3305 bytes assets/shop/gloves/ias_gloves2.jpg | Bin 0 -> 3429 bytes assets/shop/gloves/ias_gloves3.jpg | Bin 0 -> 3409 bytes config/shop.ini | 4 +- src/shop/anya.py | 88 +++++++++++++++-------------- 6 files changed, 48 insertions(+), 44 deletions(-) create mode 100644 assets/shop/gloves/gg_gloves.jpg create mode 100644 assets/shop/gloves/ias_gloves.jpg create mode 100644 assets/shop/gloves/ias_gloves2.jpg create mode 100644 assets/shop/gloves/ias_gloves3.jpg diff --git a/assets/shop/gloves/gg_gloves.jpg b/assets/shop/gloves/gg_gloves.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1e6ecc9ea85db7eee0bbe81ea01d5033a3aaa857 GIT binary patch literal 6470 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 literal 0 HcmV?d00001 diff --git a/assets/shop/gloves/ias_gloves.jpg b/assets/shop/gloves/ias_gloves.jpg new file mode 100644 index 0000000000000000000000000000000000000000..00cf7ec6f807feb28259266b6fc1277cb8a8711a GIT binary patch literal 3305 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 U-c6p|R_H=l@BHiJheu=o1a!bq*#H0l literal 0 HcmV?d00001 diff --git a/config/shop.ini b/config/shop.ini index ff4894d..7a04854 100644 --- a/config/shop.ini +++ b/config/shop.ini @@ -6,14 +6,14 @@ ; x light senetry: +6 ; x weapon block: +1 ; x death sentrey: +4 -shop_trap_claws=1 +shop_trap_claws=0 trap_min_score=13 ; Current scoring for melee claws ; 2 assa: +10 ; x venom: +6 ; x weapon block: +2 -shop_melee_claws=1 +shop_melee_claws=0 melee_min_score=13 [gloves] diff --git a/src/shop/anya.py b/src/shop/anya.py index f5ab3d5..32358d3 100644 --- a/src/shop/anya.py +++ b/src/shop/anya.py @@ -82,62 +82,66 @@ class AnyaShopper: self.reset_shop() self.shop_loop() - def shop_loop(self): - + def look_for_ias_gloves(self, glove_img_name, shop_img): asset_folder = "assets/shop/gloves/" - while True: - open_npc_menu(Npc.ANYA) - press_npc_btn(Npc.ANYA, "trade") - time.sleep(0.1) - img = grab() - - # 20 IAS gloves have a unique color so we can skip all others - ias_glove = template_finder.search( - ref=load_template(asset_folder + "ias_gloves.png"), - inp_img=img, + ias_glove = template_finder.search( + ref=load_template(asset_folder + glove_img_name), + inp_img=shop_img, threshold=0.96, roi=Config().ui_roi["left_inventory"] ) - if ias_glove.valid: - self.ias_gloves_seen += 1 - mouse.move(*ias_glove.center_monitor) - time.sleep(0.1) - img = grab() - - if self.look_for_plus_3_gloves is True: - gg_gloves = template_finder.search( + if ias_glove.valid: + self.ias_gloves_seen += 1 + mouse.move(*ias_glove.center_monitor) + time.sleep(0.5) + glove_dialog_img = grab() + + if self.look_for_plus_3_gloves is True: + Logger.info(f"Found 20 IAS gloves ({glove_img_name}), checking for jav skills") + gg_gloves = template_finder.search( + ref=load_template( + asset_folder + "gg_gloves.jpg" # assets for javazon gloves are mixed up, this one need +3 as in the 1080p version + ), + inp_img=glove_dialog_img, + threshold=0.80 + ) + if gg_gloves.valid: + mouse.click(button="right") + if self._messenger.enabled: + self._messenger.send_message("Bought awesome IAS/+3 gloves!") + Logger.info("IAS/jav gloves bought!") + self.gloves_bought += 1 + time.sleep(1) + else: + if self.look_for_plus_2_gloves is True: + g_gloves = template_finder.search( ref=load_template( - asset_folder + "gg_gloves.png" # assets for javazon gloves are mixed up, this one need +3 as in the 1080p version + asset_folder + "g_gloves.png" ), - inp_img=img, + inp_img=glove_dialog_img, threshold=0.80 ) - if gg_gloves.valid: + if g_gloves.valid: mouse.click(button="right") if self._messenger.enabled: - self._messenger.send_message("Bought awesome IAS/+3 gloves!") - - Logger.info("IAS/+3 gloves bought!") + self._messenger.send_message("Bought some decent IAS/+2 gloves") + Logger.info("IAS/+2 gloves bought!") self.gloves_bought += 1 time.sleep(1) - else: - if self.look_for_plus_2_gloves is True: - g_gloves = template_finder.search( - ref=load_template( - asset_folder + "g_gloves.png" - ), - inp_img=img, - threshold=0.80 - ) - if g_gloves.valid: - mouse.click(button="right") - if self._messenger.enabled: - self._messenger.send_message("Bought some decent IAS/+2 gloves") - Logger.info("IAS/+2 gloves bought!") - self.gloves_bought += 1 - time.sleep(1) + def shop_loop(self): + while True: + open_npc_menu(Npc.ANYA) + press_npc_btn(Npc.ANYA, "trade") + time.sleep(0.5) + img = grab() + + #For some reason the glove image varies slightly depending on where it is located in the shop. + #Additional ias_glove pictures were added after screenshot verification showed they weren't detected. + self.look_for_ias_gloves("ias_gloves.jpg", img) + self.look_for_ias_gloves("ias_gloves2.jpg", img) + self.look_for_ias_gloves("ias_gloves3.jpg", img) # Select Weapons section if self.look_for_trap_claws is True or self.look_for_melee_claws is True: