Skip to content

Commit

Permalink
Merge pull request #80 from Babel-TTT/sos-test
Browse files Browse the repository at this point in the history 
24/10/01 add new liveries of 25k
  • Loading branch information
@JohnFranklin523
JohnFranklin523 authored Oct 1, 2024
2 parents 9abefee + 31fb881 commit b0077ec
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Feature: improved language strings of reliability decay and comfort

0.3.1.167 (8/8/2024)
--------------------
Add: NC3, P80, UZ25T, P50, P65
Add: NC3, P80, UZ25T, P50, P65, G50
Renewal the sprites of HXD1D, 25T
Wagons with aging liveries now have new feature: The probabilities of aging liveries will change by years
Fix #47: The Cargo Type of PB
Expand Down
Binary file modified gfx/25-electric/extra/hxd1d-1898.vox
View file
Binary file not shown.
Binary file modified gfx/25-electric/extra/hxd3d-1886.vox
View file
Binary file not shown.
Binary file modified gfx/25-electric/extra/hxd3d-1893.vox
View file
Binary file not shown.
Binary file modified gfx/25-electric/extra/hxd3d-1921.vox
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions src/coaches/25k/ca25k.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ switch (FEAT_TRAINS, SELF, switch_ca25k_cargo_subtype, cargo_subtype) {
1: return string(STR_ORIGINAL);
/* 2: string(STR_GAOZU_GREEN); */
2: return string(STR_GMSR);
/* 3: return string(STR_GUANGSHEN); */
3: return string(STR_GUANGSHEN);
return CB_RESULT_NO_TEXT;
}

Expand All @@ -51,7 +51,7 @@ switch (FEAT_TRAINS, SELF, switch_ca25k_graphics_subtype, cargo_subtype) {
1: spriteset_ca25k_original;
/* 2: ; */
2: spriteset_ca25k_gmsr;
/* 3: spriteset_ca25k_guangshen; */
3: spriteset_ca25k_guangshen;
}

switch (FEAT_TRAINS, SELF, switch_ca25k_graphics, position_in_articulated_veh % 3) {
Expand Down Expand Up @@ -105,7 +105,7 @@ item (FEAT_TRAINS, ca25k) {
}
graphics {
// Menu
additional_text: string(STR_DESC_4, string(STR_FULL_NAME_CA25K), string(STR_CAFE_EFFECT), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_MEDIUM, 200));
additional_text: string(STR_DESC_4, string(STR_FULL_NAME_CA25K), string(STR_CAFE_EFFECT), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_MEDIUM, 200));
can_attach_wagon: locowagon;
cargo_subtype_text: switch_ca25k_cargo_subtype;

Expand Down
8 changes: 4 additions & 4 deletions src/coaches/25k/kd25k.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ switch (FEAT_TRAINS, SELF, switch_kd25k_graphics_subtype, cargo_subtype) {
1: spriteset_kd25k_original;
/* 2: ; */
2: spriteset_kd25k_gmsr;
/* 3: spriteset_kd25k_guangshen; */
3: spriteset_kd25k_luchaogang;
4: spriteset_kd25k_xian;
3: spriteset_kd25k_guangshen;
4: spriteset_kd25k_luchaogang;
5: spriteset_kd25k_xian;
}

switch (FEAT_TRAINS, SELF, switch_kd25k_graphics, position_in_articulated_veh % 3) {
Expand Down Expand Up @@ -104,7 +104,7 @@ item (FEAT_TRAINS, kd25k) {
}
graphics {
// Menu
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_KD25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN)*/, string(STR_GMSR)/* , string(STR_GUANGSHEN) */, string(STR_LUCHAOGANG), string(STR_XIAN)), string(STR_AIR_CONDITIONER_EFFECT));
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_KD25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN)*/, string(STR_GMSR), string(STR_GUANGSHEN), string(STR_LUCHAOGANG), string(STR_XIAN)), string(STR_AIR_CONDITIONER_EFFECT));
can_attach_wagon: locowagon;
cargo_subtype_text: switch_kd25k_cargo_subtype;

Expand Down
6 changes: 3 additions & 3 deletions src/coaches/25k/rw25k.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ switch (FEAT_TRAINS, SELF, switch_rw25k_cargo_subtype, cargo_subtype) {
1: return string(STR_ORIGINAL);
/* 2: string(STR_GAOZU_GREEN); */
2: return string(STR_GMSR);
/* 3: return string(STR_GUANGSHEN); */
3: return string(STR_GUANGSHEN);
return CB_RESULT_NO_TEXT;
}

Expand All @@ -52,7 +52,7 @@ switch (FEAT_TRAINS, SELF, switch_rw25k_graphics_subtype, cargo_subtype) {
1: spriteset_rw25k_original;
/* 2: ; */
2: spriteset_rw25k_gmsr;
/* 3: spriteset_rw25k_guangshen; */
3: spriteset_rw25k_guangshen;
}

