250211 Add DF series and CRH liveries

chinasettrains.pnml

@@ -204,10 +204,13 @@
 #include "src/diesel/df4e.pnml"
 #include "src/diesel/df5kz.pnml"
 #include "src/diesel/df5.pnml"
+#include "src/diesel/df7d.pnml"
+#include "src/diesel/df7d3000.pnml"
 #include "src/diesel/df7g.pnml"
 #include "src/diesel/df7g5000.pnml"
 #include "src/diesel/df7g8000.pnml"
 #include "src/diesel/df8b.pnml"
+#include "src/diesel/df9.pnml"
 #include "src/diesel/df11.pnml"
 #include "src/diesel/df11g.pnml"
 #include "src/diesel/df11z.pnml"

docs/contributor.csv

@@ -111,6 +111,8 @@ CHA1A,,Babel,NACHN,
 SS4B,,wuwu,NACHN,
 SS4C,,wuwu,wuwu,
 DFH3,dfh3,wuwu,EMB,
+DF7D,,wuwu,"EMB, wuwu",
+DF9,,wuwu,wuwu,
 C64,,JF,Babel,
 P62,,JF,Babel,
 G60,,JF,Babel,Other Colaor: Sunjuzhensun

docs/str.CSV

@@ -186,10 +186,13 @@ STR_NAME_DF4D7000,DF4D-7000 (Diesel),DF4D-7000 (内燃)
 STR_NAME_DF4E,DF4E (Diesel),DF4E (内燃)
 STR_NAME_DF5KZ,DF5 (Diesel Shunter),DF5 (内燃) (调车用)
 STR_NAME_DF5,DF5-1000 (Diesel Shunter),DF5-1000 (内燃) (调车用)
+STR_NAME_DF7D,DF7D (Diesel),DF7D (内燃)
+STR_NAME_DF7D3000,DF7D-3000 (Diesel),DF7D-3000 (内燃)
 STR_NAME_DF7G,DF7G (Diesel Shunter),DF7G (内燃) (调车用)
 STR_NAME_DF7G5000,DF7G-5000 (Diesel Shunter),DF7G-5000 (内燃) (调车用)
 STR_NAME_DF7G8000,DF7G-8000 (Diesel Shunter),DF7G-8000 (内燃) (调车用)
 STR_NAME_DF8B,DF8B (Diesel),DF8B (内燃)
+STR_NAME_DF9,DF9 (Diesel),DF9 (内燃)
 STR_NAME_DF11,DF11 (Diesel),DF11 (内燃)
 STR_NAME_DF11G,DF11G (Diesel),DF11G (内燃)
 STR_NAME_DF11Z,DF11Z (Diesel),DF11Z (内燃)
