Skip to content

Commit a8ceae4

Browse files
committed
Add extra blue shade to ItemReceiveDetector. Move new programs to beta.
1 parent c8a5013 commit a8ceae4

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include "CommonFramework/VideoPipeline/VideoOverlay.h"
1515
#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
1616

17-
// #include <iostream>
18-
// using std::cout;
19-
// using std::endl;
17+
//#include <iostream>
18+
//using std::cout;
19+
//using std::endl;
2020

2121
namespace PokemonAutomation{
2222
namespace NintendoSwitch{
@@ -347,6 +347,7 @@ void ItemReceiveDetector::make_overlays(VideoOverlaySet& items) const{
347347
}
348348
bool ItemReceiveDetector::detect(const ImageViewRGB32& screen){
349349
ImageStats top = image_stats(extract_box_reference(screen, m_top));
350+
// cout << top.average << top.stddev << endl;
350351
if (top.average.sum() > 250){
351352
return false;
352353
}
@@ -356,15 +357,9 @@ bool ItemReceiveDetector::detect(const ImageViewRGB32& screen){
356357
if (is_solid(top, {0.153583, 0.245751, 0.600666}, 0.25, 40)){
357358
break;
358359
}
359-
#if 0
360-
if (is_solid(
361-
extract_box_reference(screen, m_top),
362-
{0, 0.134207, 0.865793},
363-
40
364-
)){
360+
if (is_solid(top, {0.00228537, 0.070115, 0.9276}, 0.25, 40)){
365361
break;
366362
}
367-
#endif
368363

369364
m_last_detected_box.reset();
370365
// cout << "not solid" << endl;

SerialPrograms/Source/PokemonLZA/PokemonLZA_Panels.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,20 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
5454
ret.emplace_back("---- Farming ----");
5555
ret.emplace_back(make_single_switch_program<RestaurantFarmer_Descriptor, RestaurantFarmer>());
5656
ret.emplace_back(make_single_switch_program<MegaShardFarmer_Descriptor, MegaShardFarmer>());
57-
if (PreloadSettings::instance().DEVELOPER_MODE){
57+
if (IS_BETA_VERSION){
5858
ret.emplace_back(make_single_switch_program<JacintheInfiniteFarmer_Descriptor, JacintheInfiniteFarmer>());
5959
}
6060

6161
ret.emplace_back("---- Shiny Hunting ----");
6262
ret.emplace_back(make_single_switch_program<ShinyHunt_BenchSit_Descriptor, ShinyHunt_BenchSit>());
6363
ret.emplace_back(make_single_switch_program<ShinyHunt_OverworldReset_Descriptor, ShinyHunt_OverworldReset>());
6464
ret.emplace_back(make_single_switch_program<ShinyHunt_WildZoneEntrance_Descriptor, ShinyHunt_WildZoneEntrance>());
65+
if (IS_BETA_VERSION){
66+
ret.emplace_back(make_single_switch_program<AutoFossil_Descriptor, AutoFossil>());
67+
}
6568

6669
if (PreloadSettings::instance().DEVELOPER_MODE){
6770
ret.emplace_back(make_single_switch_program<BeldumHunter_Descriptor, BeldumHunter>());
68-
ret.emplace_back(make_single_switch_program<AutoFossil_Descriptor, AutoFossil>());
6971
}
7072

7173

0 commit comments

Comments
 (0)