switch (FEAT_TRAINS, SELF, switch_rw25k_graphics, position_in_articulated_veh % 3) {
Expand Down Expand Up @@ -105,7 +105,7 @@ item (FEAT_TRAINS, rw25k) {
}
graphics {
// Menu
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_RW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_HIGH, 384));
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_RW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_HIGH, 384));
can_attach_wagon: locowagon;
cargo_subtype_text: switch_rw25k_cargo_subtype;

Expand Down
6 changes: 3 additions & 3 deletions src/coaches/25k/xl25k.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ switch (FEAT_TRAINS, SELF, switch_xl25k_cargo_subtype, cargo_subtype) {
1: return string(STR_ORIGINAL);
/* 2: string(STR_GAOZU_GREEN); */
2: return string(STR_GMSR);
/* 3: return string(STR_GUANGSHEN); */
3: return string(STR_GUANGSHEN);
return CB_RESULT_NO_TEXT;
}

Expand All @@ -51,7 +51,7 @@ switch (FEAT_TRAINS, SELF, switch_xl25k_graphics_subtype, cargo_subtype) {
1: spriteset_xl25k_original;
/* 2: ; */
2: spriteset_xl25k_gmsr;
/* 3: spriteset_xl25k_guangshen; */
3: spriteset_xl25k_guangshen;
}

switch (FEAT_TRAINS, SELF, switch_xl25k_graphics, position_in_articulated_veh % 3) {
Expand Down Expand Up @@ -104,7 +104,7 @@ item (FEAT_TRAINS, xl25k) {
}
graphics {
// Menu
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_XL25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_FRESHNESS_MEDIUM, 200));
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_XL25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_FRESHNESS_MEDIUM, 200));
can_attach_wagon: locowagon;
cargo_subtype_text: switch_xl25k_cargo_subtype;

Expand Down
6 changes: 3 additions & 3 deletions src/coaches/25k/yw25k.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ switch (FEAT_TRAINS, SELF, switch_yw25k_cargo_subtype, cargo_subtype) {
1: return string(STR_ORIGINAL);
/* 2: string(STR_GAOZU_GREEN); */
2: return string(STR_GMSR);
/* 3: return string(STR_GUANGSHEN); */
3: return string(STR_GUANGSHEN);
return CB_RESULT_NO_TEXT;
}

Expand All @@ -54,7 +54,7 @@ switch (FEAT_TRAINS, SELF, switch_yw25k_graphics_subtype, cargo_subtype) {
1: spriteset_yw25k_original;
/* 2: ; */
2: spriteset_yw25k_gmsr;
/* 3: spriteset_yw25k_guangshen; */
3: spriteset_yw25k_guangshen;
}

switch (FEAT_TRAINS, SELF, switch_yw25k_graphics, position_in_articulated_veh % 3) {
Expand Down Expand Up @@ -109,7 +109,7 @@ item (FEAT_TRAINS, yw25k) {
}
graphics {
// Menu
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_YW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_HIGH, 288));
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_YW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_HIGH, 288));
can_attach_wagon: locowagon;
cargo_subtype_text: switch_yw25k_cargo_subtype;

Expand Down
6 changes: 3 additions & 3 deletions src/coaches/25k/yz25k.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ switch (FEAT_TRAINS, SELF, switch_yz25k_cargo_subtype, cargo_subtype) {
1: return string(STR_ORIGINAL);
/* 2: string(STR_GAOZU_GREEN); */
2: return string(STR_GMSR);
/* 3: return string(STR_GUANGSHEN); */
3: return string(STR_GUANGSHEN);
return CB_RESULT_NO_TEXT;
}

Expand All @@ -50,7 +50,7 @@ switch (FEAT_TRAINS, SELF, switch_yz25k_graphics_subtype, cargo_subtype) {
1: spriteset_yz25k_original;
/* 2: ; */
2: spriteset_yz25k_gmsr;
/* 3: spriteset_yz25k_guangshen; */
3: spriteset_yz25k_guangshen;
}

switch (FEAT_TRAINS, SELF, switch_yz25k_graphics, position_in_articulated_veh % 3) {
Expand Down Expand Up @@ -102,7 +102,7 @@ item (FEAT_TRAINS, yz25k) {
}
graphics {
// Menu
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_YZ25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_LOW, 160));
additional_text: string(STR_DESC_3, string(STR_FULL_NAME_YZ25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_LOW, 160));
can_attach_wagon: locowagon;
cargo_subtype_text: switch_yz25k_cargo_subtype;

Expand Down

0 comments on commit b0077ec

Please sign in to comment.