@@ -401,10 +404,13 @@ STR_FULL_NAME_DF4DF,{BLACK}FULLNAME: {GOLD}Dongfeng 4DF Diesel Locomotive,{BLACK
 STR_FULL_NAME_DF4E,{BLACK}FULLNAME: {GOLD}Dongfeng 4E Diesel Locomotive,{BLACK}全称：{GOLD}东风4E型内燃机车
 STR_FULL_NAME_DF5KZ,{BLACK}FULLNAME: {GOLD}Dongfeng 5 Diesel Locomotive ,{BLACK}全称：{GOLD}东风5型内燃机车
 STR_FULL_NAME_DF5,{BLACK}FULLNAME: {GOLD}Dongfeng 5 Diesel Locomotive 1000 Series,{BLACK}全称：{GOLD}东风5型内燃机车1000系
+STR_FULL_NAME_DF7D,"{BLACK}FULLNAME: {GOLD}Dongfeng 7D Diesel Locomotive{}{BLACK}Livery Availability: {GOLD}Orange Livery, Green Livery",{BLACK}全称：{GOLD}东风7D型内燃机车{}{BLACK}可选择的涂装：{GOLD}橘色涂装，绿色涂装
+STR_FULL_NAME_DF7D3000,"{BLACK}FULLNAME: {GOLD}Dongfeng 7D Diesel Locomotive 3000 Series{}{BLACK}Livery Availability: {GOLD}Orange Livery, Green Livery, Double Cab Livery",{BLACK}全称：{GOLD}东风7D型内燃机车3000系{}{BLACK}可选择的涂装：{GOLD}橘色涂装，绿色涂装，双司机室
 STR_FULL_NAME_DF7G,{BLACK}FULLNAME: {GOLD}Dongfeng 7G Diesel Locomotive,{BLACK}全称：{GOLD}东风7G型内燃机车
 STR_FULL_NAME_DF7G5000,{BLACK}FULLNAME: {GOLD}Dongfeng 7G Diesel Locomotive 5000 Series,{BLACK}全称：{GOLD}东风7G型内燃机车5000系
 STR_FULL_NAME_DF7G8000,{BLACK}FULLNAME: {GOLD}Dongfeng 7G Diesel Locomotive 8000 Series,{BLACK}全称：{GOLD}东风7G型内燃机车8000系
 STR_FULL_NAME_DF8B,{BLACK}FULLNAME: {GOLD}Dongfeng 8B Diesel Locomotive,{BLACK}全称：{GOLD}东风8B型内燃机车
+STR_FULL_NAME_DF9,"{BLACK}FULLNAME: {GOLD}Dongfeng 9 Diesel Locomotive{}{BLACK}Livery Availability: {GOLD}Blue Livery, Red Livery, Light Blue Livery",{BLACK}全称：{GOLD}东风9型内燃机车{}{BLACK}可选择的涂装：{GOLD}蓝色涂装，红色涂装，浅蓝色涂装
 STR_FULL_NAME_DF11,{BLACK}FULLNAME: {GOLD}Dongfeng 11 Diesel Locomotive,{BLACK}全称：{GOLD}东风11型内燃机车
 STR_FULL_NAME_DF11G,{BLACK}FULLNAME: {BLUE}Dongfeng 11G {WHITE}Diesel Locomotive,{BLACK}全称：{BLUE}东风11G型{WHITE}内燃机车
 STR_FULL_NAME_DF11Z,{BLACK}FULLNAME: {GOLD}Dongfeng 11Z Diesel Locomotive,{BLACK}全称：{GOLD}东风11Z型内燃机车
@@ -452,6 +458,7 @@ STR_SL_SERIES,ShengLi Series (Steam Locomotive),胜利系列 (蒸汽机车)
 STR_DF4_SERIES,DF4 Series (Diesel Locomotive),DF4系列 (内燃机车)
 STR_DF4D_SERIES,DF4D Series (Diesel Locomotive),DF4D系列 (内燃机车)
 STR_DF5_SERIES,DF5 Series (Diesel Locomotive),DF5系列 (内燃机车)
+STR_DF7D_SERIES,DF7D Series (Diesel Locomotive),DF7D系列 (内燃机车)
 STR_DF7G_SERIES,DF7G Series (Diesel Locomotive),DF7G系列 (内燃机车)
 STR_SS4_SERIES,SS4 Series (Electric Locomotive),SS4系列 (电力机车)
 STR_SS6_SERIES,SS6 Series (Electric Locomotive),SS6系列 (电力机车)
@@ -629,7 +636,7 @@ STR_NDJ3_NICKNAME,{BLACK}Nickname: {WHITE}White Pig,{BLACK}昵称：{WHITE}大
 STR_CR200J_NICKNAME,"{BLACK}Nickname: {GREEN}""Hulk"" {GOLD}(Official), {GREEN}""Trash Bin"" {GOLD}(Folk)",{BLACK}昵称：{GREEN}“绿巨人”{GOLD}(官方)，{GREEN}“垃圾桶”{GOLD}(民间)
 STR_CR200JSG_NICKNAME,"{BLACK}Nickname: {GREEN}""Dual-Powerd Bin"" {GOLD}(Folk)",{BLACK}昵称：{GREEN}“双源桶”{GOLD}(民间)
 STR_CR200JC_NICKNAME,"{BLACK}Nickname: {RED}""A{WHITE}D {GREEN}Bin"" {GOLD}(Folk)",{BLACK}昵称：{RED}“A{WHITE}D{GREEN}桶”{GOLD}(民间)
-STR_CRH1A_NICKNAME,{BLACK}Nickname: {GOLD}Metro ,{BLACK}昵称：{GOLD}地铁
+STR_CRH1A_NICKNAME,{BLACK}Nickname: {GOLD}Metro,{BLACK}昵称：{GOLD}地铁
 STR_CRH1B_NICKNAME,{BLACK}Nickname: {GOLD}Long Metro ,{BLACK}昵称：{GOLD}长地铁
 STR_CRH1E_NICKNAME,{BLACK}Nickname: {GOLD}Sleeping Metro ,{BLACK}昵称：{GOLD}睡地铁
 STR_CRH1AA_NICKNAME,{BLACK}Nickname: {GOLD}Cute Metro ,{BLACK}昵称：{GOLD}萌地铁
@@ -726,6 +733,7 @@ STR_SHENHUA,{BLACK} - {GOLD}Shenhua Groups Livery,{BLACK} - {GOLD}神华集团
 STR_GUONENG,{BLACK} - {GOLD}CHN Energy Livery,{BLACK} - {GOLD}国家能源集团涂装
 STR_CHN2LAOS,{BLACK} - {GOLD}China-Laos Railway Livery,{BLACK} - {GOLD}中老铁路涂装
 STR_WUJING,"{BLACK} - {GOLD}""Armed Police""Livery",{BLACK} - {GOLD}“武警”涂装
+STR_DOUBLE_CAB,{BLACK} - {GOLD}Locomotive with Double Cab,{BLACK} - {GOLD}改装为两端司机室
 STR_DFH7,{BLACK} - DFH7,
 STR_DFH7B,{BLACK} - DFH7B,
 STR_HXD_F,{BLACK} - HXD{COMMA}F,

src/25-emu/crh1a.pnml

@@ -33,14 +33,70 @@ spriteset (spriteset_crh1a_cab_c_r, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
     template_reversed ("25-emu", "crh1a-c-c")
 }
 
+spriteset (spriteset_crh1a_front_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu", "crh1a-c-prototype")
+}
+spriteset (spriteset_crh1a_middle_m_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu", "crh1a-m-prototype")
+}
+spriteset (spriteset_crh1a_middle_p_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu", "crh1a-p-prototype")
+}
+spriteset (spriteset_crh1a_middle_p_r_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_reversed ("25-emu", "crh1a-p-prototype")
+}
+spriteset (spriteset_crh1a_cab_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_reversed ("25-emu", "crh1a-c-prototype")
+}
+spriteset (spriteset_crh1a_cab_c_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu", "crh1a-c-c-prototype")
+}
+spriteset (spriteset_crh1a_cab_c_r_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_reversed ("25-emu", "crh1a-c-c-prototype")
+}
+
 switch (FEAT_TRAINS, SELF, switch_crh1a_articulated_part, extra_callback_info1) {
     1..2: return crh1a;
     return CB_RESULT_NO_MORE_ARTICULATED_PARTS;
 }
 
+switch (FEAT_TRAINS, PARENT, switch_crh1a_front, cargo_subtype) {
+    1: spriteset_crh1a_front_prototype;
+    spriteset_crh1a_front;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh1a_middle_p, cargo_subtype) {
+    1: spriteset_crh1a_middle_p_prototype;
+    spriteset_crh1a_middle_p;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh1a_middle_p_r, cargo_subtype) {
+    1: spriteset_crh1a_middle_p_r_prototype;
+    spriteset_crh1a_middle_p_r;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh1a_middle_m, cargo_subtype) {
+    1: spriteset_crh1a_middle_m_prototype;
+    spriteset_crh1a_middle_m;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh1a_cab, cargo_subtype) {
+    1: spriteset_crh1a_cab_prototype;
+    spriteset_crh1a_cab;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh1a_cab_c, cargo_subtype) {
+    1: spriteset_crh1a_cab_c_prototype;
+    spriteset_crh1a_cab_c;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh1a_cab_c_r, cargo_subtype) {
+    1: spriteset_crh1a_cab_c_r_prototype;
+    spriteset_crh1a_cab_c_r;
+}
 
 switch (FEAT_TRAINS, SELF, switch_crh1a_graphics, position_in_articulated_veh % 3) {
-    1: spriteset_crh1a_front;
+    1: switch_crh1a_front;
     empty_sprites;
 }
 
@@ -49,6 +105,12 @@ switch (FEAT_TRAINS, SELF, switch_crh1a_head_capacity, position_in_articulated_v
     return 0;
 }
 
+switch (FEAT_TRAINS, SELF, swtich_crh1a_cargo_subtype, cargo_subtype) {
+    0: return string(STR_LATER);
+    1: return string(STR_EARLIER);
+    return CB_RESULT_NO_TEXT;
+}
+
 //GFX
 
 /* switch (FEAT_TRAINS, SELF, switch_crh1a_short_graphics, (position_in_consist_from_end == position_in_consist) || (position_in_consist_from_end == position_in_consist + 3)) {
@@ -76,29 +138,29 @@ switch (FEAT_TRAINS, SELF, switch_crh1a_cab_graphics, position_in_articulated_ve
     empty_sprites;
 } */
 switch (FEAT_TRAINS, SELF, switch_crh1a_middle_wagon_long_p_back, (position_in_consist_from_end / 3) + 1 == 2 || (position_in_consist_from_end / 3) + 1 - (num_vehs_in_consist / 6) == 2) {
-    1: spriteset_crh1a_middle_p;
-    spriteset_crh1a_middle_m;
+    1: switch_crh1a_middle_p;
+    switch_crh1a_middle_m;
 }
 
 switch (FEAT_TRAINS, SELF, switch_crh1a_middle_wagon_long_p_front, (position_in_consist / 3) + 1 == 2 || (position_in_consist / 3) + 1 - (num_vehs_in_consist / 6) == 2) {
-    1: spriteset_crh1a_middle_p_r;
+    1: switch_crh1a_middle_p_r;
     switch_crh1a_middle_wagon_long_p_back;
 }
 
 switch (FEAT_TRAINS, SELF, switch_crh1a_middle_wagon_long, (position_in_consist / 3) - (num_vehs_in_consist / 6) + 1) {
-    0: spriteset_crh1a_cab_c_r;
-    1: spriteset_crh1a_cab_c;
+    0: switch_crh1a_cab_c_r;
+    1: switch_crh1a_cab_c;
     switch_crh1a_middle_wagon_long_p_front;
 }
 
 
 switch (FEAT_TRAINS, SELF, switch_crh1a_middle_wagon_short_p, (position_in_consist_from_end / 3) + 1) {
-    2: spriteset_crh1a_middle_p;
-    spriteset_crh1a_middle_m;
+    2: switch_crh1a_middle_p;
+    switch_crh1a_middle_m;
 }
 
 switch (FEAT_TRAINS, SELF, switch_crh1a_middle_wagon_short, (position_in_consist / 3) + 1) {
-    2: spriteset_crh1a_middle_p_r;
+    2: switch_crh1a_middle_p_r;
     switch_crh1a_middle_wagon_short_p;
 }
 
@@ -108,7 +170,7 @@ switch (FEAT_TRAINS, SELF, switch_crh1a_graphics_length, num_vehs_in_consist / 3
 }
 
 switch (FEAT_TRAINS, SELF, switch_crh1a_wagon_graphics_cab, position_in_consist_from_end) {
-    1: spriteset_crh1a_cab;
+    1: switch_crh1a_cab;
     switch_crh1a_graphics_length;
 }
 
@@ -117,8 +179,6 @@ switch (FEAT_TRAINS, SELF, switch_crh1a_wagon_graphics, position_in_articulated_
     empty_sprites;
 }
 
-
-
 switch (FEAT_TRAINS, SELF, switch_crh1a_wagon_length, position_in_consist_from_end) {
     switch_length_2_8_2;
 }
@@ -274,9 +334,10 @@ item (FEAT_TRAINS, crh1a) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_5, string(STR_CRH_CAN_ATTACH_WAGON), string(STR_CRH1A_NICKNAME), string(STR_RELDEC_LOW, 12), string(STR_CRH1A_CONSIST), string(STR_CRH1A_HEAD_SEAT));
+        additional_text:                string(STR_DESC_6, string(STR_CRH_CAN_ATTACH_WAGON), string(STR_CRH1A_NICKNAME), string(STR_LV_AVAILABLE_S, string(STR_LIVERY_AVALIABLE), string(STR_LATER), string(STR_EARLIER)), string(STR_RELDEC_LOW, 12), string(STR_CRH1A_CONSIST), string(STR_CRH1A_HEAD_SEAT));
         can_attach_wagon:               crhwagon;
         start_stop:                     mu4to24car;
