alex/my-botty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code improve for eth only filter (#269)

Browse Source 
* Adapt eth checking

* update pickit
This commit is contained in:
aeon0
2021-12-12 09:57:09 +01:00
committed by GitHub
parent 68f2f0f3ce
commit 1e1b4a2da0
2 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/pickit.ini
+24 -24
View File
@@ -504,39 +504,39 @@ white_crown_shield=0
white_vortex_shield=0
white_royal_shield=0
white_sacred_targe=1
white_sacred_rondache=1
white_sacred_rondache=0
white_kurast_shield=0
white_zakarum_shield=0
white_akaran_targe=0
white_akaran_rondache=0
;superior white
white_superior_vortex_shield=1
white_superior_vortex_shield=0
white_superior_royal_shield=0
white_superior_sacred_targe=1
white_superior_sacred_rondache=1
white_superior_kurast_shield=1
white_superior_zakarum_shield=1
white_superior_sacred_rondache=0
white_superior_kurast_shield=0
white_superior_zakarum_shield=0
white_superior_akaran_targe=0
white_superior_akaran_rondache=0
;ethereal-socketed
eth_sacred_targe=1
eth_sacred_rondache=1
eth_kurast_shield=1
eth_zakarum_shield=1
eth_vortex_shield=1
eth_sacred_rondache=0
eth_kurast_shield=0
eth_zakarum_shield=0
eth_vortex_shield=0
eth_akaran_targe=0
eth_akaran_rondache=0
eth_royal_shield=0
;superior ethereal-socketed
eth_superior_vortex_shield=1
eth_superior_vortex_shield=0
eth_superior_royal_shield=0
eth_superior_sacred_targe=1
eth_superior_sacred_rondache=1
eth_superior_kurast_shield=1
eth_superior_zakarum_shield=1
eth_superior_sacred_rondache=0
eth_superior_kurast_shield=0
eth_superior_zakarum_shield=0
eth_superior_akaran_targe=0
eth_superior_akaran_rondache=0
@@ -565,7 +565,7 @@ white_superior_flail=0
white_superior_phase_blade=0
;ethereal
eth_weapon_berserker_axe=1
eth_weapon_berserker_axe=0
eth_weapon_crystal_sword=0
eth_weapon_flail=0
eth_weapon_phase_blade=0
@@ -586,18 +586,18 @@ eth_superior_phase_blade=1
;-----------------------------------------;
;ethereal
eth_weapon_colossus_voulge=1
eth_weapon_thresher=1
eth_weapon_giant_thresher=1
eth_weapon_cryptic_axe=1
eth_weapon_great_poleaxe=1
eth_weapon_ghost_spear=1
eth_weapon_colossus_voulge=3
eth_weapon_thresher=3
eth_weapon_giant_thresher=3
eth_weapon_cryptic_axe=3
eth_weapon_great_poleaxe=3
eth_weapon_ghost_spear=3
;superior ethereal
eth_weapon_superior_colossus_voulge=1
eth_weapon_superior_cryptic_axe=1
eth_weapon_superior_thresher=1
eth_weapon_superior_giant_thresher=1
eth_weapon_superior_colossus_voulge=3
eth_weapon_superior_cryptic_axe=3
eth_weapon_superior_thresher=3
eth_weapon_superior_giant_thresher=3
;-----------------------------------------;
src/ui/ui_manager.py
+3 -8
View File
@@ -266,13 +266,8 @@ class UiManager():
_, w, _ = img.shape
img = img[:, (w//2):,:]
item_list = item_finder.search(img)
item_list = [x for x in item_list if "potion" not in x.name]
# if ethereal is required but item is non-ethereal, ignore
item_list_dup = item_list
for item in item_list_dup:
if self._config.items[item.name] == 3:
if not self._template_finder.search("ETHEREAL", img).valid:
item_list.remove(item)
item_list = [x for x in item_list if "potion" not in x.name and not \
(self._config.items[x.name] == 3 and not self._template_finder.search("ETHEREAL", img).valid)]
return len(item_list) > 0
def _move_to_stash_tab(self, stash_idx: int):
@@ -544,4 +539,4 @@ if __name__ == "__main__":
template_finder = TemplateFinder(screen)
item_finder = ItemFinder(config)
ui_manager = UiManager(screen, template_finder)
ui_manager.stash_all_items(1, item_finder)
ui_manager.stash_all_items(5, item_finder)