Added level, nature, ability and language to detection and json output in Pokemon HOME sorter #528
Conversation
redshift-s
changed the title
redshift-s
changed the title
| @@ -242,6 +253,11 @@ std::ostream& operator<<(std::ostream& os, const std::optional<Pokemon>& pokemon | |||
| os << "ball_slug:" << pokemon->ball_slug << " "; | |||
| os << "gender:" << gender_to_string(pokemon->gender) << " "; | |||
| os << "ot_id:" << pokemon->ot_id << " "; | |||
| os << "level:" << pokemon->level << " "; | |||
| os << "language:" << pokemon->language << " "; | |||
There was a problem hiding this comment.
Try to keep the same order as other locations>
uint32_t level = 0;
std::string origin = "";
std::string language = "";
std::string nature = "";
std::string ability = "";
| @@ -384,6 +400,11 @@ void output_boxes_data_json(const std::vector<std::optional<Pokemon>>& boxes_dat | |||
| pokemon["ball_slug"] = current_pokemon->ball_slug; | |||
| pokemon["gender"] = gender_to_string(current_pokemon->gender); | |||
| pokemon["ot_id"] = current_pokemon->ot_id; | |||
| pokemon["level"] = current_pokemon->level; | |||
| pokemon["language"] = current_pokemon->language; | |||
There was a problem hiding this comment.
uint32_t level = 0;
std::string origin = "";
std::string language = "";
std::string nature = "";
std::string ability = "";
| // level_box | ||
| // ot_box | ||
| int level = OCR::read_number_waterfill(env.console, extract_box_reference(screen, level_box), 0xff000000, 0xff7f7f7f); | ||
| if (level < 0 || level > 100) { |
There was a problem hiding this comment.
<= 0 ?
And have you tried with eggs ? (I forgot what the program does when there is eggsà
| env.console.log("Level: " + std::to_string(level), COLOR_GREEN); | ||
|
|
||
| // language | ||
| std::string language = OCR::ocr_read(Language::English, extract_box_reference(screen, language_box)); |
There was a problem hiding this comment.
Raw OCR isn't perfect and it'd be better to have a dictionnary (a list of words it can find, in this case all languages). That way, OCR will be able to correct minor errors while reading. Also check that all languages slugs are written in latin character (otherwise, the language need to be adapted and can't be english all the time)
| // nature_box | ||
| std::string nature = OCR::ocr_read(Language::English, extract_box_reference(screen, nature_box)); |
There was a problem hiding this comment.
for the nature, you should be giving the language used by pokemon home as natures from asiatic languages for example won't be readble using an english OCR (also, it'd be better to use a dictionnary)
| // ability_box | ||
| std::string ability = OCR::ocr_read(Language::English, extract_box_reference(screen, ability_box)); |
There was a problem hiding this comment.
for the ability, you should be giving the language used by pokemon home as abilities from asiatic languages for example won't be readble using an english OCR (also, it'd be better to use a dictionnary)
No description provided.