+        cargo_subtype_text:             swtich_crh1a_cargo_subtype;
         // Graphics
         default:                        switch_crh1a_graphics;
         purchase:                       spriteset_crh1a_purchase_original;

src/25-emu/crh5a.pnml

@@ -33,13 +33,70 @@ spriteset (spriteset_crh5a_cab_c_r, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
     template_standard ("25-emu/crh5a", "crh5a-mc-c")
 }
 
+spriteset (spriteset_crh5a_front_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu/crh5a", "crh5a-mc-prototype")
+}
+spriteset (spriteset_crh5a_middle_m_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu/crh5a", "crh5a-m-prototype")
+}
+spriteset (spriteset_crh5a_middle_tp_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu/crh5a", "crh5a-tp-prototype")
+}
+spriteset (spriteset_crh5a_middle_tp_r_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_reversed ("25-emu/crh5a", "crh5a-tp-prototype")
+}
+spriteset (spriteset_crh5a_cab_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_reversed ("25-emu/crh5a", "crh5a-mc-prototype")
+}
+spriteset (spriteset_crh5a_cab_c_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_reversed ("25-emu/crh5a", "crh5a-mc-c-prototype")
+}
+spriteset (spriteset_crh5a_cab_c_r_prototype, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
+    template_standard ("25-emu/crh5a", "crh5a-mc-c-prototype")
+}
+
 switch (FEAT_TRAINS, SELF, switch_crh5a_articulated_part, extra_callback_info1) {
     1..2: return crh5a;
     return CB_RESULT_NO_MORE_ARTICULATED_PARTS;
 }
 
