Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
segment_list.emplace_back(std::make_unique<AutoStory_Segment_26>());
segment_list.emplace_back(std::make_unique<AutoStory_Segment_27>());
segment_list.emplace_back(std::make_unique<AutoStory_Segment_28>());
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_29>());
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_30>());
segment_list.emplace_back(std::make_unique<AutoStory_Segment_29>());
segment_list.emplace_back(std::make_unique<AutoStory_Segment_30>());
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_31>());
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_32>());
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_33>());
Expand Down Expand Up @@ -720,6 +720,10 @@ void AutoStory::test_checkpoints(
checkpoint_list.push_back([&](){checkpoint_74(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_75(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_76(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_77(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_78(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_79(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_80(env, context, notif_status_update, stats);});


if (end == 0){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1203,119 +1203,6 @@ void checkpoint_reattempt_loop_tutorial(



void move_from_glaseado_gym_to_north_province_area_one(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
context.wait_for_all_requests();

DirectionDetector direction;
do_action_and_monitor_for_battles(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){

direction.change_direction(env.program_info(), env.console, context, 3.855289);
pbf_move_left_joystick(context, 128, 0, 200, 50);

direction.change_direction(env.program_info(), env.console, context, 3.056395);
pbf_move_left_joystick(context, 128, 0, 300, 50);

direction.change_direction(env.program_info(), env.console, context, 3.805047);
pbf_move_left_joystick(context, 128, 0, 700, 50);

direction.change_direction(env.program_info(), env.console, context, 1.589021);
pbf_move_left_joystick(context, 128, 0, 600, 50);

direction.change_direction(env.program_info(), env.console, context, 2.741829);
pbf_move_left_joystick(context, 128, 0, 300, 50);
});

// marker 1 {0.33125, 0.314815} {0.297396, 0.322222} {0.313021, 0.322222}
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 0, 0},
FlyPoint::POKECENTER,
{0.313021, 0.322222}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 255, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 2 {0.222396, 0.413889} {0.253646, 0.386111}
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 0, 0},
FlyPoint::POKECENTER,
{0.253646, 0.386111}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);



// marker 3 {0.80625, 0.574074} {0.803125, 0.615741} {0.794792, 0.614815} (0.794792, 0.609259).
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 255, 0, 50},
FlyPoint::POKECENTER,
{0.794792, 0.609259}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 50, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 255, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 4. set marker to pokecenter
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 255, 128, 80},
{ZoomChange::KEEP_ZOOM, 0, 0, 0}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 110, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 5. set marker past pokecenter
handle_unexpected_battles(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 255, 255, 50);
});
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 15, 12, 12, false); // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter


fly_to_overlapping_flypoint(env.program_info(), env.console, context);


}


void move_from_north_province_area_one_to_fighting_base(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
DirectionDetector direction;
do_action_and_monitor_for_battles(env.program_info(), env.console, context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,6 @@ void checkpoint_reattempt_loop_tutorial(



// moves player from Glaseado Gym Pokecenter to North Province Area One
void move_from_glaseado_gym_to_north_province_area_one(SingleSwitchProgramEnvironment& env, ProControllerContext& context);

// moves player from North Province Area One to Team Star Fighting base
void move_from_north_province_area_one_to_fighting_base(SingleSwitchProgramEnvironment& env, ProControllerContext& context);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -399,12 +399,6 @@ void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env,



void checkpoint_75(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
}

void checkpoint_76(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
}


}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env,



// start:
// end:
void checkpoint_75(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);

// start:
// end:
void checkpoint_76(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);


}
}
Expand Down
Loading