Skip to content

Commit 91f9bc4

Browse files
MysticialMysticial
committed
fucking tabs
1 parent 5c43164 commit 91f9bc4

16 files changed

+98
-99
lines changed

‎SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,9 +584,9 @@ JsonValue RecordKeyboardController::controller_history_to_json(Logger& logger, C
584584
// 12:00 11201us 8ms
585585
// total time elapsed: 11.2ms vs 8ms
586586

587-
// Normalized timestamps Diff using normalized timestamps Total time since start
587+
// Normalized timestamps Diff using normalized timestamps Total time since start
588588
// 0ms 1ms 0ms
589-
// 1.4ms -> 1ms 2ms 1ms
589+
// 1.4ms -> 1ms 2ms 1ms
590590
// 2.8ms -> 3ms 1ms 3ms
591591
// 4.2ms -> 4ms 2ms 4ms
592592
// 5.6ms -> 6ms 1ms 6ms

‎SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ bool ShinySoundHandler::on_shiny_sound(
150150
}
151151

152152
if (action == ShinySoundDetectedAction::NO_NOTIFICATIONS && current_count > 1){
153-
return false;
154-
}
153+
return false;
154+
}
155155

156156
if (action != ShinySoundDetectedAction::NO_NOTIFICATIONS){
157157
m_option.send_shiny_sound_notification(env, stream, error_coefficient);

‎SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ FriendshipFarmer::FriendshipFarmer()
107107
FARMING_OPTION.add_listener(*this);
108108
}
109109