+switch (FEAT_TRAINS, PARENT, switch_crh5a_front, cargo_subtype) {
+    1: spriteset_crh5a_front_prototype;
+    spriteset_crh5a_front;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh5a_middle_m, cargo_subtype) {
+    1: spriteset_crh5a_middle_m_prototype;
+    spriteset_crh5a_middle_m;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh5a_middle_tp, cargo_subtype) {
+    1: spriteset_crh5a_middle_tp_prototype;
+    spriteset_crh5a_middle_tp;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh5a_middle_tp_r, cargo_subtype) {
+    1: spriteset_crh5a_middle_tp_r_prototype;
+    spriteset_crh5a_middle_tp_r;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh5a_cab, cargo_subtype) {
+    1: spriteset_crh5a_cab_prototype;
+    spriteset_crh5a_cab;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh5a_cab_c, cargo_subtype) {
+    1: spriteset_crh5a_cab_c_prototype;
+    spriteset_crh5a_cab_c;
+}
+
+switch (FEAT_TRAINS, PARENT, switch_crh5a_cab_c_r, cargo_subtype) {
+    1: spriteset_crh5a_cab_c_r_prototype;
+    spriteset_crh5a_cab_c_r;
+}
+
 switch (FEAT_TRAINS, SELF, switch_crh5a_graphics, position_in_articulated_veh % 3) {
-    1: spriteset_crh5a_front;
+    1: switch_crh5a_front;
     empty_sprites;
 }
 
