Skip to content

Commit 95d0849

Browse files
jw098jw098
committed
add blank Autostory segments
1 parent 5a1177f commit 95d0849

15 files changed

+722
-206
lines changed

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
#include "PokemonSV_AutoStory_Segment_22.h"
4747
#include "PokemonSV_AutoStory_Segment_23.h"
4848
#include "PokemonSV_AutoStory_Segment_24.h"
49+
#include "PokemonSV_AutoStory_Segment_25.h"
50+
#include "PokemonSV_AutoStory_Segment_26.h"
51+
#include "PokemonSV_AutoStory_Segment_27.h"
52+
#include "PokemonSV_AutoStory_Segment_28.h"
53+
#include "PokemonSV_AutoStory_Segment_29.h"
4954
#include "PokemonSV_AutoStory.h"
5055

5156
#include <iostream>
@@ -88,8 +93,13 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
8893
segment_list.emplace_back(std::make_unique<AutoStory_Segment_20>());
8994
segment_list.emplace_back(std::make_unique<AutoStory_Segment_21>());
9095
segment_list.emplace_back(std::make_unique<AutoStory_Segment_22>());
91-
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_23>());
96+
segment_list.emplace_back(std::make_unique<AutoStory_Segment_23>());
9297
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_24>());
98+
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_25>());
99+
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_26>());
100+
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_27>());
101+
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_28>());
102+
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_29>());
93103

94104
return segment_list;
95105
};

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp‎

Lines changed: 3 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ namespace PokemonSV{
3030

3131

3232
std::string AutoStory_Segment_23::name() const{
33-
return "23: Orthworm Titan";
33+
return "23: Orthworm Titan: Go to East Province (Area Three) Watchtower.";
3434
}
3535

3636
std::string AutoStory_Segment_23::start_text() const{
3737
return "Start: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";
3838
}
3939

4040
std::string AutoStory_Segment_23::end_text() const{
41-
return "End: ";
41+
return "End: At East Province (Area Three) Watchtower.";
4242
}
4343

4444
void AutoStory_Segment_23::run_segment(
@@ -54,7 +54,7 @@ void AutoStory_Segment_23::run_segment(
5454
context.wait_for_all_requests();
5555
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5656

57-
// checkpoint_(env, context, options.notif_status_update, stats);
57+
checkpoint_54(env, context, options.notif_status_update, stats);
5858

5959
context.wait_for_all_requests();
6060
env.console.log("End Segment " + name(), COLOR_GREEN);
@@ -337,152 +337,6 @@ void checkpoint_54(
337337

338338
}
339339

340-
void checkpoint_55(
341-
SingleSwitchProgramEnvironment& env,
342-
ProControllerContext& context,
343-
EventNotificationOption& notif_status_update,
344-
AutoStoryStats& stats
345-
){
346-
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
347-
[&](size_t attempt_number){
348-
349-
// todo: try to align to left side of tunnel. then charge at Orthworm
350-
// reset if caught in battle.
351-
/////////////////////
352-
353-
// get_off_ride(env.program_info(), env.console, context);
354-
355-
356-
// direction.change_direction(env.program_info(), env.console, context, 0.261);
357-
// pbf_move_left_joystick(context, 128, 0, 500, 100);
358-
// pbf_move_left_joystick(context, 0, 0, 500, 100);
359-
360-
// // now aligned to corner.
361-
362-
// direction.change_direction(env.program_info(), env.console, context, 3.736);
363-
// pbf_move_left_joystick(context, 128, 0, 400, 100);
364-
365-
// direction.change_direction(env.program_info(), env.console, context, 5.306);
366-
// pbf_move_left_joystick(context, 128, 0, 700, 100);
367-
368-
369-
// direction.change_direction(env.program_info(), env.console, context, 4.988);
370-
// pbf_move_left_joystick(context, 128, 0, 800, 100);
371-
// pbf_move_left_joystick(context, 255, 0, 500, 100);
372-
373-
// // now aligned to the wall next to the hole/passage
374-
375-
// // walk away from wall slightly
376-
// pbf_move_left_joystick(context, 128, 255, 50, 100);
377-
// get_on_ride(env.program_info(), env.console, context);
378-
379-
// direction.change_direction(env.program_info(), env.console, context, 0.366);
380-
// pbf_move_left_joystick(context, 128, 0, 250, 100);
381-
382-
// direction.change_direction(env.program_info(), env.console, context, 2.565);
383-
// // run at Orthworm. run into its second position as well.
384-
// pbf_move_left_joystick(context, 128, 0, 50, 0);
385-
// pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, 500);
386-
// pbf_move_left_joystick(context, 255, 0, 500, 500);
387-
388-
// get_off_ride(env.program_info(), env.console, context);
389-
390-
// direction.change_direction(env.program_info(), env.console, context, 0.261);
391-
// pbf_move_left_joystick(context, 128, 0, 500, 100);
392-
// pbf_move_left_joystick(context, 0, 0, 500, 100);
393-
394-
// // now aligned to corner.
395-
396-
// direction.change_direction(env.program_info(), env.console, context, 3.736);
397-
// pbf_move_left_joystick(context, 128, 0, 400, 100);
398-
399-
// direction.change_direction(env.program_info(), env.console, context, 5.306);
400-
// pbf_move_left_joystick(context, 128, 0, 700, 100);
401-
402-
403-
// direction.change_direction(env.program_info(), env.console, context, 4.988);
404-
// pbf_move_left_joystick(context, 128, 0, 800, 100);
405-
// pbf_move_left_joystick(context, 255, 0, 500, 100);
406-
407-
// // now aligned to the wall next to the hole/passage
408-
409-
410-
});
411-
412-
}
413-
414-
void checkpoint_56(
415-
SingleSwitchProgramEnvironment& env,
416-
ProControllerContext& context,
417-
EventNotificationOption& notif_status_update,
418-
AutoStoryStats& stats
419-
){
420-
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
421-
[&](size_t attempt_number){
422-
423-
424-
});
425-
426-
}
427-
428-
void checkpoint_57(
429-
SingleSwitchProgramEnvironment& env,
430-
ProControllerContext& context,
431-
EventNotificationOption& notif_status_update,
432-
AutoStoryStats& stats
433-
){
434-
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
435-
[&](size_t attempt_number){
436-
437-
438-
});
439-
440-
}
441-
442-
void checkpoint_58(
443-
SingleSwitchProgramEnvironment& env,
444-
ProControllerContext& context,
445-
EventNotificationOption& notif_status_update,
446-
AutoStoryStats& stats
447-
){
448-
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
449-
[&](size_t attempt_number){
450-
451-
452-
});
453-
454-
}
455-
456-
void checkpoint_59(
457-
SingleSwitchProgramEnvironment& env,
458-
ProControllerContext& context,
459-
EventNotificationOption& notif_status_update,
460-
AutoStoryStats& stats
461-
){
462-
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
463-
[&](size_t attempt_number){
464-
465-
466-
});
467-
468-
}
469-
470-
void checkpoint_60(
471-
SingleSwitchProgramEnvironment& env,
472-
ProControllerContext& context,
473-
EventNotificationOption& notif_status_update,
474-
AutoStoryStats& stats
475-
){
476-
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
477-
[&](size_t attempt_number){
478-
479-
480-
});
481-
482-
}
483-
484-
485-
486340

