Skip to content

Commit

Permalink
Merge pull request #214 from petertang2012/bonus-loot_and_cursed-trea…
Browse files Browse the repository at this point in the history
…sures_update

[eng version only] Deal with bonus loot and cursed treasure states
  • Loading branch information
Pik-4 authored Dec 4, 2022
2 parents db577df + bde76db commit 651b35e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lushi.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(self, cfg):
self.battle_time_wait = 1
self.states = ['box', 'mercenaries', 'team_lock', 'travel', 'boss_list', 'team_list', 'map_not_ready',
'goto', 'show', 'teleport', 'start_game', 'member_not_ready', 'not_ready_dots', 'battle_ready',
'treasure_list', 'treasure_replace', 'treasure_list2', 'destroy', 'blue_portal', 'boom', 'visitor_list',
'treasure_list', 'treasure_replace', 'treasure_list2', 'destroy', 'blue_portal', 'boom', 'bonus_loot', 'cursed_treasure', 'visitor_list',
'final_reward', 'final_reward2', 'final_confirm', 'close', 'ok', 'done', 'member_not_ready2', 'campfire']

self.load_config(cfg)
Expand Down Expand Up @@ -701,7 +701,7 @@ def state_handler(self, state, tic, text):
'''
self.states = ['box', 'mercenaries', 'team_lock', 'travel', 'boss_list', 'team_list', 'map_not_ready',
'goto', 'show', 'teleport', 'start_game', 'member_not_ready', 'not_ready_dots', 'battle_ready',
'treasure_list', 'treasure_replace', 'treasure_list2', 'destroy', 'blue_portal', 'boom', 'visitor_list',
'treasure_list', 'treasure_replace', 'treasure_list2', 'destroy', 'blue_portal', 'boom', 'bonus_loot', 'cursed_treasure', 'visitor_list',
'final_reward', 'final_reward2', 'final_confirm', 'ok', 'close', 'done', 'member_not_ready2', 'campfire']
'''
if success:
Expand Down Expand Up @@ -970,7 +970,7 @@ def state_handler(self, state, tic, text):
self.new_click(tuple_add(rect, self.locs.treasures_collect))
del screen

if state in ['destroy', 'blue_portal', 'boom']:
if state in ['destroy', 'blue_portal', 'boom', 'bonus_loot', 'cursed_treasure']:
logger.info(f'find {state}, try to click')
if self.basic.early_stop:
time.sleep(1)
Expand Down
Binary file added resource/imgs_eng_1024x768/icons/bonus_loot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 651b35e

Please sign in to comment.