@@ -48,31 +105,34 @@ switch (FEAT_TRAINS, SELF, switch_crh5a_head_capacity, position_in_articulated_v
     return 0;
 }
 
-
-
+switch (FEAT_TRAINS, SELF, swtich_crh5a_cargo_subtype, cargo_subtype) {
+    0: return string(STR_LATER);
+    1: return string(STR_EARLIER);
+    return CB_RESULT_NO_TEXT;
+}
 
 switch (FEAT_TRAINS, SELF, switch_crh5a_middle_graphics_unit_front, (position_in_consist / 3) + 1) {
-    3: spriteset_crh5a_middle_tp;
-    spriteset_crh5a_middle_m;
+    3: switch_crh5a_middle_tp;
+    switch_crh5a_middle_m;
 }
 switch (FEAT_TRAINS, SELF, switch_crh5a_middle_graphics_unit_back, (position_in_consist_from_end / 3) + 1) {
-    3: spriteset_crh5a_middle_tp_r;
-    spriteset_crh5a_middle_m;
+    3: switch_crh5a_middle_tp_r;
+    switch_crh5a_middle_m;
 }
 switch (FEAT_TRAINS, SELF, switch_crh5a_middle_graphics_short, (position_in_consist_from_end / 3) + 1) {
-    3: spriteset_crh5a_middle_tp_r;
+    3: switch_crh5a_middle_tp_r;
     switch_crh5a_middle_graphics_unit_front;
 }
 
 
 
 switch (FEAT_TRAINS, SELF, switch_crh5a_middle_graphics_long, (position_in_consist / 3) + 1 - (num_vehs_in_consist / 6) + 2) {
-    0: spriteset_crh5a_middle_tp_r;
-    1: spriteset_crh5a_middle_m;
-    2: spriteset_crh5a_cab_c;
-    3: spriteset_crh5a_cab_c_r;
-    4: spriteset_crh5a_middle_m;
-    5: spriteset_crh5a_middle_tp;
+    0: switch_crh5a_middle_tp_r;
+    1: switch_crh5a_middle_m;
+    2: switch_crh5a_cab_c;
+    3: switch_crh5a_cab_c_r;
+    4: switch_crh5a_middle_m;
+    5: switch_crh5a_middle_tp;
     6..20: switch_crh5a_middle_graphics_unit_back;
     switch_crh5a_middle_graphics_unit_front;
 }
