Allow usage of technique points for Ruan Mei in simulated universe#345
Closed
JerryLingjieMei wants to merge 15 commits intoLmeSzinc:masterfrom
Closed
Allow usage of technique points for Ruan Mei in simulated universe#345JerryLingjieMei wants to merge 15 commits intoLmeSzinc:masterfrom
JerryLingjieMei wants to merge 15 commits intoLmeSzinc:masterfrom
Conversation
…ing consistent OCR results for buttons.
LmeSzinc
reviewed
Feb 27, 2024
Owner
LmeSzinc
left a comment
LmeSzinc
left a comment
There was a problem hiding this comment.
- Make 2 PRs, one fixes the technique points detection, another adds new feature
- Add a GUI option to toggle using techniques
Comment on lines
+108
to
+111
| TECHNIQUE_POINT_STRICT_1 = ButtonWrapper( | ||
| name='TECHNIQUE_POINT_STRICT_1', | ||
| share=Button( | ||
| file='./assets/share/map/control/TECHNIQUE_POINT_1.png', |
Owner
There was a problem hiding this comment.
Assets files are auto generated, don't modify it manaully
Contributor
Author
There was a problem hiding this comment.
This button wrapper is to ensure a horizontal search area where technique_point_strict_1 can be found.
tasks/map/control/joystick.py
Outdated
Comment on lines
+200
to
+210
| TECHNIQUE_POINT_STRICT_1.match_template(self.device.image) | ||
| points = [] | ||
| for button in [ | ||
| TECHNIQUE_POINT_STRICT_1, | ||
| TECHNIQUE_POINT_STRICT_2, | ||
| TECHNIQUE_POINT_STRICT_3, | ||
| TECHNIQUE_POINT_STRICT_4, | ||
| TECHNIQUE_POINT_STRICT_5, | ||
| ]: | ||
| button.load_offset(TECHNIQUE_POINT_STRICT_1) | ||
| points.append(self.image_color_count(button, color=(255, 255, 255), threshold=221, count=20, offset=True)) |
Owner
There was a problem hiding this comment.
- TECHNIQUE_POINT_1 cannot detect empty technique points, add another template for that case
image_color_count()accepts area tuple, usebutton.buttoninstead of adding argumentoffset
tasks/rogue/route/base.py
Outdated
Comment on lines
+149
to
+151
| # Use techniques before enemy | ||
| logger.info('Trying to use technique') | ||
| UseTechniqueUI(self.config, self.device).use_technique_(1) |
Owner
There was a problem hiding this comment.
Check if current character is in LIST_ROGUE_SPECIAL_TECHNIQUE_RANGES before using techniques
Comment on lines
+170
to
-171
| # Use techniques before BOSS | ||
| logger.info('Trying to use technique') | ||
| UseTechniqueUI(self.config, self.device).use_technique_(1) | ||
|
|
||
| logger.hr('Clear elite', level=1) | ||
| waypoints = ensure_waypoints(waypoints) | ||
| end_point = waypoints[-1] | ||
| end_point.speed = 'run_2x' | ||
|
|
||
| # TODO: Use techniques before BOSS | ||
| pass | ||
|
|
Owner
There was a problem hiding this comment.
Use techinique from multiple characters to empty technique points before boss
Contributor
Author
There was a problem hiding this comment.
I would refrain from using all technique pts for at least the first elite enemy since it might run out later.
tasks/character/keywords/__init__.py
Outdated
Comment on lines
+38
to
+41
| # Special character that has special effects in rogues | ||
| LIST_ROGUE_SPECIAL_TECHNIQUE_RANGES = [ | ||
| RuanMei, TopazNumby, FuXuan, BlackSwan | ||
| ] No newline at end of file |
Owner
There was a problem hiding this comment.
Make a full list of characters with useful techniques
LmeSzinc
added
good first issue / 首次贡献
…re allowing consistent OCR results for buttons." This reverts commit 5afa62b.
This was referenced Mar 4, 2024
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The program can run well under python 3.10, addressing issues in #344 and #338 .
Ruan Mei is switched to the current character at the start of the rogue trial. Each time an enemy or elite enemy is cleared, the current character will try to use technique points once. The technique points are now detected using a horizontal search around its suggested location.