110-
void FriendshipFarmer::on_config_value_changed(void* object) {
111-
if (FARMING_OPTION == FarmingOption::Cafe) {
110+
void FriendshipFarmer::on_config_value_changed(void* object){
111+
if (FARMING_OPTION == FarmingOption::Cafe){
112112
NUM_PARTY_MEMBERS.set_visibility(ConfigOptionState::ENABLED);
113113
}
114114
else {
@@ -161,7 +161,7 @@ void FriendshipFarmer::enter_cafe(SingleSwitchProgramEnvironment& env, ProContro
161161
OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
162162
int ret2 = 0;
163163

164-
switch (ret) {
164+
switch (ret){
165165
case 0:
166166
env.log("Detected A button.");
167167
pbf_press_button(context, BUTTON_A, 80ms, 40ms);
@@ -196,7 +196,7 @@ void FriendshipFarmer::enter_cafe(SingleSwitchProgramEnvironment& env, ProContro
196196
{ overworld }
197197
);
198198

199-
if (ret2 == 0) {
199+
if (ret2 == 0){
200200
env.log("Returned to overworld.");
201201
continue;
202202
}
@@ -220,7 +220,7 @@ void FriendshipFarmer::enter_cafe(SingleSwitchProgramEnvironment& env, ProContro
220220
}
221221
}
222222

223-
void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
223+
void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
224224
FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
225225

226226
int reset_attempt = 0;
@@ -251,15 +251,15 @@ void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProContro
251251
selection_arrow_watcher,
252252
white_dialog_watcher,
253253
blue_dialog_watcher,
254-
black_screen
254+
black_screen
255255
}
256256
);
257257
context.wait_for(100ms);
258258

259259
OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
260260
int ret2 = 0;
261261

262-
switch (ret) {
262+
switch (ret){
263263
case 0:
264264
env.log("Detected A button.");
265265
return;
@@ -279,15 +279,15 @@ void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProContro
279279
case 5:
280280
env.log("Detected day change.");
281281
ret2 = wait_until(
282-
env.console, context,
283-
30s,
284-
{overworld}
282+
env.console, context,
283+
30s,
284+
{overworld}
285285
);
286286

287287
if (ret2 == 0){
288288
env.log("Returned to overworld.");
289289
continue;
290-
}
290+
}
291291

292292
++stats.errors;
293293
env.update_stats();
@@ -297,7 +297,7 @@ void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProContro
297297
env.console
298298
);
299299
default:
300-
if (seen_selection_arrow && ++reset_attempt <= 10) {
300+
if (seen_selection_arrow && ++reset_attempt <= 10){
301301
env.log("Attempting to face the bench.");
302302
pbf_move_left_joystick(context, 128, 0, 250ms, 0ms);
303303
continue;
@@ -314,7 +314,7 @@ void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProContro
314314
}
315315
}
316316

317-
void FriendshipFarmer::exit_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
317+
void FriendshipFarmer::exit_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
318318
FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
319319

320320
while (true){
@@ -349,7 +349,7 @@ void FriendshipFarmer::exit_cafe(SingleSwitchProgramEnvironment& env, ProControl
349349
OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
350350
int ret2 = 0;
351351

352-
switch (ret) {
352+
switch (ret){
353353
case 0:
354354
env.log("Detected A button.");
355355
return;
@@ -373,7 +373,7 @@ void FriendshipFarmer::exit_cafe(SingleSwitchProgramEnvironment& env, ProControl
373373
{ overworld }
374374
);
375375

376-
if (ret2 == 0) {
376+
if (ret2 == 0){
377377
env.log("Returned to overworld.");
378378
continue;
379379
}
@@ -432,28 +432,28 @@ void FriendshipFarmer::hang_out_bench(SingleSwitchProgramEnvironment& env, ProCo
432432
selection_arrow_watcher,
433433
white_dialog_watcher,
434434
blue_dialog_watcher,
435-
black_screen
435+
black_screen
436436
}
437437
);
438438
context.wait_for(100ms);
439439

440440
OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
441441
int ret2 = 0;
442442

443-
switch (ret) {
443+
switch (ret){
444444
case 0:
445445
env.log("Detected A button.");
446446
pbf_press_button(context, BUTTON_A, 80ms, 40ms);
447447
continue;
448448
case 1:
449-
env.log("Detected B button. Waiting 10 Seconds."); //Wait 10 seconds to gain friendship points.
449+
env.log("Detected B button. Waiting 10 Seconds."); //Wait 10 seconds to gain friendship points.
450450
context.wait_for(10000ms);
451451
pbf_press_button(context, BUTTON_B, 80ms, 40ms);
452452
return;
453453
case 2:
454454
env.log("Detected selection arrow.");
455455
seen_selection_arrow = true;
456-
//Select second option to hang out on bench.
456+
//Select second option to hang out on bench.
457457
pbf_press_dpad(context, DPAD_DOWN, 40ms, 40ms);
458458
pbf_press_button(context, BUTTON_A, 80ms, 40ms);
459459
continue;
@@ -469,7 +469,7 @@ void FriendshipFarmer::hang_out_bench(SingleSwitchProgramEnvironment& env, ProCo
469469
if (seen_selection_arrow){
470470
env.log("Detected loading screen. Hanging out on bench.");
471471
continue;
472-
}
472+
}
473473

474474
env.log("Detected day change.");
475475
ret2 = wait_until(
@@ -478,7 +478,7 @@ void FriendshipFarmer::hang_out_bench(SingleSwitchProgramEnvironment& env, ProCo
478478
{ overworld }
479479
);
480480

481-
if (ret2 == 0) {
481+
if (ret2 == 0){
482482
env.log("Returned to overworld.");
483483
continue;
484484
}
@@ -507,24 +507,23 @@ void FriendshipFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
507507

508508
FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
509509

510-
if (FARMING_OPTION.get() == FarmingOption::Cafe){
510+
if (FARMING_OPTION.get() == FarmingOption::Cafe){
511511
env.log("Cafe Method Started");
512512

513-
for (int i = 0; i < NUM_PARTY_MEMBERS; ++i)
514-
{
513+
for (int i = 0; i < NUM_PARTY_MEMBERS; ++i){
515514
int drinks_needed;
516515

517-
//Each drink at cafe gives 30 friendship points.
518-
//Evolve = 160 points = 5.33 drinks
519-
//Max = 255 points = 8.5 drinks
520-
if (FRIENDSHIP_AMOUNT.get() == FriendshipAmount::Evolve) {
516+
//Each drink at cafe gives 30 friendship points.
517+
//Evolve = 160 points = 5.33 drinks
518+
//Max = 255 points = 8.5 drinks
519+
if (FRIENDSHIP_AMOUNT.get() == FriendshipAmount::Evolve){
521520
drinks_needed = 6;
522521
}
523522
else {
524523
drinks_needed = 9;
525524
}
526525

527-
for (int d = 0; d < drinks_needed; ++d) {
526+
for (int d = 0; d < drinks_needed; ++d){
528527
enter_cafe(env, context);
529528
exit_cafe(env, context);
530529

@@ -543,14 +542,14 @@ void FriendshipFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
543542
env.log("Bench Method Started");
544543
int hang_outs_needed;
545544

546-
//Each hangout on bench gives 10 friendship points.
547-
// Evolve = 160 points = 16 hangouts
548-
// Max = 255 points = 26 hangouts
545+
//Each hangout on bench gives 10 friendship points.
546+
// Evolve = 160 points = 16 hangouts
547+
// Max = 255 points = 26 hangouts
549548
if (FRIENDSHIP_AMOUNT.get() == FriendshipAmount::Evolve){
550549
hang_outs_needed = 16;
551550
}
552551
else{
553-
hang_outs_needed = 26;
552+
hang_outs_needed = 26;
554553
}
555554

556555
for (int i = 0; i < hang_outs_needed; ++i)
@@ -559,7 +558,7 @@ void FriendshipFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
559558
exit_bench(env, context);
560559

561560
++stats.hang_out_sessions;
562-
env.update_stats();
561+
env.update_stats();
563562
}
564563
}
565564

‎SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.h‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@ namespace PokemonLZA{
2727

2828
class FriendshipFarmer_Descriptor : public SingleSwitchProgramDescriptor{
2929
public:
30-
FriendshipFarmer_Descriptor();
30+
FriendshipFarmer_Descriptor();
3131

32-
class Stats;
33-
virtual std::unique_ptr<StatsTracker> make_stats() const override;
32+
class Stats;
33+
virtual std::unique_ptr<StatsTracker> make_stats() const override;
3434
};
3535

3636
class FriendshipFarmer : public SingleSwitchProgramInstance, public ConfigOption::Listener{
3737
public:
38-
~FriendshipFarmer();
39-
FriendshipFarmer();
38+
~FriendshipFarmer();
39+
FriendshipFarmer();
4040

41-
virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
41+
virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
4242

4343
private:
44-
void enter_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
45-
void exit_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
46-
void exit_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
47-
void hang_out_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
48-
49-
virtual void on_config_value_changed(void* object) override;
50-
51-
enum class FarmingOption{
52-
Cafe,
53-
Bench
54-
};
55-
enum class FriendshipAmount{
56-
Evolve,
57-
Max
58-
};
59-
EnumDropdownOption<FarmingOption> FARMING_OPTION;
60-
EnumDropdownOption<FriendshipAmount> FRIENDSHIP_AMOUNT;
61-
SimpleIntegerOption<uint8_t> NUM_PARTY_MEMBERS;
62-
GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
63-
EventNotificationOption NOTIFICATION_STATUS_OPTION;
64-
EventNotificationsOption NOTIFICATIONS;
44+
void enter_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
45+
void exit_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
46+
void exit_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
47+
void hang_out_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
48+
49+
virtual void on_config_value_changed(void* object) override;
50+
51+
enum class FarmingOption{
52+
Cafe,
53+
Bench
54+
};
55+
enum class FriendshipAmount{
56+
Evolve,
57+
Max
58+
};
59+
EnumDropdownOption<FarmingOption> FARMING_OPTION;
60+
EnumDropdownOption<FriendshipAmount> FRIENDSHIP_AMOUNT;
61+
SimpleIntegerOption<uint8_t> NUM_PARTY_MEMBERS;
62+
GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
63+
EventNotificationOption NOTIFICATION_STATUS_OPTION;
64+
EventNotificationsOption NOTIFICATIONS;
6565
};
6666

6767
}

‎SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool save_game_to_menu(ConsoleHandle& console, ProControllerContext& context){
7373
console.log("Detected dialog before save prompt. Unable to save.", COLOR_RED);
7474
pbf_press_button(context, BUTTON_B, 160ms, 240ms);
7575
return false;
76-
}
76+
}
7777

7878
console.log("Detected dialog...");
7979
seen_saved_dialog = true;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void AutoStory_Segment_23::run_segment(
5555
context.wait_for_all_requests();
5656
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5757

58-
AutoStory_Checkpoint_54().run_checkpoint(env, context, options, stats);
58+
AutoStory_Checkpoint_54().run_checkpoint(env, context, options, stats);
5959

6060
context.wait_for_all_requests();
6161
env.console.log("End Segment " + name(), COLOR_GREEN);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void AutoStory_Segment_24::run_segment(
5353
context.wait_for_all_requests();
5454
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5555

56-
AutoStory_Checkpoint_55().run_checkpoint(env, context, options, stats);
56+
AutoStory_Checkpoint_55().run_checkpoint(env, context, options, stats);
5757
AutoStory_Checkpoint_56().run_checkpoint(env, context, options, stats);
5858
AutoStory_Checkpoint_57().run_checkpoint(env, context, options, stats);
5959

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ void AutoStory_Segment_25::run_segment(
5555
context.wait_for_all_requests();
5656
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5757

58-
AutoStory_Checkpoint_58().run_checkpoint(env, context, options, stats);
59-
AutoStory_Checkpoint_59().run_checkpoint(env, context, options, stats);
60-
AutoStory_Checkpoint_60().run_checkpoint(env, context, options, stats);
58+
AutoStory_Checkpoint_58().run_checkpoint(env, context, options, stats);
59+
AutoStory_Checkpoint_59().run_checkpoint(env, context, options, stats);
60+
AutoStory_Checkpoint_60().run_checkpoint(env, context, options, stats);
6161

6262
context.wait_for_all_requests();
6363
env.console.log("End Segment " + name(), COLOR_GREEN);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void AutoStory_Segment_26::run_segment(
5555
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5656

5757
AutoStory_Checkpoint_61().run_checkpoint(env, context, options, stats);
58-
AutoStory_Checkpoint_62().run_checkpoint(env, context, options, stats);
59-
AutoStory_Checkpoint_63().run_checkpoint(env, context, options, stats);
58+
AutoStory_Checkpoint_62().run_checkpoint(env, context, options, stats);
59+
AutoStory_Checkpoint_63().run_checkpoint(env, context, options, stats);
6060

6161
context.wait_for_all_requests();
6262
env.console.log("End Segment " + name(), COLOR_GREEN);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ void AutoStory_Segment_27::run_segment(
5454
context.wait_for_all_requests();
5555
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5656

57-
AutoStory_Checkpoint_64().run_checkpoint(env, context, options, stats);
58-
AutoStory_Checkpoint_65().run_checkpoint(env, context, options, stats);
59-
AutoStory_Checkpoint_66().run_checkpoint(env, context, options, stats);
60-
AutoStory_Checkpoint_67().run_checkpoint(env, context, options, stats);
57+
AutoStory_Checkpoint_64().run_checkpoint(env, context, options, stats);
58+
AutoStory_Checkpoint_65().run_checkpoint(env, context, options, stats);
59+
AutoStory_Checkpoint_66().run_checkpoint(env, context, options, stats);
60+
AutoStory_Checkpoint_67().run_checkpoint(env, context, options, stats);
6161

6262
context.wait_for_all_requests();
6363
env.console.log("End Segment " + name(), COLOR_GREEN);

0 commit comments

Comments
 (0)