diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp index 393be8d1a6..84bb8f648f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp @@ -381,9 +381,8 @@ AutoStory_Descriptor::AutoStory_Descriptor() FeedbackType::VIDEO_AUDIO, AllowCommandsWhenRunning::DISABLE_COMMANDS, false, - { - // "PokemonSV/AreaZero", - // "PaddleOCR" // not needed since an OCR library is bundled with this program + { + "PokemonSV/AreaZero", } ) {} @@ -418,8 +417,8 @@ AutoStory::AutoStory() , STORY_SECTION( "Story Section:", { - {StorySection::TUTORIAL, "tutorial", "Tutorial"}, - {StorySection::MAIN_STORY, "main-story", "Main Story"}, + {StorySection::TUTORIAL, "tutorial", "Tutorial"}, + {StorySection::MAIN_STORY, "main-story", "Main Story"}, }, LockMode::LOCK_WHILE_RUNNING, StorySection::TUTORIAL @@ -697,7 +696,7 @@ AutoStory::AutoStory() false, "YOLO Path:", LockMode::LOCK_WHILE_RUNNING, - "PokemonSV/YOLO/A0-station-2.onnx", + "PokemonSV/AreaZero/A0-station-2.onnx", "<.onnx file>" ) , TARGET_LABEL( @@ -1265,7 +1264,7 @@ void AutoStory::test_code(SingleSwitchProgramEnvironment& env, ProControllerCont - // YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-2.onnx"); + // YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-2.onnx"); // move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-tera", 0.294444); // move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-tera", 0.604688); direction.change_direction(env.program_info(), env.console, context, 3.855289); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp index 21d1360be7..5b033abab9 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp @@ -234,7 +234,7 @@ void checkpoint_94(SingleSwitchProgramEnvironment& env, ProControllerContext& co [&](size_t attempt_number){ - YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-1.onnx"); + YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-1.onnx"); move_player_forward(env, context, 6, @@ -606,7 +606,7 @@ void checkpoint_94(SingleSwitchProgramEnvironment& env, ProControllerContext& co mash_button_till_overworld(env.console, context, BUTTON_A); - YOLOv5Detector yolo_detector2(RESOURCE_PATH() + "PokemonSV/YOLO/station-door-1.onnx"); + YOLOv5Detector yolo_detector2(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/station-door-1.onnx"); move_player_forward(env, context, 4, [&](){ run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp index 84d6257bd8..4e99771b1d 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp @@ -82,7 +82,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co checkpoint_reattempt_loop(env, context, notif_status_update, stats, checkpoint_text, [&](size_t attempt_number){ - YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-2.onnx"); + YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-2.onnx"); pbf_move_left_joystick(context, {0, -1}, 3200ms, 800ms); @@ -276,7 +276,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG); mash_button_till_overworld(env.console, context, BUTTON_A); - YOLOv5Detector yolo_detector2(RESOURCE_PATH() + "PokemonSV/YOLO/station-door-1.onnx"); // we can reuse the detector for station door 1. + YOLOv5Detector yolo_detector2(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/station-door-1.onnx"); // we can reuse the detector for station door 1. do_action_until_dialog(env.program_info(), env.console, context, [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){ diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp index b49d276312..7a0bb12c2d 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp @@ -79,7 +79,7 @@ void checkpoint_98(SingleSwitchProgramEnvironment& env, ProControllerContext& co checkpoint_reattempt_loop(env, context, notif_status_update, stats, checkpoint_text, [&](size_t attempt_number){ - YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-3.onnx"); + YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-3.onnx"); pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms); walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 10000ms, +1, 0); @@ -319,7 +319,7 @@ void checkpoint_98(SingleSwitchProgramEnvironment& env, ProControllerContext& co mash_button_till_overworld(env.console, context, BUTTON_A); - YOLOv5Detector yolo_detector2(RESOURCE_PATH() + "PokemonSV/YOLO/station-door-1.onnx"); // we can reuse the detector for station door 1. + YOLOv5Detector yolo_detector2(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/station-door-1.onnx"); // we can reuse the detector for station door 1. do_action_until_dialog(env.program_info(), env.console, context, [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){ diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp index 74a38835b8..95610b7647 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp @@ -80,7 +80,7 @@ void checkpoint_100(SingleSwitchProgramEnvironment& env, ProControllerContext& c checkpoint_reattempt_loop(env, context, notif_status_update, stats, checkpoint_text, [&](size_t attempt_number){ - YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-4a.onnx"); + YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-4a.onnx"); pbf_move_left_joystick(context, {0, -1}, 3200ms, 800ms); pbf_wait(context, 3000ms); @@ -248,7 +248,7 @@ void checkpoint_101(SingleSwitchProgramEnvironment& env, ProControllerContext& c [&](size_t attempt_number){ - YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-4b.onnx"); + YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-4b.onnx"); // align to crystal-4-1. // center before: X: 0.84 diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp index 829b7335cc..6ac0386b62 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp @@ -80,7 +80,7 @@ void checkpoint_102(SingleSwitchProgramEnvironment& env, ProControllerContext& c checkpoint_reattempt_loop(env, context, notif_status_update, stats, checkpoint_text, [&](size_t attempt_number){ - YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-lab.onnx"); + YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-lab.onnx"); pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms); walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 10000ms, +1, 0);