Skip to content

Commit 2af6689

Browse files
MysticialMysticial
authored
Partial ticks migration for AutoStory. (#919)
* Partial ticks migration for AutoStory. * Revert walk_forward_until_dialog() changes. * minor
1 parent 4e59fec commit 2af6689

32 files changed

+378
-356
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,8 +1207,8 @@ void realign_player_from_landmark(
12071207
}
12081208
uint8_t move_x1 = move_cursor_near_landmark.move_x;
12091209
uint8_t move_y1 = move_cursor_near_landmark.move_y;
1210-
uint16_t move_duration1 = move_cursor_near_landmark.move_duration;
1211-
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1 * TICKS_PER_SECOND);
1210+
Milliseconds move_duration1 = move_cursor_near_landmark.move_duration;
1211+
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1000ms);
12121212

12131213
// move cursor to pokecenter
12141214
double push_scale = 0.29 * adjustment_table[try_count];
@@ -1243,8 +1243,8 @@ void realign_player_from_landmark(
12431243
}
12441244
uint8_t move_x2 = move_cursor_to_target.move_x;
12451245
uint8_t move_y2 = move_cursor_to_target.move_y;
1246-
uint16_t move_duration2 = move_cursor_to_target.move_duration;
1247-
pbf_move_left_joystick(context, move_x2, move_y2, move_duration2, 1 * TICKS_PER_SECOND);
1246+
Milliseconds move_duration2 = move_cursor_to_target.move_duration;
1247+
pbf_move_left_joystick(context, move_x2, move_y2, move_duration2, 1000ms);
12481248

12491249
// place down marker
12501250
pbf_press_button(context, BUTTON_A, 160ms, 840ms);
@@ -1337,8 +1337,8 @@ void move_cursor_towards_flypoint_and_go_there(
13371337
}
13381338
uint8_t move_x1 = move_cursor_near_flypoint.move_x;
13391339
uint8_t move_y1 = move_cursor_near_flypoint.move_y;
1340-
uint16_t move_duration1 = move_cursor_near_flypoint.move_duration;
1341-
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1 * TICKS_PER_SECOND);
1340+
Milliseconds move_duration1 = move_cursor_near_flypoint.move_duration;
1341+
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1000ms);
13421342

13431343
double push_scale = 0.29 * adjustment_table[try_count];
13441344
if (!fly_to_visible_closest_flypoint_cur_zoom_level(info, stream, context, fly_point, push_scale)){

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void checkpoint_02(
162162
pbf_move_left_joystick(context, 0, 0, 3000ms, 160ms);
163163
pbf_move_left_joystick(context, 0, 128, 3000ms, 160ms);
164164
pbf_move_left_joystick(context, {0, -1}, 4000ms, 160ms);
165-
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 0, 128);
165+
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 0, 128);
166166