487341
}
488342
}

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.h‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -37,62 +37,6 @@ void checkpoint_54(
3737
);
3838

3939

40-
// start: At East Province (Area Three) Watchtower.
41-
// end:
42-
void checkpoint_55(
43-
SingleSwitchProgramEnvironment& env,
44-
ProControllerContext& context,
45-
EventNotificationOption& notif_status_update,
46-
AutoStoryStats& stats
47-
);
48-
49-
// start:
50-
// end:
51-
void checkpoint_56(
52-
SingleSwitchProgramEnvironment& env,
53-
ProControllerContext& context,
54-
EventNotificationOption& notif_status_update,
55-
AutoStoryStats& stats
56-
);
57-
58-
// start:
59-
// end:
60-
void checkpoint_57(
61-
SingleSwitchProgramEnvironment& env,
62-
ProControllerContext& context,
63-
EventNotificationOption& notif_status_update,
64-
AutoStoryStats& stats
65-
);
66-
67-
// start:
68-
// end:
69-
void checkpoint_58(
70-
SingleSwitchProgramEnvironment& env,
71-
ProControllerContext& context,
72-
EventNotificationOption& notif_status_update,
73-
AutoStoryStats& stats
74-
);
75-
76-
// start:
77-
// end:
78-
void checkpoint_59(
79-
SingleSwitchProgramEnvironment& env,
80-
ProControllerContext& context,
81-
EventNotificationOption& notif_status_update,
82-
AutoStoryStats& stats
83-
);
84-
85-
// start:
86-
// end:
87-
void checkpoint_60(
88-
SingleSwitchProgramEnvironment& env,
89-
ProControllerContext& context,
90-
EventNotificationOption& notif_status_update,
91-
AutoStoryStats& stats
92-
);
93-
94-
95-
9640

9741
}
9842
}

0 commit comments

Comments
 (0)