Skip to content

Commit e22675c

Browse files
jw098jw098
committed
Change Segment number format. Update Start/End Segment logging.
1 parent 5c0f6f9 commit e22675c

15 files changed

+43
-43
lines changed

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

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

3131

3232
std::string AutoStory_Segment_10::name() const{
33-
return "10.1: Cortondo Gym - Go to Cortondo city";
33+
return "10: Cortondo Gym (Bug): Go to Cortondo city";
3434
}
3535

3636
std::string AutoStory_Segment_10::start_text() const{
@@ -49,14 +49,14 @@ void AutoStory_Segment_10::run_segment(
4949
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
5050

5151
context.wait_for_all_requests();
52-
env.console.log("Start Segment 10.1: Cortondo Gym - Go to Cortondo city", COLOR_ORANGE);
52+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5353

5454
checkpoint_21(env, context, options.notif_status_update);
5555
checkpoint_22(env, context, options.notif_status_update);
5656
checkpoint_23(env, context, options.notif_status_update);
5757

5858
context.wait_for_all_requests();
59-
env.console.log("End Segment 10.1: Cortondo Gym - Go to Cortondo city", COLOR_GREEN);
59+
env.console.log("End Segment " + name(), COLOR_GREEN);
6060
stats.m_segment++;
6161
env.update_stats();
6262

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace PokemonSV{
3737

3838

3939
std::string AutoStory_Segment_11::name() const{
40-
return "10.2: Cortondo Gym - Gym challenge";
40+
return "11: Cortondo Gym (Bug): Gym challenge";
4141
}
4242

4343
std::string AutoStory_Segment_11::start_text() const{
@@ -56,15 +56,15 @@ void AutoStory_Segment_11::run_segment(
5656
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
5757

5858
context.wait_for_all_requests();
59-
env.console.log("Start Segment 10.2: Cortondo Gym - Gym challenge", COLOR_ORANGE);
59+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
6060

6161
checkpoint_24(env, context, options.notif_status_update);
6262
checkpoint_25(env, context, options.notif_status_update);
6363
checkpoint_26(env, context, options.notif_status_update);
6464
checkpoint_27(env, context, options.notif_status_update);
6565

6666
context.wait_for_all_requests();
67-
env.console.log("End Segment 10.2: Cortondo Gym - Gym challenge", COLOR_GREEN);
67+
env.console.log("End Segment " + name(), COLOR_GREEN);
6868
stats.m_segment++;
6969
env.update_stats();
7070

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace PokemonSV{
3232

3333

3434
std::string AutoStory_Segment_12::name() const{
35-
return "10.3: Cortondo Gym - Gym battle";
35+
return "12: Cortondo Gym (Bug): Gym battle";
3636
}
3737

3838
std::string AutoStory_Segment_12::start_text() const{
@@ -52,12 +52,12 @@ void AutoStory_Segment_12::run_segment(
5252
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
5353

5454
context.wait_for_all_requests();
55-
env.console.log("Start Segment 10.3: Cortondo Gym - Gym battle", COLOR_ORANGE);
55+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5656

5757
checkpoint_28(env, context, options.notif_status_update);
5858

5959
context.wait_for_all_requests();
60-
env.console.log("End Segment 10.3: Cortondo Gym - Gym battle", COLOR_GREEN);
60+
env.console.log("End Segment " + name(), COLOR_GREEN);
6161
stats.m_segment++;
6262
env.update_stats();
6363

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace PokemonSV{
2828

2929

3030
std::string AutoStory_Segment_13::name() const{
31-
return "11.1: Bombirdier Titan: Go to West Province Area One Central Pokecenter";
31+
return "13: Bombirdier Titan: Go to West Province Area One Central Pokecenter";
3232
}
3333

3434
std::string AutoStory_Segment_13::start_text() const{
@@ -47,12 +47,12 @@ void AutoStory_Segment_13::run_segment(
4747
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
4848

4949
context.wait_for_all_requests();
50-
env.console.log("Start Segment 11.1: Bombirdier Titan: Go to West Province Area One Central Pokecenter", COLOR_ORANGE);
50+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5151

5252
checkpoint_29(env, context, options.notif_status_update);
5353

5454
context.wait_for_all_requests();
55-
env.console.log("End Segment 11.1: Bombirdier Titan: Go to West Province Area One Central Pokecenter", COLOR_GREEN);
55+
env.console.log("End Segment " + name(), COLOR_GREEN);
5656
stats.m_segment++;
5757
env.update_stats();
5858

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace PokemonSV{
2929

3030

3131
std::string AutoStory_Segment_14::name() const{
32-
return "11.2: Bombirdier Titan: Battle Bombirdier";
32+
return "14: Bombirdier Titan: Battle Bombirdier";
3333
}
3434

3535
std::string AutoStory_Segment_14::start_text() const{
@@ -48,13 +48,13 @@ void AutoStory_Segment_14::run_segment(
4848
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
4949

5050
context.wait_for_all_requests();
51-
env.console.log("Start Segment 11.2: Bombirdier Titan: Battle Bombirdier", COLOR_ORANGE);
51+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5252

5353
checkpoint_30(env, context, options.notif_status_update);
5454
checkpoint_31(env, context, options.notif_status_update);
5555

5656
context.wait_for_all_requests();
57-
env.console.log("End Segment 11.2: Bombirdier Titan: Battle Bombirdier", COLOR_GREEN);
57+
env.console.log("End Segment " + name(), COLOR_GREEN);
5858
stats.m_segment++;
5959
env.update_stats();
6060

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace PokemonSV{
3232

3333

3434
std::string AutoStory_Segment_15::name() const{
35-
return "12: Team Star (Dark)";
35+
return "15: Team Star (Dark)";
3636
}
3737

3838
std::string AutoStory_Segment_15::start_text() const{
@@ -51,15 +51,15 @@ void AutoStory_Segment_15::run_segment(
5151
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
5252

5353
context.wait_for_all_requests();
54-
env.console.log("Start Segment 12: Team Star (Dark)", COLOR_ORANGE);
54+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5555

5656
checkpoint_32(env, context, options.notif_status_update);
5757
checkpoint_33(env, context, options.notif_status_update);
5858
checkpoint_34(env, context, options.notif_status_update);
5959

6060

6161
context.wait_for_all_requests();
62-
env.console.log("End Segment 12: Team Star (Dark)", COLOR_GREEN);
62+
env.console.log("End Segment " + name(), COLOR_GREEN);
6363
stats.m_segment++;
6464
env.update_stats();
6565

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace PokemonSV{
2929

3030

3131
std::string AutoStory_Segment_16::name() const{
32-
return "13.1: Cascarrafa Gym (Water): Get Kofu's wallet";
32+
return "16: Cascarrafa Gym (Water): Get Kofu's wallet";
3333
}
3434

3535
std::string AutoStory_Segment_16::start_text() const{
@@ -48,13 +48,13 @@ void AutoStory_Segment_16::run_segment(
4848
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
4949

5050
context.wait_for_all_requests();
51-
env.console.log("Start Segment 13.1: Cascarrafa Gym (Water): Get Kofu's wallet", COLOR_ORANGE);
51+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5252

5353
checkpoint_35(env, context, options.notif_status_update);
5454
checkpoint_36(env, context, options.notif_status_update);
5555

5656
context.wait_for_all_requests();
57-
env.console.log("End Segment 13.1: Cascarrafa Gym (Water): Get Kofu's wallet", COLOR_GREEN);
57+
env.console.log("End Segment " + name(), COLOR_GREEN);
5858
stats.m_segment++;
5959
env.update_stats();
6060

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace PokemonSV{
2929

3030

3131
std::string AutoStory_Segment_17::name() const{
32-
return "13.2: Cascarrafa Gym (Water): Gym challenge and Gym battle";
32+
return "17: Cascarrafa Gym (Water): Gym challenge and Gym battle";
3333
}
3434

3535
std::string AutoStory_Segment_17::start_text() const{
@@ -48,13 +48,13 @@ void AutoStory_Segment_17::run_segment(
4848
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
4949

5050
context.wait_for_all_requests();
51-
env.console.log("Start Segment 13.2: Cascarrafa Gym (Water): Gym battle", COLOR_ORANGE);
51+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5252

5353
checkpoint_37(env, context, options.notif_status_update);
5454
checkpoint_38(env, context, options.notif_status_update);
5555

5656
context.wait_for_all_requests();
57-
env.console.log("End Segment 13.2: Cascarrafa Gym (Water): Gym battle", COLOR_GREEN);
57+
env.console.log("End Segment " + name(), COLOR_GREEN);
5858
stats.m_segment++;
5959
env.update_stats();
6060

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

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

3131

3232
std::string AutoStory_Segment_18::name() const{
33-
return "14: Great Tusk/Iron Treads titan";
33+
return "18: Great Tusk/Iron Treads titan";
3434
}
3535

3636
std::string AutoStory_Segment_18::start_text() const{
@@ -49,13 +49,13 @@ void AutoStory_Segment_18::run_segment(
4949
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
5050

5151
context.wait_for_all_requests();
52-
env.console.log("Start Segment 14: Great Tusk/Iron Treads titan", COLOR_ORANGE);
52+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5353

5454
checkpoint_39(env, context, options.notif_status_update);
5555
checkpoint_40(env, context, options.notif_status_update);
5656

5757
context.wait_for_all_requests();
58-
env.console.log("End Segment 14: Great Tusk/Iron Treads titan", COLOR_GREEN);
58+
env.console.log("End Segment " + name(), COLOR_GREEN);
5959
stats.m_segment++;
6060
env.update_stats();
6161

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace PokemonSV{
2929

3030

3131
std::string AutoStory_Segment_19::name() const{
32-
return "15.1: Klawf Titan: Battle Klawf";
32+
return "19: Klawf Titan: Battle Klawf";
3333
}
3434

3535
std::string AutoStory_Segment_19::start_text() const{
@@ -48,13 +48,13 @@ void AutoStory_Segment_19::run_segment(
4848
AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
4949

5050
context.wait_for_all_requests();
51-
env.console.log("Start Segment 15.2: Klawf Titan: Battle Klawf", COLOR_ORANGE);
51+
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5252

5353
checkpoint_41(env, context, options.notif_status_update);
5454
checkpoint_42(env, context, options.notif_status_update);
5555

5656
context.wait_for_all_requests();
57-
env.console.log("End Segment 15.2: Klawf Titan: Battle Klawf", COLOR_GREEN);
57+
env.console.log("End Segment " + name(), COLOR_GREEN);
5858
stats.m_segment++;
5959
env.update_stats();
6060

0 commit comments

Comments
 (0)