@@ -83,7 +143,7 @@ switch (FEAT_TRAINS, SELF, switch_crh5a_middle_graphics_length, num_vehs_in_cons
 }
 
 switch (FEAT_TRAINS, SELF, switch_crh5a_cab_graphics, position_in_consist_from_end) {
-    1: spriteset_crh5a_cab;
+    1: switch_crh5a_cab;
     switch_crh5a_middle_graphics_length;
 }
 
@@ -245,9 +305,10 @@ item (FEAT_TRAINS, crh5a) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_5, string(STR_CRH_CAN_ATTACH_WAGON), string(STR_CRH5A_NICKNAME), string(STR_RELDEC_MEDIUM, 16), string(STR_CRH5_CONSIST), string(STR_CRH5_HEAD_SEAT));
+        additional_text:                string(STR_DESC_5, string(STR_CRH_CAN_ATTACH_WAGON), string(STR_CRH5A_NICKNAME), string(STR_LV_AVAILABLE_S, string(STR_LIVERY_AVALIABLE) , string(STR_LATER), string(STR_EARLIER)), string(STR_RELDEC_MEDIUM, 16), string(STR_CRH5_CONSIST), string(STR_CRH5_HEAD_SEAT));
         can_attach_wagon:               crhwagon;
         start_stop:                     mu4to24car;
+        cargo_subtype_text:             swtich_crh5a_cargo_subtype;
         // Graphics
         default:                        switch_crh5a_graphics;
         purchase:                       spriteset_crh5a_purchase_original;