167167
env.console.log("clear_dialog: Talk with Clavell at living room.");
168168
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void checkpoint_05(
9393
pbf_move_left_joystick(context, {0, +1}, 7000ms, 400ms);
9494
direction.change_direction(env.program_info(), env.console, context, 1.13);
9595
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
96-
96+
9797
context.wait_for_all_requests();
9898
env.console.log("Get mom's sandwich");
9999
env.console.overlay().add_log("Get mom's sandwich", COLOR_WHITE);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void checkpoint_08(
139139
realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, 150, 20, 20);
140140
pbf_move_left_joystick(context, 128, 0, 1000, 50);
141141
realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, 160, 20, 20);
142-
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 128, 0);
142+
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 128, 0);
143143
}
144144
);
145145

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ void checkpoint_22(
158158
// section 1
159159
realign_player_from_landmark(
160160
env.program_info(), env.console, context,
161-
{ZoomChange::ZOOM_IN, 0, 128, 80},
162-
{ZoomChange::KEEP_ZOOM, 255, 80, 37}
161+
{ZoomChange::ZOOM_IN, 0, 128, 640ms},
162+
{ZoomChange::KEEP_ZOOM, 255, 80, 296ms}
163163
);
164164
overworld_navigation(env.program_info(), env.console, context,
165165
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
@@ -168,8 +168,8 @@ void checkpoint_22(
168168
// section 2
169169
realign_player_from_landmark(
170170
env.program_info(), env.console, context,
171-
{ZoomChange::ZOOM_IN, 0, 128, 40},
172-
{ZoomChange::KEEP_ZOOM, 255, 255, 27}
171+
{ZoomChange::ZOOM_IN, 0, 128, 320ms},
172+
{ZoomChange::KEEP_ZOOM, 255, 255, 216ms}
173173
);
174174
overworld_navigation(env.program_info(), env.console, context,
175175
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
@@ -178,8 +178,8 @@ void checkpoint_22(
178178
// section 3. set marker to pokecenter
179179
realign_player_from_landmark(
180180
env.program_info(), env.console, context,
181-
{ZoomChange::ZOOM_IN, 128, 128, 0},
182-
{ZoomChange::KEEP_ZOOM, 128, 128, 0}
181+
{ZoomChange::ZOOM_IN, 128, 128, 0ms},
182+
{ZoomChange::KEEP_ZOOM, 128, 128, 0ms}
183183
);
184184
overworld_navigation(env.program_info(), env.console, context,
185185
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
@@ -225,8 +225,8 @@ void checkpoint_23(
225225
// section 2
226226
realign_player_from_landmark(
227227
env.program_info(), env.console, context,
228-
{ZoomChange::ZOOM_IN, 0, 128, 80},
229-
{ZoomChange::KEEP_ZOOM, 255, 95, 100}
228+
{ZoomChange::ZOOM_IN, 0, 128, 640ms},
229+
{ZoomChange::KEEP_ZOOM, 255, 95, 800ms}
230230
);
231231
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
232232
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
@@ -243,8 +243,8 @@ void checkpoint_23(
243243
// section 3
244244
realign_player_from_landmark(
245245
env.program_info(), env.console, context,
246-
{ZoomChange::ZOOM_IN, 0, 128, 80},
247-
{ZoomChange::KEEP_ZOOM, 255, 75, 65}
246+
{ZoomChange::ZOOM_IN, 0, 128, 640ms},
247+
{ZoomChange::KEEP_ZOOM, 255, 75, 520ms}
248248
);
249249
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
250250
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
@@ -261,8 +261,8 @@ void checkpoint_23(
261261
// section 4
262262
realign_player_from_landmark(
263263
env.program_info(), env.console, context,
264-
{ZoomChange::ZOOM_IN, 0, 128, 50},
265-
{ZoomChange::KEEP_ZOOM, 255, 180, 17}
264+
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
265+
{ZoomChange::KEEP_ZOOM, 255, 180, 136ms}
266266
);
267267
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
268268
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
@@ -279,8 +279,8 @@ void checkpoint_23(
279279
// section 5. set marker to pokecenter
280280
realign_player_from_landmark(
281281
env.program_info(), env.console, context,
282-
{ZoomChange::ZOOM_IN, 128, 128, 0},
283-
{ZoomChange::KEEP_ZOOM, 128, 128, 0}
282+
{ZoomChange::ZOOM_IN, 128, 128, 0ms},
283+
{ZoomChange::KEEP_ZOOM, 128, 128, 0ms}
284284
);
285285
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
286286
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ void checkpoint_24(
117117
DirectionDetector direction;
118118
if (attempt_number > 0 || ENABLE_TEST){
119119
env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
120-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
121-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
120+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
121+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
122122
}
123123

124124
do_action_and_monitor_for_battles(env.program_info(), env.console, context,
@@ -617,7 +617,7 @@ void checkpoint_27(
617617
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
618618
[&](size_t attempt_number){
619619
context.wait_for_all_requests();
620-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 255, 128, 40});
620+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 255, 128, 320ms});
621621

622622
});
623623

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ void checkpoint_28(
8787
DirectionDetector direction;
8888
if (attempt_number > 0 || ENABLE_TEST){
8989
env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
90-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
91-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
90+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
91+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
9292
}
9393

9494
do_action_and_monitor_for_battles(env.program_info(), env.console, context,

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ void checkpoint_29(
7979

8080
if (attempt_number > 0 || ENABLE_TEST){
8181
env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
82-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
83-
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
82+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
83+
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
8484
}
8585

8686
// align for long stretch 1, part 1
@@ -102,8 +102,8 @@ void checkpoint_29(
102102
// align for long stretch 1, part 2
103103
realign_player_from_landmark(
104104
env.program_info(), env.console, context,
105-
{ZoomChange::ZOOM_IN, 128, 255, 40},
106-
{ZoomChange::KEEP_ZOOM, 80, 0, 75}
105+
{ZoomChange::ZOOM_IN, 128, 255, 320ms},
106+
{ZoomChange::KEEP_ZOOM, 80, 0, 600ms}
107107
);
108108

109109
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
@@ -122,8 +122,8 @@ void checkpoint_29(
122122

123123
realign_player_from_landmark(
124124
env.program_info(), env.console, context,
125-
{ZoomChange::ZOOM_IN, 128, 255, 60},
126-
{ZoomChange::KEEP_ZOOM, 95, 0, 115}
125+
{ZoomChange::ZOOM_IN, 128, 255, 480ms},
126+
{ZoomChange::KEEP_ZOOM, 95, 0, 920ms}
127127
);
128128

129129
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
@@ -141,8 +141,8 @@ void checkpoint_29(
141141
// align for long stretch 2
142142
realign_player_from_landmark(
143143
env.program_info(), env.console, context,
144-
{ZoomChange::ZOOM_IN, 128, 255, 100},
145-
{ZoomChange::KEEP_ZOOM, 0, 105, 65}
144+
{ZoomChange::ZOOM_IN, 128, 255, 800ms},
145+
{ZoomChange::KEEP_ZOOM, 0, 105, 520ms}
146146
);
147147

148148
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
@@ -160,8 +160,8 @@ void checkpoint_29(
160160
// align for long stretch 3, part 1
161161
realign_player_from_landmark(
162162
env.program_info(), env.console, context,
163-
{ZoomChange::ZOOM_IN, 255, 128, 65},
164-
{ZoomChange::KEEP_ZOOM, 0, 50, 87}
163+
{ZoomChange::ZOOM_IN, 255, 128, 520ms},
164+
{ZoomChange::KEEP_ZOOM, 0, 50, 696ms}
165165
);
166166

167167

@@ -180,8 +180,8 @@ void checkpoint_29(
180180
// align for long stretch 3, part 2
181181
realign_player_from_landmark(
182182
env.program_info(), env.console, context,
183-
{ZoomChange::ZOOM_IN, 255, 160, 65},
184-
{ZoomChange::KEEP_ZOOM, 20, 0, 110}
183+
{ZoomChange::ZOOM_IN, 255, 160, 520ms},
184+
{ZoomChange::KEEP_ZOOM, 20, 0, 880ms}
185185
);
186186

187187

@@ -200,8 +200,8 @@ void checkpoint_29(
200200
// align for long stretch 3, part 3
201201
realign_player_from_landmark(
202202
env.program_info(), env.console, context,
203-
{ZoomChange::ZOOM_IN, 0, 60, 110},
204-
{ZoomChange::KEEP_ZOOM, 255, 128, 115}
203+
{ZoomChange::ZOOM_IN, 0, 60, 880ms},
204+
{ZoomChange::KEEP_ZOOM, 255, 128, 920ms}
205205
);
206206

207207

@@ -226,7 +226,7 @@ void checkpoint_29(
226226

227227
//align for long stretch 3, part 4. just prior to bridge. {0.339062, 0.612037}
228228
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
229-
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
229+
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
230230
FlyPoint::POKECENTER,
231231
{0.339062, 0.612037}
232232
);
@@ -253,7 +253,7 @@ void checkpoint_29(
253253

254254
// align to cross bridge {0.385937, 0.615741}
255255
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
256-
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
256+
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
257257
FlyPoint::POKECENTER,
258258
{0.385937, 0.615741}
259259
);
@@ -290,7 +290,7 @@ void checkpoint_29(
290290
// walk back to start position before bridge
291291
// {0.310937, 0.580556} {0.310937, 0.589815} {0.310937, 0.584259}
292292
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
293-
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
293+
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
294294
FlyPoint::POKECENTER,
295295
{0.310937, 0.584259}
296296
);
@@ -309,7 +309,7 @@ void checkpoint_29(
309309

310310
// align to cross bridge {0.385937, 0.615741}
311311
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
312-
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
312+
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
313313
FlyPoint::POKECENTER,
314314
{0.385937, 0.615741}
315315
);
@@ -330,8 +330,8 @@ void checkpoint_29(
330330
// align for post-bridge section 1
331331
realign_player_from_landmark(
332332
env.program_info(), env.console, context,
333-
{ZoomChange::ZOOM_IN, 0, 150, 60},
334-
{ZoomChange::KEEP_ZOOM, 255, 60, 50} // {ZoomChange::KEEP_ZOOM, 255, 60, 50}
333+
{ZoomChange::ZOOM_IN, 0, 150, 480ms},
334+
{ZoomChange::KEEP_ZOOM, 255, 60, 400ms} // {ZoomChange::KEEP_ZOOM, 255, 60, 50}
335335
);
336336

337337

@@ -351,8 +351,8 @@ void checkpoint_29(
351351
// align for post-bridge section 2
352352
realign_player_from_landmark(
353353
env.program_info(), env.console, context,
354-
{ZoomChange::ZOOM_IN, 0, 150, 60},
355-
{ZoomChange::KEEP_ZOOM, 255, 105, 50}
354+
{ZoomChange::ZOOM_IN, 0, 150, 480ms},
355+
{ZoomChange::KEEP_ZOOM, 255, 105, 400ms}
356356
);
357357

358358

@@ -371,8 +371,8 @@ void checkpoint_29(
371371
// align for post-bridge section 3. move up towards tree
372372
realign_player_from_landmark(
373373
env.program_info(), env.console, context,
374-
{ZoomChange::ZOOM_IN, 0, 128, 50},
375-
{ZoomChange::KEEP_ZOOM, 255, 90, 35}
374+
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
375+
{ZoomChange::KEEP_ZOOM, 255, 90, 280ms}
376376
);
377377

378378

@@ -391,8 +391,8 @@ void checkpoint_29(
391391
// align for post-bridge section 4
392392
realign_player_from_landmark(
393393
env.program_info(), env.console, context,
394-
{ZoomChange::ZOOM_IN, 0, 128, 50},
395-
{ZoomChange::KEEP_ZOOM, 255, 55, 25}
394+
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
395+
{ZoomChange::KEEP_ZOOM, 255, 55, 200ms}
396396
);
397397

398398

@@ -413,8 +413,8 @@ void checkpoint_29(
413413
// align for post-bridge section 5. set marker to pokecenter.
414414
realign_player_from_landmark(
415415
env.program_info(), env.console, context,
416-
{ZoomChange::ZOOM_IN, 0, 128, 50},
417-
{ZoomChange::KEEP_ZOOM, 128, 128, 0}
416+
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
417+
{ZoomChange::KEEP_ZOOM, 128, 128, 0ms}
418418
);
419419

420420

0 commit comments

Comments
 (0)