diff --git a/docs/changelog.txt b/docs/changelog.txt index 5abe56db..564b2d86 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -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 diff --git a/gfx/25-electric/extra/hxd1d-1898.vox b/gfx/25-electric/extra/hxd1d-1898.vox index 1e83852a..6c56d180 100644 Binary files a/gfx/25-electric/extra/hxd1d-1898.vox and b/gfx/25-electric/extra/hxd1d-1898.vox differ diff --git a/gfx/25-electric/extra/hxd3d-1886.vox b/gfx/25-electric/extra/hxd3d-1886.vox index 140b380a..4498880a 100644 Binary files a/gfx/25-electric/extra/hxd3d-1886.vox and b/gfx/25-electric/extra/hxd3d-1886.vox differ diff --git a/gfx/25-electric/extra/hxd3d-1893.vox b/gfx/25-electric/extra/hxd3d-1893.vox index cb30fe9a..ea543766 100644 Binary files a/gfx/25-electric/extra/hxd3d-1893.vox and b/gfx/25-electric/extra/hxd3d-1893.vox differ diff --git a/gfx/25-electric/extra/hxd3d-1921.vox b/gfx/25-electric/extra/hxd3d-1921.vox index 63711891..16cafc6a 100644 Binary files a/gfx/25-electric/extra/hxd3d-1921.vox and b/gfx/25-electric/extra/hxd3d-1921.vox differ diff --git a/src/coaches/25k/ca25k.pnml b/src/coaches/25k/ca25k.pnml index 7989b490..7b6b9596 100644 --- a/src/coaches/25k/ca25k.pnml +++ b/src/coaches/25k/ca25k.pnml @@ -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; } @@ -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) { @@ -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; diff --git a/src/coaches/25k/kd25k.pnml b/src/coaches/25k/kd25k.pnml index 043d4c44..1c7cfc09 100644 --- a/src/coaches/25k/kd25k.pnml +++ b/src/coaches/25k/kd25k.pnml @@ -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) { @@ -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; diff --git a/src/coaches/25k/rw25k.pnml b/src/coaches/25k/rw25k.pnml index 7f6bc9c3..ecf8ea3c 100644 --- a/src/coaches/25k/rw25k.pnml +++ b/src/coaches/25k/rw25k.pnml @@ -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; } @@ -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) { @@ -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; diff --git a/src/coaches/25k/xl25k.pnml b/src/coaches/25k/xl25k.pnml index 26c184b2..6182e79f 100644 --- a/src/coaches/25k/xl25k.pnml +++ b/src/coaches/25k/xl25k.pnml @@ -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; } @@ -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) { @@ -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; diff --git a/src/coaches/25k/yw25k.pnml b/src/coaches/25k/yw25k.pnml index 93f713d4..d45fbdc9 100644 --- a/src/coaches/25k/yw25k.pnml +++ b/src/coaches/25k/yw25k.pnml @@ -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; } @@ -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) { @@ -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; diff --git a/src/coaches/25k/yz25k.pnml b/src/coaches/25k/yz25k.pnml index ecbb0a3d..f9552df9 100644 --- a/src/coaches/25k/yz25k.pnml +++ b/src/coaches/25k/yz25k.pnml @@ -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; } @@ -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) { @@ -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;