diff --git a/src/PNMLs_usage b/src/PNMLs_usage index 4114a5b11..1eca244e4 100644 --- a/src/PNMLs_usage +++ b/src/PNMLs_usage @@ -1039,7 +1039,7 @@ src/wagons/cargoes8/container/containers.pnml -> (src/wagons/wagons-xussr.pnml), src/wagons/cargoes9/cargoes-flatbed.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) src/wagons/cargoes9/cargoes-gondola.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) src/wagons/cargoes9/cargoes.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) -src/wagons/cargoes9/cargoes7_9/cargoes-gondola.pnml -> (src/electric/electric-xussr.pnml) +src/wagons/cargoes9/cargoes7_9/cargoes-gondola.pnml -> (src/electric/electric-xussr.pnml), (src/xussr.pnml) src/wagons/cargoes9/container/containers.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) src/wagons/flatbeds/13-36-use.pnml -> (src/wagons/wagons-list.pnml) src/wagons/flatbeds/13-401-type1964.pnml -> (src/wagons/wagons-list.pnml) diff --git a/src/diesel/2te3250.pnml b/src/diesel/2te3250.pnml index bbdfa89e1..193988e63 100644 --- a/src/diesel/2te3250.pnml +++ b/src/diesel/2te3250.pnml @@ -42,7 +42,7 @@ item (FEAT_TRAINS, _2te3250, 729) { additional_text: _2te3250_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: _2te3250_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te3250_create_effect_sprites_start; @@ -51,7 +51,7 @@ item (FEAT_TRAINS, _2te3250, 729) { purchase_speed: return 120; running_cost_factor: _2te3250_running_cost_factor; speed: _2te3250_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/2te25a-type2006.pnml b/src/diesel/bryansk/2te25a-type2006.pnml index b12f870ff..414f87f4d 100644 --- a/src/diesel/bryansk/2te25a-type2006.pnml +++ b/src/diesel/bryansk/2te25a-type2006.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te25a_type2006, 280) { additional_text: _2te25a_type2006_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _2te25a_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te25a_type2006_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te25a_type2006, 280) { purchase: _2te25a_type2006_purchase_sprites; running_cost_factor: _2te25a_type2006_running_cost_factor; speed: _2te25a_type2006_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/2te25a-type2010.pnml b/src/diesel/bryansk/2te25a-type2010.pnml index 870928ab5..5f3295a34 100644 --- a/src/diesel/bryansk/2te25a-type2010.pnml +++ b/src/diesel/bryansk/2te25a-type2010.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, _2te25a_type2010, 1080) { additional_text: _2te25a_type2010_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _2te25a_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te25a_type2010_create_effect_sprites_start; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _2te25a_type2010, 1080) { purchase: _2te25a_type2010_purchase_sprites; running_cost_factor: _2te25a_type2010_running_cost_factor; speed: _2te25a_type2010_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/2te25km.pnml b/src/diesel/bryansk/2te25km.pnml index 92d89c10a..d501f0099 100644 --- a/src/diesel/bryansk/2te25km.pnml +++ b/src/diesel/bryansk/2te25km.pnml @@ -89,7 +89,7 @@ item (FEAT_TRAINS, _2te25km, 484) { additional_text: _2te25km_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _2te25km_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te25km_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -99,7 +99,7 @@ item (FEAT_TRAINS, _2te25km, 484) { purchase: _2te25km_purchase_sprites; running_cost_factor: _2te25km_running_cost_factor; speed: _2te25km_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/3te25k2m.pnml b/src/diesel/bryansk/3te25k2m.pnml index 4b209f764..171a22ce1 100644 --- a/src/diesel/bryansk/3te25k2m.pnml +++ b/src/diesel/bryansk/3te25k2m.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _3te25k2m, 669) { additional_text: _3te25k2m_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _3te25k2m_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _3te25k2m_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _3te25k2m, 669) { purchase: _3te25k2m_purchase_sprites; running_cost_factor: _3te25k2m_running_cost_factor; speed: _3te25k2m_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/3te25k2m_m.pnml b/src/diesel/bryansk/3te25k2m_m.pnml index 094e16f00..8b16b1c3a 100644 --- a/src/diesel/bryansk/3te25k2m_m.pnml +++ b/src/diesel/bryansk/3te25k2m_m.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, _3te25k2m_m, 670) { additional_text: _3te25k2m_m_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _3te25k2m_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_3te25k2m_m_CC; colour_mapping: any_cc_colour; create_effect: _3te25k2m_m_create_effect_sprites_start; diff --git a/src/diesel/bryansk/3te28.pnml b/src/diesel/bryansk/3te28.pnml index 5f9089eaa..b3b6db485 100644 --- a/src/diesel/bryansk/3te28.pnml +++ b/src/diesel/bryansk/3te28.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _3te28, 860) { additional_text: _3te28_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _3te28_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _3te28_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _3te28, 860) { purchase: _3te28_purchase_sprites; running_cost_factor: _3te28_running_cost_factor; speed: _3te28_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/3te28_m.pnml b/src/diesel/bryansk/3te28_m.pnml index c9ac2c67c..afeda854b 100644 --- a/src/diesel/bryansk/3te28_m.pnml +++ b/src/diesel/bryansk/3te28_m.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, _3te28_m, 861) { additional_text: _3te28_m_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _3te28_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_3te28_m_CC; colour_mapping: any_cc_colour; create_effect: _3te28_m_create_effect_sprites_start; diff --git a/src/diesel/bryansk/tem1-pre.pnml b/src/diesel/bryansk/tem1-pre.pnml index d3fa52a5a..2578321bc 100644 --- a/src/diesel/bryansk/tem1-pre.pnml +++ b/src/diesel/bryansk/tem1-pre.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tem1_pre, 344) { additional_text: tem1_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem1_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem1_pre_CC; colour_mapping: any_cc_colour; create_effect: tem1_pre_create_effect_sprites_start_sp; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tem1_pre, 344) { purchase: tem1_pre_purchase_sprites; running_cost_factor: tem1_pre_running_cost_factor; speed: tem1_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem1-type1959.pnml b/src/diesel/bryansk/tem1-type1959.pnml index 8c5e0bacc..f11d34064 100644 --- a/src/diesel/bryansk/tem1-type1959.pnml +++ b/src/diesel/bryansk/tem1-type1959.pnml @@ -69,7 +69,7 @@ item (FEAT_TRAINS, tem1_type1959, 1082) { additional_text: tem1_type1959_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem1_type1959_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem1_type1959_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -80,7 +80,7 @@ item (FEAT_TRAINS, tem1_type1959, 1082) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem1_type1959_running_cost_factor; speed: tem1_type1959_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem1-type1960.pnml b/src/diesel/bryansk/tem1-type1960.pnml index a824c79dd..30cbf7618 100644 --- a/src/diesel/bryansk/tem1-type1960.pnml +++ b/src/diesel/bryansk/tem1-type1960.pnml @@ -69,7 +69,7 @@ item (FEAT_TRAINS, tem1_type1960, 705) { additional_text: tem1_type1960_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem1_type1960_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem1_type1960_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -80,7 +80,7 @@ item (FEAT_TRAINS, tem1_type1960, 705) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem1_type1960_running_cost_factor; speed: tem1_type1960_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem1-type1964_use.pnml b/src/diesel/bryansk/tem1-type1964_use.pnml index 8c5d49364..02e2b8cfa 100644 --- a/src/diesel/bryansk/tem1-type1964_use.pnml +++ b/src/diesel/bryansk/tem1-type1964_use.pnml @@ -60,7 +60,7 @@ item (FEAT_TRAINS, tem1_type1964, 1083) { additional_text: tem1_type1964_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem1_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem1_type1964_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -71,7 +71,7 @@ item (FEAT_TRAINS, tem1_type1964, 1083) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem1_type1964_running_cost_factor; speed: tem1_type1964_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem18.pnml b/src/diesel/bryansk/tem18.pnml index efadb9ebd..72c3d1788 100644 --- a/src/diesel/bryansk/tem18.pnml +++ b/src/diesel/bryansk/tem18.pnml @@ -79,7 +79,7 @@ item (FEAT_TRAINS, tem18, 348) { additional_text: tem18_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem18_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem18_CC; cargo_subtype_text: tem18_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -89,7 +89,7 @@ item (FEAT_TRAINS, tem18, 348) { purchase: tem18_purchase_sprites; running_cost_factor: tem18_running_cost_factor; speed: tem18_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem18dm.pnml b/src/diesel/bryansk/tem18dm.pnml index a4499c8fe..51bfa9fc1 100644 --- a/src/diesel/bryansk/tem18dm.pnml +++ b/src/diesel/bryansk/tem18dm.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, tem18dm, 517) { additional_text: tem18dm_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem18dm_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tem18dm_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -90,7 +90,7 @@ item (FEAT_TRAINS, tem18dm, 517) { purchase: tem18dm_purchase_sprites; running_cost_factor: tem18dm_running_cost_factor; speed: tem18dm_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem2-pre_use.pnml b/src/diesel/bryansk/tem2-pre_use.pnml index c2897bfc8..23fd61235 100644 --- a/src/diesel/bryansk/tem2-pre_use.pnml +++ b/src/diesel/bryansk/tem2-pre_use.pnml @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tem2_pre, 341) { additional_text: tem2_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem2_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem2_pre_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, tem2_pre, 341) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem2_pre_running_cost_factor; speed: tem2_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem2-type1967.pnml b/src/diesel/bryansk/tem2-type1967.pnml index a4c1e86ae..0ce3492c0 100644 --- a/src/diesel/bryansk/tem2-type1967.pnml +++ b/src/diesel/bryansk/tem2-type1967.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tem2_type1967, 1085) { additional_text: tem2_type1967_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem2_type1967_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem2_type1967_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -70,7 +70,7 @@ item (FEAT_TRAINS, tem2_type1967, 1085) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem2_type1967_running_cost_factor; speed: tem2_type1967_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem2-type1971.pnml b/src/diesel/bryansk/tem2-type1971.pnml index 32721a60a..389ed02c4 100644 --- a/src/diesel/bryansk/tem2-type1971.pnml +++ b/src/diesel/bryansk/tem2-type1971.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tem2_type1971, 1086) { additional_text: tem2_type1971_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem2_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -70,7 +70,7 @@ item (FEAT_TRAINS, tem2_type1971, 1086) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem2_type1971_running_cost_factor; speed: tem2_type1971_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem2-type1974_use.pnml b/src/diesel/bryansk/tem2-type1974_use.pnml index ff268ddf5..66a2773c8 100644 --- a/src/diesel/bryansk/tem2-type1974_use.pnml +++ b/src/diesel/bryansk/tem2-type1974_use.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, tem2_type1974, 1087) { additional_text: tem2_type1974_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem2_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem2_type1974_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, tem2_type1974, 1087) { purchase_colour_mapping: return shunting_cc + 3; running_cost_factor: tem2_type1974_running_cost_factor; speed: tem2_type1974_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem2u.pnml b/src/diesel/bryansk/tem2u.pnml index d5c1568ac..8c0d1d4de 100644 --- a/src/diesel/bryansk/tem2u.pnml +++ b/src/diesel/bryansk/tem2u.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, tem2u, 342) { additional_text: tem2u_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem2u_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem2u_CC; cargo_subtype_text: tem2u_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -87,7 +87,7 @@ item (FEAT_TRAINS, tem2u, 342) { purchase: tem2u_purchase_sprites; running_cost_factor: tem2u_running_cost_factor; speed: tem2u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/bryansk/tem2um_use.pnml b/src/diesel/bryansk/tem2um_use.pnml index b6ab6ea68..ca7d1416b 100644 --- a/src/diesel/bryansk/tem2um_use.pnml +++ b/src/diesel/bryansk/tem2um_use.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, tem2um, 343) { additional_text: tem2um_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem2um_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem2um_CC; cargo_subtype_text: tem2u_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, tem2um, 343) { purchase: tem2u_purchase_sprites; running_cost_factor: tem2um_running_cost_factor; speed: tem2um_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/chme3.pnml b/src/diesel/chme3.pnml index 7ecef484d..442501717 100644 --- a/src/diesel/chme3.pnml +++ b/src/diesel/chme3.pnml @@ -144,7 +144,7 @@ item (FEAT_TRAINS, chme3, 202) { additional_text: chme3_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: chme3_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_chme3_CC; cargo_subtype_text: chme3_cargo_subtype_text; colour_mapping: chme3_colour_mapping; @@ -154,7 +154,7 @@ item (FEAT_TRAINS, chme3, 202) { purchase: chme3_purchase_sprites; running_cost_factor: chme3_running_cost_factor; speed: chme3_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/chme3t.pnml b/src/diesel/chme3t.pnml index 686900d99..b0946078f 100644 --- a/src/diesel/chme3t.pnml +++ b/src/diesel/chme3t.pnml @@ -97,7 +97,7 @@ item (FEAT_TRAINS, chme3t, 624) { additional_text: chme3t_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: chme3t_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_chme3t_CC; cargo_subtype_text: chme3_cargo_subtype_text; colour_mapping: chme3_colour_mapping; @@ -107,7 +107,7 @@ item (FEAT_TRAINS, chme3t, 624) { purchase: chme3t_purchase_sprites; running_cost_factor: chme3t_running_cost_factor; speed: chme3t_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/da.pnml b/src/diesel/da.pnml index e4e44d2d0..a0b5d1e53 100644 --- a/src/diesel/da.pnml +++ b/src/diesel/da.pnml @@ -69,7 +69,7 @@ item (FEAT_TRAINS, diesel_da, 144) { additional_text: diesel_da_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: diesel_da_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: diesel_da_cargo_subtype_text; colour_mapping: diesel_da_colour_mapping; @@ -80,7 +80,7 @@ item (FEAT_TRAINS, diesel_da, 144) { purchase_speed: return 96; running_cost_factor: diesel_da_running_cost_factor; speed: diesel_da_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/db.pnml b/src/diesel/db.pnml index e966c6db8..d8fc5559e 100644 --- a/src/diesel/db.pnml +++ b/src/diesel/db.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, diesel_db, 722) { additional_text: diesel_db_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: diesel_db_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: diesel_db_cargo_subtype_text; colour_mapping: diesel_db_colour_mapping; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, diesel_db, 722) { purchase_speed: return 96; running_cost_factor: diesel_db_running_cost_factor; speed: diesel_db_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/diesel-middle-units.pnml b/src/diesel/diesel-middle-units.pnml index f191fc68d..f9bfa3732 100644 --- a/src/diesel/diesel-middle-units.pnml +++ b/src/diesel/diesel-middle-units.pnml @@ -9,37 +9,37 @@ // некорректные составы (собранные из разных сетов) -switch (FEAT_TRAINS, PARENT, wrong_consist_start_stop, +switch (FEAT_TRAINS, PARENT, wrong_consist_start_stop_diesel, is_wrong_consist()) { 1: return string(STR_START_STOP_WRONG_CONSIST); return CB_RESULT_NO_TEXT; } -switch (FEAT_TRAINS, PARENT, any_start_stop_mid, +switch (FEAT_TRAINS, PARENT, any_start_stop_mid_diesel, [ set_offset_to(num_vehs_in_consist-2), all_mid_section_diesel()]) { 1: return string(STR_START_STOP_MIDDLE_MUST_NOT_BE_LAST); - wrong_consist_start_stop; + wrong_consist_start_stop_diesel; } // некорректные грузы -switch (FEAT_TRAINS, PARENT, any_start_stop, +switch (FEAT_TRAINS, PARENT, any_start_stop_diesel, has_inadmissible_cargo()) { 1: return string(STR_START_STOP_INADMISSIBLE_CARGO); - return any_start_stop_mid; + return any_start_stop_mid_diesel; } -switch (FEAT_TRAINS, SELF, any_start_stop_with_lines_only, +switch (FEAT_TRAINS, SELF, any_start_stop_diesel_with_lines_only, (cargo_subtype >= 0xE0) && (current_year >= GREAT_CHANGE_YEAR) && (position_in_consist == 0)) { 1: return string(STR_START_STOP_RED_LINES_REQUIRED); - any_start_stop; + any_start_stop_diesel; } // Специальная проверка для управления присоединением 3ТЭ10М, 3ТЭ10У, 4ТЭ10С, 3М62У и других со средней секцией @@ -52,7 +52,7 @@ switch (FEAT_TRAINS, PARENT, _4te10s_buster_required, return string(STR_CAN_ATTACH_MISS_MIDDLE_UNIT); } -switch (FEAT_TRAINS, PARENT, other_can_attach_wagon, +switch (FEAT_TRAINS, PARENT, other_can_attach_wagon_diesel, [ set_offset_to(num_vehs_in_consist-2), ( all_mid_section_diesel() + ((prev_vehicle_type_id() == _4te10s) * 2)) ]) @@ -204,7 +204,7 @@ switch (FEAT_TRAINS, PARENT, m_3te28_can_attach_wagon_h, // choose the block to use -switch (FEAT_TRAINS, SELF, any_can_attach_wagon, +switch (FEAT_TRAINS, SELF, any_can_attach_wagon_diesel, [ STORE_TEMP(vehicle_type_id, 5), vehicle_type_id]) { @@ -232,5 +232,5 @@ switch (FEAT_TRAINS, SELF, any_can_attach_wagon, _3te28: m_3te28_can_attach_wagon_h; _3te28_m: m_3te28_can_attach_wagon_m; - other_can_attach_wagon; + other_can_attach_wagon_diesel; } diff --git a/src/diesel/eel2.pnml b/src/diesel/eel2.pnml index a50934d13..73d482bc5 100644 --- a/src/diesel/eel2.pnml +++ b/src/diesel/eel2.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, eel2, 719) { additional_text: eel2_additional_text; articulated_part: eel2_articulated_part; bitmask_vehicle_info: eel2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: eel2_cargo_subtype_text; colour_mapping: eel2_colour_mapping; @@ -91,7 +91,7 @@ item (FEAT_TRAINS, eel2, 719) { purchase_speed: return 45; running_cost_factor: eel2_running_cost_factor; speed: eel2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/2te10.pnml b/src/diesel/kharkiv/2te10.pnml index d6599fc12..c020fed57 100644 --- a/src/diesel/kharkiv/2te10.pnml +++ b/src/diesel/kharkiv/2te10.pnml @@ -133,7 +133,7 @@ item (FEAT_TRAINS, _2te10, 149) { additional_text: _2te10_additional_text; articulated_part: _2te10_articulated_part; bitmask_vehicle_info: _2te10_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -143,7 +143,7 @@ item (FEAT_TRAINS, _2te10, 149) { purchase: _2te10_purchase_sprites; running_cost_factor: _2te10_running_cost_factor; speed: _2te10_speed; - start_stop: any_start_stop_with_lines_only; + start_stop: any_start_stop_diesel_with_lines_only; } } diff --git a/src/diesel/kharkiv/2te40.pnml b/src/diesel/kharkiv/2te40.pnml index dcfcd6e7b..85d9711fe 100644 --- a/src/diesel/kharkiv/2te40.pnml +++ b/src/diesel/kharkiv/2te40.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, _2te40, 645) { additional_text: _2te40_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te40_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te40_create_effect_sprites_start; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, _2te40, 645) { purchase_speed: return 100; running_cost_factor: _2te40_running_cost_factor; speed: _2te40_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te10.pnml b/src/diesel/kharkiv/te10.pnml index 5e4b17746..ed37ccd22 100644 --- a/src/diesel/kharkiv/te10.pnml +++ b/src/diesel/kharkiv/te10.pnml @@ -107,7 +107,7 @@ item (FEAT_TRAINS, te10, 147) { additional_text: te10_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: te10_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te10_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -117,7 +117,7 @@ item (FEAT_TRAINS, te10, 147) { purchase: te10_purchase_sprites; running_cost_factor: te10_running_cost_factor; speed: te10_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te1_use.pnml b/src/diesel/kharkiv/te1_use.pnml index d07810908..c76cef7a0 100644 --- a/src/diesel/kharkiv/te1_use.pnml +++ b/src/diesel/kharkiv/te1_use.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, te1, 145) { additional_text: te1_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te1_cargo_subtype_text; colour_mapping: te1_colour_mapping; @@ -91,7 +91,7 @@ item (FEAT_TRAINS, te1, 145) { purchase_speed: return 93; running_cost_factor: te1_running_cost_factor; speed: te1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te2-pre.pnml b/src/diesel/kharkiv/te2-pre.pnml index faefc62d6..2ca53cdf1 100644 --- a/src/diesel/kharkiv/te2-pre.pnml +++ b/src/diesel/kharkiv/te2-pre.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, te2_pre, 1009) { additional_text: te2_pre_additional_text; articulated_part: te2_pre_articulated_part; bitmask_vehicle_info: te2_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: te2_pre_create_effect_sprites_start; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, te2_pre, 1009) { purchase: te2_pre_purchase_sprites; running_cost_factor: te2_pre_running_cost_factor; speed: te2_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te2-type1950.pnml b/src/diesel/kharkiv/te2-type1950.pnml index c52b02761..a4c3af974 100644 --- a/src/diesel/kharkiv/te2-type1950.pnml +++ b/src/diesel/kharkiv/te2-type1950.pnml @@ -121,7 +121,7 @@ item (FEAT_TRAINS, te2_type1950, 146) { additional_text: te2_type1950_additional_text; articulated_part: te2_type1950_articulated_part; bitmask_vehicle_info: te2_type1950_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te2_type1950_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -131,7 +131,7 @@ item (FEAT_TRAINS, te2_type1950, 146) { purchase: te2_type1950_purchase_sprites; running_cost_factor: te2_type1950_running_cost_factor; speed: te2_type1950_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te3-pre.pnml b/src/diesel/kharkiv/te3-pre.pnml index 2b49fe274..fd47f0270 100644 --- a/src/diesel/kharkiv/te3-pre.pnml +++ b/src/diesel/kharkiv/te3-pre.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, te3_pre, 1012) { additional_text: te3_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: te3_pre_create_effect_sprites_start; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, te3_pre, 1012) { purchase: te3_pre_purchase_sprites; running_cost_factor: te3_pre_running_cost_factor; speed: te3_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te3-type1955_use.pnml b/src/diesel/kharkiv/te3-type1955_use.pnml index 37493ce2a..451bcfced 100644 --- a/src/diesel/kharkiv/te3-type1955_use.pnml +++ b/src/diesel/kharkiv/te3-type1955_use.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, te3_type1955, 1013) { additional_text: te3_type1955_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1956_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1956_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, te3_type1955, 1013) { purchase: te3_type1955_purchase_sprites; running_cost_factor: te3_type1955_running_cost_factor; speed: te3_type1955_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te3-type1956.pnml b/src/diesel/kharkiv/te3-type1956.pnml index 1ca39cc64..d01efe903 100644 --- a/src/diesel/kharkiv/te3-type1956.pnml +++ b/src/diesel/kharkiv/te3-type1956.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, te3_type1956, 1014) { additional_text: te3_type1956_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1956_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1956_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -90,7 +90,7 @@ item (FEAT_TRAINS, te3_type1956, 1014) { purchase: te3_type1956_purchase_sprites; running_cost_factor: te3_type1956_running_cost_factor; speed: te3_type1956_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te3-type1957.pnml b/src/diesel/kharkiv/te3-type1957.pnml index 5130f7639..e25680eb2 100644 --- a/src/diesel/kharkiv/te3-type1957.pnml +++ b/src/diesel/kharkiv/te3-type1957.pnml @@ -87,7 +87,7 @@ item (FEAT_TRAINS, te3_type1957, 1015) { additional_text: te3_type1957_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1957_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1957_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -97,7 +97,7 @@ item (FEAT_TRAINS, te3_type1957, 1015) { purchase: te3_type1957_purchase_sprites; running_cost_factor: te3_type1957_running_cost_factor; speed: te3_type1957_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te7-pre.pnml b/src/diesel/kharkiv/te7-pre.pnml index a907ed928..941ed60d8 100644 --- a/src/diesel/kharkiv/te7-pre.pnml +++ b/src/diesel/kharkiv/te7-pre.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, te7_pre, 1006) { additional_text: te7_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te7_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: te7_pre_create_effect_sprites_start; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, te7_pre, 1006) { purchase: te7_pre_purchase_sprites; running_cost_factor: te7_pre_running_cost_factor; speed: te7_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/te7-type1960.pnml b/src/diesel/kharkiv/te7-type1960.pnml index 980b84a30..a28628b2c 100644 --- a/src/diesel/kharkiv/te7-type1960.pnml +++ b/src/diesel/kharkiv/te7-type1960.pnml @@ -87,7 +87,7 @@ item (FEAT_TRAINS, te7_type1960, 418) { additional_text: te7_type1960_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te7_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te7_type1960_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -97,7 +97,7 @@ item (FEAT_TRAINS, te7_type1960, 418) { purchase: te7_type1960_purchase_sprites; running_cost_factor: te7_type1960_running_cost_factor; speed: te7_type1960_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kharkiv/tep10-type1960.pnml b/src/diesel/kharkiv/tep10-type1960.pnml index 5a0843141..bff91bf7a 100644 --- a/src/diesel/kharkiv/tep10-type1960.pnml +++ b/src/diesel/kharkiv/tep10-type1960.pnml @@ -92,7 +92,7 @@ item (FEAT_TRAINS, tep10_type1960, 150) { additional_text: tep10_type1960_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep10_type1960_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep10_type1960_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -103,7 +103,7 @@ item (FEAT_TRAINS, tep10_type1960, 150) { purchase_speed: return 140; running_cost_factor: tep10_type1960_running_cost_factor; speed: tep10_type1960_speed; - start_stop: any_start_stop_with_lines_only; + start_stop: any_start_stop_diesel_with_lines_only; } } diff --git a/src/diesel/kharkiv/tep10-type1964_use.pnml b/src/diesel/kharkiv/tep10-type1964_use.pnml index 926e28cc2..9f3b46793 100644 --- a/src/diesel/kharkiv/tep10-type1964_use.pnml +++ b/src/diesel/kharkiv/tep10-type1964_use.pnml @@ -37,7 +37,7 @@ item (FEAT_TRAINS, tep10_type1964, 1054) { additional_text: tep10_type1964_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep10_type1960_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep10_type1960_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -48,7 +48,7 @@ item (FEAT_TRAINS, tep10_type1964, 1054) { purchase_speed: return 140; running_cost_factor: tep10_type1964_running_cost_factor; speed: tep10_type1964_speed; - start_stop: any_start_stop_with_lines_only; + start_stop: any_start_stop_diesel_with_lines_only; } } diff --git a/src/diesel/kolomna/2te70.pnml b/src/diesel/kolomna/2te70.pnml index 0ab9b4866..fd9a82912 100644 --- a/src/diesel/kolomna/2te70.pnml +++ b/src/diesel/kolomna/2te70.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, _2te70, 176) { additional_text: _2te70_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: _2te70_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te70_create_effect_sprites_start; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, _2te70, 176) { purchase_speed: return 110; running_cost_factor: _2te70_running_cost_factor; speed: _2te70_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/2tep60-pre.pnml b/src/diesel/kolomna/2tep60-pre.pnml index ded6909f9..24430e109 100644 --- a/src/diesel/kolomna/2tep60-pre.pnml +++ b/src/diesel/kolomna/2tep60-pre.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, _2tep60_pre, 1029) { additional_text: _2tep60_pre_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2tep60_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2tep60_pre_create_effect_sprites_start; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, _2tep60_pre, 1029) { purchase_speed: return 160; running_cost_factor: _2tep60_pre_running_cost_factor; speed: _2tep60_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/2tep60-type1966.pnml b/src/diesel/kolomna/2tep60-type1966.pnml index 97f4b1440..4c4f109ae 100644 --- a/src/diesel/kolomna/2tep60-type1966.pnml +++ b/src/diesel/kolomna/2tep60-type1966.pnml @@ -46,7 +46,7 @@ item (FEAT_TRAINS, _2tep60_type1966, 1030) { additional_text: _2tep60_type1966_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2tep60_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2tep60_type1966_create_effect_sprites_start; @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2tep60_type1966, 1030) { purchase_speed: return 160; running_cost_factor: _2tep60_type1966_running_cost_factor; speed: _2tep60_type1966_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/2tep60-type1968.pnml b/src/diesel/kolomna/2tep60-type1968.pnml index f1ae83412..6298726ea 100644 --- a/src/diesel/kolomna/2tep60-type1968.pnml +++ b/src/diesel/kolomna/2tep60-type1968.pnml @@ -93,7 +93,7 @@ item (FEAT_TRAINS, _2tep60_type1968, 152) { additional_text: _2tep60_type1968_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2tep60_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2tep60_type1968_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -103,7 +103,7 @@ item (FEAT_TRAINS, _2tep60_type1968, 152) { purchase: _2tep60_type1968_purchase_sprites; running_cost_factor: _2tep60_type1968_running_cost_factor; speed: _2tep60_type1968_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/eel.pnml b/src/diesel/kolomna/eel.pnml index 39f27dc90..df36dbda2 100644 --- a/src/diesel/kolomna/eel.pnml +++ b/src/diesel/kolomna/eel.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, eel, 361) { additional_text: eel_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: eel_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: eel_create_effect_sprites_start; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, eel, 361) { purchase_speed: return 55; running_cost_factor: eel_running_cost_factor; speed: eel_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/g1.pnml b/src/diesel/kolomna/g1.pnml index be30b4c52..433d4cfcd 100644 --- a/src/diesel/kolomna/g1.pnml +++ b/src/diesel/kolomna/g1.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, g1, 1055) { additional_text: g1_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: g1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: g1_create_effect_sprites_start; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, g1, 1055) { purchase_speed: return 100; running_cost_factor: g1_running_cost_factor; speed: g1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/gp1.pnml b/src/diesel/kolomna/gp1.pnml index bd5763d39..4165c867b 100644 --- a/src/diesel/kolomna/gp1.pnml +++ b/src/diesel/kolomna/gp1.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, gp1, 1093) { additional_text: gp1_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: gp1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: gp1_create_effect_sprites_start; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, gp1, 1093) { purchase_speed: return 160; running_cost_factor: gp1_running_cost_factor; speed: gp1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/te3-kz-type1956_use.pnml b/src/diesel/kolomna/te3-kz-type1956_use.pnml index e1cb50e58..24795894a 100644 --- a/src/diesel/kolomna/te3-kz-type1956_use.pnml +++ b/src/diesel/kolomna/te3-kz-type1956_use.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, te3_kz_type1956, 1017) { additional_text: te3_kz_type1956_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1956_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1956_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, te3_kz_type1956, 1017) { purchase: te3_kz_type1956_purchase_sprites; running_cost_factor: te3_kz_type1956_running_cost_factor; speed: te3_kz_type1956_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/te3-kz-type1957_use.pnml b/src/diesel/kolomna/te3-kz-type1957_use.pnml index fafc9b0ab..a50ee7f68 100644 --- a/src/diesel/kolomna/te3-kz-type1957_use.pnml +++ b/src/diesel/kolomna/te3-kz-type1957_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, te3_kz_type1957, 1018) { additional_text: te3_kz_type1957_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1957_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1957_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, te3_kz_type1957, 1018) { purchase: te3_kz_type1957_purchase_sprites; running_cost_factor: te3_kz_type1957_running_cost_factor; speed: te3_kz_type1957_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/te50.pnml b/src/diesel/kolomna/te50.pnml index 9b9a74ae4..d7d42c7c7 100644 --- a/src/diesel/kolomna/te50.pnml +++ b/src/diesel/kolomna/te50.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, te50, 646) { additional_text: te50_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: te50_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_te50_CC; create_effect: te50_create_effect_sprites_start_sp; default: te50_sprites; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, te50, 646) { purchase: te50_purchase_sprites; running_cost_factor: te50_running_cost_factor; speed: te50_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-pre.pnml b/src/diesel/kolomna/tep60-pre.pnml index 75f364fbc..6037580f0 100644 --- a/src/diesel/kolomna/tep60-pre.pnml +++ b/src/diesel/kolomna/tep60-pre.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tep60_pre, 1023) { additional_text: tep60_pre_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tep60_pre_create_effect_sprites_start_sp; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, tep60_pre, 1023) { purchase: tep60_pre_purchase_sprites; running_cost_factor: tep60_pre_running_cost_factor; speed: tep60_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-type1961.pnml b/src/diesel/kolomna/tep60-type1961.pnml index dc7c2d643..5eafb60ce 100644 --- a/src/diesel/kolomna/tep60-type1961.pnml +++ b/src/diesel/kolomna/tep60-type1961.pnml @@ -95,7 +95,7 @@ item (FEAT_TRAINS, tep60_type1961, 151) { additional_text: tep60_type1961_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep60_type1961_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -105,7 +105,7 @@ item (FEAT_TRAINS, tep60_type1961, 151) { purchase: tep60_type1961_purchase_sprites; running_cost_factor: tep60_type1961_running_cost_factor; speed: tep60_type1961_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-type1963_use.pnml b/src/diesel/kolomna/tep60-type1963_use.pnml index a2ca425e1..e7e1a5972 100644 --- a/src/diesel/kolomna/tep60-type1963_use.pnml +++ b/src/diesel/kolomna/tep60-type1963_use.pnml @@ -86,7 +86,7 @@ item (FEAT_TRAINS, tep60_type1963, 1025) { additional_text: tep60_type1963_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep60_type1963_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -96,7 +96,7 @@ item (FEAT_TRAINS, tep60_type1963, 1025) { purchase: tep60_type1963_purchase_sprites; running_cost_factor: tep60_type1963_running_cost_factor; speed: tep60_type1963_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-type1964.pnml b/src/diesel/kolomna/tep60-type1964.pnml index c8ad90942..990e6bce3 100644 --- a/src/diesel/kolomna/tep60-type1964.pnml +++ b/src/diesel/kolomna/tep60-type1964.pnml @@ -102,7 +102,7 @@ item (FEAT_TRAINS, tep60_type1964, 1024) { additional_text: tep60_type1964_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep60_type1964_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -112,7 +112,7 @@ item (FEAT_TRAINS, tep60_type1964, 1024) { purchase: tep60_type1964_purchase_sprites; running_cost_factor: tep60_type1964_running_cost_factor; speed: tep60_type1964_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-type1965_use.pnml b/src/diesel/kolomna/tep60-type1965_use.pnml index fb20d5ac9..fc5c471e5 100644 --- a/src/diesel/kolomna/tep60-type1965_use.pnml +++ b/src/diesel/kolomna/tep60-type1965_use.pnml @@ -83,7 +83,7 @@ item (FEAT_TRAINS, tep60_type1965, 1026) { additional_text: tep60_type1965_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep60_type1965_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -93,7 +93,7 @@ item (FEAT_TRAINS, tep60_type1965, 1026) { purchase: tep60_type1965_purchase_sprites; running_cost_factor: tep60_type1965_running_cost_factor; speed: tep60_type1965_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-type1966_use.pnml b/src/diesel/kolomna/tep60-type1966_use.pnml index 5a92b7d6c..af9926b6c 100644 --- a/src/diesel/kolomna/tep60-type1966_use.pnml +++ b/src/diesel/kolomna/tep60-type1966_use.pnml @@ -79,7 +79,7 @@ item (FEAT_TRAINS, tep60_type1966, 1027) { additional_text: tep60_type1966_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep60_type1966_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -89,7 +89,7 @@ item (FEAT_TRAINS, tep60_type1966, 1027) { purchase: tep60_type1966_purchase_sprites; running_cost_factor: tep60_type1966_running_cost_factor; speed: tep60_type1966_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep60-type1967_use.pnml b/src/diesel/kolomna/tep60-type1967_use.pnml index 63ab62de4..e30fc2db1 100644 --- a/src/diesel/kolomna/tep60-type1967_use.pnml +++ b/src/diesel/kolomna/tep60-type1967_use.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, tep60_type1967, 1028) { additional_text: tep60_type1967_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: tep60_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep60_type1967_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, tep60_type1967, 1028) { purchase: tep60_type1967_purchase_sprites; running_cost_factor: tep60_type1967_running_cost_factor; speed: tep60_type1967_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep70-pre.pnml b/src/diesel/kolomna/tep70-pre.pnml index 8dfe8cf0f..294554a00 100644 --- a/src/diesel/kolomna/tep70-pre.pnml +++ b/src/diesel/kolomna/tep70-pre.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, tep70_pre, 1033) { additional_text: tep70_pre_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tep70_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tep70_pre_create_effect_sprites_start_sp; @@ -70,7 +70,7 @@ item (FEAT_TRAINS, tep70_pre, 1033) { purchase: tep70_pre_purchase_sprites; running_cost_factor: tep70_pre_running_cost_factor; speed: tep70_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep70-type1978.pnml b/src/diesel/kolomna/tep70-type1978.pnml index 5ad8d7064..be008e35d 100644 --- a/src/diesel/kolomna/tep70-type1978.pnml +++ b/src/diesel/kolomna/tep70-type1978.pnml @@ -85,7 +85,7 @@ item (FEAT_TRAINS, tep70_type1978, 173) { additional_text: tep70_type1978_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70_type1978_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -95,7 +95,7 @@ item (FEAT_TRAINS, tep70_type1978, 173) { purchase: tep70_type1978_purchase_sprites; running_cost_factor: tep70_type1978_running_cost_factor; speed: tep70_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep70-type1989.pnml b/src/diesel/kolomna/tep70-type1989.pnml index 4890bbe3e..9aea673b2 100644 --- a/src/diesel/kolomna/tep70-type1989.pnml +++ b/src/diesel/kolomna/tep70-type1989.pnml @@ -88,7 +88,7 @@ item (FEAT_TRAINS, tep70_type1989, 1034) { additional_text: tep70_type1989_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70_type1989_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -98,7 +98,7 @@ item (FEAT_TRAINS, tep70_type1989, 1034) { purchase: tep70_type1989_purchase_sprites; running_cost_factor: tep70_type1989_running_cost_factor; speed: tep70_type1989_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep70-type1992_use.pnml b/src/diesel/kolomna/tep70-type1992_use.pnml index 9b88928e3..cbf7f7f98 100644 --- a/src/diesel/kolomna/tep70-type1992_use.pnml +++ b/src/diesel/kolomna/tep70-type1992_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, tep70_type1992, 1035) { additional_text: tep70_type1992_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70_type1992_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70_type1989_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tep70_type1992, 1035) { purchase: tep70_type1992_purchase_sprites; running_cost_factor: tep70_type1992_running_cost_factor; speed: tep70_type1992_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep70bs-pre.pnml b/src/diesel/kolomna/tep70bs-pre.pnml index e4a60295e..fa3ea2cf8 100644 --- a/src/diesel/kolomna/tep70bs-pre.pnml +++ b/src/diesel/kolomna/tep70bs-pre.pnml @@ -91,7 +91,7 @@ item (FEAT_TRAINS, tep70bs_pre, 1036) { additional_text: tep70bs_pre_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70bs_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70bs_pre_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -102,7 +102,7 @@ item (FEAT_TRAINS, tep70bs_pre, 1036) { refit_cost: tep70bs_pre_refit_cost; running_cost_factor: tep70bs_pre_running_cost_factor; speed: tep70bs_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: tep70bs_pre_tractive_effort_coefficient; } } diff --git a/src/diesel/kolomna/tep70bs-type2006.pnml b/src/diesel/kolomna/tep70bs-type2006.pnml index 4763e66d0..a4c9fe585 100644 --- a/src/diesel/kolomna/tep70bs-type2006.pnml +++ b/src/diesel/kolomna/tep70bs-type2006.pnml @@ -144,7 +144,7 @@ item (FEAT_TRAINS, tep70bs_type2006, 1037) { additional_text: tep70bs_type2006_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70bs_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70bs_type2006_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -155,7 +155,7 @@ item (FEAT_TRAINS, tep70bs_type2006, 1037) { refit_cost: tep70bs_type2006_refit_cost; running_cost_factor: tep70bs_type2006_running_cost_factor; speed: tep70bs_type2006_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: tep70bs_type2006_tractive_effort_coefficient; } } diff --git a/src/diesel/kolomna/tep70bs-type2011_use.pnml b/src/diesel/kolomna/tep70bs-type2011_use.pnml index 74fa30c94..e20baa310 100644 --- a/src/diesel/kolomna/tep70bs-type2011_use.pnml +++ b/src/diesel/kolomna/tep70bs-type2011_use.pnml @@ -117,7 +117,7 @@ item (FEAT_TRAINS, tep70bs_type2011, 1038) { additional_text: tep70bs_type2011_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70bs_type2011_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70bs_type2011_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -128,7 +128,7 @@ item (FEAT_TRAINS, tep70bs_type2011, 1038) { refit_cost: tep70bs_type2011_refit_cost; running_cost_factor: tep70bs_type2011_running_cost_factor; speed: tep70bs_type2011_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: tep70bs_type2011_tractive_effort_coefficient; } } diff --git a/src/diesel/kolomna/tep70bs-type2018_use.pnml b/src/diesel/kolomna/tep70bs-type2018_use.pnml index af9a67bff..6c46e3a90 100644 --- a/src/diesel/kolomna/tep70bs-type2018_use.pnml +++ b/src/diesel/kolomna/tep70bs-type2018_use.pnml @@ -118,7 +118,7 @@ item (FEAT_TRAINS, tep70bs_type2018, 175) { additional_text: tep70bs_type2018_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70bs_type2018_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep70bs_type2018_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -129,7 +129,7 @@ item (FEAT_TRAINS, tep70bs_type2018, 175) { refit_cost: tep70bs_type2018_refit_cost; running_cost_factor: tep70bs_type2018_running_cost_factor; speed: tep70bs_type2018_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: tep70bs_type2018_tractive_effort_coefficient; } } diff --git a/src/diesel/kolomna/tep70u.pnml b/src/diesel/kolomna/tep70u.pnml index 73a18abd5..49d356a02 100644 --- a/src/diesel/kolomna/tep70u.pnml +++ b/src/diesel/kolomna/tep70u.pnml @@ -49,7 +49,7 @@ item (FEAT_TRAINS, tep70u, 174) { additional_text: tep70u_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep70u_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tep70u_create_effect_sprites_start_sp; @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tep70u, 174) { purchase_speed: return 160; running_cost_factor: tep70u_running_cost_factor; speed: tep70u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tep75.pnml b/src/diesel/kolomna/tep75.pnml index f5624db2c..8f273d9d9 100644 --- a/src/diesel/kolomna/tep75.pnml +++ b/src/diesel/kolomna/tep75.pnml @@ -50,7 +50,7 @@ item (FEAT_TRAINS, tep75, 920) { additional_text: tep75_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: tep75_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tep75_create_effect_sprites_start_sp; @@ -60,7 +60,7 @@ item (FEAT_TRAINS, tep75, 920) { purchase_speed: return 160; running_cost_factor: tep75_running_cost_factor; speed: tep75_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/tgp50.pnml b/src/diesel/kolomna/tgp50.pnml index b5c16857e..990ae05b4 100644 --- a/src/diesel/kolomna/tgp50.pnml +++ b/src/diesel/kolomna/tgp50.pnml @@ -45,7 +45,7 @@ item (FEAT_TRAINS, tgp50, 917) { additional_text: tgp50_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tgp50_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tgp50_create_effect_start; @@ -55,7 +55,7 @@ item (FEAT_TRAINS, tgp50, 917) { purchase_speed: return 140; running_cost_factor: tgp50_running_cost_factor; speed: tgp50_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/kolomna/vm20.pnml b/src/diesel/kolomna/vm20.pnml index c7b42066d..f49261057 100644 --- a/src/diesel/kolomna/vm20.pnml +++ b/src/diesel/kolomna/vm20.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, vm20, 723) { additional_text: vm20_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vm20_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: vm20_create_effect_sprites_start; @@ -56,7 +56,7 @@ item (FEAT_TRAINS, vm20, 723) { purchase_speed: return 72; running_cost_factor: vm20_running_cost_factor; speed: vm20_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2m62.pnml b/src/diesel/luhansk/2m62.pnml index 08a944481..71f6c9551 100644 --- a/src/diesel/luhansk/2m62.pnml +++ b/src/diesel/luhansk/2m62.pnml @@ -103,7 +103,7 @@ item (FEAT_TRAINS, _2m62, 167) { additional_text: _2m62_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2m62_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2m62_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -113,7 +113,7 @@ item (FEAT_TRAINS, _2m62, 167) { purchase: _2m62_purchase_sprites; running_cost_factor: _2m62_running_cost_factor; speed: _2m62_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2m62u.pnml b/src/diesel/luhansk/2m62u.pnml index 40446e550..efd021eca 100644 --- a/src/diesel/luhansk/2m62u.pnml +++ b/src/diesel/luhansk/2m62u.pnml @@ -124,7 +124,7 @@ item (FEAT_TRAINS, _2m62u, 168) { additional_text: _2m62u_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2m62u_bitmask_vehicle_info_drb1; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2m62u_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -135,7 +135,7 @@ item (FEAT_TRAINS, _2m62u, 168) { refit_cost: _2m62u_refit_cost; running_cost_factor: _2m62u_running_cost_factor; speed: _2m62u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10l-pre.pnml b/src/diesel/luhansk/2te10l-pre.pnml index 27ec80e03..c2cbd3200 100644 --- a/src/diesel/luhansk/2te10l-pre.pnml +++ b/src/diesel/luhansk/2te10l-pre.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2te10l_pre, 1049) { additional_text: _2te10l_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10l_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te10l_pre_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _2te10l_pre, 1049) { purchase: _2te10l_pre_purchase_sprites; running_cost_factor: _2te10l_pre_running_cost_factor; speed: _2te10l_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10l-type1963.pnml b/src/diesel/luhansk/2te10l-type1963.pnml index a5ee59795..e3c1c7064 100644 --- a/src/diesel/luhansk/2te10l-type1963.pnml +++ b/src/diesel/luhansk/2te10l-type1963.pnml @@ -105,7 +105,7 @@ item (FEAT_TRAINS, _2te10l_type1963, 154) { additional_text: _2te10l_type1963_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10l_type1963_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10l_type1963_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -115,7 +115,7 @@ item (FEAT_TRAINS, _2te10l_type1963, 154) { purchase: _2te10l_type1963_purchase_sprites; running_cost_factor: _2te10l_type1963_running_cost_factor; speed: _2te10l_type1963_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10l-type1971_use.pnml b/src/diesel/luhansk/2te10l-type1971_use.pnml index 76c5a07e7..5ff09387d 100644 --- a/src/diesel/luhansk/2te10l-type1971_use.pnml +++ b/src/diesel/luhansk/2te10l-type1971_use.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, _2te10l_type1971, 1052) { additional_text: _2te10l_type1971_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10l_type1963_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10l_type1971_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, _2te10l_type1971, 1052) { purchase: _2te10l_type1971_purchase_sprites; running_cost_factor: _2te10l_type1971_running_cost_factor; speed: _2te10l_type1971_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10m-type1981.pnml b/src/diesel/luhansk/2te10m-type1981.pnml index 8fbdc9cb8..a2a0c5cac 100644 --- a/src/diesel/luhansk/2te10m-type1981.pnml +++ b/src/diesel/luhansk/2te10m-type1981.pnml @@ -74,7 +74,7 @@ item (FEAT_TRAINS, _2te10m_type1981, 159) { additional_text: _2te10m_type1981_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10m_type1981_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10m_type1981_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -84,7 +84,7 @@ item (FEAT_TRAINS, _2te10m_type1981, 159) { purchase: _2te10m_type1981_purchase_sprites; running_cost_factor: _2te10m_type1981_running_cost_factor; speed: _2te10m_type1981_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10m-type1985.pnml b/src/diesel/luhansk/2te10m-type1985.pnml index 8bdb86a44..49df0748f 100644 --- a/src/diesel/luhansk/2te10m-type1985.pnml +++ b/src/diesel/luhansk/2te10m-type1985.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, _2te10m_type1985, 1050) { additional_text: _2te10m_type1985_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10m_type1981_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10m_type1985_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, _2te10m_type1985, 1050) { purchase: _2te10m_type1985_purchase_sprites; running_cost_factor: _2te10m_type1985_running_cost_factor; speed: _2te10m_type1985_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10mk.pnml b/src/diesel/luhansk/2te10mk.pnml index f6ecefad4..7ee35d7e2 100644 --- a/src/diesel/luhansk/2te10mk.pnml +++ b/src/diesel/luhansk/2te10mk.pnml @@ -78,7 +78,7 @@ item (FEAT_TRAINS, _2te10mk, 156) { additional_text: _2te10mk_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10mk_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10mk_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -88,7 +88,7 @@ item (FEAT_TRAINS, _2te10mk, 156) { purchase: _2te10mk_purchase_sprites; running_cost_factor: _2te10mk_running_cost_factor; speed: _2te10mk_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10s.pnml b/src/diesel/luhansk/2te10s.pnml index a31db9581..562726de5 100644 --- a/src/diesel/luhansk/2te10s.pnml +++ b/src/diesel/luhansk/2te10s.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, _2te10s, 349) { additional_text: _2te10s_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10s_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te10s_create_effect_sprites_start; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, _2te10s, 349) { purchase_speed: return 100; running_cost_factor: _2te10s_running_cost_factor; speed: _2te10s_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10u.pnml b/src/diesel/luhansk/2te10u.pnml index f3b5e3a8b..d47ee10f9 100644 --- a/src/diesel/luhansk/2te10u.pnml +++ b/src/diesel/luhansk/2te10u.pnml @@ -79,7 +79,7 @@ item (FEAT_TRAINS, _2te10u, 162) { additional_text: _2te10u_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10m_type1981_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10u_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -89,7 +89,7 @@ item (FEAT_TRAINS, _2te10u, 162) { purchase: _2te10u_purchase_sprites; running_cost_factor: _2te10u_running_cost_factor; speed: _2te10u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10ut.pnml b/src/diesel/luhansk/2te10ut.pnml index b2bb87806..4ab63ecaa 100644 --- a/src/diesel/luhansk/2te10ut.pnml +++ b/src/diesel/luhansk/2te10ut.pnml @@ -70,7 +70,7 @@ item (FEAT_TRAINS, _2te10ut, 158) { additional_text: _2te10ut_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10ut_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10ut_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -81,7 +81,7 @@ item (FEAT_TRAINS, _2te10ut, 158) { purchase_speed: return 120; running_cost_factor: _2te10ut_running_cost_factor; speed: _2te10ut_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10utk.pnml b/src/diesel/luhansk/2te10utk.pnml index eac7771d6..1dd84c10d 100644 --- a/src/diesel/luhansk/2te10utk.pnml +++ b/src/diesel/luhansk/2te10utk.pnml @@ -79,7 +79,7 @@ item (FEAT_TRAINS, _2te10utk, 157) { additional_text: _2te10utk_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10utk_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10utk_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -90,7 +90,7 @@ item (FEAT_TRAINS, _2te10utk, 157) { purchase_speed: return 120; running_cost_factor: _2te10utk_running_cost_factor; speed: _2te10utk_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10v-type1975.pnml b/src/diesel/luhansk/2te10v-type1975.pnml index c32d615b8..f23928855 100644 --- a/src/diesel/luhansk/2te10v-type1975.pnml +++ b/src/diesel/luhansk/2te10v-type1975.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2te10v_type1975, 155) { additional_text: _2te10v_type1975_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10v_type1975_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te10v_type1975_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _2te10v_type1975, 155) { purchase: _2te10v_type1975_purchase_sprites; running_cost_factor: _2te10v_type1975_running_cost_factor; speed: _2te10v_type1975_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te10v-type1978.pnml b/src/diesel/luhansk/2te10v-type1978.pnml index abc30e24e..b217ac0be 100644 --- a/src/diesel/luhansk/2te10v-type1978.pnml +++ b/src/diesel/luhansk/2te10v-type1978.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te10v_type1978, 1051) { additional_text: _2te10v_type1978_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10v_type1975_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te10v_type1978_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te10v_type1978, 1051) { purchase: _2te10v_type1978_purchase_sprites; running_cost_factor: _2te10v_type1978_running_cost_factor; speed: _2te10v_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1971.pnml b/src/diesel/luhansk/2te116-type1971.pnml index cad54ae79..ef0443d84 100644 --- a/src/diesel/luhansk/2te116-type1971.pnml +++ b/src/diesel/luhansk/2te116-type1971.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, _2te116_type1971, 171) { additional_text: _2te116_type1971_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te116_type1971_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -87,7 +87,7 @@ item (FEAT_TRAINS, _2te116_type1971, 171) { purchase: _2te116_type1971_purchase_sprites; running_cost_factor: _2te116_type1971_running_cost_factor; speed: _2te116_type1971_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1973.pnml b/src/diesel/luhansk/2te116-type1973.pnml index f2de4685a..34460c3b3 100644 --- a/src/diesel/luhansk/2te116-type1973.pnml +++ b/src/diesel/luhansk/2te116-type1973.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1973, 1061) { additional_text: _2te116_type1973_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1973_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1973, 1061) { purchase: _2te116_type1973_purchase_sprites; running_cost_factor: _2te116_type1973_running_cost_factor; speed: _2te116_type1973_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1975.pnml b/src/diesel/luhansk/2te116-type1975.pnml index ae89c3f88..1717b6f76 100644 --- a/src/diesel/luhansk/2te116-type1975.pnml +++ b/src/diesel/luhansk/2te116-type1975.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1975, 1062) { additional_text: _2te116_type1975_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1975_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1975, 1062) { purchase: _2te116_type1975_purchase_sprites; running_cost_factor: _2te116_type1975_running_cost_factor; speed: _2te116_type1975_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1976.pnml b/src/diesel/luhansk/2te116-type1976.pnml index 4fa299861..4c015dd66 100644 --- a/src/diesel/luhansk/2te116-type1976.pnml +++ b/src/diesel/luhansk/2te116-type1976.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1976, 1063) { additional_text: _2te116_type1976_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1976_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1976, 1063) { purchase: _2te116_type1976_purchase_sprites; running_cost_factor: _2te116_type1976_running_cost_factor; speed: _2te116_type1976_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1977.pnml b/src/diesel/luhansk/2te116-type1977.pnml index 7bf10c3bb..fe721a8d0 100644 --- a/src/diesel/luhansk/2te116-type1977.pnml +++ b/src/diesel/luhansk/2te116-type1977.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1977, 1064) { additional_text: _2te116_type1977_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1977_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1977, 1064) { purchase: _2te116_type1977_purchase_sprites; running_cost_factor: _2te116_type1977_running_cost_factor; speed: _2te116_type1977_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1979.pnml b/src/diesel/luhansk/2te116-type1979.pnml index bc199a666..291fe9782 100644 --- a/src/diesel/luhansk/2te116-type1979.pnml +++ b/src/diesel/luhansk/2te116-type1979.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1979, 1069) { additional_text: _2te116_type1979_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1979_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1979, 1069) { purchase: _2te116_type1979_purchase_sprites; running_cost_factor: _2te116_type1979_running_cost_factor; speed: _2te116_type1979_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1982.pnml b/src/diesel/luhansk/2te116-type1982.pnml index c87906884..1d41efb81 100644 --- a/src/diesel/luhansk/2te116-type1982.pnml +++ b/src/diesel/luhansk/2te116-type1982.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1982, 1065) { additional_text: _2te116_type1982_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1982_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1982, 1065) { purchase: _2te116_type1982_purchase_sprites; running_cost_factor: _2te116_type1982_running_cost_factor; speed: _2te116_type1982_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1984.pnml b/src/diesel/luhansk/2te116-type1984.pnml index e30cb58db..8544da7fa 100644 --- a/src/diesel/luhansk/2te116-type1984.pnml +++ b/src/diesel/luhansk/2te116-type1984.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1984, 1066) { additional_text: _2te116_type1984_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1984_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1984, 1066) { purchase: _2te116_type1984_purchase_sprites; running_cost_factor: _2te116_type1984_running_cost_factor; speed: _2te116_type1984_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1990.pnml b/src/diesel/luhansk/2te116-type1990.pnml index 91e122d1c..b01f0aff1 100644 --- a/src/diesel/luhansk/2te116-type1990.pnml +++ b/src/diesel/luhansk/2te116-type1990.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2te116_type1990, 1067) { additional_text: _2te116_type1990_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te116_type1990_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te116_type1990, 1067) { purchase: _2te116_type1990_purchase_sprites; running_cost_factor: _2te116_type1990_running_cost_factor; speed: _2te116_type1990_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116-type1991.pnml b/src/diesel/luhansk/2te116-type1991.pnml index c635c2024..2a013e5bf 100644 --- a/src/diesel/luhansk/2te116-type1991.pnml +++ b/src/diesel/luhansk/2te116-type1991.pnml @@ -82,7 +82,7 @@ item (FEAT_TRAINS, _2te116_type1991, 1068) { additional_text: _2te116_type1991_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116_type1971_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te116_type1991_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -92,7 +92,7 @@ item (FEAT_TRAINS, _2te116_type1991, 1068) { purchase: _2te116_type1991_purchase_sprites; running_cost_factor: _2te116_type1991_running_cost_factor; speed: _2te116_type1991_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te116u-type2007.pnml b/src/diesel/luhansk/2te116u-type2007.pnml index 8069d297a..ec5b07432 100644 --- a/src/diesel/luhansk/2te116u-type2007.pnml +++ b/src/diesel/luhansk/2te116u-type2007.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, _2te116u_type2007, 172) { additional_text: _2te116u_type2007_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116u_type2007_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te116u_type2007_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -91,7 +91,7 @@ item (FEAT_TRAINS, _2te116u_type2007, 172) { refit_cost: _2te116u_type2007_refit_cost; running_cost_factor: _2te116u_type2007_running_cost_factor; speed: _2te116u_type2007_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: _2te116u_type2007_tractive_effort_coefficient; } } diff --git a/src/diesel/luhansk/2te116u-type2009.pnml b/src/diesel/luhansk/2te116u-type2009.pnml index 2e8932df2..62cd707db 100644 --- a/src/diesel/luhansk/2te116u-type2009.pnml +++ b/src/diesel/luhansk/2te116u-type2009.pnml @@ -101,7 +101,7 @@ item (FEAT_TRAINS, _2te116u_type2009, 1070) { additional_text: _2te116u_type2009_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116u_type2007_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te116u_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -112,7 +112,7 @@ item (FEAT_TRAINS, _2te116u_type2009, 1070) { refit_cost: _2te116u_type2009_refit_cost; running_cost_factor: _2te116u_type2009_running_cost_factor; speed: _2te116u_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: _2te116u_type2009_tractive_effort_coefficient; } } diff --git a/src/diesel/luhansk/2te116u-type2011_use.pnml b/src/diesel/luhansk/2te116u-type2011_use.pnml index ce5d65b6c..c52daf802 100644 --- a/src/diesel/luhansk/2te116u-type2011_use.pnml +++ b/src/diesel/luhansk/2te116u-type2011_use.pnml @@ -81,7 +81,7 @@ item (FEAT_TRAINS, _2te116u_type2011, 1071) { additional_text: _2te116u_type2011_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2te116u_type2007_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te116u_type2011_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -92,7 +92,7 @@ item (FEAT_TRAINS, _2te116u_type2011, 1071) { refit_cost: _2te116u_type2011_refit_cost; running_cost_factor: _2te116u_type2011_running_cost_factor; speed: _2te116u_type2011_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; tractive_effort_coefficient: _2te116u_type2011_tractive_effort_coefficient; } } diff --git a/src/diesel/luhansk/2te121-pre.pnml b/src/diesel/luhansk/2te121-pre.pnml index ae2996de1..8a32e15a4 100644 --- a/src/diesel/luhansk/2te121-pre.pnml +++ b/src/diesel/luhansk/2te121-pre.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2te121_pre, 1058) { additional_text: _2te121_pre_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _2te121_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te121_pre_cargo_subtype_text; colour_mapping: _2te121_pre_colour_mapping; @@ -74,7 +74,7 @@ item (FEAT_TRAINS, _2te121_pre, 1058) { purchase: _2te121_pre_purchase_sprites; running_cost_factor: _2te121_pre_running_cost_factor; speed: _2te121_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te121-pre2.pnml b/src/diesel/luhansk/2te121-pre2.pnml index 47ed626a4..c70104b02 100644 --- a/src/diesel/luhansk/2te121-pre2.pnml +++ b/src/diesel/luhansk/2te121-pre2.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _2te121_pre2, 1059) { additional_text: _2te121_pre2_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _2te121_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te121_pre2_cargo_subtype_text; colour_mapping: _2te121_pre2_colour_mapping; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _2te121_pre2, 1059) { purchase: _2te121_pre2_purchase_sprites; running_cost_factor: _2te121_pre2_running_cost_factor; speed: _2te121_pre2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/2te121-type1983.pnml b/src/diesel/luhansk/2te121-type1983.pnml index 862e68a9d..ed96d6b30 100644 --- a/src/diesel/luhansk/2te121-type1983.pnml +++ b/src/diesel/luhansk/2te121-type1983.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _2te121_type1983, 587) { additional_text: _2te121_type1983_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: _2te121_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te121_type1983_cargo_subtype_text; colour_mapping: _2te121_type1983_colour_mapping; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _2te121_type1983, 587) { purchase: _2te121_type1983_purchase_sprites; running_cost_factor: _2te121_type1983_running_cost_factor; speed: _2te121_type1983_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/3m62u.pnml b/src/diesel/luhansk/3m62u.pnml index 30eaa3b06..d01814aa3 100644 --- a/src/diesel/luhansk/3m62u.pnml +++ b/src/diesel/luhansk/3m62u.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, _3m62u, 169) { additional_text: _3m62u_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2m62u_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _3m62u_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -79,7 +79,7 @@ item (FEAT_TRAINS, _3m62u, 169) { purchase_speed: return 100; running_cost_factor: _3m62u_running_cost_factor; speed: _3m62u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/3m62u_m.pnml b/src/diesel/luhansk/3m62u_m.pnml index 9dafb3b15..5d2f6b059 100644 --- a/src/diesel/luhansk/3m62u_m.pnml +++ b/src/diesel/luhansk/3m62u_m.pnml @@ -86,7 +86,7 @@ item (FEAT_TRAINS, _3m62u_m, 170) { additional_text: _3m62u_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3m62u_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_3m62u_m_CC; cargo_subtype_text: _3m62u_m_cargo_subtype_text; colour_mapping: any_cc_colour; diff --git a/src/diesel/luhansk/3te10m-type1979_use.pnml b/src/diesel/luhansk/3te10m-type1979_use.pnml index 35dd299d2..61c4f7044 100644 --- a/src/diesel/luhansk/3te10m-type1979_use.pnml +++ b/src/diesel/luhansk/3te10m-type1979_use.pnml @@ -51,7 +51,7 @@ item (FEAT_TRAINS, _3te10m_type1979, 160) { additional_text: _3te10m_type1979_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10m_type1981_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10m_type1981_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -61,7 +61,7 @@ item (FEAT_TRAINS, _3te10m_type1979, 160) { purchase: _3te10m_type1979_purchase_sprites; running_cost_factor: _3te10m_type1979_running_cost_factor; speed: _3te10m_type1979_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/3te10m-type1985_use.pnml b/src/diesel/luhansk/3te10m-type1985_use.pnml index 797922bfe..c4e26e08f 100644 --- a/src/diesel/luhansk/3te10m-type1985_use.pnml +++ b/src/diesel/luhansk/3te10m-type1985_use.pnml @@ -51,7 +51,7 @@ item (FEAT_TRAINS, _3te10m_type1985, 1053) { additional_text: _3te10m_type1985_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10m_type1981_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10m_type1985_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -61,7 +61,7 @@ item (FEAT_TRAINS, _3te10m_type1985, 1053) { purchase: _3te10m_type1985_purchase_sprites; running_cost_factor: _3te10m_type1985_running_cost_factor; speed: _3te10m_type1985_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/3te10m_m.pnml b/src/diesel/luhansk/3te10m_m.pnml index 940965f02..798aaac78 100644 --- a/src/diesel/luhansk/3te10m_m.pnml +++ b/src/diesel/luhansk/3te10m_m.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, _3te10m_m, 161) { additional_text: _3te10m_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3te10m_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_3te10m_m_CC; cargo_subtype_text: _2te10m_type1985_cargo_subtype_text; colour_mapping: any_cc_colour; diff --git a/src/diesel/luhansk/3te10u_m.pnml b/src/diesel/luhansk/3te10u_m.pnml index 41c610bb3..e15b13fd0 100644 --- a/src/diesel/luhansk/3te10u_m.pnml +++ b/src/diesel/luhansk/3te10u_m.pnml @@ -83,7 +83,7 @@ item (FEAT_TRAINS, _3te10u_m, 164) { additional_text: _3te10u_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3te10u_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_3te10u_m_CC; cargo_subtype_text: _2te10u_cargo_subtype_text; colour_mapping: any_cc_colour; diff --git a/src/diesel/luhansk/3te10u_use.pnml b/src/diesel/luhansk/3te10u_use.pnml index fb69a1fd1..95259b0f6 100644 --- a/src/diesel/luhansk/3te10u_use.pnml +++ b/src/diesel/luhansk/3te10u_use.pnml @@ -41,7 +41,7 @@ item (FEAT_TRAINS, _3te10u, 163) { additional_text: _3te10u_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10m_type1981_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: _2te10u_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -52,7 +52,7 @@ item (FEAT_TRAINS, _3te10u, 163) { purchase_speed: return 100; running_cost_factor: _3te10u_running_cost_factor; speed: _3te10u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/4te10s_m.pnml b/src/diesel/luhansk/4te10s_m.pnml index 177fe038e..af545249a 100644 --- a/src/diesel/luhansk/4te10s_m.pnml +++ b/src/diesel/luhansk/4te10s_m.pnml @@ -60,7 +60,7 @@ item (FEAT_TRAINS, _4te10s_m, 351) { additional_text: _4te10s_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _4te10s_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_4te10s_m_CC; colour_mapping: any_cc_colour; create_effect: _4te10s_m_create_effect_sprites_start; diff --git a/src/diesel/luhansk/4te10s_use.pnml b/src/diesel/luhansk/4te10s_use.pnml index d904b85ab..3d069e395 100644 --- a/src/diesel/luhansk/4te10s_use.pnml +++ b/src/diesel/luhansk/4te10s_use.pnml @@ -15,7 +15,7 @@ switch (FEAT_TRAINS, PARENT, _4te10s_start_stop5, ((prev_vehicle_type_id() == _4te10s) || (prev_vehicle_type_id() == _4te10s_m)) && LOAD_TEMP(0) ]) { - 1: any_start_stop; + 1: any_start_stop_diesel; return string(STR_START_STOP_NEED_AT_LEAST_4_CONSECUTIVE_ENGINE); } @@ -36,7 +36,7 @@ switch (FEAT_TRAINS, PARENT, _4te10s_start_stop3, ((prev_vehicle_type_id() == _4te10s) || (prev_vehicle_type_id() == _4te10s_m)) && LOAD_TEMP(0) ]) { - 1: any_start_stop; + 1: any_start_stop_diesel; return string(STR_START_STOP_NEED_AT_LEAST_3_CONSECUTIVE_ENGINE); } @@ -92,7 +92,7 @@ item (FEAT_TRAINS, _4te10s, 350) { additional_text: _4te10s_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2te10s_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2te10s_create_effect_sprites_start; diff --git a/src/diesel/luhansk/dm62.pnml b/src/diesel/luhansk/dm62.pnml index 3cfdb5c7a..348937bba 100644 --- a/src/diesel/luhansk/dm62.pnml +++ b/src/diesel/luhansk/dm62.pnml @@ -86,7 +86,7 @@ item (FEAT_TRAINS, dm62, 166) { additional_text: dm62_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: dm62_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: dm62_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -97,7 +97,7 @@ item (FEAT_TRAINS, dm62, 166) { purchase_speed: return 100; running_cost_factor: dm62_running_cost_factor; speed: dm62_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/m62-pre.pnml b/src/diesel/luhansk/m62-pre.pnml index f4e410bd5..a9893689b 100644 --- a/src/diesel/luhansk/m62-pre.pnml +++ b/src/diesel/luhansk/m62-pre.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, m62_pre, 1045) { additional_text: m62_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: m62_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: m62_pre_create_effect_sprites_start_sp; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, m62_pre, 1045) { purchase: m62_pre_purchase_sprites; running_cost_factor: m62_pre_running_cost_factor; speed: m62_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/m62-type1970.pnml b/src/diesel/luhansk/m62-type1970.pnml index b1319462d..2b046d920 100644 --- a/src/diesel/luhansk/m62-type1970.pnml +++ b/src/diesel/luhansk/m62-type1970.pnml @@ -83,7 +83,7 @@ item (FEAT_TRAINS, m62_type1970, 165) { additional_text: m62_type1970_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: m62_type1970_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: m62_type1970_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -93,7 +93,7 @@ item (FEAT_TRAINS, m62_type1970, 165) { purchase: m62_type1970_purchase_sprites; running_cost_factor: m62_type1970_running_cost_factor; speed: m62_type1970_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te109-pre.pnml b/src/diesel/luhansk/te109-pre.pnml index c19c468a5..fa279024d 100644 --- a/src/diesel/luhansk/te109-pre.pnml +++ b/src/diesel/luhansk/te109-pre.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, te109_pre, 1042) { additional_text: te109_pre_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: te109_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: te109_pre_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, te109_pre, 1042) { purchase: te109_pre_purchase_sprites; running_cost_factor: te109_pre_running_cost_factor; speed: te109_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te109-pre2_use.pnml b/src/diesel/luhansk/te109-pre2_use.pnml index 84d534b77..29b38cf94 100644 --- a/src/diesel/luhansk/te109-pre2_use.pnml +++ b/src/diesel/luhansk/te109-pre2_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, te109_pre2, 1043) { additional_text: te109_pre2_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: te109_pre2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: te109_pre2_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, te109_pre2, 1043) { purchase: te109_pre2_purchase_sprites; running_cost_factor: te109_pre2_running_cost_factor; speed: te109_pre2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te109-type1977.pnml b/src/diesel/luhansk/te109-type1977.pnml index 4150ffee8..b52a1b8c6 100644 --- a/src/diesel/luhansk/te109-type1977.pnml +++ b/src/diesel/luhansk/te109-type1977.pnml @@ -75,7 +75,7 @@ item (FEAT_TRAINS, te109_type1977, 352) { additional_text: te109_type1977_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: te109_type1977_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te109_type1977_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -85,7 +85,7 @@ item (FEAT_TRAINS, te109_type1977, 352) { purchase: te109_type1977_purchase_sprites; running_cost_factor: te109_type1977_running_cost_factor; speed: te109_type1977_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te3-lz-type1956_use.pnml b/src/diesel/luhansk/te3-lz-type1956_use.pnml index da3f92006..73e18e0d9 100644 --- a/src/diesel/luhansk/te3-lz-type1956_use.pnml +++ b/src/diesel/luhansk/te3-lz-type1956_use.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, te3_lz_type1956, 1020) { additional_text: te3_lz_type1956_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1956_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1956_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, te3_lz_type1956, 1020) { purchase: te3_lz_type1956_purchase_sprites; running_cost_factor: te3_lz_type1956_running_cost_factor; speed: te3_lz_type1956_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te3-lz-type1957_use.pnml b/src/diesel/luhansk/te3-lz-type1957_use.pnml index ce393d1fd..9027aba92 100644 --- a/src/diesel/luhansk/te3-lz-type1957_use.pnml +++ b/src/diesel/luhansk/te3-lz-type1957_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, te3_lz_type1957, 1021) { additional_text: te3_lz_type1957_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1957_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1957_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, te3_lz_type1957, 1021) { purchase: te3_lz_type1957_purchase_sprites; running_cost_factor: te3_lz_type1957_running_cost_factor; speed: te3_lz_type1957_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te3-lz-type1963_use.pnml b/src/diesel/luhansk/te3-lz-type1963_use.pnml index d1b55ea9b..61d96480e 100644 --- a/src/diesel/luhansk/te3-lz-type1963_use.pnml +++ b/src/diesel/luhansk/te3-lz-type1963_use.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, te3_lz_type1963, 347) { additional_text: te3_lz_type1963_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te3_type1957_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te3_type1957_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, te3_lz_type1963, 347) { purchase: te3_lz_type1963_purchase_sprites; running_cost_factor: te3_lz_type1963_running_cost_factor; speed: te3_lz_type1963_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/te7-type1963_use.pnml b/src/diesel/luhansk/te7-type1963_use.pnml index 246beff45..d100ca829 100644 --- a/src/diesel/luhansk/te7-type1963_use.pnml +++ b/src/diesel/luhansk/te7-type1963_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, te7_type1963, 1007) { additional_text: te7_type1963_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: te7_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te7_type1960_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, te7_type1963, 1007) { purchase: te7_type1963_purchase_sprites; running_cost_factor: te7_type1963_running_cost_factor; speed: te7_type1963_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/tep10l.pnml b/src/diesel/luhansk/tep10l.pnml index cadf2813a..c88c8d7a8 100644 --- a/src/diesel/luhansk/tep10l.pnml +++ b/src/diesel/luhansk/tep10l.pnml @@ -83,7 +83,7 @@ item (FEAT_TRAINS, tep10l, 153) { additional_text: tep10l_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tep10l_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tep10l_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -94,7 +94,7 @@ item (FEAT_TRAINS, tep10l, 153) { purchase_speed: return 140; running_cost_factor: tep10l_running_cost_factor; speed: tep10l_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/tep150.pnml b/src/diesel/luhansk/tep150.pnml index be83c0b7a..faab3282e 100644 --- a/src/diesel/luhansk/tep150.pnml +++ b/src/diesel/luhansk/tep150.pnml @@ -48,7 +48,7 @@ item (FEAT_TRAINS, tep150, 717) { additional_text: tep150_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tep150_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tep150_create_effect; @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tep150, 717) { purchase_speed: return 160; running_cost_factor: tep150_running_cost_factor; speed: tep150_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/tg100.pnml b/src/diesel/luhansk/tg100.pnml index 44c565bb3..2e01f022d 100644 --- a/src/diesel/luhansk/tg100.pnml +++ b/src/diesel/luhansk/tg100.pnml @@ -44,7 +44,7 @@ item (FEAT_TRAINS, tg100, 655) { additional_text: tg100_additional_text; articulated_part: tg100_articulated_part; bitmask_vehicle_info: tg100_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg100_create_effect_sprites_start; @@ -53,7 +53,7 @@ item (FEAT_TRAINS, tg100, 655) { purchase_speed: return 120; running_cost_factor: tg100_running_cost_factor; speed: tg100_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/tg102-pre.pnml b/src/diesel/luhansk/tg102-pre.pnml index 2e69429e4..c0c69e2c4 100644 --- a/src/diesel/luhansk/tg102-pre.pnml +++ b/src/diesel/luhansk/tg102-pre.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tg102_pre, 999) { additional_text: tg102_pre_additional_text; articulated_part: tg102_pre_articulated_part; bitmask_vehicle_info: tg102_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg102_pre_create_effect_sprites_start; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tg102_pre, 999) { purchase: tg102_pre_purchase_sprites; running_cost_factor: tg102_pre_running_cost_factor; speed: tg102_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/luhansk/tg106.pnml b/src/diesel/luhansk/tg106.pnml index bd0d92284..84aa3c1f4 100644 --- a/src/diesel/luhansk/tg106.pnml +++ b/src/diesel/luhansk/tg106.pnml @@ -41,7 +41,7 @@ item (FEAT_TRAINS, tg106, 963) { additional_text: tg106_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tg106_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg106_create_effect_start; @@ -50,7 +50,7 @@ item (FEAT_TRAINS, tg106, 963) { purchase_speed: return 120; running_cost_factor: tg106_running_cost_factor; speed: tg106_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem10.pnml b/src/diesel/lyudinovsk/tem10.pnml index b328f41f5..fc437a18b 100644 --- a/src/diesel/lyudinovsk/tem10.pnml +++ b/src/diesel/lyudinovsk/tem10.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, tem10, 728) { additional_text: tem10_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: tem10_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tem10_cargo_subtype_text; colour_mapping: tem10_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tem10, 728) { purchase_speed: return 100; running_cost_factor: tem10_running_cost_factor; speed: tem10_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem14.pnml b/src/diesel/lyudinovsk/tem14.pnml index 4c5933108..1d2b60431 100644 --- a/src/diesel/lyudinovsk/tem14.pnml +++ b/src/diesel/lyudinovsk/tem14.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tem14, 606) { additional_text: tem14_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tem14_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem14_CC; colour_mapping: any_cc_colour; create_effect: tem14_create_effect_sprites_start_sp; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tem14, 606) { purchase: tem14_purchase_sprites; running_cost_factor: tem14_running_cost_factor; speed: tem14_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem7.pnml b/src/diesel/lyudinovsk/tem7.pnml index 024230cda..738809d92 100644 --- a/src/diesel/lyudinovsk/tem7.pnml +++ b/src/diesel/lyudinovsk/tem7.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tem7, 404) { additional_text: tem7_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tem7_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tem7_create_effect_sprites_start_sp; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tem7, 404) { purchase: tem7_purchase_sprites; running_cost_factor: tem7_running_cost_factor; speed: tem7_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem7a-type1988.pnml b/src/diesel/lyudinovsk/tem7a-type1988.pnml index b7293936f..ec63f0205 100644 --- a/src/diesel/lyudinovsk/tem7a-type1988.pnml +++ b/src/diesel/lyudinovsk/tem7a-type1988.pnml @@ -75,7 +75,7 @@ item (FEAT_TRAINS, tem7a_type1988, 405) { additional_text: tem7a_type1988_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tem7a_type1988_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem7a_type1988_CC; cargo_subtype_text: tem7a_type1988_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -85,7 +85,7 @@ item (FEAT_TRAINS, tem7a_type1988, 405) { purchase: tem7a_type1988_purchase_sprites; running_cost_factor: tem7a_type1988_running_cost_factor; speed: tem7a_type1988_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem7a-type2008.pnml b/src/diesel/lyudinovsk/tem7a-type2008.pnml index 4c0f2ee36..93a432c2f 100644 --- a/src/diesel/lyudinovsk/tem7a-type2008.pnml +++ b/src/diesel/lyudinovsk/tem7a-type2008.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, tem7a_type2008, 1091) { additional_text: tem7a_type2008_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tem7a_type1988_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tem7a_type2008_CC; cargo_subtype_text: tem7a_type2008_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -87,7 +87,7 @@ item (FEAT_TRAINS, tem7a_type2008, 1091) { purchase: tem7a_type2008_purchase_sprites; running_cost_factor: tem7a_type2008_running_cost_factor; speed: tem7a_type2008_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem7a-type2012_use.pnml b/src/diesel/lyudinovsk/tem7a-type2012_use.pnml index 1cb4f3c6d..b65ae5dc6 100644 --- a/src/diesel/lyudinovsk/tem7a-type2012_use.pnml +++ b/src/diesel/lyudinovsk/tem7a-type2012_use.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, tem7a_type2012, 1092) { additional_text: tem7a_type2012_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tem7a_type1988_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tem7a_type2012_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -87,7 +87,7 @@ item (FEAT_TRAINS, tem7a_type2012, 1092) { purchase: tem7a_type2012_purchase_sprites; running_cost_factor: tem7a_type2012_running_cost_factor; speed: tem7a_type2012_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tem9.pnml b/src/diesel/lyudinovsk/tem9.pnml index 1270c174a..6d9ccc228 100644 --- a/src/diesel/lyudinovsk/tem9.pnml +++ b/src/diesel/lyudinovsk/tem9.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, tem9, 539) { additional_text: tem9_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tem9_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tem9_cargo_subtype_text; colour_mapping: tem9_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tem9, 539) { purchase_speed: return 100; running_cost_factor: tem9_running_cost_factor; speed: tem9_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tera1.pnml b/src/diesel/lyudinovsk/tera1.pnml index 4dd68e8aa..ae0b62fc0 100644 --- a/src/diesel/lyudinovsk/tera1.pnml +++ b/src/diesel/lyudinovsk/tera1.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, tera1, 201) { additional_text: tera1_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tera1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tera1_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, tera1, 201) { purchase_speed: return 115; running_cost_factor: tera1_running_cost_factor; speed: tera1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tg102k-type1965_use.pnml b/src/diesel/lyudinovsk/tg102k-type1965_use.pnml index e92049279..2cd5d4142 100644 --- a/src/diesel/lyudinovsk/tg102k-type1965_use.pnml +++ b/src/diesel/lyudinovsk/tg102k-type1965_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, tg102k_type1965, 1001) { additional_text: tg102k_type1965_additional_text; articulated_part: tg102k_type1965_articulated_part; bitmask_vehicle_info: tg102k_type1965_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg102k_type1962_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, tg102k_type1965, 1001) { purchase: tg102k_type1965_purchase_sprites; running_cost_factor: tg102k_type1965_running_cost_factor; speed: tg102k_type1965_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm3-type1959.pnml b/src/diesel/lyudinovsk/tgm3-type1959.pnml index 7a8bcc90d..91bfcfd58 100644 --- a/src/diesel/lyudinovsk/tgm3-type1959.pnml +++ b/src/diesel/lyudinovsk/tgm3-type1959.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm3_type1959, 424) { additional_text: tgm3_type1959_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm3_type1959_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm3_type1959_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm3_type1959, 424) { purchase: tgm3_type1959_purchase_sprites; running_cost_factor: tgm3_type1959_running_cost_factor; speed: tgm3_type1959_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm3-type1968.pnml b/src/diesel/lyudinovsk/tgm3-type1968.pnml index 1e98f3f1f..21a09d6fa 100644 --- a/src/diesel/lyudinovsk/tgm3-type1968.pnml +++ b/src/diesel/lyudinovsk/tgm3-type1968.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, tgm3_type1968, 1095) { additional_text: tgm3_type1968_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm3_type1959_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm3_type1968_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tgm3_type1968, 1095) { purchase: tgm3_type1968_purchase_sprites; running_cost_factor: tgm3_type1968_running_cost_factor; speed: tgm3_type1968_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm3a-type1961_use.pnml b/src/diesel/lyudinovsk/tgm3a-type1961_use.pnml index 171ec0ee4..57e5f433d 100644 --- a/src/diesel/lyudinovsk/tgm3a-type1961_use.pnml +++ b/src/diesel/lyudinovsk/tgm3a-type1961_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm3a_type1961, 475) { additional_text: tgm3a_type1961_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm3a_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm3a_type1961_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm3a_type1961, 475) { purchase: tgm3a_type1961_purchase_sprites; running_cost_factor: tgm3a_type1961_running_cost_factor; speed: tgm3a_type1961_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm3a-type1968_use.pnml b/src/diesel/lyudinovsk/tgm3a-type1968_use.pnml index 6670c0df2..f74bf1328 100644 --- a/src/diesel/lyudinovsk/tgm3a-type1968_use.pnml +++ b/src/diesel/lyudinovsk/tgm3a-type1968_use.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, tgm3a_type1968, 1096) { additional_text: tgm3a_type1968_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm3a_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm3a_type1968_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, tgm3a_type1968, 1096) { purchase: tgm3a_type1968_purchase_sprites; running_cost_factor: tgm3a_type1968_running_cost_factor; speed: tgm3a_type1968_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm3b-type1964_use.pnml b/src/diesel/lyudinovsk/tgm3b-type1964_use.pnml index baac78470..6ff804d6c 100644 --- a/src/diesel/lyudinovsk/tgm3b-type1964_use.pnml +++ b/src/diesel/lyudinovsk/tgm3b-type1964_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm3b_type1964, 476) { additional_text: tgm3b_type1964_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm3b_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm3b_type1964_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm3b_type1964, 476) { purchase: tgm3b_type1964_purchase_sprites; running_cost_factor: tgm3b_type1964_running_cost_factor; speed: tgm3b_type1964_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm3b-type1968_use.pnml b/src/diesel/lyudinovsk/tgm3b-type1968_use.pnml index 6a3558694..864a47a03 100644 --- a/src/diesel/lyudinovsk/tgm3b-type1968_use.pnml +++ b/src/diesel/lyudinovsk/tgm3b-type1968_use.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, tgm3b_type1968, 1097) { additional_text: tgm3b_type1968_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm3b_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm3b_type1968_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, tgm3b_type1968, 1097) { purchase: tgm3b_type1968_purchase_sprites; running_cost_factor: tgm3b_type1968_running_cost_factor; speed: tgm3b_type1968_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4-type1973.pnml b/src/diesel/lyudinovsk/tgm4-type1973.pnml index 55ba7262d..e18259b37 100644 --- a/src/diesel/lyudinovsk/tgm4-type1973.pnml +++ b/src/diesel/lyudinovsk/tgm4-type1973.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tgm4_type1973, 425) { additional_text: tgm4_type1973_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4_type1973_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4_type1973_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, tgm4_type1973, 425) { purchase: tgm4_type1973_purchase_sprites; running_cost_factor: tgm4_type1973_running_cost_factor; speed: tgm4_type1973_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4-type1975.pnml b/src/diesel/lyudinovsk/tgm4-type1975.pnml index f5f98c48e..99b132846 100644 --- a/src/diesel/lyudinovsk/tgm4-type1975.pnml +++ b/src/diesel/lyudinovsk/tgm4-type1975.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tgm4_type1975, 1099) { additional_text: tgm4_type1975_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4_type1975_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4_type1975_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, tgm4_type1975, 1099) { purchase: tgm4_type1975_purchase_sprites; running_cost_factor: tgm4_type1975_running_cost_factor; speed: tgm4_type1975_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4-type1977.pnml b/src/diesel/lyudinovsk/tgm4-type1977.pnml index 5031fd7b1..bbeba34cd 100644 --- a/src/diesel/lyudinovsk/tgm4-type1977.pnml +++ b/src/diesel/lyudinovsk/tgm4-type1977.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tgm4_type1977, 1100) { additional_text: tgm4_type1977_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4_type1977_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4_type1977_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, tgm4_type1977, 1100) { purchase: tgm4_type1977_purchase_sprites; running_cost_factor: tgm4_type1977_running_cost_factor; speed: tgm4_type1977_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4-type1978.pnml b/src/diesel/lyudinovsk/tgm4-type1978.pnml index 45ceeb162..c2e7ffaa2 100644 --- a/src/diesel/lyudinovsk/tgm4-type1978.pnml +++ b/src/diesel/lyudinovsk/tgm4-type1978.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tgm4_type1978, 1101) { additional_text: tgm4_type1978_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4_type1978_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4_type1978_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, tgm4_type1978, 1101) { purchase: tgm4_type1978_purchase_sprites; running_cost_factor: tgm4_type1978_running_cost_factor; speed: tgm4_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4-type1984.pnml b/src/diesel/lyudinovsk/tgm4-type1984.pnml index 1e825a3b4..9efc18a68 100644 --- a/src/diesel/lyudinovsk/tgm4-type1984.pnml +++ b/src/diesel/lyudinovsk/tgm4-type1984.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tgm4_type1984, 1102) { additional_text: tgm4_type1984_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4_type1984_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4_type1984_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, tgm4_type1984, 1102) { purchase: tgm4_type1984_purchase_sprites; running_cost_factor: tgm4_type1984_running_cost_factor; speed: tgm4_type1984_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4b-type1989.pnml b/src/diesel/lyudinovsk/tgm4b-type1989.pnml index c7a4d6fed..e60026586 100644 --- a/src/diesel/lyudinovsk/tgm4b-type1989.pnml +++ b/src/diesel/lyudinovsk/tgm4b-type1989.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm4b_type1989, 534) { additional_text: tgm4b_type1989_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4b_type1989_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4b_type1989_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm4b_type1989, 534) { purchase: tgm4b_type1989_purchase_sprites; running_cost_factor: tgm4b_type1989_running_cost_factor; speed: tgm4b_type1989_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4b-type1991.pnml b/src/diesel/lyudinovsk/tgm4b-type1991.pnml index 00699a781..ecae1a5be 100644 --- a/src/diesel/lyudinovsk/tgm4b-type1991.pnml +++ b/src/diesel/lyudinovsk/tgm4b-type1991.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm4b_type1991, 1103) { additional_text: tgm4b_type1991_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4b_type1991_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4b_type1991_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm4b_type1991, 1103) { purchase: tgm4b_type1991_purchase_sprites; running_cost_factor: tgm4b_type1991_running_cost_factor; speed: tgm4b_type1991_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm4b-type2005.pnml b/src/diesel/lyudinovsk/tgm4b-type2005.pnml index 38d49f47e..33724b346 100644 --- a/src/diesel/lyudinovsk/tgm4b-type2005.pnml +++ b/src/diesel/lyudinovsk/tgm4b-type2005.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm4b_type2005, 1104) { additional_text: tgm4b_type2005_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm4b_type2005_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm4b_type2005_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm4b_type2005, 1104) { purchase: tgm4b_type2005_purchase_sprites; running_cost_factor: tgm4b_type2005_running_cost_factor; speed: tgm4b_type2005_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm6a-type1970.pnml b/src/diesel/lyudinovsk/tgm6a-type1970.pnml index 1c79b83bc..1c975651c 100644 --- a/src/diesel/lyudinovsk/tgm6a-type1970.pnml +++ b/src/diesel/lyudinovsk/tgm6a-type1970.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, tgm6a_type1970, 727) { additional_text: tgm6a_type1970_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm6a_type1970_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm6a_type1970_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tgm6a_type1970, 727) { purchase: tgm6a_type1970_purchase_sprites; running_cost_factor: tgm6a_type1970_running_cost_factor; speed: tgm6a_type1970_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm6a-type1973.pnml b/src/diesel/lyudinovsk/tgm6a-type1973.pnml index e1a3068ad..089997208 100644 --- a/src/diesel/lyudinovsk/tgm6a-type1973.pnml +++ b/src/diesel/lyudinovsk/tgm6a-type1973.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, tgm6a_type1973, 1106) { additional_text: tgm6a_type1973_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm6a_type1970_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm6a_type1973_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, tgm6a_type1973, 1106) { purchase: tgm6a_type1973_purchase_sprites; running_cost_factor: tgm6a_type1973_running_cost_factor; speed: tgm6a_type1973_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/lyudinovsk/tgm6d.pnml b/src/diesel/lyudinovsk/tgm6d.pnml index da22f4041..4a6bc3ece 100644 --- a/src/diesel/lyudinovsk/tgm6d.pnml +++ b/src/diesel/lyudinovsk/tgm6d.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm6d, 732) { additional_text: tgm6d_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm6d_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tgm6d, 732) { purchase: tgm6d_purchase_sprites; running_cost_factor: tgm6d_running_cost_factor; speed: tgm6d_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/m32.pnml b/src/diesel/m32.pnml index 98029a83a..bb573742c 100644 --- a/src/diesel/m32.pnml +++ b/src/diesel/m32.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, m32, 494) { additional_text: m32_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: m32_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: m32_cargo_subtype_text; colour_mapping: m32_colour_mapping; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, m32, 494) { purchase_speed: return 38; running_cost_factor: m32_running_cost_factor; speed: m32_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/mx.pnml b/src/diesel/mx.pnml index 16db700da..37d735998 100644 --- a/src/diesel/mx.pnml +++ b/src/diesel/mx.pnml @@ -40,7 +40,7 @@ item (FEAT_TRAINS, _mx, 379) { additional_text: _mx_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: _mx_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _mx_create_effect; @@ -49,7 +49,7 @@ item (FEAT_TRAINS, _mx, 379) { purchase_speed: return 45; running_cost_factor: _mx_running_cost_factor; speed: _mx_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/schel1.pnml b/src/diesel/schel1.pnml index 4821440d2..87b7be719 100644 --- a/src/diesel/schel1.pnml +++ b/src/diesel/schel1.pnml @@ -52,7 +52,7 @@ item (FEAT_TRAINS, schel1, 730) { additional_text: schel1_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: schel1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: schel1_cargo_subtype_text; colour_mapping: schel1_colour_mapping; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, schel1, 730) { purchase_speed: return 75; running_cost_factor: schel1_running_cost_factor; speed: schel1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/te33a-type2009.pnml b/src/diesel/te33a-type2009.pnml index cb0aeb733..89c9cfc47 100644 --- a/src/diesel/te33a-type2009.pnml +++ b/src/diesel/te33a-type2009.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, te33a_type2009, 623) { additional_text: te33a_type2009_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: te33a_type2009_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: return ttd_cc2 + 0x41; create_effect: te33a_type2009_create_effect_sprites_start_sp; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, te33a_type2009, 623) { purchase: te33a_type2009_purchase_sprites; running_cost_factor: te33a_type2009_running_cost_factor; speed: te33a_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/te33a-type2010.pnml b/src/diesel/te33a-type2010.pnml index 475bc9025..7381f2a3a 100644 --- a/src/diesel/te33a-type2010.pnml +++ b/src/diesel/te33a-type2010.pnml @@ -93,7 +93,7 @@ item (FEAT_TRAINS, te33a_type2010, 1073) { additional_text: te33a_type2010_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: te33a_type2009_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te33a_type2010_cargo_subtype_text; colour_mapping: te33a_type2010_colour_mapping; @@ -103,7 +103,7 @@ item (FEAT_TRAINS, te33a_type2010, 1073) { purchase: te33a_type2010_purchase_sprites; running_cost_factor: te33a_type2010_running_cost_factor; speed: te33a_type2010_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/te33ac.pnml b/src/diesel/te33ac.pnml index b415677b7..a36eb48b5 100644 --- a/src/diesel/te33ac.pnml +++ b/src/diesel/te33ac.pnml @@ -89,7 +89,7 @@ item (FEAT_TRAINS, te33ac, 1074) { additional_text: te33ac_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: te33a_type2009_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: te33ac_cargo_subtype_text; colour_mapping: te33ac_colour_mapping; @@ -99,7 +99,7 @@ item (FEAT_TRAINS, te33ac, 1074) { purchase: te33ac_purchase_sprites; running_cost_factor: te33ac_running_cost_factor; speed: te33ac_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tep33a.pnml b/src/diesel/tep33a.pnml index b47088332..5d7eacdef 100644 --- a/src/diesel/tep33a.pnml +++ b/src/diesel/tep33a.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tep33a, 1075) { additional_text: tep33a_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: tep33a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tep33a_create_effect_sprites_start_sp; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tep33a, 1075) { purchase: tep33a_purchase_sprites; running_cost_factor: tep33a_running_cost_factor; speed: tep33a_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tg102-type1960_use.pnml b/src/diesel/tg102-type1960_use.pnml index 841f4a3cd..f8fdcc63b 100644 --- a/src/diesel/tg102-type1960_use.pnml +++ b/src/diesel/tg102-type1960_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, tg102_type1960, 1004) { additional_text: tg102_type1960_additional_text; articulated_part: tg102_type1960_articulated_part; bitmask_vehicle_info: tg102_type1960_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg102_pre_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, tg102_type1960, 1004) { purchase: tg102_type1960_purchase_sprites; running_cost_factor: tg102_type1960_running_cost_factor; speed: tg102_type1960_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tg102-type1961.pnml b/src/diesel/tg102-type1961.pnml index 23dc859b5..7670702ec 100644 --- a/src/diesel/tg102-type1961.pnml +++ b/src/diesel/tg102-type1961.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, tg102_type1961, 148) { additional_text: tg102_type1961_additional_text; articulated_part: tg102_type1961_articulated_part; bitmask_vehicle_info: tg102_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: tg102_type1961_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, tg102_type1961, 148) { purchase: tg102_type1961_purchase_sprites; running_cost_factor: tg102_type1961_running_cost_factor; speed: tg102_type1961_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tg102f-type1961_use.pnml b/src/diesel/tg102f-type1961_use.pnml index 49057faf8..3b84574e8 100644 --- a/src/diesel/tg102f-type1961_use.pnml +++ b/src/diesel/tg102f-type1961_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, tg102f_type1961, 1003) { additional_text: tg102f_type1961_additional_text; articulated_part: tg102f_type1961_articulated_part; bitmask_vehicle_info: tg102f_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg102_pre_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, tg102f_type1961, 1003) { purchase: tg102f_type1961_purchase_sprites; running_cost_factor: tg102f_type1961_running_cost_factor; speed: tg102f_type1961_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tg102f-type1962_use.pnml b/src/diesel/tg102f-type1962_use.pnml index 7451f37f3..6b75c72d9 100644 --- a/src/diesel/tg102f-type1962_use.pnml +++ b/src/diesel/tg102f-type1962_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, tg102f_type1962, 1002) { additional_text: tg102f_type1962_additional_text; articulated_part: tg102f_type1962_articulated_part; bitmask_vehicle_info: tg102f_type1962_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg102k_type1962_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, tg102f_type1962, 1002) { purchase: tg102f_type1962_purchase_sprites; running_cost_factor: tg102f_type1962_running_cost_factor; speed: tg102f_type1962_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tg102k-type1962.pnml b/src/diesel/tg102k-type1962.pnml index 27cb389ac..f639ed5dc 100644 --- a/src/diesel/tg102k-type1962.pnml +++ b/src/diesel/tg102k-type1962.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tg102k_type1962, 1000) { additional_text: tg102k_type1962_additional_text; articulated_part: tg102k_type1962_articulated_part; bitmask_vehicle_info: tg102k_type1962_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: tg102k_type1962_create_effect_sprites_start; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, tg102k_type1962, 1000) { purchase: tg102k_type1962_purchase_sprites; running_cost_factor: tg102k_type1962_running_cost_factor; speed: tg102k_type1962_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tgk.pnml b/src/diesel/tgk.pnml index 0a36aa082..91faa83fe 100644 --- a/src/diesel/tgk.pnml +++ b/src/diesel/tgk.pnml @@ -89,7 +89,7 @@ item (FEAT_TRAINS, tgk, 718) { additional_text: tgk_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgk_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgk_CC; cargo_subtype_text: tgk_cargo_subtype_text; colour_mapping: tgk_colour_mapping; @@ -99,7 +99,7 @@ item (FEAT_TRAINS, tgk, 718) { purchase: tgk_purchase_sprites; running_cost_factor: tgk_running_cost_factor; speed: tgk_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tgk2.pnml b/src/diesel/tgk2.pnml index aeee63c2a..082cd8263 100644 --- a/src/diesel/tgk2.pnml +++ b/src/diesel/tgk2.pnml @@ -89,7 +89,7 @@ item (FEAT_TRAINS, tgk2, 511) { additional_text: tgk2_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgk2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgk2_CC; cargo_subtype_text: tgk2_cargo_subtype_text; colour_mapping: tgk2_colour_mapping; @@ -99,7 +99,7 @@ item (FEAT_TRAINS, tgk2, 511) { purchase: tgk2_purchase_sprites; running_cost_factor: tgk2_running_cost_factor; speed: tgk2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tgm23.pnml b/src/diesel/tgm23.pnml index 9585d6a6a..5c9745ab3 100644 --- a/src/diesel/tgm23.pnml +++ b/src/diesel/tgm23.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tgm23, 780) { additional_text: tgm23_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm23_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm23_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -69,7 +69,7 @@ item (FEAT_TRAINS, tgm23, 780) { purchase: tgm23_purchase_sprites; running_cost_factor: tgm23_running_cost_factor; speed: tgm23_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tgm23b_use.pnml b/src/diesel/tgm23b_use.pnml index 763422152..db24759b7 100644 --- a/src/diesel/tgm23b_use.pnml +++ b/src/diesel/tgm23b_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, tgm23b, 277) { additional_text: tgm23b_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm23b_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm23b_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, tgm23b, 277) { purchase: tgm23b_purchase_sprites; running_cost_factor: tgm23b_running_cost_factor; speed: tgm23b_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tgm23d_use.pnml b/src/diesel/tgm23d_use.pnml index 6cf28c472..df4350aa6 100644 --- a/src/diesel/tgm23d_use.pnml +++ b/src/diesel/tgm23d_use.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, tgm23d, 279) { additional_text: tgm23d_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm23d_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm23d_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm23d, 279) { purchase: tgm23b_purchase_sprites; running_cost_factor: tgm23d_running_cost_factor; speed: tgm23d_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/tgm23v_use.pnml b/src/diesel/tgm23v_use.pnml index 0e7875692..86ca76a23 100644 --- a/src/diesel/tgm23v_use.pnml +++ b/src/diesel/tgm23v_use.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, tgm23v, 278) { additional_text: tgm23v_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: tgm23v_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return PROP_tgm23v_CC; cargo_subtype_text: shunting_cargo_subtype_text; colour_mapping: shunting_colour_mapping; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, tgm23v, 278) { purchase: tgm23b_purchase_sprites; running_cost_factor: tgm23v_running_cost_factor; speed: tgm23v_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/vme1-type1958.pnml b/src/diesel/vme1-type1958.pnml index a3f1392c4..64b1c6195 100644 --- a/src/diesel/vme1-type1958.pnml +++ b/src/diesel/vme1-type1958.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vme1_type1958, 731) { additional_text: vme1_type1958_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vme1_type1958_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: vme1_type1958_cargo_subtype_text; colour_mapping: vme1_type1958_colour_mapping; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, vme1_type1958, 731) { purchase: vme1_type1958_purchase_sprites; running_cost_factor: vme1_type1958_running_cost_factor; speed: vme1_type1958_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/vme1-type1959.pnml b/src/diesel/vme1-type1959.pnml index c15fdfc04..394182eaa 100644 --- a/src/diesel/vme1-type1959.pnml +++ b/src/diesel/vme1-type1959.pnml @@ -67,7 +67,7 @@ item (FEAT_TRAINS, vme1_type1959, 1077) { additional_text: vme1_type1959_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vme1_type1958_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: vme1_type1959_cargo_subtype_text; colour_mapping: vme1_type1959_colour_mapping; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, vme1_type1959, 1077) { purchase: vme1_type1959_purchase_sprites; running_cost_factor: vme1_type1959_running_cost_factor; speed: vme1_type1959_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/diesel/vme1-type1961_use.pnml b/src/diesel/vme1-type1961_use.pnml index e856f3fd4..c020f0400 100644 --- a/src/diesel/vme1-type1961_use.pnml +++ b/src/diesel/vme1-type1961_use.pnml @@ -48,7 +48,7 @@ item (FEAT_TRAINS, vme1_type1961, 1078) { additional_text: vme1_type1961_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vme1_type1961_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_diesel; cargo_capacity: return 0; cargo_subtype_text: vme1_type1959_cargo_subtype_text; colour_mapping: vme1_type1959_colour_mapping; @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vme1_type1961, 1078) { purchase: vme1_type1961_purchase_sprites; running_cost_factor: vme1_type1961_running_cost_factor; speed: vme1_type1961_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_diesel; } } diff --git a/src/electric/2el4_use.pnml b/src/electric/2el4_use.pnml index 354543dbb..f9b99df15 100644 --- a/src/electric/2el4_use.pnml +++ b/src/electric/2el4_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, _2el4, 919) { additional_text: _2el4_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2el4_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2el4_create_effect_sprites_start; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, _2el4, 919) { purchase: _2el4_purchase_sprites; running_cost_factor: _2el4_running_cost_factor; speed: _2el4_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es4k-type2006.pnml b/src/electric/2es4k-type2006.pnml index 016c18fd0..8a1843a4e 100644 --- a/src/electric/2es4k-type2006.pnml +++ b/src/electric/2es4k-type2006.pnml @@ -81,7 +81,7 @@ item (FEAT_TRAINS, _2es4k_type2006, 187) { additional_text: _2es4k_type2006_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es4k_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es4k_type2006_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -91,7 +91,7 @@ item (FEAT_TRAINS, _2es4k_type2006, 187) { purchase: _2es4k_type2006_purchase_sprites; running_cost_factor: _2es4k_type2006_running_cost_factor; speed: _2es4k_type2006_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es4k-type2009.pnml b/src/electric/2es4k-type2009.pnml index 66f4592f8..bf0b1a624 100644 --- a/src/electric/2es4k-type2009.pnml +++ b/src/electric/2es4k-type2009.pnml @@ -91,7 +91,7 @@ item (FEAT_TRAINS, _2es4k_type2009, 909) { additional_text: _2es4k_type2009_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es4k_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es4k_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -101,7 +101,7 @@ item (FEAT_TRAINS, _2es4k_type2009, 909) { purchase: _2es4k_type2009_purchase_sprites; running_cost_factor: _2es4k_type2009_running_cost_factor; speed: _2es4k_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es4k-type2010_use.pnml b/src/electric/2es4k-type2010_use.pnml index fd56855dd..032f09347 100644 --- a/src/electric/2es4k-type2010_use.pnml +++ b/src/electric/2es4k-type2010_use.pnml @@ -87,7 +87,7 @@ item (FEAT_TRAINS, _2es4k_type2010, 918) { additional_text: _2es4k_type2010_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es4k_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es4k_type2010_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -97,7 +97,7 @@ item (FEAT_TRAINS, _2es4k_type2010, 918) { purchase: _2es4k_type2010_purchase_sprites; running_cost_factor: _2es4k_type2010_running_cost_factor; speed: _2es4k_type2010_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es4k-type2011_use.pnml b/src/electric/2es4k-type2011_use.pnml index eb9b09905..b6d8bdc58 100644 --- a/src/electric/2es4k-type2011_use.pnml +++ b/src/electric/2es4k-type2011_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, _2es4k_type2011, 910) { additional_text: _2es4k_type2011_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es4k_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es4k_type2006_create_effect_sprites_start; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, _2es4k_type2011, 910) { purchase: _2es4k_type2011_purchase_sprites; running_cost_factor: _2es4k_type2011_running_cost_factor; speed: _2es4k_type2011_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es4k-type2012.pnml b/src/electric/2es4k-type2012.pnml index 1c2312864..25d322775 100644 --- a/src/electric/2es4k-type2012.pnml +++ b/src/electric/2es4k-type2012.pnml @@ -90,7 +90,7 @@ item (FEAT_TRAINS, _2es4k_type2012, 911) { additional_text: _2es4k_type2012_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es4k_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es4k_type2012_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -100,7 +100,7 @@ item (FEAT_TRAINS, _2es4k_type2012, 911) { purchase: _2es4k_type2012_purchase_sprites; running_cost_factor: _2es4k_type2012_running_cost_factor; speed: _2es4k_type2012_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es5-type2015.pnml b/src/electric/2es5-type2015.pnml index 31847d6d7..d7522d7d2 100644 --- a/src/electric/2es5-type2015.pnml +++ b/src/electric/2es5-type2015.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2es5_type2015, 913) { additional_text: _2es5_type2015_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es5_type2015_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2es5_type2015, 913) { purchase: _2es5_type2015_purchase_sprites; running_cost_factor: _2es5_type2015_running_cost_factor; speed: _2es5_type2015_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2es5.pnml b/src/electric/2es5.pnml index 6fcd6828c..753365c45 100644 --- a/src/electric/2es5.pnml +++ b/src/electric/2es5.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2es5, 538) { additional_text: _2es5_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es5_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _2es5, 538) { purchase: _2es5_purchase_sprites; running_cost_factor: _2es5_running_cost_factor; speed: _2es5_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/2ev120.pnml b/src/electric/2ev120.pnml index 4ba50b9d3..f691e95e0 100644 --- a/src/electric/2ev120.pnml +++ b/src/electric/2ev120.pnml @@ -90,7 +90,7 @@ item (FEAT_TRAINS, _2ev120, 444) { additional_text: _2ev120_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: _2ev120_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2ev120_create_effect_sprites_start; @@ -100,7 +100,7 @@ item (FEAT_TRAINS, _2ev120, 444) { purchase_speed: return 120; running_cost_factor: _2ev120_running_cost_factor; speed: _2ev120_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/3es4k_m.pnml b/src/electric/3es4k_m.pnml index 8fd9d74a7..26578fc19 100644 --- a/src/electric/3es4k_m.pnml +++ b/src/electric/3es4k_m.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, _3es4k_m, 625) { additional_text: _3es4k_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3es4k_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _3es4k_m_create_effect_sprites_start; diff --git a/src/electric/3es4k_use.pnml b/src/electric/3es4k_use.pnml index ef4912023..15aa0eda4 100644 --- a/src/electric/3es4k_use.pnml +++ b/src/electric/3es4k_use.pnml @@ -40,7 +40,7 @@ item (FEAT_TRAINS, _3es4k, 626) { additional_text: _3es4k_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es4k_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es4k_type2006_create_effect_sprites_start; @@ -50,7 +50,7 @@ item (FEAT_TRAINS, _3es4k, 626) { purchase_speed: return 120; running_cost_factor: _3es4k_running_cost_factor; speed: _3es4k_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ds3.pnml b/src/electric/ds3.pnml index 8e43c8da9..307ae9ed5 100644 --- a/src/electric/ds3.pnml +++ b/src/electric/ds3.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, ds3, 197) { additional_text: ds3_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: ds3_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: ds3_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, ds3, 197) { refit_cost: ds3_refit_cost; running_cost_factor: ds3_running_cost_factor; speed: ds3_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2el5.pnml b/src/electric/e5k/2el5.pnml index 938ff9024..b4f537229 100644 --- a/src/electric/e5k/2el5.pnml +++ b/src/electric/e5k/2el5.pnml @@ -48,7 +48,7 @@ item (FEAT_TRAINS, _2el5, 579) { additional_text: _2el5_additional_text; articulated_part: _2el5_articulated_part; bitmask_vehicle_info: _2el5_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2el5_create_effect_sprites_start; @@ -58,7 +58,7 @@ item (FEAT_TRAINS, _2el5, 579) { purchase_speed: return 110; running_cost_factor: _2el5_running_cost_factor; speed: _2el5_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5k-pre.pnml b/src/electric/e5k/2es5k-pre.pnml index d9f8a2b42..1cc1f326e 100644 --- a/src/electric/e5k/2es5k-pre.pnml +++ b/src/electric/e5k/2es5k-pre.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, _2es5k_pre, 863) { additional_text: _2es5k_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es5k_pre_create_effect_sprites_start; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, _2es5k_pre, 863) { purchase: _2es5k_pre_purchase_sprites; running_cost_factor: _2es5k_pre_running_cost_factor; speed: _2es5k_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5k-type2006.pnml b/src/electric/e5k/2es5k-type2006.pnml index a8471ef9b..ffb14ff90 100644 --- a/src/electric/e5k/2es5k-type2006.pnml +++ b/src/electric/e5k/2es5k-type2006.pnml @@ -60,7 +60,7 @@ item (FEAT_TRAINS, _2es5k_type2006, 864) { additional_text: _2es5k_type2006_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es5k_pre_create_effect_sprites_start; @@ -69,7 +69,7 @@ item (FEAT_TRAINS, _2es5k_type2006, 864) { purchase: _2es5k_type2006_purchase_sprites; running_cost_factor: _2es5k_type2006_running_cost_factor; speed: _2es5k_type2006_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5k-type2007_use.pnml b/src/electric/e5k/2es5k-type2007_use.pnml index d14beeed3..b65f997ce 100644 --- a/src/electric/e5k/2es5k-type2007_use.pnml +++ b/src/electric/e5k/2es5k-type2007_use.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _2es5k_type2007, 865) { additional_text: _2es5k_type2007_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es5k_type2007_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, _2es5k_type2007, 865) { purchase: _2es5k_type2007_purchase_sprites; running_cost_factor: _2es5k_type2007_running_cost_factor; speed: _2es5k_type2007_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5k-type2009_use.pnml b/src/electric/e5k/2es5k-type2009_use.pnml index e1f71f93a..994a7f889 100644 --- a/src/electric/e5k/2es5k-type2009_use.pnml +++ b/src/electric/e5k/2es5k-type2009_use.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _2es5k_type2009, 866) { additional_text: _2es5k_type2009_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es5k_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, _2es5k_type2009, 866) { purchase: _2es5k_type2009_purchase_sprites; running_cost_factor: _2es5k_type2009_running_cost_factor; speed: _2es5k_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5k-type2010.pnml b/src/electric/e5k/2es5k-type2010.pnml index 6e61c3ce6..ae7fe8a7c 100644 --- a/src/electric/e5k/2es5k-type2010.pnml +++ b/src/electric/e5k/2es5k-type2010.pnml @@ -74,7 +74,7 @@ item (FEAT_TRAINS, _2es5k_type2010, 867) { additional_text: _2es5k_type2010_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es5k_type2010_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -84,7 +84,7 @@ item (FEAT_TRAINS, _2es5k_type2010, 867) { purchase: _2es5k_type2010_purchase_sprites; running_cost_factor: _2es5k_type2010_running_cost_factor; speed: _2es5k_type2010_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5k-type2013_use.pnml b/src/electric/e5k/2es5k-type2013_use.pnml index b111ce838..8cae712d8 100644 --- a/src/electric/e5k/2es5k-type2013_use.pnml +++ b/src/electric/e5k/2es5k-type2013_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, _2es5k_type2013, 198) { additional_text: _2es5k_type2013_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es5k_pre_create_effect_sprites_start; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, _2es5k_type2013, 198) { purchase: _2es5k_type2013_purchase_sprites; running_cost_factor: _2es5k_type2013_running_cost_factor; speed: _2es5k_type2013_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/2es5s.pnml b/src/electric/e5k/2es5s.pnml index 1d8d559be..df9c75062 100644 --- a/src/electric/e5k/2es5s.pnml +++ b/src/electric/e5k/2es5s.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, _2es5s, 634) { additional_text: _2es5s_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5s_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es5s_create_effect_sprites_start; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, _2es5s, 634) { purchase_speed: return 120; running_cost_factor: _2es5s_running_cost_factor; speed: _2es5s_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/3es5k-type2007_use.pnml b/src/electric/e5k/3es5k-type2007_use.pnml index 73a70f814..7de4266d7 100644 --- a/src/electric/e5k/3es5k-type2007_use.pnml +++ b/src/electric/e5k/3es5k-type2007_use.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, _3es5k_type2007, 868) { additional_text: _3es5k_type2007_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _3es5k_type2007_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _3es5k_type2007, 868) { purchase_speed: return 110; running_cost_factor: _3es5k_type2007_running_cost_factor; speed: _3es5k_type2007_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/3es5k-type2009_use.pnml b/src/electric/e5k/3es5k-type2009_use.pnml index 5ff833106..fdfbff15a 100644 --- a/src/electric/e5k/3es5k-type2009_use.pnml +++ b/src/electric/e5k/3es5k-type2009_use.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _3es5k_type2009, 869) { additional_text: _3es5k_type2009_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _3es5k_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -74,7 +74,7 @@ item (FEAT_TRAINS, _3es5k_type2009, 869) { purchase_speed: return 110; running_cost_factor: _3es5k_type2009_running_cost_factor; speed: _3es5k_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/3es5k-type2010_use.pnml b/src/electric/e5k/3es5k-type2010_use.pnml index f2562f799..d1e9b7ecd 100644 --- a/src/electric/e5k/3es5k-type2010_use.pnml +++ b/src/electric/e5k/3es5k-type2010_use.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _3es5k_type2010, 870) { additional_text: _3es5k_type2010_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _3es5k_type2010_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -74,7 +74,7 @@ item (FEAT_TRAINS, _3es5k_type2010, 870) { purchase_speed: return 110; running_cost_factor: _3es5k_type2010_running_cost_factor; speed: _3es5k_type2010_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/3es5k-type2012.pnml b/src/electric/e5k/3es5k-type2012.pnml index fe0d83f23..5beb5cae4 100644 --- a/src/electric/e5k/3es5k-type2012.pnml +++ b/src/electric/e5k/3es5k-type2012.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _3es5k_type2012, 199) { additional_text: _3es5k_type2012_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es5k_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _3es5k_type2012_create_effect_sprites_start; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, _3es5k_type2012, 199) { purchase: _3es5k_type2012_purchase_sprites; running_cost_factor: _3es5k_type2012_running_cost_factor; speed: _3es5k_type2012_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/3es5k_m-type2007_use.pnml b/src/electric/e5k/3es5k_m-type2007_use.pnml index 0bf738300..d988cfc6f 100644 --- a/src/electric/e5k/3es5k_m-type2007_use.pnml +++ b/src/electric/e5k/3es5k_m-type2007_use.pnml @@ -82,7 +82,7 @@ item (FEAT_TRAINS, _3es5k_m_type2007, 200) { additional_text: _3es5k_m_type2007_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3es5k_m_type2007_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_3es5k_m_type2007_CC; cargo_subtype_text: _3es5k_m_type2007_cargo_subtype_text; colour_mapping: any_cc_colour; diff --git a/src/electric/e5k/3es5k_m-type2009_use.pnml b/src/electric/e5k/3es5k_m-type2009_use.pnml index 0ff504382..9d7d0e204 100644 --- a/src/electric/e5k/3es5k_m-type2009_use.pnml +++ b/src/electric/e5k/3es5k_m-type2009_use.pnml @@ -82,7 +82,7 @@ item (FEAT_TRAINS, _3es5k_m_type2009, 871) { additional_text: _3es5k_m_type2009_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3es5k_m_type2009_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_3es5k_m_type2009_CC; cargo_subtype_text: _3es5k_m_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; diff --git a/src/electric/e5k/3es5k_m-type2010_use.pnml b/src/electric/e5k/3es5k_m-type2010_use.pnml index 723ebbaf1..6948fd976 100644 --- a/src/electric/e5k/3es5k_m-type2010_use.pnml +++ b/src/electric/e5k/3es5k_m-type2010_use.pnml @@ -82,7 +82,7 @@ item (FEAT_TRAINS, _3es5k_m_type2010, 872) { additional_text: _3es5k_m_type2010_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3es5k_m_type2010_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_3es5k_m_type2010_CC; cargo_subtype_text: _3es5k_m_type2010_cargo_subtype_text; colour_mapping: any_cc_colour; diff --git a/src/electric/e5k/3es5k_m-type2012.pnml b/src/electric/e5k/3es5k_m-type2012.pnml index 2cb387b0b..fd0055334 100644 --- a/src/electric/e5k/3es5k_m-type2012.pnml +++ b/src/electric/e5k/3es5k_m-type2012.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _3es5k_m_type2012, 873) { additional_text: _3es5k_m_type2012_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _3es5k_m_type2012_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_3es5k_m_type2012_CC; colour_mapping: any_cc_colour; default: _3es5k_m_type2012_sprites; diff --git a/src/electric/e5k/4es5k_use.pnml b/src/electric/e5k/4es5k_use.pnml index 9466ff910..f54b9860b 100644 --- a/src/electric/e5k/4es5k_use.pnml +++ b/src/electric/e5k/4es5k_use.pnml @@ -78,7 +78,7 @@ item (FEAT_TRAINS, _4es5k, 472) { additional_text: _4es5k_additional_text; articulated_part: _4es5k_articulated_part; bitmask_vehicle_info: _4es5k_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _4es5k_create_effect_sprites_start; @@ -88,7 +88,7 @@ item (FEAT_TRAINS, _4es5k, 472) { purchase_speed: return 110; running_cost_factor: _4es5k_running_cost_factor; speed: _4es5k_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/e5k-type2007.pnml b/src/electric/e5k/e5k-type2007.pnml index 3c93111b4..491725b86 100644 --- a/src/electric/e5k/e5k-type2007.pnml +++ b/src/electric/e5k/e5k-type2007.pnml @@ -66,7 +66,7 @@ item (FEAT_TRAINS, e5k_type2007, 268) { additional_text: e5k_type2007_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: e5k_type2007_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: e5k_type2007_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, e5k_type2007, 268) { purchase_speed: return 110; running_cost_factor: e5k_type2007_running_cost_factor; speed: e5k_type2007_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/e5k/e5k-type2009.pnml b/src/electric/e5k/e5k-type2009.pnml index 57c8f9987..7912d848b 100644 --- a/src/electric/e5k/e5k-type2009.pnml +++ b/src/electric/e5k/e5k-type2009.pnml @@ -66,7 +66,7 @@ item (FEAT_TRAINS, e5k_type2009, 874) { additional_text: e5k_type2009_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: e5k_type2009_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: e5k_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, e5k_type2009, 874) { purchase_speed: return 110; running_cost_factor: e5k_type2009_running_cost_factor; speed: e5k_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/electric-attach.pnml b/src/electric/electric-attach.pnml index 144a39af7..e6ad450e5 100644 --- a/src/electric/electric-attach.pnml +++ b/src/electric/electric-attach.pnml @@ -328,7 +328,7 @@ switch (FEAT_TRAINS, PARENT, q_2es10_can_attach_wagon, q_2es7_can_attach_wagon; } -switch (FEAT_TRAINS, PARENT, double_can_attach_wagon, +switch (FEAT_TRAINS, PARENT, double_can_attach_wagon_electric, [ set_offset_to(num_vehs_in_consist-2), STORE_TEMP (prev_vehicle_type_id(), 3) ]) { @@ -341,9 +341,9 @@ switch (FEAT_TRAINS, PARENT, pe2_for_pwd_dumpcar_required3, [ set_offset_to(num_vehs_in_consist-8), prev_vehicle_type_id() ]) { - pe2: double_can_attach_wagon; - pe2m: double_can_attach_wagon; - pe2u: double_can_attach_wagon; + pe2: double_can_attach_wagon_electric; + pe2m: double_can_attach_wagon_electric; + pe2u: double_can_attach_wagon_electric; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } @@ -351,9 +351,9 @@ switch (FEAT_TRAINS, PARENT, pe2_for_pwd_dumpcar_required2, [ set_offset_to(num_vehs_in_consist-6), prev_vehicle_type_id() ]) { - pe2: double_can_attach_wagon; - pe2m: double_can_attach_wagon; - pe2u: double_can_attach_wagon; + pe2: double_can_attach_wagon_electric; + pe2m: double_can_attach_wagon_electric; + pe2u: double_can_attach_wagon_electric; pwd_dumpcar: pe2_for_pwd_dumpcar_required3; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } @@ -362,21 +362,21 @@ switch (FEAT_TRAINS, PARENT, pe2_for_pwd_dumpcar_required, [ set_offset_to(num_vehs_in_consist-4), prev_vehicle_type_id() ]) { - pe2: double_can_attach_wagon; - pe2m: double_can_attach_wagon; - pe2u: double_can_attach_wagon; + pe2: double_can_attach_wagon_electric; + pe2m: double_can_attach_wagon_electric; + pe2u: double_can_attach_wagon_electric; pwd_dumpcar: pe2_for_pwd_dumpcar_required2; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } -switch (FEAT_TRAINS, PARENT, other_can_attach_wagon, +switch (FEAT_TRAINS, PARENT, other_can_attach_wagon_electric, [ set_offset_to(num_vehs_in_consist-2), ( all_mid_section_electric() + (((prev_vehicle_type_id() == pwd_dumpcar) && (!((LOAD_TEMP(5) == pe2) || (LOAD_TEMP(5) == pe2u) || (LOAD_TEMP(5) == pe2m)))) * 2)) ]) { 1: return string(STR_CAN_ATTACH_NO_AFTER_MIDDLE_UNIT); 2: pe2_for_pwd_dumpcar_required; - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_3es4k_can_attach_wagon_m, @@ -392,7 +392,7 @@ switch (FEAT_TRAINS, PARENT, m_3es4k_can_attach_wagon_m, (!LOAD_TEMP(3)) ]) { 0: return string(STR_CAN_ATTACH_NO_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_3es4k_can_attach_wagon_h, @@ -400,7 +400,7 @@ switch (FEAT_TRAINS, PARENT, m_3es4k_can_attach_wagon_h, all_mid_section_electric() && (prev_vehicle_type_id() != _3es4k_m) ]) { 1: return string(STR_CAN_ATTACH_NO_AFTER_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_3es5k_can_attach_wagon_m, @@ -420,7 +420,7 @@ switch (FEAT_TRAINS, PARENT, m_3es5k_can_attach_wagon_m, (!LOAD_TEMP(3)) ]) { 0: return string(STR_CAN_ATTACH_NO_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_3es5k_can_attach_wagon_h, @@ -432,7 +432,7 @@ switch (FEAT_TRAINS, PARENT, m_3es5k_can_attach_wagon_h, (prev_vehicle_type_id() != _3es5k_m_type2012) ]) { 1: return string(STR_CAN_ATTACH_NO_AFTER_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_3es8_can_attach_wagon_m, @@ -444,7 +444,7 @@ switch (FEAT_TRAINS, PARENT, m_3es8_can_attach_wagon_m, (!LOAD_TEMP(3)) ]) { 0: return string(STR_CAN_ATTACH_NO_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_3es8_can_attach_wagon_h, @@ -453,7 +453,7 @@ switch (FEAT_TRAINS, PARENT, m_3es8_can_attach_wagon_h, (prev_vehicle_type_id() != _3es8_m) ]) { 1: return string(STR_CAN_ATTACH_NO_AFTER_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_2es6_can_attach_wagon_m, @@ -468,7 +468,7 @@ switch (FEAT_TRAINS, PARENT, m_2es6_can_attach_wagon_m, (!LOAD_TEMP(3)) ]) { 0: return string(STR_CAN_ATTACH_NO_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_2es6_can_attach_wagon_h, @@ -476,7 +476,7 @@ switch (FEAT_TRAINS, PARENT, m_2es6_can_attach_wagon_h, all_mid_section_electric() && (prev_vehicle_type_id() != _2es6_m)]) { 1: return string(STR_CAN_ATTACH_NO_AFTER_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_2es10_can_attach_wagon_m, @@ -489,7 +489,7 @@ switch (FEAT_TRAINS, PARENT, m_2es10_can_attach_wagon_m, (!LOAD_TEMP(3)) ]) { 0: return string(STR_CAN_ATTACH_NO_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_2es10_can_attach_wagon_h, @@ -497,7 +497,7 @@ switch (FEAT_TRAINS, PARENT, m_2es10_can_attach_wagon_h, all_mid_section_electric() && (prev_vehicle_type_id() != _2es10_m)]) { 1: return string(STR_CAN_ATTACH_NO_AFTER_MIDDLE_UNIT); - double_can_attach_wagon; + double_can_attach_wagon_electric; } // Специальная проверка для управления присоединением тяговыми агрегатами @@ -507,9 +507,9 @@ switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon6, prev_vehicle_type_id()]) { pwd_dumpcar: return string(STR_START_STOP_POWER_UNIT_REQUIRED); - pe2: double_can_attach_wagon; - pe2m: double_can_attach_wagon; - pe2u: double_can_attach_wagon; + pe2: double_can_attach_wagon_electric; + pe2m: double_can_attach_wagon_electric; + pe2u: double_can_attach_wagon_electric; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } @@ -518,9 +518,9 @@ switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon5, prev_vehicle_type_id()]) { pwd_dumpcar: m_pwd_dumpcar_can_attach_wagon6; - pe2: double_can_attach_wagon; - pe2m: double_can_attach_wagon; - pe2u: double_can_attach_wagon; + pe2: double_can_attach_wagon_electric; + pe2m: double_can_attach_wagon_electric; + pe2u: double_can_attach_wagon_electric; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } @@ -529,9 +529,9 @@ switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon4, prev_vehicle_type_id()]) { pwd_dumpcar: m_pwd_dumpcar_can_attach_wagon5; - pe2: double_can_attach_wagon; - pe2m: double_can_attach_wagon; - pe2u: double_can_attach_wagon; + pe2: double_can_attach_wagon_electric; + pe2m: double_can_attach_wagon_electric; + pe2u: double_can_attach_wagon_electric; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } @@ -540,7 +540,7 @@ switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon3, prev_vehicle_type_id()]) { pwd_dumpcar: m_pwd_dumpcar_can_attach_wagon4; - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon2, @@ -548,7 +548,7 @@ switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon2, prev_vehicle_type_id()]) { pwd_dumpcar: m_pwd_dumpcar_can_attach_wagon3; - double_can_attach_wagon; + double_can_attach_wagon_electric; } switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon, @@ -556,12 +556,12 @@ switch (FEAT_TRAINS, PARENT, m_pwd_dumpcar_can_attach_wagon, prev_vehicle_type_id()]) { pwd_dumpcar: m_pwd_dumpcar_can_attach_wagon2; - double_can_attach_wagon; + double_can_attach_wagon_electric; } // choose the block to use -switch (FEAT_TRAINS, SELF, any_can_attach_wagon, +switch (FEAT_TRAINS, SELF, any_can_attach_wagon_electric, [ STORE_TEMP(vehicle_type_id, 5), vehicle_type_id]) { @@ -599,7 +599,7 @@ switch (FEAT_TRAINS, SELF, any_can_attach_wagon, _3es5k_m_type2010: m_3es5k_can_attach_wagon_m; _3es5k_m_type2012: m_3es5k_can_attach_wagon_m; pwd_dumpcar: m_pwd_dumpcar_can_attach_wagon; - other_can_attach_wagon; + other_can_attach_wagon_electric; } // end diff --git a/src/electric/electric-start.pnml b/src/electric/electric-start.pnml index 7c1e92def..7ac38d4ee 100644 --- a/src/electric/electric-start.pnml +++ b/src/electric/electric-start.pnml @@ -1,6 +1,6 @@ // некорректные составы (собранные из разных сетов) -switch (FEAT_TRAINS, PARENT, wrong_consist_start_stop, +switch (FEAT_TRAINS, PARENT, wrong_consist_start_stop_electric, is_wrong_consist()) { 1: return string(STR_START_STOP_WRONG_CONSIST); @@ -18,7 +18,7 @@ switch (FEAT_TRAINS, PARENT, q_2ev120_start_stop, (!(prev_vehicle_type_id() == _2ev120)) ]) { 1: return string(STR_START_STOP_DUAL_END_REQUIRED); - return wrong_consist_start_stop; + return wrong_consist_start_stop_electric; } switch (FEAT_TRAINS, PARENT, q_vl15s_start_stop, @@ -277,7 +277,7 @@ switch (FEAT_TRAINS, PARENT, q_2el4_start_stop, q_2_3es4k_start_stop; } -switch (FEAT_TRAINS, PARENT, any_start_stop_mid, +switch (FEAT_TRAINS, PARENT, any_start_stop_mid_electric, [ set_offset_to(num_vehs_in_consist-2), all_mid_section_electric()]) { @@ -291,7 +291,7 @@ switch (FEAT_TRAINS, PARENT, any_start_stop_pwdd_total, (count_veh_id(pe2) + count_veh_id(pe2m) + count_veh_id(pe2u)) * 3 - count_veh_id(pwd_dumpcar) >= 0) { - 1: any_start_stop_mid; + 1: any_start_stop_mid_electric; return string(STR_START_STOP_POWER_UNIT_REQUIRED); } @@ -346,18 +346,18 @@ switch (FEAT_TRAINS, PARENT, any_start_stop_pwdd, // некорректные грузы -switch (FEAT_TRAINS, PARENT, any_start_stop, +switch (FEAT_TRAINS, PARENT, any_start_stop_electric, has_inadmissible_cargo()) { 1: return string(STR_START_STOP_INADMISSIBLE_CARGO); any_start_stop_pwdd; } -switch (FEAT_TRAINS, SELF, any_start_stop_with_lines_only, +switch (FEAT_TRAINS, SELF, any_start_stop_electric_with_lines_only, (cargo_subtype >= 0xE0) && (current_year >= GREAT_CHANGE_YEAR) && (position_in_consist == 0)) { 1: return string(STR_START_STOP_RED_LINES_REQUIRED); - any_start_stop; + any_start_stop_electric; } diff --git a/src/electric/ep1-pre.pnml b/src/electric/ep1-pre.pnml index 9917e8189..c2daf7ad1 100644 --- a/src/electric/ep1-pre.pnml +++ b/src/electric/ep1-pre.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, ep1_pre, 857) { additional_text: ep1_pre_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1_pre_CC; colour_mapping: any_cc_colour; create_effect: ep1_pre_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, ep1_pre, 857) { purchase: ep1_pre_purchase_sprites; running_cost_factor: ep1_pre_running_cost_factor; speed: ep1_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep1.pnml b/src/electric/ep1.pnml index a63598e33..b96a16951 100644 --- a/src/electric/ep1.pnml +++ b/src/electric/ep1.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, ep1, 429) { additional_text: ep1_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1_CC; colour_mapping: any_cc_colour; create_effect: ep1_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, ep1, 429) { purchase: ep1_purchase_sprites; running_cost_factor: ep1_running_cost_factor; speed: ep1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep10-pre.pnml b/src/electric/ep10-pre.pnml index d3ab9151f..a6ee737fd 100644 --- a/src/electric/ep10-pre.pnml +++ b/src/electric/ep10-pre.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, ep10_pre, 854) { additional_text: ep10_pre_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep10_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep10_pre_CC; colour_mapping: any_cc_colour; create_effect: ep10_pre_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, ep10_pre, 854) { purchase: ep10_pre_purchase_sprites; running_cost_factor: ep10_pre_running_cost_factor; speed: ep10_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep10-type2006.pnml b/src/electric/ep10-type2006.pnml index 71020a72c..94afe3b41 100644 --- a/src/electric/ep10-type2006.pnml +++ b/src/electric/ep10-type2006.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, ep10_type2006, 855) { additional_text: ep10_type2006_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep10_type2006_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep10_type2006_CC; colour_mapping: any_cc_colour; create_effect: ep10_type2006_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, ep10_type2006, 855) { purchase: ep10_type2006_purchase_sprites; running_cost_factor: ep10_type2006_running_cost_factor; speed: ep10_type2006_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep10.pnml b/src/electric/ep10.pnml index 63cc70bc1..2b055f149 100644 --- a/src/electric/ep10.pnml +++ b/src/electric/ep10.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, ep10, 309) { additional_text: ep10_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep10_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep10_CC; colour_mapping: any_cc_colour; create_effect: ep10_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, ep10, 309) { purchase: ep10_purchase_sprites; running_cost_factor: ep10_running_cost_factor; speed: ep10_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep1m-type2009.pnml b/src/electric/ep1m-type2009.pnml index db660e9a6..55e55d6aa 100644 --- a/src/electric/ep1m-type2009.pnml +++ b/src/electric/ep1m-type2009.pnml @@ -74,7 +74,7 @@ item (FEAT_TRAINS, ep1m_type2009, 858) { additional_text: ep1m_type2009_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1m_type2009_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1m_type2009_CC; cargo_subtype_text: ep1m_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -84,7 +84,7 @@ item (FEAT_TRAINS, ep1m_type2009, 858) { purchase: ep1m_type2009_purchase_sprites; running_cost_factor: ep1m_type2009_running_cost_factor; speed: ep1m_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep1m-type2011_use.pnml b/src/electric/ep1m-type2011_use.pnml index 9ac7c5610..c795b4cab 100644 --- a/src/electric/ep1m-type2011_use.pnml +++ b/src/electric/ep1m-type2011_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, ep1m_type2011, 928) { additional_text: ep1m_type2011_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1m_type2011_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1m_type2011_CC; colour_mapping: any_cc_colour; create_effect: ep1m_type2009_create_effect; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, ep1m_type2011, 928) { purchase: ep1m_type2011_purchase_sprites; running_cost_factor: ep1m_type2011_running_cost_factor; speed: ep1m_type2011_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep1m.pnml b/src/electric/ep1m.pnml index 741367ba7..413449cbe 100644 --- a/src/electric/ep1m.pnml +++ b/src/electric/ep1m.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, ep1m, 556) { additional_text: ep1m_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1m_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1m_CC; colour_mapping: any_cc_colour; create_effect: ep1m_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, ep1m, 556) { purchase: ep1m_purchase_sprites; running_cost_factor: ep1m_running_cost_factor; speed: ep1m_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep1p-type2009_use.pnml b/src/electric/ep1p-type2009_use.pnml index a16d153ec..7ea839f9f 100644 --- a/src/electric/ep1p-type2009_use.pnml +++ b/src/electric/ep1p-type2009_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, ep1p_type2009, 859) { additional_text: ep1p_type2009_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1p_type2009_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1p_type2009_CC; colour_mapping: any_cc_colour; create_effect: ep1p_type2009_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, ep1p_type2009, 859) { purchase: ep1p_type2009_purchase_sprites; running_cost_factor: ep1p_type2009_running_cost_factor; speed: ep1p_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep1p_use.pnml b/src/electric/ep1p_use.pnml index b2f577a6d..534631057 100644 --- a/src/electric/ep1p_use.pnml +++ b/src/electric/ep1p_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, ep1p, 557) { additional_text: ep1p_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep1p_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_ep1p_CC; colour_mapping: any_cc_colour; create_effect: ep1p_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, ep1p, 557) { purchase: ep1p_purchase_sprites; running_cost_factor: ep1p_running_cost_factor; speed: ep1p_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep20.pnml b/src/electric/ep20.pnml index aa89e61ab..f3b8204a3 100644 --- a/src/electric/ep20.pnml +++ b/src/electric/ep20.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, ep20, 421) { additional_text: ep20_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep20_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: ep20_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -84,7 +84,7 @@ item (FEAT_TRAINS, ep20, 421) { refit_cost: ep20_refit_cost; running_cost_factor: ep20_running_cost_factor; speed: ep20_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: ep20_tractive_effort_coefficient; } } diff --git a/src/electric/ep2k-type2009.pnml b/src/electric/ep2k-type2009.pnml index 1d6258a18..f40c2a398 100644 --- a/src/electric/ep2k-type2009.pnml +++ b/src/electric/ep2k-type2009.pnml @@ -79,7 +79,7 @@ item (FEAT_TRAINS, ep2k_type2009, 915) { additional_text: ep2k_type2009_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep2k_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: ep2k_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -89,7 +89,7 @@ item (FEAT_TRAINS, ep2k_type2009, 915) { purchase: ep2k_type2009_purchase_sprites; running_cost_factor: ep2k_type2009_running_cost_factor; speed: ep2k_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep2k-type2012_use.pnml b/src/electric/ep2k-type2012_use.pnml index 7dbdc7c37..9e453bbe9 100644 --- a/src/electric/ep2k-type2012_use.pnml +++ b/src/electric/ep2k-type2012_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, ep2k_type2012, 916) { additional_text: ep2k_type2012_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep2k_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: ep2k_type2009_create_effect; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, ep2k_type2012, 916) { purchase: ep2k_type2012_purchase_sprites; running_cost_factor: ep2k_type2012_running_cost_factor; speed: ep2k_type2012_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/ep2k.pnml b/src/electric/ep2k.pnml index ed44cc41d..f23615d08 100644 --- a/src/electric/ep2k.pnml +++ b/src/electric/ep2k.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, ep2k, 186) { additional_text: ep2k_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: ep2k_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: ep2k_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, ep2k, 186) { purchase: ep2k_purchase_sprites; running_cost_factor: ep2k_running_cost_factor; speed: ep2k_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/f.pnml b/src/electric/f.pnml index b2662aa8c..d603d0c58 100644 --- a/src/electric/f.pnml +++ b/src/electric/f.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, electric_f, 191) { additional_text: electric_f_additional_text; articulated_part: articulated_part_dummy6; bitmask_vehicle_info: electric_f_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: electric_f_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, electric_f, 191) { purchase: electric_f_purchase_sprites; running_cost_factor: electric_f_running_cost_factor; speed: electric_f_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/fp.pnml b/src/electric/fp.pnml index 787f67daf..c7f45abdf 100644 --- a/src/electric/fp.pnml +++ b/src/electric/fp.pnml @@ -65,7 +65,7 @@ item (FEAT_TRAINS, electric_fp, 192) { additional_text: electric_fp_additional_text; articulated_part: articulated_part_dummy6; bitmask_vehicle_info: electric_fp_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: electric_fp_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -76,7 +76,7 @@ item (FEAT_TRAINS, electric_fp, 192) { purchase_speed: return 160; running_cost_factor: electric_fp_running_cost_factor; speed: electric_fp_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/21em_use.pnml b/src/electric/industrial/21em_use.pnml index 0a8e1ef6b..be8745883 100644 --- a/src/electric/industrial/21em_use.pnml +++ b/src/electric/industrial/21em_use.pnml @@ -51,7 +51,7 @@ item (FEAT_TRAINS, _21em, 933) { additional_text: _21em_additional_text; articulated_part: _21em_articulated_part; bitmask_vehicle_info: _21em_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP__21em_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -61,7 +61,7 @@ item (FEAT_TRAINS, _21em, 933) { purchase: _21em_purchase_sprites; running_cost_factor: _21em_running_cost_factor; speed: _21em_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/el1.pnml b/src/electric/industrial/el1.pnml index 05fb4149d..70ac50d18 100644 --- a/src/electric/industrial/el1.pnml +++ b/src/electric/industrial/el1.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, el1, 677) { additional_text: el1_additional_text; articulated_part: el1_articulated_part; bitmask_vehicle_info: el1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_el1_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, el1, 677) { purchase: el1_purchase_sprites; running_cost_factor: el1_running_cost_factor; speed: el1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/el2.pnml b/src/electric/industrial/el2.pnml index 51a1acdcf..a6f7968e0 100644 --- a/src/electric/industrial/el2.pnml +++ b/src/electric/industrial/el2.pnml @@ -43,7 +43,7 @@ item (FEAT_TRAINS, el2, 733) { additional_text: el2_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: el2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -53,7 +53,7 @@ item (FEAT_TRAINS, el2, 733) { purchase_speed: return 65; running_cost_factor: el2_running_cost_factor; speed: el2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/el21.pnml b/src/electric/industrial/el21.pnml index 10b91be1c..18ec7bb0e 100644 --- a/src/electric/industrial/el21.pnml +++ b/src/electric/industrial/el21.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, el21, 675) { additional_text: el21_additional_text; articulated_part: el21_articulated_part; bitmask_vehicle_info: el21_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_el21_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, el21, 675) { purchase: el21_purchase_sprites; running_cost_factor: el21_running_cost_factor; speed: el21_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/pe150.pnml b/src/electric/industrial/pe150.pnml index 022da2d88..7532b8339 100644 --- a/src/electric/industrial/pe150.pnml +++ b/src/electric/industrial/pe150.pnml @@ -98,7 +98,7 @@ item (FEAT_TRAINS, pe150, 674) { additional_text: pe150_additional_text; articulated_part: pe150_articulated_part; bitmask_vehicle_info: pe150_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -108,7 +108,7 @@ item (FEAT_TRAINS, pe150, 674) { purchase_speed: return 60; running_cost_factor: pe150_running_cost_factor; speed: pe150_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/pe2.pnml b/src/electric/industrial/pe2.pnml index 61c208097..bf4c4ddd7 100644 --- a/src/electric/industrial/pe2.pnml +++ b/src/electric/industrial/pe2.pnml @@ -150,7 +150,7 @@ item (FEAT_TRAINS, pe2, 758) { additional_text: pe2_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: pe2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_pe2_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -161,7 +161,7 @@ item (FEAT_TRAINS, pe2, 758) { purchase: pe2_purchase_sprites; running_cost_factor: pe2_running_cost_factor; speed: pe2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/pe2m_use.pnml b/src/electric/industrial/pe2m_use.pnml index ee0061a92..615bb9068 100644 --- a/src/electric/industrial/pe2m_use.pnml +++ b/src/electric/industrial/pe2m_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, pe2m, 778) { additional_text: pe2m_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: pe2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_pe2m_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, pe2m, 778) { purchase: pe2m_purchase_sprites; running_cost_factor: pe2m_running_cost_factor; speed: pe2m_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/pe2u_use.pnml b/src/electric/industrial/pe2u_use.pnml index a52c40e80..aa68ec788 100644 --- a/src/electric/industrial/pe2u_use.pnml +++ b/src/electric/industrial/pe2u_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, pe2u, 779) { additional_text: pe2u_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: pe2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_pe2u_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, pe2u, 779) { purchase: pe2u_purchase_sprites; running_cost_factor: pe2u_running_cost_factor; speed: pe2u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/pwd-dumpcar.pnml b/src/electric/industrial/pwd-dumpcar.pnml index a87fd1222..229bdaf74 100644 --- a/src/electric/industrial/pwd-dumpcar.pnml +++ b/src/electric/industrial/pwd-dumpcar.pnml @@ -109,7 +109,7 @@ item (FEAT_TRAINS, pwd_dumpcar, 757) { purchase_menu_nocc(PROP_pwd_dumpcar_CF, PROP_pwd_dumpcar_RC, PROP_pwd_dumpcar_SD, PROP_pwd_dumpcar_WT, PROP_pwd_dumpcar_TE, PROP_pwd_dumpcar_PR) additional_text: pwd_dumpcar_additional_text; articulated_part: articulated_part_dummy1; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: pwd_dumpcar_cargo_capacity; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -121,7 +121,7 @@ item (FEAT_TRAINS, pwd_dumpcar, 757) { refit_cost: return 0 | CB_RESULT_AUTOREFIT; running_cost_factor: pwd_dumpcar_running_cost_factor; speed: return PROP_pwd_dumpcar_SD; // does not have or provide a speed penalty - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/industrial/so.pnml b/src/electric/industrial/so.pnml index 29e83add3..107f73ce6 100644 --- a/src/electric/industrial/so.pnml +++ b/src/electric/industrial/so.pnml @@ -43,7 +43,7 @@ item (FEAT_TRAINS, electric_so, 734) { additional_text: electric_so_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: electric_so_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -53,7 +53,7 @@ item (FEAT_TRAINS, electric_so, 734) { purchase_speed: return 65; running_cost_factor: electric_so_running_cost_factor; speed: electric_so_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/kz4a.pnml b/src/electric/kz4a.pnml index 31e835249..d27cb71ee 100644 --- a/src/electric/kz4a.pnml +++ b/src/electric/kz4a.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, kz4a, 1031) { additional_text: kz4a_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: kz4a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_kz4a_CC; colour_mapping: any_cc_colour; create_effect: kz4a_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, kz4a, 1031) { purchase: kz4a_purchase_sprites; running_cost_factor: kz4a_running_cost_factor; speed: kz4a_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/kz4ac.pnml b/src/electric/kz4ac.pnml index 8461c7a22..12e5860d1 100644 --- a/src/electric/kz4ac.pnml +++ b/src/electric/kz4ac.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, kz4ac, 1253) { additional_text: kz4ac_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: kz4a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_kz4ac_CC; colour_mapping: any_cc_colour; create_effect: kz4ac_create_effect; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, kz4ac, 1253) { purchase: kz4ac_purchase_sprites; running_cost_factor: kz4ac_running_cost_factor; speed: kz4ac_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n6o-pre.pnml b/src/electric/n6o-pre.pnml index e99c3e773..30c69b674 100644 --- a/src/electric/n6o-pre.pnml +++ b/src/electric/n6o-pre.pnml @@ -52,7 +52,7 @@ item (FEAT_TRAINS, n6o_pre, 832) { additional_text: n6o_pre_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: n6o_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n6o_pre_CC; colour_mapping: any_cc_colour; create_effect: n6o_pre_create_effect; @@ -61,7 +61,7 @@ item (FEAT_TRAINS, n6o_pre, 832) { purchase: n6o_pre_purchase_sprites; running_cost_factor: n6o_pre_running_cost_factor; speed: n6o_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n6o-pre2_use.pnml b/src/electric/n6o-pre2_use.pnml index 37b766b36..51ad181d9 100644 --- a/src/electric/n6o-pre2_use.pnml +++ b/src/electric/n6o-pre2_use.pnml @@ -48,7 +48,7 @@ item (FEAT_TRAINS, n6o_pre2, 833) { additional_text: n6o_pre2_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: n6o_pre2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n6o_pre2_CC; colour_mapping: any_cc_colour; create_effect: n6o_pre_create_effect; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, n6o_pre2, 833) { purchase: n6o_pre2_purchase_sprites; running_cost_factor: n6o_pre2_running_cost_factor; speed: n6o_pre2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n6o-type1959_use.pnml b/src/electric/n6o-type1959_use.pnml index b880a75c7..5e384a9b5 100644 --- a/src/electric/n6o-type1959_use.pnml +++ b/src/electric/n6o-type1959_use.pnml @@ -49,7 +49,7 @@ item (FEAT_TRAINS, n6o_type1959, 834) { additional_text: n6o_type1959_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: n6o_type1959_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n6o_type1959_CC; colour_mapping: any_cc_colour; create_effect: vl60_type1962_create_effect; @@ -58,7 +58,7 @@ item (FEAT_TRAINS, n6o_type1959, 834) { purchase: n6o_type1959_purchase_sprites; running_cost_factor: n6o_type1959_running_cost_factor; speed: n6o_type1959_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n6o-type1960_use.pnml b/src/electric/n6o-type1960_use.pnml index 1b9d43654..0ff69aa9f 100644 --- a/src/electric/n6o-type1960_use.pnml +++ b/src/electric/n6o-type1960_use.pnml @@ -92,7 +92,7 @@ item (FEAT_TRAINS, n6o_type1960, 907) { additional_text: n6o_type1960_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: n6o_type1960_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n6o_type1960_CC; cargo_subtype_text: n6o_type1960_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -103,7 +103,7 @@ item (FEAT_TRAINS, n6o_type1960, 907) { refit_cost: n6o_type1960_refit_cost; running_cost_factor: n6o_type1960_running_cost_factor; speed: n6o_type1960_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n6ok_use.pnml b/src/electric/n6ok_use.pnml index 244f49542..2407548db 100644 --- a/src/electric/n6ok_use.pnml +++ b/src/electric/n6ok_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, n6ok, 328) { additional_text: n6ok_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: n6ok_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n6ok_CC; colour_mapping: any_cc_colour; create_effect: vl60_type1962_create_effect; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, n6ok, 328) { purchase: n6ok_purchase_sprites; running_cost_factor: n6ok_running_cost_factor; speed: n6ok_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8-pre.pnml b/src/electric/n8-pre.pnml index 01fe43a9c..d5f5aa5f8 100644 --- a/src/electric/n8-pre.pnml +++ b/src/electric/n8-pre.pnml @@ -91,7 +91,7 @@ item (FEAT_TRAINS, n8_pre, 842) { additional_text: n8_pre_additional_text; articulated_part: n8_pre_articulated_part; bitmask_vehicle_info: n8_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n8_pre_CC; cargo_subtype_text: n8_pre_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -101,7 +101,7 @@ item (FEAT_TRAINS, n8_pre, 842) { purchase: n8_pre_purchase_sprites; running_cost_factor: n8_pre_running_cost_factor; speed: n8_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8-tevz-type1957_use.pnml b/src/electric/n8-tevz-type1957_use.pnml index fbc13feb9..ec99e1182 100644 --- a/src/electric/n8-tevz-type1957_use.pnml +++ b/src/electric/n8-tevz-type1957_use.pnml @@ -78,7 +78,7 @@ item (FEAT_TRAINS, n8_tevz_type1957, 956) { additional_text: n8_tevz_type1957_additional_text; articulated_part: n8_tevz_type1957_articulated_part; bitmask_vehicle_info: n8_tevz_type1957_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: n8_type1957_cargo_subtype_text; colour_mapping: n8_type1957_colour_mapping; @@ -89,7 +89,7 @@ item (FEAT_TRAINS, n8_tevz_type1957, 956) { refit_cost: n8_tevz_type1957_refit_cost; running_cost_factor: n8_tevz_type1957_running_cost_factor; speed: n8_tevz_type1957_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8-type1955_use.pnml b/src/electric/n8-type1955_use.pnml index afe1a361f..01016e02f 100644 --- a/src/electric/n8-type1955_use.pnml +++ b/src/electric/n8-type1955_use.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, n8_type1955, 953) { additional_text: n8_type1955_additional_text; articulated_part: n8_type1955_articulated_part; bitmask_vehicle_info: n8_type1955_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n8_type1955_CC; cargo_subtype_text: n8_type1955_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -87,7 +87,7 @@ item (FEAT_TRAINS, n8_type1955, 953) { purchase: n8_type1955_purchase_sprites; running_cost_factor: n8_type1955_running_cost_factor; speed: n8_type1955_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8-type1956.pnml b/src/electric/n8-type1956.pnml index 516673e3c..b260191ff 100644 --- a/src/electric/n8-type1956.pnml +++ b/src/electric/n8-type1956.pnml @@ -112,7 +112,7 @@ item (FEAT_TRAINS, n8_type1956, 843) { additional_text: n8_type1956_additional_text; articulated_part: n8_type1956_articulated_part; bitmask_vehicle_info: n8_type1956_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_n8_type1956_CC; cargo_subtype_text: n8_type1956_cargo_subtype_text; colour_mapping: n8_type1956_colour_mapping; @@ -122,7 +122,7 @@ item (FEAT_TRAINS, n8_type1956, 843) { purchase: n8_type1956_purchase_sprites; running_cost_factor: n8_type1956_running_cost_factor; speed: n8_type1956_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8-type1957.pnml b/src/electric/n8-type1957.pnml index b69789a9e..879c5c0af 100644 --- a/src/electric/n8-type1957.pnml +++ b/src/electric/n8-type1957.pnml @@ -160,7 +160,7 @@ item (FEAT_TRAINS, n8_type1957, 178) { additional_text: n8_type1957_additional_text; articulated_part: n8_type1957_articulated_part; bitmask_vehicle_info: n8_type1957_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: n8_type1957_cargo_subtype_text; colour_mapping: n8_type1957_colour_mapping; @@ -171,7 +171,7 @@ item (FEAT_TRAINS, n8_type1957, 178) { refit_cost: n8_type1957_refit_cost; running_cost_factor: n8_type1957_running_cost_factor; speed: n8_type1957_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8-type1959_use.pnml b/src/electric/n8-type1959_use.pnml index 45ec13f64..a6a212be3 100644 --- a/src/electric/n8-type1959_use.pnml +++ b/src/electric/n8-type1959_use.pnml @@ -67,7 +67,7 @@ item (FEAT_TRAINS, n8_type1959, 955) { additional_text: n8_type1959_additional_text; articulated_part: n8_type1959_articulated_part; bitmask_vehicle_info: n8_type1959_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: n8_type1957_cargo_subtype_text; colour_mapping: n8_type1957_colour_mapping; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, n8_type1959, 955) { refit_cost: n8_type1959_refit_cost; running_cost_factor: n8_type1959_running_cost_factor; speed: n8_type1959_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n81-pre.pnml b/src/electric/n81-pre.pnml index a6471e822..df661ffa3 100644 --- a/src/electric/n81-pre.pnml +++ b/src/electric/n81-pre.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, n81, 548) { additional_text: n81_additional_text; articulated_part: n81_articulated_part; bitmask_vehicle_info: n81_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, n81, 548) { purchase: n81_purchase_sprites; running_cost_factor: n81_running_cost_factor; speed: n81_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/n8o-pre.pnml b/src/electric/n8o-pre.pnml index b8652b062..765243477 100644 --- a/src/electric/n8o-pre.pnml +++ b/src/electric/n8o-pre.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, n8o, 894) { additional_text: n8o_additional_text; articulated_part: n8o_articulated_part; bitmask_vehicle_info: n8o_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: n8o_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, n8o, 894) { purchase: n8o_purchase_sprites; running_cost_factor: n8o_running_cost_factor; speed: n8o_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es10-type2011.pnml b/src/electric/sinara/2es10-type2011.pnml index 501bf5730..7443bfd26 100644 --- a/src/electric/sinara/2es10-type2011.pnml +++ b/src/electric/sinara/2es10-type2011.pnml @@ -75,7 +75,7 @@ item (FEAT_TRAINS, _2es10_type2011, 577) { additional_text: _2es10_type2011_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es10_type2011_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es10_type2011_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -85,7 +85,7 @@ item (FEAT_TRAINS, _2es10_type2011, 577) { purchase: _2es10_type2011_purchase_sprites; running_cost_factor: _2es10_type2011_running_cost_factor; speed: _2es10_type2011_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es10-type2012_use.pnml b/src/electric/sinara/2es10-type2012_use.pnml index ebcb73339..f14619036 100644 --- a/src/electric/sinara/2es10-type2012_use.pnml +++ b/src/electric/sinara/2es10-type2012_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, _2es10_type2012, 929) { additional_text: _2es10_type2012_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es10_type2011_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP__2es10_type2012_CC / 2; colour_mapping: any_cc_colour; create_effect: _2es10_type2011_create_effect_sprites_start; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, _2es10_type2012, 929) { purchase: _2es10_type2012_purchase_sprites; running_cost_factor: _2es10_type2012_running_cost_factor; speed: _2es10_type2012_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es10-type2020.pnml b/src/electric/sinara/2es10-type2020.pnml index d5e08bdfe..159c9da2b 100644 --- a/src/electric/sinara/2es10-type2020.pnml +++ b/src/electric/sinara/2es10-type2020.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2es10_type2020, 879) { additional_text: _2es10_type2020_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es10_type2011_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP__2es10_type2020_CC / 2; colour_mapping: any_cc_colour; create_effect: _2es10_type2020_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2es10_type2020, 879) { purchase: _2es10_type2020_purchase_sprites; running_cost_factor: _2es10_type2020_running_cost_factor; speed: _2es10_type2020_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es10_m.pnml b/src/electric/sinara/2es10_m.pnml index 606497375..351f452ef 100644 --- a/src/electric/sinara/2es10_m.pnml +++ b/src/electric/sinara/2es10_m.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, _2es10_m, 578) { additional_text: _2es10_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es10_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_2es10_m_CC; colour_mapping: any_cc_colour; default: _2es10_m_sprites; diff --git a/src/electric/sinara/2es6-pre.pnml b/src/electric/sinara/2es6-pre.pnml index 5dd800628..3311c6089 100644 --- a/src/electric/sinara/2es6-pre.pnml +++ b/src/electric/sinara/2es6-pre.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2es6_pre, 882) { additional_text: _2es6_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es6_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es6_pre_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _2es6_pre, 882) { purchase: _2es6_pre_purchase_sprites; running_cost_factor: _2es6_pre_running_cost_factor; speed: _2es6_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es6-type2007_use.pnml b/src/electric/sinara/2es6-type2007_use.pnml index aa53b07ce..3b8f5c27d 100644 --- a/src/electric/sinara/2es6-type2007_use.pnml +++ b/src/electric/sinara/2es6-type2007_use.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _2es6_type2007, 884) { additional_text: _2es6_type2007_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es6_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es6_type2007_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, _2es6_type2007, 884) { purchase: _2es6_type2007_purchase_sprites; running_cost_factor: _2es6_type2007_running_cost_factor; speed: _2es6_type2007_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es6-type2009_use.pnml b/src/electric/sinara/2es6-type2009_use.pnml index da9bf25c8..5949d5f0f 100644 --- a/src/electric/sinara/2es6-type2009_use.pnml +++ b/src/electric/sinara/2es6-type2009_use.pnml @@ -73,7 +73,7 @@ item (FEAT_TRAINS, _2es6_type2009, 883) { additional_text: _2es6_type2009_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es6_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: _2es6_type2009_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, _2es6_type2009, 883) { purchase: _2es6_type2009_purchase_sprites; running_cost_factor: _2es6_type2009_running_cost_factor; speed: _2es6_type2009_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es6-type2012.pnml b/src/electric/sinara/2es6-type2012.pnml index 80d102659..372d3e058 100644 --- a/src/electric/sinara/2es6-type2012.pnml +++ b/src/electric/sinara/2es6-type2012.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2es6_type2012, 188) { additional_text: _2es6_type2012_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es6_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es6_type2012_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2es6_type2012, 188) { purchase: _2es6_type2012_purchase_sprites; running_cost_factor: _2es6_type2012_running_cost_factor; speed: _2es6_type2012_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es6_m.pnml b/src/electric/sinara/2es6_m.pnml index 9ffe16f3d..1a23f8aee 100644 --- a/src/electric/sinara/2es6_m.pnml +++ b/src/electric/sinara/2es6_m.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, _2es6_m, 716) { additional_text: _2es6_m_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es6_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_2es6_m_CC; colour_mapping: any_cc_colour; create_effect: _2es6_m_create_effect_sprites_start; diff --git a/src/electric/sinara/2es7-pre.pnml b/src/electric/sinara/2es7-pre.pnml index a36202a91..fe66923a4 100644 --- a/src/electric/sinara/2es7-pre.pnml +++ b/src/electric/sinara/2es7-pre.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2es7_pre, 880) { additional_text: _2es7_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es7_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es7_pre_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _2es7_pre, 880) { purchase: _2es7_pre_purchase_sprites; running_cost_factor: _2es7_pre_running_cost_factor; speed: _2es7_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es7.pnml b/src/electric/sinara/2es7.pnml index 2c6c8a121..6cd024edd 100644 --- a/src/electric/sinara/2es7.pnml +++ b/src/electric/sinara/2es7.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, _2es7, 881) { additional_text: _2es7_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: _2es7_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es7_create_effect_sprites_start; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, _2es7, 881) { purchase: _2es7_purchase_sprites; running_cost_factor: _2es7_running_cost_factor; speed: _2es7_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/2es8.pnml b/src/electric/sinara/2es8.pnml index e937d64d0..7ce3a2246 100644 --- a/src/electric/sinara/2es8.pnml +++ b/src/electric/sinara/2es8.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, _2es8, 875) { additional_text: _2es8_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: _2es8_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es8_create_effect_sprites_start; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, _2es8, 875) { purchase: _2es8_purchase_sprites; running_cost_factor: _2es8_running_cost_factor; speed: _2es8_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/sinara/3es8_m.pnml b/src/electric/sinara/3es8_m.pnml index 5aace4a9c..11db5eb3e 100644 --- a/src/electric/sinara/3es8_m.pnml +++ b/src/electric/sinara/3es8_m.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, _3es8_m, 877) { additional_text: _3es8_m_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: _3es8_m_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; default: _3es8_m_sprites; diff --git a/src/electric/sinara/3es8_use.pnml b/src/electric/sinara/3es8_use.pnml index 72a3a8966..6c4189172 100644 --- a/src/electric/sinara/3es8_use.pnml +++ b/src/electric/sinara/3es8_use.pnml @@ -49,7 +49,7 @@ item (FEAT_TRAINS, _3es8, 876) { additional_text: _3es8_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: _2es8_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: _2es8_create_effect_sprites_start; @@ -58,7 +58,7 @@ item (FEAT_TRAINS, _3es8, 876) { purchase: _3es8_purchase_sprites; running_cost_factor: _3es8_running_cost_factor; speed: _3es8_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/13e.pnml b/src/electric/skoda/13e.pnml index 692403c04..64c265b19 100644 --- a/src/electric/skoda/13e.pnml +++ b/src/electric/skoda/13e.pnml @@ -99,7 +99,7 @@ item (FEAT_TRAINS, _13e, 673) { additional_text: _13e_additional_text; articulated_part: _13e_articulated_part; bitmask_vehicle_info: _13e_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP__13e_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -109,7 +109,7 @@ item (FEAT_TRAINS, _13e, 673) { purchase: _13e_purchase_sprites; running_cost_factor: _13e_running_cost_factor; speed: _13e_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/21e_use.pnml b/src/electric/skoda/21e_use.pnml index 33d6b68c8..22dd799ab 100644 --- a/src/electric/skoda/21e_use.pnml +++ b/src/electric/skoda/21e_use.pnml @@ -51,7 +51,7 @@ item (FEAT_TRAINS, _21e, 676) { additional_text: _21e_additional_text; articulated_part: _21e_articulated_part; bitmask_vehicle_info: _21e_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP__21e_CC; cargo_subtype_text: pe_type_cargo_subtype_text; colour_mapping: pe_type_colour_mapping; @@ -61,7 +61,7 @@ item (FEAT_TRAINS, _21e, 676) { purchase: _21e_purchase_sprites; running_cost_factor: _21e_running_cost_factor; speed: _21e_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs1-24e0.pnml b/src/electric/skoda/chs1-24e0.pnml index a0791828a..0830e6e6a 100644 --- a/src/electric/skoda/chs1-24e0.pnml +++ b/src/electric/skoda/chs1-24e0.pnml @@ -66,7 +66,7 @@ item (FEAT_TRAINS, chs1_24e0, 537) { additional_text: chs1_24e0_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: chs1_24e0_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs1_24e0_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -76,7 +76,7 @@ item (FEAT_TRAINS, chs1_24e0, 537) { purchase: chs1_24e0_purchase_sprites; running_cost_factor: chs1_24e0_running_cost_factor; speed: chs1_24e0_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs1-41e.pnml b/src/electric/skoda/chs1-41e.pnml index 41312f10e..a0de7566a 100644 --- a/src/electric/skoda/chs1-41e.pnml +++ b/src/electric/skoda/chs1-41e.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, chs1_41e, 935) { additional_text: chs1_41e_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: chs1_41e_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_chs1_41e_CC; cargo_subtype_text: chs1_41e_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -74,7 +74,7 @@ item (FEAT_TRAINS, chs1_41e, 935) { purchase: chs1_41e_purchase_sprites; running_cost_factor: chs1_41e_running_cost_factor; speed: chs1_41e_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2-25e0.pnml b/src/electric/skoda/chs2-25e0.pnml index e2f90dd9f..562e646cd 100644 --- a/src/electric/skoda/chs2-25e0.pnml +++ b/src/electric/skoda/chs2-25e0.pnml @@ -113,7 +113,7 @@ item (FEAT_TRAINS, chs2_25e0, 304) { additional_text: chs2_25e0_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2_25e0_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs2_25e0_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -124,7 +124,7 @@ item (FEAT_TRAINS, chs2_25e0, 304) { refit_cost: chs2_25e0_refit_cost; running_cost_factor: chs2_25e0_running_cost_factor; speed: chs2_25e0_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2-34e1.pnml b/src/electric/skoda/chs2-34e1.pnml index 25645740c..2edc4ee08 100644 --- a/src/electric/skoda/chs2-34e1.pnml +++ b/src/electric/skoda/chs2-34e1.pnml @@ -95,7 +95,7 @@ item (FEAT_TRAINS, chs2_34e1, 937) { additional_text: chs2_34e1_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2_25e0_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs2_34e1_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -106,7 +106,7 @@ item (FEAT_TRAINS, chs2_34e1, 937) { refit_cost: chs2_25e0_refit_cost; running_cost_factor: chs2_34e1_running_cost_factor; speed: chs2_34e1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2-34e2.pnml b/src/electric/skoda/chs2-34e2.pnml index ee4a8187a..40a2a33d6 100644 --- a/src/electric/skoda/chs2-34e2.pnml +++ b/src/electric/skoda/chs2-34e2.pnml @@ -86,7 +86,7 @@ item (FEAT_TRAINS, chs2_34e2, 938) { additional_text: chs2_34e2_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2_25e0_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs2_34e1_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -97,7 +97,7 @@ item (FEAT_TRAINS, chs2_34e2, 938) { refit_cost: chs2_25e0_refit_cost; running_cost_factor: chs2_34e2_running_cost_factor; speed: chs2_34e2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2-53e.pnml b/src/electric/skoda/chs2-53e.pnml index 0c2bf32b5..da7ce3bbd 100644 --- a/src/electric/skoda/chs2-53e.pnml +++ b/src/electric/skoda/chs2-53e.pnml @@ -168,7 +168,7 @@ item (FEAT_TRAINS, chs2_53e, 939) { additional_text: chs2_53e_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2_25e0_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs2_53e_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -179,7 +179,7 @@ item (FEAT_TRAINS, chs2_53e, 939) { refit_cost: chs2_53e_refit_cost; running_cost_factor: chs2_53e_running_cost_factor; speed: chs2_53e_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs200-57er.pnml b/src/electric/skoda/chs200-57er.pnml index 883db308c..0040494b1 100644 --- a/src/electric/skoda/chs200-57er.pnml +++ b/src/electric/skoda/chs200-57er.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, chs200_57er, 588) { additional_text: chs200_57er_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: chs200_57er_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: chs200_57er_create_effect; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, chs200_57er, 588) { purchase: chs200_57er_purchase_sprites; running_cost_factor: chs200_57er_running_cost_factor; speed: chs200_57er_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs200-66e0.pnml b/src/electric/skoda/chs200-66e0.pnml index 21ade9891..12a274be0 100644 --- a/src/electric/skoda/chs200-66e0.pnml +++ b/src/electric/skoda/chs200-66e0.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, chs200_66e0, 952) { additional_text: chs200_66e0_additional_text; articulated_part: chs200_66e0_articulated_part; bitmask_vehicle_info: chs200_66e0_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs200_66e0_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -87,7 +87,7 @@ item (FEAT_TRAINS, chs200_66e0, 952) { purchase: chs200_66e0_purchase_sprites; running_cost_factor: chs200_66e0_running_cost_factor; speed: chs200_66e0_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs200-66e1.pnml b/src/electric/skoda/chs200-66e1.pnml index 14a4bdf8a..bdf7f1744 100644 --- a/src/electric/skoda/chs200-66e1.pnml +++ b/src/electric/skoda/chs200-66e1.pnml @@ -99,7 +99,7 @@ item (FEAT_TRAINS, chs200_66e1, 273) { additional_text: chs200_66e1_additional_text; articulated_part: chs200_66e1_articulated_part; bitmask_vehicle_info: chs200_66e1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs200_66e1_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -109,7 +109,7 @@ item (FEAT_TRAINS, chs200_66e1, 273) { purchase: chs200_66e1_purchase_sprites; running_cost_factor: chs200_66e1_running_cost_factor; speed: chs200_66e1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2t-63e0.pnml b/src/electric/skoda/chs2t-63e0.pnml index f2d05670f..74ba3d83f 100644 --- a/src/electric/skoda/chs2t-63e0.pnml +++ b/src/electric/skoda/chs2t-63e0.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, chs2t_63e0, 183) { additional_text: chs2t_63e0_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2t_63e0_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: chs2t_63e0_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, chs2t_63e0, 183) { purchase: chs2t_63e0_purchase_sprites; running_cost_factor: chs2t_63e0_running_cost_factor; speed: chs2t_63e0_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2t-63e1.pnml b/src/electric/skoda/chs2t-63e1.pnml index 80797fb59..7a142e730 100644 --- a/src/electric/skoda/chs2t-63e1.pnml +++ b/src/electric/skoda/chs2t-63e1.pnml @@ -92,7 +92,7 @@ item (FEAT_TRAINS, chs2t_63e1, 940) { additional_text: chs2t_63e1_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2t_63e1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs2t_63e1_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -102,7 +102,7 @@ item (FEAT_TRAINS, chs2t_63e1, 940) { purchase: chs2t_63e1_purchase_sprites; running_cost_factor: chs2t_63e1_running_cost_factor; speed: chs2t_63e1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs2t-63e2.pnml b/src/electric/skoda/chs2t-63e2.pnml index 6da6464f6..f4c3d71bb 100644 --- a/src/electric/skoda/chs2t-63e2.pnml +++ b/src/electric/skoda/chs2t-63e2.pnml @@ -83,7 +83,7 @@ item (FEAT_TRAINS, chs2t_63e2, 941) { additional_text: chs2t_63e2_additional_text; articulated_part: articulated_part_dummy3; bitmask_vehicle_info: chs2t_63e2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs2t_63e2_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -93,7 +93,7 @@ item (FEAT_TRAINS, chs2t_63e2, 941) { purchase: chs2t_63e2_purchase_sprites; running_cost_factor: chs2t_63e2_running_cost_factor; speed: chs2t_63e2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs3.pnml b/src/electric/skoda/chs3.pnml index 7667c4c35..bca1bbc15 100644 --- a/src/electric/skoda/chs3.pnml +++ b/src/electric/skoda/chs3.pnml @@ -48,7 +48,7 @@ item (FEAT_TRAINS, chs3, 536) { additional_text: chs3_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: chs3_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: chs3_create_effect; @@ -57,7 +57,7 @@ item (FEAT_TRAINS, chs3, 536) { purchase_speed: return 120; running_cost_factor: chs3_running_cost_factor; speed: chs3_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs4-52e1.pnml b/src/electric/skoda/chs4-52e1.pnml index a494ba5b2..4fecbf0b9 100644 --- a/src/electric/skoda/chs4-52e1.pnml +++ b/src/electric/skoda/chs4-52e1.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, chs4_52e1, 193) { additional_text: chs4_52e1_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: chs4_52e1_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: chs4_52e1_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, chs4_52e1, 193) { purchase: chs4_52e1_purchase_sprites; running_cost_factor: chs4_52e1_running_cost_factor; speed: chs4_52e1_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs4-52e2.pnml b/src/electric/skoda/chs4-52e2.pnml index b90e10b80..60203dda8 100644 --- a/src/electric/skoda/chs4-52e2.pnml +++ b/src/electric/skoda/chs4-52e2.pnml @@ -133,7 +133,7 @@ item (FEAT_TRAINS, chs4_52e2, 943) { additional_text: chs4_52e2_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: chs4_52e2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs4_52e2_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -144,7 +144,7 @@ item (FEAT_TRAINS, chs4_52e2, 943) { refit_cost: chs4_52e2_refit_cost; running_cost_factor: chs4_52e2_running_cost_factor; speed: chs4_52e2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs4t.pnml b/src/electric/skoda/chs4t.pnml index 4c4e7e39a..0ef53dca8 100644 --- a/src/electric/skoda/chs4t.pnml +++ b/src/electric/skoda/chs4t.pnml @@ -131,7 +131,7 @@ item (FEAT_TRAINS, chs4t, 195) { additional_text: chs4t_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: chs4t_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs4t_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -141,7 +141,7 @@ item (FEAT_TRAINS, chs4t, 195) { purchase: chs4t_purchase_sprites; running_cost_factor: chs4t_running_cost_factor; speed: chs4t_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs6.pnml b/src/electric/skoda/chs6.pnml index 52fa91100..8b1a88db3 100644 --- a/src/electric/skoda/chs6.pnml +++ b/src/electric/skoda/chs6.pnml @@ -82,7 +82,7 @@ item (FEAT_TRAINS, chs6, 184) { additional_text: chs6_additional_text; articulated_part: chs6_articulated_part; bitmask_vehicle_info: chs6_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs6_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -92,7 +92,7 @@ item (FEAT_TRAINS, chs6, 184) { purchase_speed: return 160; running_cost_factor: chs6_running_cost_factor; speed: chs6_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs7.pnml b/src/electric/skoda/chs7.pnml index 70c8a8a47..24ca4c5ec 100644 --- a/src/electric/skoda/chs7.pnml +++ b/src/electric/skoda/chs7.pnml @@ -159,7 +159,7 @@ item (FEAT_TRAINS, chs7, 185) { additional_text: chs7_additional_text; articulated_part: chs7_articulated_part; bitmask_vehicle_info: chs7_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs7_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -169,7 +169,7 @@ item (FEAT_TRAINS, chs7, 185) { purchase_speed: return 160; running_cost_factor: chs7_running_cost_factor; speed: chs7_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/skoda/chs8.pnml b/src/electric/skoda/chs8.pnml index 1b7c9fced..128031e20 100644 --- a/src/electric/skoda/chs8.pnml +++ b/src/electric/skoda/chs8.pnml @@ -119,7 +119,7 @@ item (FEAT_TRAINS, chs8, 196) { additional_text: chs8_additional_text; articulated_part: chs8_articulated_part; bitmask_vehicle_info: chs8_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: chs8_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -129,7 +129,7 @@ item (FEAT_TRAINS, chs8, 196) { purchase_speed: return 180; running_cost_factor: chs8_running_cost_factor; speed: chs8_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/surami/si.pnml b/src/electric/surami/si.pnml index bfc8da43a..d9b148929 100644 --- a/src/electric/surami/si.pnml +++ b/src/electric/surami/si.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, electric_si, 559) { additional_text: electric_si_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: ss_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: electric_si_cargo_subtype_text; colour_mapping: electric_si_colour_mapping; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, electric_si, 559) { purchase_speed: return 65; running_cost_factor: electric_si_running_cost_factor; speed: electric_si_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/surami/sk.pnml b/src/electric/surami/sk.pnml index 4e0dda906..26b3a1e61 100644 --- a/src/electric/surami/sk.pnml +++ b/src/electric/surami/sk.pnml @@ -46,7 +46,7 @@ item (FEAT_TRAINS, electric_sk, 558) { additional_text: electric_sk_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: electric_sk_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: electric_sk_create_effect; @@ -56,7 +56,7 @@ item (FEAT_TRAINS, electric_sk, 558) { purchase_speed: return 85; running_cost_factor: electric_sk_running_cost_factor; speed: electric_sk_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/surami/sku_use.pnml b/src/electric/surami/sku_use.pnml index c12be5d68..a25c4cf35 100644 --- a/src/electric/surami/sku_use.pnml +++ b/src/electric/surami/sku_use.pnml @@ -43,7 +43,7 @@ item (FEAT_TRAINS, sku, 845) { additional_text: sku_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: sku_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: sku_create_effect; @@ -53,7 +53,7 @@ item (FEAT_TRAINS, sku, 845) { purchase_speed: return 92; running_cost_factor: sku_running_cost_factor; speed: sku_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/surami/ss-pre.pnml b/src/electric/surami/ss-pre.pnml index 723da7cb9..499a5f0eb 100644 --- a/src/electric/surami/ss-pre.pnml +++ b/src/electric/surami/ss-pre.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, ss_pre, 837) { additional_text: ss_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: ss_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: ss_pre_create_effect; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, ss_pre, 837) { purchase_speed: return 65; running_cost_factor: ss_pre_running_cost_factor; speed: ss_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/surami/ss.pnml b/src/electric/surami/ss.pnml index 64101137d..ff5b0922b 100644 --- a/src/electric/surami/ss.pnml +++ b/src/electric/surami/ss.pnml @@ -108,7 +108,7 @@ item (FEAT_TRAINS, electric_ss, 310) { additional_text: electric_ss_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: ss_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: electric_ss_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -121,7 +121,7 @@ item (FEAT_TRAINS, electric_ss, 310) { refit_cost: electric_ss_refit_cost; running_cost_factor: electric_ss_running_cost_factor; speed: electric_ss_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/surami/vl19-15dc_use.pnml b/src/electric/surami/vl19-15dc_use.pnml index de12b1431..ff65ad818 100644 --- a/src/electric/surami/vl19-15dc_use.pnml +++ b/src/electric/surami/vl19-15dc_use.pnml @@ -241,7 +241,7 @@ item (FEAT_TRAINS, vl19_15dc, 798) { additional_text: vl19_15dc_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl19_15dc_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl19_15dc_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -253,7 +253,7 @@ item (FEAT_TRAINS, vl19_15dc, 798) { refit_cost: vl19_15dc_refit_cost; running_cost_factor: vl19_15dc_running_cost_factor; speed: vl19_15dc_speed_advanced; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl19_15dc_tractive_effort_coefficient; weight: vl19_15dc_weight; } diff --git a/src/electric/surami/vl19-ddc_use.pnml b/src/electric/surami/vl19-ddc_use.pnml index 965807681..86712ee36 100644 --- a/src/electric/surami/vl19-ddc_use.pnml +++ b/src/electric/surami/vl19-ddc_use.pnml @@ -231,7 +231,7 @@ item (FEAT_TRAINS, vl19_ddc, 797) { additional_text: vl19_ddc_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl19_ddc_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl19_ddc_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -243,7 +243,7 @@ item (FEAT_TRAINS, vl19_ddc, 797) { refit_cost: vl19_ddc_refit_cost; running_cost_factor: vl19_ddc_running_cost_factor; speed: vl19_ddc_speed_advanced; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl19_ddc_tractive_effort_coefficient; weight: vl19_ddc_weight; } diff --git a/src/electric/surami/vl19-pre.pnml b/src/electric/surami/vl19-pre.pnml index 223375947..0135cd834 100644 --- a/src/electric/surami/vl19-pre.pnml +++ b/src/electric/surami/vl19-pre.pnml @@ -139,7 +139,7 @@ item (FEAT_TRAINS, vl19_pre, 796) { additional_text: vl19_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl19_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl19_pre_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -151,7 +151,7 @@ item (FEAT_TRAINS, vl19_pre, 796) { refit_cost: vl19_pre_refit_cost; running_cost_factor: vl19_pre_running_cost_factor; speed: vl19_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl19_pre_tractive_effort_coefficient; weight: vl19_pre_weight; } diff --git a/src/electric/surami/vl19.pnml b/src/electric/surami/vl19.pnml index 4a0892e40..a6de0ef8e 100644 --- a/src/electric/surami/vl19.pnml +++ b/src/electric/surami/vl19.pnml @@ -320,7 +320,7 @@ item (FEAT_TRAINS, vl19, 312) { additional_text: vl19_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl19_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl19_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -332,7 +332,7 @@ item (FEAT_TRAINS, vl19, 312) { refit_cost: vl19_refit_cost; running_cost_factor: vl19_running_cost_factor; speed: vl19_speed_advanced; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl19_tractive_effort_coefficient; weight: vl19_weight; } diff --git a/src/electric/surami/vl22.pnml b/src/electric/surami/vl22.pnml index dc6985e34..f4f0cb155 100644 --- a/src/electric/surami/vl22.pnml +++ b/src/electric/surami/vl22.pnml @@ -97,7 +97,7 @@ item (FEAT_TRAINS, vl22, 313) { additional_text: vl22_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl22_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl22_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -109,7 +109,7 @@ item (FEAT_TRAINS, vl22, 313) { refit_cost: vl22_refit_cost; running_cost_factor: vl22_running_cost_factor; speed: vl22_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl22_tractive_effort_coefficient; } } diff --git a/src/electric/surami/vl22m-pre_use.pnml b/src/electric/surami/vl22m-pre_use.pnml index 1963c8b94..7d8059b71 100644 --- a/src/electric/surami/vl22m-pre_use.pnml +++ b/src/electric/surami/vl22m-pre_use.pnml @@ -77,7 +77,7 @@ item (FEAT_TRAINS, vl22m_pre, 990) { additional_text: vl22m_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl22m_type1947_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl22m_type1947_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -89,7 +89,7 @@ item (FEAT_TRAINS, vl22m_pre, 990) { refit_cost: vl22m_pre_refit_cost; running_cost_factor: vl22m_pre_running_cost_factor; speed: vl22m_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl22m_pre_tractive_effort_coefficient; } } diff --git a/src/electric/surami/vl22m-type1947.pnml b/src/electric/surami/vl22m-type1947.pnml index 35a19c711..0365e2c80 100644 --- a/src/electric/surami/vl22m-type1947.pnml +++ b/src/electric/surami/vl22m-type1947.pnml @@ -113,7 +113,7 @@ item (FEAT_TRAINS, vl22m_type1947, 314) { additional_text: vl22m_type1947_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl22m_type1947_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl22m_type1947_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -125,7 +125,7 @@ item (FEAT_TRAINS, vl22m_type1947, 314) { refit_cost: vl22m_type1947_refit_cost; running_cost_factor: vl22m_type1947_running_cost_factor; speed: vl22m_type1947_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl22m_type1947_tractive_effort_coefficient; } } diff --git a/src/electric/surami/vl22m-type1956_use.pnml b/src/electric/surami/vl22m-type1956_use.pnml index 393f13bec..5efb3c798 100644 --- a/src/electric/surami/vl22m-type1956_use.pnml +++ b/src/electric/surami/vl22m-type1956_use.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, vl22m_type1956, 838) { additional_text: vl22m_type1956_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl22m_type1947_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl22m_type1947_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -88,7 +88,7 @@ item (FEAT_TRAINS, vl22m_type1956, 838) { refit_cost: vl22m_type1956_refit_cost; running_cost_factor: vl22m_type1956_running_cost_factor; speed: vl22m_type1956_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl22m_type1956_tractive_effort_coefficient; } } diff --git a/src/electric/surami/vl22m-type1957.pnml b/src/electric/surami/vl22m-type1957.pnml index 34198302c..55b137c14 100644 --- a/src/electric/surami/vl22m-type1957.pnml +++ b/src/electric/surami/vl22m-type1957.pnml @@ -118,7 +118,7 @@ item (FEAT_TRAINS, vl22m_type1957, 839) { additional_text: vl22m_type1957_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl22m_type1947_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl22m_type1957_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -130,7 +130,7 @@ item (FEAT_TRAINS, vl22m_type1957, 839) { refit_cost: vl22m_type1957_refit_cost; running_cost_factor: vl22m_type1957_running_cost_factor; speed: vl22m_type1957_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl22m_type1957_tractive_effort_coefficient; } } diff --git a/src/electric/t8-pre.pnml b/src/electric/t8-pre.pnml index 6cedea013..6b61ce173 100644 --- a/src/electric/t8-pre.pnml +++ b/src/electric/t8-pre.pnml @@ -75,7 +75,7 @@ item (FEAT_TRAINS, t8_pre, 897) { additional_text: t8_pre_additional_text; articulated_part: t8_pre_articulated_part; bitmask_vehicle_info: t8_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_t8_pre_CC; cargo_subtype_text: t8_pre_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -85,7 +85,7 @@ item (FEAT_TRAINS, t8_pre, 897) { purchase: t8_pre_purchase_sprites; running_cost_factor: t8_pre_running_cost_factor; speed: t8_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-nevz-type1969_use.pnml b/src/electric/vl10-nevz-type1969_use.pnml index cbfcb3372..b4c146d7d 100644 --- a/src/electric/vl10-nevz-type1969_use.pnml +++ b/src/electric/vl10-nevz-type1969_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, vl10_nevz_type1969, 901) { additional_text: vl10_nevz_type1969_additional_text; articulated_part: vl10_nevz_type1969_articulated_part; bitmask_vehicle_info: vl10_nevz_type1969_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_nevz_type1969_CC; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, vl10_nevz_type1969, 901) { purchase: vl10_nevz_type1969_purchase_sprites; running_cost_factor: vl10_nevz_type1969_running_cost_factor; speed: vl10_nevz_type1969_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-nevz-type1973_use.pnml b/src/electric/vl10-nevz-type1973_use.pnml index 94201fca8..a699607fb 100644 --- a/src/electric/vl10-nevz-type1973_use.pnml +++ b/src/electric/vl10-nevz-type1973_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10_nevz_type1973, 902) { additional_text: vl10_nevz_type1973_additional_text; articulated_part: vl10_nevz_type1973_articulated_part; bitmask_vehicle_info: vl10_nevz_type1973_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_nevz_type1973_CC; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10_nevz_type1973, 902) { purchase: vl10_nevz_type1973_purchase_sprites; running_cost_factor: vl10_nevz_type1973_running_cost_factor; speed: vl10_nevz_type1973_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-nevz-type1974_use.pnml b/src/electric/vl10-nevz-type1974_use.pnml index 57520dfe6..ef974a1f3 100644 --- a/src/electric/vl10-nevz-type1974_use.pnml +++ b/src/electric/vl10-nevz-type1974_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10_nevz_type1974, 903) { additional_text: vl10_nevz_type1974_additional_text; articulated_part: vl10_nevz_type1974_articulated_part; bitmask_vehicle_info: vl10_nevz_type1974_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_nevz_type1974_CC; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10_nevz_type1974, 903) { purchase: vl10_nevz_type1974_purchase_sprites; running_cost_factor: vl10_nevz_type1974_running_cost_factor; speed: vl10_nevz_type1974_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-type1963.pnml b/src/electric/vl10-type1963.pnml index 6758bfa09..57cb362ac 100644 --- a/src/electric/vl10-type1963.pnml +++ b/src/electric/vl10-type1963.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, vl10_type1963, 850) { additional_text: vl10_type1963_additional_text; articulated_part: vl10_type1963_articulated_part; bitmask_vehicle_info: vl10_type1963_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_type1963_CC; cargo_subtype_text: vl10_type1963_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, vl10_type1963, 850) { purchase: vl10_type1963_purchase_sprites; running_cost_factor: vl10_type1963_running_cost_factor; speed: vl10_type1963_speed; - start_stop: any_start_stop_with_lines_only; + start_stop: any_start_stop_electric_with_lines_only; } } diff --git a/src/electric/vl10-type1967.pnml b/src/electric/vl10-type1967.pnml index 821375651..8c3509d36 100644 --- a/src/electric/vl10-type1967.pnml +++ b/src/electric/vl10-type1967.pnml @@ -114,7 +114,7 @@ item (FEAT_TRAINS, vl10_type1967, 899) { additional_text: vl10_type1967_additional_text; articulated_part: vl10_type1967_articulated_part; bitmask_vehicle_info: vl10_type1967_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_type1967_CC; cargo_subtype_text: vl10_type1967_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -125,7 +125,7 @@ item (FEAT_TRAINS, vl10_type1967, 899) { refit_cost: vl10_type1967_refit_cost; running_cost_factor: vl10_type1967_running_cost_factor; speed: vl10_type1967_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-type1969.pnml b/src/electric/vl10-type1969.pnml index 9bf7a5b3d..e1502a2b6 100644 --- a/src/electric/vl10-type1969.pnml +++ b/src/electric/vl10-type1969.pnml @@ -75,7 +75,7 @@ item (FEAT_TRAINS, vl10_type1969, 316) { additional_text: vl10_type1969_additional_text; articulated_part: vl10_type1969_articulated_part; bitmask_vehicle_info: vl10_type1969_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_type1969_CC; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -85,7 +85,7 @@ item (FEAT_TRAINS, vl10_type1969, 316) { purchase: vl10_type1969_purchase_sprites; running_cost_factor: vl10_type1969_running_cost_factor; speed: vl10_type1969_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-type1973.pnml b/src/electric/vl10-type1973.pnml index e388d893e..9b40512a1 100644 --- a/src/electric/vl10-type1973.pnml +++ b/src/electric/vl10-type1973.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10_type1973, 851) { additional_text: vl10_type1973_additional_text; articulated_part: vl10_type1973_articulated_part; bitmask_vehicle_info: vl10_type1973_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_type1973_CC; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10_type1973, 851) { purchase: vl10_type1973_purchase_sprites; running_cost_factor: vl10_type1973_running_cost_factor; speed: vl10_type1973_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10-type1974.pnml b/src/electric/vl10-type1974.pnml index 1cbdd1700..ac9ba24bf 100644 --- a/src/electric/vl10-type1974.pnml +++ b/src/electric/vl10-type1974.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10_type1974, 852) { additional_text: vl10_type1974_additional_text; articulated_part: vl10_type1974_articulated_part; bitmask_vehicle_info: vl10_type1974_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl10_type1974_CC; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10_type1974, 852) { purchase: vl10_type1974_purchase_sprites; running_cost_factor: vl10_type1974_running_cost_factor; speed: vl10_type1974_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10u-nevz-type1976_use.pnml b/src/electric/vl10u-nevz-type1976_use.pnml index 36f04849d..60ae3b578 100644 --- a/src/electric/vl10u-nevz-type1976_use.pnml +++ b/src/electric/vl10u-nevz-type1976_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10u_nevz_type1976, 905) { additional_text: vl10u_nevz_type1976_additional_text; articulated_part: vl10u_nevz_type1976_articulated_part; bitmask_vehicle_info: vl10u_nevz_type1976_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10u_nevz_type1976, 905) { purchase: vl10u_nevz_type1976_purchase_sprites; running_cost_factor: vl10u_nevz_type1976_running_cost_factor; speed: vl10u_nevz_type1976_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10u-nevz-type1978_use.pnml b/src/electric/vl10u-nevz-type1978_use.pnml index 0f8ef1ced..45222ce9e 100644 --- a/src/electric/vl10u-nevz-type1978_use.pnml +++ b/src/electric/vl10u-nevz-type1978_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10u_nevz_type1978, 906) { additional_text: vl10u_nevz_type1978_additional_text; articulated_part: vl10u_nevz_type1978_articulated_part; bitmask_vehicle_info: vl10u_nevz_type1978_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10u_nevz_type1978, 906) { purchase: vl10u_nevz_type1978_purchase_sprites; running_cost_factor: vl10u_nevz_type1978_running_cost_factor; speed: vl10u_nevz_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10u-type1976.pnml b/src/electric/vl10u-type1976.pnml index f7991f9ff..5a6f3d9cc 100644 --- a/src/electric/vl10u-type1976.pnml +++ b/src/electric/vl10u-type1976.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl10u_type1976, 317) { additional_text: vl10u_type1976_additional_text; articulated_part: vl10u_type1976_articulated_part; bitmask_vehicle_info: vl10u_type1976_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl10u_type1976, 317) { purchase: vl10u_type1976_purchase_sprites; running_cost_factor: vl10u_type1976_running_cost_factor; speed: vl10u_type1976_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl10u-type1978.pnml b/src/electric/vl10u-type1978.pnml index bed085644..8f4e1606f 100644 --- a/src/electric/vl10u-type1978.pnml +++ b/src/electric/vl10u-type1978.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, vl10u_type1978, 853) { additional_text: vl10u_type1978_additional_text; articulated_part: vl10u_type1978_articulated_part; bitmask_vehicle_info: vl10u_type1978_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -69,7 +69,7 @@ item (FEAT_TRAINS, vl10u_type1978, 853) { purchase: vl10u_type1978_purchase_sprites; running_cost_factor: vl10u_type1978_running_cost_factor; speed: vl10u_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11-8_use.pnml b/src/electric/vl11-8_use.pnml index 77e215c5e..13a9e553c 100644 --- a/src/electric/vl11-8_use.pnml +++ b/src/electric/vl11-8_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, vl11_8, 923) { additional_text: vl11_8_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl11_8_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl11_type1975_cargo_subtype_text; colour_mapping: vl11_type1975_colour_mapping; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, vl11_8, 923) { purchase: vl11_8_purchase_sprites; running_cost_factor: vl11_8_running_cost_factor; speed: vl11_8_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11-type1975.pnml b/src/electric/vl11-type1975.pnml index 7d220ca28..ea488b63e 100644 --- a/src/electric/vl11-type1975.pnml +++ b/src/electric/vl11-type1975.pnml @@ -122,7 +122,7 @@ item (FEAT_TRAINS, vl11_type1975, 335) { additional_text: vl11_type1975_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl11_type1975_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl11_type1975_cargo_subtype_text; colour_mapping: vl11_type1975_colour_mapping; @@ -132,7 +132,7 @@ item (FEAT_TRAINS, vl11_type1975, 335) { purchase: vl11_type1975_purchase_sprites; running_cost_factor: vl11_type1975_running_cost_factor; speed: vl11_type1975_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11-type1978.pnml b/src/electric/vl11-type1978.pnml index 3585a9bd6..47aeb7377 100644 --- a/src/electric/vl11-type1978.pnml +++ b/src/electric/vl11-type1978.pnml @@ -85,7 +85,7 @@ item (FEAT_TRAINS, vl11_type1978, 922) { additional_text: vl11_type1978_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl11_type1975_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl11_type1975_cargo_subtype_text; colour_mapping: vl11_type1975_colour_mapping; @@ -95,7 +95,7 @@ item (FEAT_TRAINS, vl11_type1978, 922) { purchase: vl11_type1978_purchase_sprites; running_cost_factor: vl11_type1978_running_cost_factor; speed: vl11_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11-u8_use.pnml b/src/electric/vl11-u8_use.pnml index 990a94b48..94a74e6eb 100644 --- a/src/electric/vl11-u8_use.pnml +++ b/src/electric/vl11-u8_use.pnml @@ -52,7 +52,7 @@ item (FEAT_TRAINS, vl11_u8, 924) { additional_text: vl11_u8_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl11_8_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl11_type1975_cargo_subtype_text; colour_mapping: vl11_type1975_colour_mapping; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, vl11_u8, 924) { purchase: vl11_u8_purchase_sprites; running_cost_factor: vl11_u8_running_cost_factor; speed: vl11_u8_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11m4.pnml b/src/electric/vl11m4.pnml index 5684eb92b..22ac190e3 100644 --- a/src/electric/vl11m4.pnml +++ b/src/electric/vl11m4.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, vl11m4, 925) { additional_text: vl11m4_additional_text; articulated_part: vl11m4_articulated_part; bitmask_vehicle_info: vl11m4_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl11m4_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, vl11m4, 925) { purchase: vl11m4_purchase_sprites; running_cost_factor: vl11m4_running_cost_factor; speed: vl11m4_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11m5.pnml b/src/electric/vl11m5.pnml index d9e11b514..0039e71f5 100644 --- a/src/electric/vl11m5.pnml +++ b/src/electric/vl11m5.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, vl11m5, 926) { additional_text: vl11m5_additional_text; articulated_part: vl11m5_articulated_part; bitmask_vehicle_info: vl11m5_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: vl11m5_create_effect_sprites_start; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, vl11m5, 926) { purchase: vl11m5_purchase_sprites; running_cost_factor: vl11m5_running_cost_factor; speed: vl11m5_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11m6.pnml b/src/electric/vl11m6.pnml index 6206e6e2a..a242f1d2b 100644 --- a/src/electric/vl11m6.pnml +++ b/src/electric/vl11m6.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, vl11m6, 927) { additional_text: vl11m6_additional_text; articulated_part: vl11m6_articulated_part; bitmask_vehicle_info: vl11m6_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: vl11m6_create_effect_sprites_start; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, vl11m6, 927) { purchase: vl11m6_purchase_sprites; running_cost_factor: vl11m6_running_cost_factor; speed: vl11m6_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl11m_use.pnml b/src/electric/vl11m_use.pnml index c74e57b6e..7f1b22305 100644 --- a/src/electric/vl11m_use.pnml +++ b/src/electric/vl11m_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, vl11m, 364) { additional_text: vl11m_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl11m_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl11_type1975_cargo_subtype_text; colour_mapping: vl11_type1975_colour_mapping; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, vl11m, 364) { purchase: vl11m_purchase_sprites; running_cost_factor: vl11m_running_cost_factor; speed: vl11m_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl15-type1984.pnml b/src/electric/vl15-type1984.pnml index a8f9d805e..27f823446 100644 --- a/src/electric/vl15-type1984.pnml +++ b/src/electric/vl15-type1984.pnml @@ -92,7 +92,7 @@ item (FEAT_TRAINS, vl15_type1984, 440) { additional_text: vl15_type1984_additional_text; articulated_part: vl15_type1984_articulated_part; bitmask_vehicle_info: vl15_type1984_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl15_type1984_CC; cargo_subtype_text: vl15_type1984_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -102,7 +102,7 @@ item (FEAT_TRAINS, vl15_type1984, 440) { purchase: vl15_type1984_purchase_sprites; running_cost_factor: vl15_type1984_running_cost_factor; speed: vl15_type1984_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl15-type1987_use.pnml b/src/electric/vl15-type1987_use.pnml index fa0c1cc57..2fe1561e1 100644 --- a/src/electric/vl15-type1987_use.pnml +++ b/src/electric/vl15-type1987_use.pnml @@ -83,7 +83,7 @@ item (FEAT_TRAINS, vl15_type1987, 946) { additional_text: vl15_type1987_additional_text; articulated_part: vl15_type1987_articulated_part; bitmask_vehicle_info: vl15_type1987_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl15_type1987_CC; cargo_subtype_text: vl15_type1987_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -93,7 +93,7 @@ item (FEAT_TRAINS, vl15_type1987, 946) { purchase: vl15_type1987_purchase_sprites; running_cost_factor: vl15_type1987_running_cost_factor; speed: vl15_type1987_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl15s_use.pnml b/src/electric/vl15s_use.pnml index 824aa56b1..b0cd62a6c 100644 --- a/src/electric/vl15s_use.pnml +++ b/src/electric/vl15s_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, vl15s, 947) { additional_text: vl15s_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: vl15s_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl15s_CC; cargo_subtype_text: vl15_type1987_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl15s, 947) { purchase: vl15s_purchase_sprites; running_cost_factor: vl15s_running_cost_factor; speed: vl15s_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl23-pre.pnml b/src/electric/vl23-pre.pnml index c9a47d2c3..e7add081c 100644 --- a/src/electric/vl23-pre.pnml +++ b/src/electric/vl23-pre.pnml @@ -99,7 +99,7 @@ item (FEAT_TRAINS, vl23_pre, 931) { additional_text: vl23_pre_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl23_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl23_pre_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -110,7 +110,7 @@ item (FEAT_TRAINS, vl23_pre, 931) { refit_cost: vl23_pre_refit_cost; running_cost_factor: vl23_pre_running_cost_factor; speed: vl23_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl23-type1958.pnml b/src/electric/vl23-type1958.pnml index eb2ede88b..30b511947 100644 --- a/src/electric/vl23-type1958.pnml +++ b/src/electric/vl23-type1958.pnml @@ -148,7 +148,7 @@ item (FEAT_TRAINS, vl23, 180) { additional_text: vl23_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl23_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl23_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -159,7 +159,7 @@ item (FEAT_TRAINS, vl23, 180) { refit_cost: vl23_refit_cost; running_cost_factor: vl23_running_cost_factor; speed: vl23_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl60-type1962.pnml b/src/electric/vl60-type1962.pnml index 492beaf62..7a7e8fff3 100644 --- a/src/electric/vl60-type1962.pnml +++ b/src/electric/vl60-type1962.pnml @@ -105,7 +105,7 @@ item (FEAT_TRAINS, vl60_type1962, 319) { additional_text: vl60_type1962_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: vl60_type1962_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl60_type1962_CC; cargo_subtype_text: vl60_type1962_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -116,7 +116,7 @@ item (FEAT_TRAINS, vl60_type1962, 319) { refit_cost: vl60_type1962_refit_cost; running_cost_factor: vl60_type1962_running_cost_factor; speed: vl60_type1962_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl60-type1964_use.pnml b/src/electric/vl60-type1964_use.pnml index 23ec36037..daf9ff6ea 100644 --- a/src/electric/vl60-type1964_use.pnml +++ b/src/electric/vl60-type1964_use.pnml @@ -103,7 +103,7 @@ item (FEAT_TRAINS, vl60_type1964, 835) { additional_text: vl60_type1964_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: vl60_type1964_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl60_type1964_CC; cargo_subtype_text: vl60_type1964_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -114,7 +114,7 @@ item (FEAT_TRAINS, vl60_type1964, 835) { refit_cost: vl60_type1964_refit_cost; running_cost_factor: vl60_type1964_running_cost_factor; speed: vl60_type1964_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl60k-type1965.pnml b/src/electric/vl60k-type1965.pnml index abbb6a257..c247235f3 100644 --- a/src/electric/vl60k-type1965.pnml +++ b/src/electric/vl60k-type1965.pnml @@ -98,7 +98,7 @@ item (FEAT_TRAINS, vl60k_type1965, 836) { additional_text: vl60k_type1965_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: vl60k_type1965_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl60k_type1965_CC; cargo_subtype_text: vl60k_type1965_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -108,7 +108,7 @@ item (FEAT_TRAINS, vl60k_type1965, 836) { purchase: vl60k_type1965_purchase_sprites; running_cost_factor: vl60k_type1965_running_cost_factor; speed: vl60k_type1965_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl60p_use.pnml b/src/electric/vl60p_use.pnml index 8bf97a45d..077150c9d 100644 --- a/src/electric/vl60p_use.pnml +++ b/src/electric/vl60p_use.pnml @@ -102,7 +102,7 @@ item (FEAT_TRAINS, vl60p, 422) { additional_text: vl60p_additional_text; articulated_part: articulated_part_dummy4; bitmask_vehicle_info: vl60p_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl60p_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -114,7 +114,7 @@ item (FEAT_TRAINS, vl60p, 422) { refit_cost: vl60p_refit_cost; running_cost_factor: vl60p_running_cost_factor; speed: vl60p_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl61.pnml b/src/electric/vl61.pnml index eb28368d2..9341fd426 100644 --- a/src/electric/vl61.pnml +++ b/src/electric/vl61.pnml @@ -176,7 +176,7 @@ item (FEAT_TRAINS, vl61, 189) { additional_text: vl61_additional_text; articulated_part: articulated_part_dummy2; bitmask_vehicle_info: vl61_bitmask_vehicle_info_advanced; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl61_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -188,7 +188,7 @@ item (FEAT_TRAINS, vl61, 189) { refit_cost: vl61_refit_cost; running_cost_factor: vl61_running_cost_factor; speed: vl61_speed_advanced; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl65-pre.pnml b/src/electric/vl65-pre.pnml index 0dcafe9ea..f3ef35994 100644 --- a/src/electric/vl65-pre.pnml +++ b/src/electric/vl65-pre.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, vl65_pre, 846) { additional_text: vl65_pre_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: vl65_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl65_pre_CC; colour_mapping: any_cc_colour; create_effect: vl65_pre_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, vl65_pre, 846) { purchase: vl65_pre_purchase_sprites; running_cost_factor: vl65_pre_running_cost_factor; speed: vl65_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl65-type1996.pnml b/src/electric/vl65-type1996.pnml index 172847748..4e8fae8fe 100644 --- a/src/electric/vl65-type1996.pnml +++ b/src/electric/vl65-type1996.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, vl65_type1996, 847) { additional_text: vl65_type1996_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: vl65_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: vl65_type1996_create_effect; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, vl65_type1996, 847) { purchase: vl65_type1996_purchase_sprites; running_cost_factor: vl65_type1996_running_cost_factor; speed: vl65_type1996_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl65.pnml b/src/electric/vl65.pnml index 0672abe65..df45004d0 100644 --- a/src/electric/vl65.pnml +++ b/src/electric/vl65.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, vl65, 430) { additional_text: vl65_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: vl65_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl65_CC; colour_mapping: any_cc_colour; create_effect: vl65_create_effect; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, vl65, 430) { purchase: vl65_purchase_sprites; running_cost_factor: vl65_running_cost_factor; speed: vl65_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl8-tevz-type1964_use.pnml b/src/electric/vl8-tevz-type1964_use.pnml index 53065c1b8..323384d49 100644 --- a/src/electric/vl8-tevz-type1964_use.pnml +++ b/src/electric/vl8-tevz-type1964_use.pnml @@ -69,7 +69,7 @@ item (FEAT_TRAINS, vl8_tevz_type1964, 957) { additional_text: vl8_tevz_type1964_additional_text; articulated_part: vl8_tevz_type1964_articulated_part; bitmask_vehicle_info: vl8_tevz_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl8_type1963_cargo_subtype_text; colour_mapping: vl8_type1963_colour_mapping; @@ -80,7 +80,7 @@ item (FEAT_TRAINS, vl8_tevz_type1964, 957) { refit_cost: vl8_tevz_type1964_refit_cost; running_cost_factor: vl8_tevz_type1964_running_cost_factor; speed: vl8_tevz_type1964_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl8-tevz-type1966_use.pnml b/src/electric/vl8-tevz-type1966_use.pnml index f70e5c3c4..82cbbe5c1 100644 --- a/src/electric/vl8-tevz-type1966_use.pnml +++ b/src/electric/vl8-tevz-type1966_use.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl8_tevz_type1966, 958) { additional_text: vl8_tevz_type1966_additional_text; articulated_part: vl8_tevz_type1966_articulated_part; bitmask_vehicle_info: vl8_tevz_type1966_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl8_type1963_cargo_subtype_text; colour_mapping: vl8_type1963_colour_mapping; @@ -79,7 +79,7 @@ item (FEAT_TRAINS, vl8_tevz_type1966, 958) { refit_cost: vl8_tevz_type1966_refit_cost; running_cost_factor: vl8_tevz_type1966_running_cost_factor; speed: vl8_tevz_type1966_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl8-type1963_use.pnml b/src/electric/vl8-type1963_use.pnml index f764afe0e..0e8644a89 100644 --- a/src/electric/vl8-type1963_use.pnml +++ b/src/electric/vl8-type1963_use.pnml @@ -113,7 +113,7 @@ item (FEAT_TRAINS, vl8_type1963, 904) { additional_text: vl8_type1963_additional_text; articulated_part: vl8_type1963_articulated_part; bitmask_vehicle_info: vl8_type1963_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl8_type1963_cargo_subtype_text; colour_mapping: vl8_type1963_colour_mapping; @@ -124,7 +124,7 @@ item (FEAT_TRAINS, vl8_type1963, 904) { refit_cost: vl8_type1963_refit_cost; running_cost_factor: vl8_type1963_running_cost_factor; speed: vl8_type1963_speed_sp; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80_use.pnml b/src/electric/vl80_use.pnml index 9037a8233..4ae11e1bb 100644 --- a/src/electric/vl80_use.pnml +++ b/src/electric/vl80_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, vl80, 890) { additional_text: vl80_additional_text; articulated_part: vl80_articulated_part; bitmask_vehicle_info: vl80_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, vl80, 890) { purchase: vl80_purchase_sprites; running_cost_factor: vl80_running_cost_factor; speed: vl80_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80k-type1964.pnml b/src/electric/vl80k-type1964.pnml index c01aafa45..9c501ca91 100644 --- a/src/electric/vl80k-type1964.pnml +++ b/src/electric/vl80k-type1964.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, vl80k_type1964, 891) { additional_text: vl80k_type1964_additional_text; articulated_part: vl80k_type1964_articulated_part; bitmask_vehicle_info: vl80k_type1964_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, vl80k_type1964, 891) { purchase: vl80k_type1964_purchase_sprites; running_cost_factor: vl80k_type1964_running_cost_factor; speed: vl80k_type1964_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80k-type1967.pnml b/src/electric/vl80k-type1967.pnml index 7d615c512..4b399603e 100644 --- a/src/electric/vl80k-type1967.pnml +++ b/src/electric/vl80k-type1967.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, vl80k_type1967, 892) { additional_text: vl80k_type1967_additional_text; articulated_part: vl80k_type1967_articulated_part; bitmask_vehicle_info: vl80k_type1967_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, vl80k_type1967, 892) { purchase: vl80k_type1967_purchase_sprites; running_cost_factor: vl80k_type1967_running_cost_factor; speed: vl80k_type1967_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80k-type1968.pnml b/src/electric/vl80k-type1968.pnml index 373d3c2a8..12a441baf 100644 --- a/src/electric/vl80k-type1968.pnml +++ b/src/electric/vl80k-type1968.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, vl80k_type1968, 893) { additional_text: vl80k_type1968_additional_text; articulated_part: vl80k_type1968_articulated_part; bitmask_vehicle_info: vl80k_type1968_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, vl80k_type1968, 893) { purchase: vl80k_type1968_purchase_sprites; running_cost_factor: vl80k_type1968_running_cost_factor; speed: vl80k_type1968_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80k.pnml b/src/electric/vl80k.pnml index fe9713729..64ad0522c 100644 --- a/src/electric/vl80k.pnml +++ b/src/electric/vl80k.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, vl80k, 327) { additional_text: vl80k_additional_text; articulated_part: vl80k_articulated_part; bitmask_vehicle_info: vl80k_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, vl80k, 327) { purchase: vl80k_purchase_sprites; running_cost_factor: vl80k_running_cost_factor; speed: vl80k_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80s.pnml b/src/electric/vl80s.pnml index 7bcd9da14..b370bdc04 100644 --- a/src/electric/vl80s.pnml +++ b/src/electric/vl80s.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, vl80s, 329) { additional_text: vl80s_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl80s_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, vl80s, 329) { purchase: vl80s_purchase_sprites; running_cost_factor: vl80s_running_cost_factor; speed: vl80s_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80t-type1972_use.pnml b/src/electric/vl80t-type1972_use.pnml index 54bd9fcd9..52765a27c 100644 --- a/src/electric/vl80t-type1972_use.pnml +++ b/src/electric/vl80t-type1972_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, vl80t_type1972, 951) { additional_text: vl80t_type1972_additional_text; articulated_part: vl80t_type1972_articulated_part; bitmask_vehicle_info: vl80t_type1972_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, vl80t_type1972, 951) { purchase: vl80t_type1972_purchase_sprites; running_cost_factor: vl80t_type1972_running_cost_factor; speed: vl80t_type1972_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80t-type1975_use.pnml b/src/electric/vl80t-type1975_use.pnml index b41fb7e99..d835a2f80 100644 --- a/src/electric/vl80t-type1975_use.pnml +++ b/src/electric/vl80t-type1975_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, vl80t_type1975, 895) { additional_text: vl80t_type1975_additional_text; articulated_part: vl80t_type1975_articulated_part; bitmask_vehicle_info: vl80t_type1975_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, vl80t_type1975, 895) { purchase: vl80t_type1975_purchase_sprites; running_cost_factor: vl80t_type1975_running_cost_factor; speed: vl80t_type1975_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80t-type1978.pnml b/src/electric/vl80t-type1978.pnml index 633101ca0..d11b08a09 100644 --- a/src/electric/vl80t-type1978.pnml +++ b/src/electric/vl80t-type1978.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, vl80t_type1978, 896) { additional_text: vl80t_type1978_additional_text; articulated_part: vl80t_type1978_articulated_part; bitmask_vehicle_info: vl80t_type1978_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, vl80t_type1978, 896) { purchase: vl80t_type1978_purchase_sprites; running_cost_factor: vl80t_type1978_running_cost_factor; speed: vl80t_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl80t.pnml b/src/electric/vl80t.pnml index 2bd3a6d3b..e815194bd 100644 --- a/src/electric/vl80t.pnml +++ b/src/electric/vl80t.pnml @@ -76,7 +76,7 @@ item (FEAT_TRAINS, vl80t, 326) { additional_text: vl80t_additional_text; articulated_part: vl80t_articulated_part; bitmask_vehicle_info: vl80t_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl_type_cargo_subtype_text; colour_mapping: vl_type_colour_mapping; @@ -86,7 +86,7 @@ item (FEAT_TRAINS, vl80t, 326) { purchase: vl80t_purchase_sprites; running_cost_factor: vl80t_running_cost_factor; speed: vl80t_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl82.pnml b/src/electric/vl82.pnml index 4a7fe19b1..38350253a 100644 --- a/src/electric/vl82.pnml +++ b/src/electric/vl82.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, vl82, 346) { additional_text: vl82_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl82_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: vl82_create_effect_sprites_start; @@ -81,7 +81,7 @@ item (FEAT_TRAINS, vl82, 346) { purchase: vl82_purchase_sprites; running_cost_factor: vl82_running_cost_factor; speed: vl82_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl82m-type1978.pnml b/src/electric/vl82m-type1978.pnml index 6ff5b54ec..4201920a6 100644 --- a/src/electric/vl82m-type1978.pnml +++ b/src/electric/vl82m-type1978.pnml @@ -67,7 +67,7 @@ item (FEAT_TRAINS, vl82m_type1978, 888) { additional_text: vl82m_type1978_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl82m_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl82m_type1978_cargo_subtype_text; colour_mapping: vl82m_type1978_colour_mapping; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, vl82m_type1978, 888) { purchase: vl82m_type1978_purchase_sprites; running_cost_factor: vl82m_type1978_running_cost_factor; speed: vl82m_type1978_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl82m_type1978_tractive_effort_coefficient; } } diff --git a/src/electric/vl82m.pnml b/src/electric/vl82m.pnml index c0bc3396f..4a43c7986 100644 --- a/src/electric/vl82m.pnml +++ b/src/electric/vl82m.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, vl82m, 402) { additional_text: vl82m_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: vl82m_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return 0; cargo_subtype_text: vl82m_cargo_subtype_text; colour_mapping: vl82m_colour_mapping; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, vl82m, 402) { purchase: vl82m_purchase_sprites; running_cost_factor: vl82m_running_cost_factor; speed: vl82m_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; tractive_effort_coefficient: vl82m_tractive_effort_coefficient; } } diff --git a/src/electric/vl85-pre_use.pnml b/src/electric/vl85-pre_use.pnml index 36a39dad4..bd22b27b7 100644 --- a/src/electric/vl85-pre_use.pnml +++ b/src/electric/vl85-pre_use.pnml @@ -75,7 +75,7 @@ item (FEAT_TRAINS, vl85_pre, 840) { additional_text: vl85_pre_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: vl85_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl85_pre_CC / 2; cargo_subtype_text: vl85_pre_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -85,7 +85,7 @@ item (FEAT_TRAINS, vl85_pre, 840) { purchase: vl85_pre_purchase_sprites; running_cost_factor: vl85_pre_running_cost_factor; speed: vl85_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/electric/vl85.pnml b/src/electric/vl85.pnml index 94ea90caa..f2d8f9c54 100644 --- a/src/electric/vl85.pnml +++ b/src/electric/vl85.pnml @@ -74,7 +74,7 @@ item (FEAT_TRAINS, vl85, 486) { additional_text: vl85_additional_text; articulated_part: articulated_part_dummy5; bitmask_vehicle_info: vl85_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_electric; cargo_capacity: return PROP_vl85_CC / 2; cargo_subtype_text: vl85_cargo_subtype_text; colour_mapping: any_cc_colour; @@ -84,7 +84,7 @@ item (FEAT_TRAINS, vl85, 486) { purchase: vl85_purchase_sprites; running_cost_factor: vl85_running_cost_factor; speed: vl85_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_electric; } } diff --git a/src/steam/9p.pnml b/src/steam/9p.pnml index be1c0f051..c683bc64a 100644 --- a/src/steam/9p.pnml +++ b/src/steam/9p.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, steam_9p, 420) { additional_text: steam_9p_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: steam_9p_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: steam_9p_create_effect; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, steam_9p, 420) { purchase_speed: return 35; running_cost_factor: steam_9p_running_cost_factor; speed: steam_9p_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/a.pnml b/src/steam/a.pnml index 3830dd711..1e2b4b8e8 100644 --- a/src/steam/a.pnml +++ b/src/steam/a.pnml @@ -112,7 +112,7 @@ item (FEAT_TRAINS, steam_a, 736) { additional_text: steam_a_additional_text; articulated_part: steam_a_articulated_part; bitmask_vehicle_info: steam_a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_a_cargo_subtype_text; colour_mapping: steam_a_colour_mapping; @@ -124,7 +124,7 @@ item (FEAT_TRAINS, steam_a, 736) { refit_cost: steam_a_refit_cost; running_cost_factor: steam_a_running_cost_factor; speed: steam_a_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/bryansk/izhitsa-bz-type1917_use.pnml b/src/steam/bryansk/izhitsa-bz-type1917_use.pnml index e05fbe188..a507ca797 100644 --- a/src/steam/bryansk/izhitsa-bz-type1917_use.pnml +++ b/src/steam/bryansk/izhitsa-bz-type1917_use.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, izhitsa_bz_type1917, 1141) { additional_text: izhitsa_bz_type1917_additional_text; articulated_part: izhitsa_bz_type1917_articulated_part; bitmask_vehicle_info: izhitsa_bz_type1917_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_izhitsa_bz_type1917_CC; colour_mapping: any_cc_colour; create_effect: izhitsa_bz_type1917_create_effect; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, izhitsa_bz_type1917, 1141) { purchase: izhitsa_bz_type1917_purchase_sprites; running_cost_factor: izhitsa_bz_type1917_running_cost_factor; speed: izhitsa_bz_type1917_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/bryansk/l-bz-type1946_use.pnml b/src/steam/bryansk/l-bz-type1946_use.pnml index 4e6f006ec..3116aa14f 100644 --- a/src/steam/bryansk/l-bz-type1946_use.pnml +++ b/src/steam/bryansk/l-bz-type1946_use.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, l_bz_type1946, 1137) { additional_text: l_bz_type1946_additional_text; articulated_part: l_bz_type1946_articulated_part; bitmask_vehicle_info: l_bz_type1946_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_l_bz_type1946_CC; colour_mapping: any_cc_colour; create_effect: l_bz_type1946_create_effect; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, l_bz_type1946, 1137) { purchase: l_bz_type1946_purchase_sprites; running_cost_factor: l_bz_type1946_running_cost_factor; speed: l_bz_type1946_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/bryansk/l-bz-type1947_use.pnml b/src/steam/bryansk/l-bz-type1947_use.pnml index 1c2f12d8d..3725a99db 100644 --- a/src/steam/bryansk/l-bz-type1947_use.pnml +++ b/src/steam/bryansk/l-bz-type1947_use.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, l_bz_type1947, 1138) { additional_text: l_bz_type1947_additional_text; articulated_part: l_bz_type1947_articulated_part; bitmask_vehicle_info: l_bz_type1947_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_l_bz_type1947_CC; colour_mapping: any_cc_colour; create_effect: l_bz_type1947_create_effect; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, l_bz_type1947, 1138) { purchase: l_bz_type1947_purchase_sprites; running_cost_factor: l_bz_type1947_running_cost_factor; speed: l_bz_type1947_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/chk-type1879.pnml b/src/steam/chk-type1879.pnml index 2d43f199a..08aaf6614 100644 --- a/src/steam/chk-type1879.pnml +++ b/src/steam/chk-type1879.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, chk_type1879, 724) { additional_text: chk_type1879_additional_text; articulated_part: chk_type1879_articulated_part; bitmask_vehicle_info: chk_type1879_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_chk_type1879_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, chk_type1879, 724) { purchase: chk_type1879_purchase_sprites; running_cost_factor: chk_type1879_running_cost_factor; speed: chk_type1879_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/chk-type1890.pnml b/src/steam/chk-type1890.pnml index 5572ed5eb..a70650ee6 100644 --- a/src/steam/chk-type1890.pnml +++ b/src/steam/chk-type1890.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, chk_type1890, 1111) { additional_text: chk_type1890_additional_text; articulated_part: chk_type1890_articulated_part; bitmask_vehicle_info: chk_type1890_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_chk_type1890_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, chk_type1890, 1111) { purchase: chk_type1890_purchase_sprites; running_cost_factor: chk_type1890_running_cost_factor; speed: chk_type1890_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/chk-type1891.pnml b/src/steam/chk-type1891.pnml index f292e21c7..ec1de8561 100644 --- a/src/steam/chk-type1891.pnml +++ b/src/steam/chk-type1891.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, chk_type1891, 1112) { additional_text: chk_type1891_additional_text; articulated_part: chk_type1891_articulated_part; bitmask_vehicle_info: chk_type1891_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_chk_type1891_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, chk_type1891, 1112) { purchase: chk_type1891_purchase_sprites; running_cost_factor: chk_type1891_running_cost_factor; speed: chk_type1891_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/chn.pnml b/src/steam/chn.pnml index 0c02c8242..a10c862eb 100644 --- a/src/steam/chn.pnml +++ b/src/steam/chn.pnml @@ -60,7 +60,7 @@ item (FEAT_TRAINS, chn, 503) { additional_text: chn_additional_text; articulated_part: chn_articulated_part; bitmask_vehicle_info: chn_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_chn_CC; colour_mapping: any_cc_colour; create_effect: chn_create_effect; @@ -70,7 +70,7 @@ item (FEAT_TRAINS, chn, 503) { purchase: chn_purchase_sprites; running_cost_factor: chn_running_cost_factor; speed: chn_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/d-schneider.pnml b/src/steam/d-schneider.pnml index b57d3e38e..41e05e0f9 100644 --- a/src/steam/d-schneider.pnml +++ b/src/steam/d-schneider.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, d_schneider, 580) { additional_text: d_schneider_additional_text; articulated_part: d_schneider_articulated_part; bitmask_vehicle_info: d_schneider_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_d_schneider_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, d_schneider, 580) { purchase: d_schneider_purchase_sprites; running_cost_factor: d_schneider_running_cost_factor; speed: d_schneider_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/dk-type1870.pnml b/src/steam/dk-type1870.pnml index b82574dfb..ac35aa054 100644 --- a/src/steam/dk-type1870.pnml +++ b/src/steam/dk-type1870.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, steam_dk_2, 735) { additional_text: steam_dk_2_additional_text; articulated_part: steam_dk_2_articulated_part; bitmask_vehicle_info: steam_dk_2_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_dk_2_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, steam_dk_2, 735) { purchase: steam_dk_2_purchase_sprites; running_cost_factor: steam_dk_2_running_cost_factor; speed: steam_dk_2_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/dk-type1875_use.pnml b/src/steam/dk-type1875_use.pnml index 82a017a57..7ffc8662c 100644 --- a/src/steam/dk-type1875_use.pnml +++ b/src/steam/dk-type1875_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, steam_dk_9, 763) { additional_text: steam_dk_9_additional_text; articulated_part: steam_dk_9_articulated_part; bitmask_vehicle_info: steam_dk_9_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_dk_9_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, steam_dk_9, 763) { purchase: steam_dk_9_purchase_sprites; running_cost_factor: steam_dk_9_running_cost_factor; speed: steam_dk_9_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/e-6606.pnml b/src/steam/e-6606.pnml index 658f5d2c0..8b5ef0b17 100644 --- a/src/steam/e-6606.pnml +++ b/src/steam/e-6606.pnml @@ -66,7 +66,7 @@ item (FEAT_TRAINS, steam_e_6606, 330) { additional_text: steam_e_6606_additional_text; articulated_part: steam_e_6606_articulated_part; bitmask_vehicle_info: steam_e_6606_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_e_6606_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, steam_e_6606, 330) { purchase: steam_e_6606_purchase_sprites; running_cost_factor: steam_e_6606_running_cost_factor; speed: steam_e_6606_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/e-9201_use.pnml b/src/steam/e-9201_use.pnml index 81a67f9b3..580ba08e0 100644 --- a/src/steam/e-9201_use.pnml +++ b/src/steam/e-9201_use.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, steam_e_9201, 782) { additional_text: steam_e_9201_additional_text; articulated_part: steam_e_9201_articulated_part; bitmask_vehicle_info: steam_e_9201_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_e_9201_CC; colour_mapping: any_cc_colour; create_effect: steam_e_9201_create_effect; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, steam_e_9201, 782) { purchase: steam_e_9201_purchase_sprites; running_cost_factor: steam_e_9201_running_cost_factor; speed: steam_e_9201_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/e-9555a_use.pnml b/src/steam/e-9555a_use.pnml index 05fa01797..0f4c0d543 100644 --- a/src/steam/e-9555a_use.pnml +++ b/src/steam/e-9555a_use.pnml @@ -69,7 +69,7 @@ item (FEAT_TRAINS, steam_e_9555a, 783) { additional_text: steam_e_9555a_additional_text; articulated_part: steam_e_9555a_articulated_part; bitmask_vehicle_info: steam_e_9555a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_e_9555a_CC; colour_mapping: any_cc_colour; create_effect: steam_e_9555a_create_effect; @@ -79,7 +79,7 @@ item (FEAT_TRAINS, steam_e_9555a, 783) { purchase: steam_e_9555a_purchase_sprites; running_cost_factor: steam_e_9555a_running_cost_factor; speed: steam_e_9555a_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/e-type1920_use.pnml b/src/steam/e-type1920_use.pnml index ee68158ee..d14a2cc1c 100644 --- a/src/steam/e-type1920_use.pnml +++ b/src/steam/e-type1920_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, e_type1920, 1150) { additional_text: e_type1920_additional_text; articulated_part: e_type1920_articulated_part; bitmask_vehicle_info: e_type1920_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_e_type1920_CC; colour_mapping: any_cc_colour; create_effect: e_type1920_create_effect; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, e_type1920, 1150) { purchase: e_type1920_purchase_sprites; running_cost_factor: e_type1920_running_cost_factor; speed: e_type1920_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/ea_use.pnml b/src/steam/ea_use.pnml index 2d2b64a61..619656826 100644 --- a/src/steam/ea_use.pnml +++ b/src/steam/ea_use.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, steam_ea, 672) { additional_text: steam_ea_additional_text; articulated_part: steam_ea_articulated_part; bitmask_vehicle_info: steam_ea_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: steam_ea_create_effect; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, steam_ea, 672) { purchase_speed: return 70; running_cost_factor: steam_ea_running_cost_factor; speed: steam_ea_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/el_use.pnml b/src/steam/el_use.pnml index c76e73529..73c20ef6f 100644 --- a/src/steam/el_use.pnml +++ b/src/steam/el_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, steam_el, 671) { additional_text: steam_el_additional_text; articulated_part: steam_el_articulated_part; bitmask_vehicle_info: steam_el_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: steam_el_create_effect; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, steam_el, 671) { purchase_speed: return 55; running_cost_factor: steam_el_running_cost_factor; speed: steam_el_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/em-type1931_use.pnml b/src/steam/em-type1931_use.pnml index f0975b6c9..fdb885bfd 100644 --- a/src/steam/em-type1931_use.pnml +++ b/src/steam/em-type1931_use.pnml @@ -70,7 +70,7 @@ item (FEAT_TRAINS, em_type1931, 332) { additional_text: em_type1931_additional_text; articulated_part: em_type1931_articulated_part; bitmask_vehicle_info: em_type1931_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_em_type1931_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -80,7 +80,7 @@ item (FEAT_TRAINS, em_type1931, 332) { purchase: em_type1931_purchase_sprites; running_cost_factor: em_type1931_running_cost_factor; speed: em_type1931_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/em-type1933_use.pnml b/src/steam/em-type1933_use.pnml index d3a4410ef..9eb8dff70 100644 --- a/src/steam/em-type1933_use.pnml +++ b/src/steam/em-type1933_use.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, em_type1933, 1148) { additional_text: em_type1933_additional_text; articulated_part: em_type1933_articulated_part; bitmask_vehicle_info: em_type1933_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_em_type1933_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, em_type1933, 1148) { purchase: em_type1933_purchase_sprites; running_cost_factor: em_type1933_running_cost_factor; speed: em_type1933_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/em-type1934_use.pnml b/src/steam/em-type1934_use.pnml index e31036c6c..7b43922a7 100644 --- a/src/steam/em-type1934_use.pnml +++ b/src/steam/em-type1934_use.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, em_type1934, 1149) { additional_text: em_type1934_additional_text; articulated_part: em_type1934_articulated_part; bitmask_vehicle_info: em_type1934_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_em_type1934_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -78,7 +78,7 @@ item (FEAT_TRAINS, em_type1934, 1149) { purchase: em_type1934_purchase_sprites; running_cost_factor: em_type1934_running_cost_factor; speed: em_type1934_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/er-type1933_use.pnml b/src/steam/er-type1933_use.pnml index 27768de67..68d58d34e 100644 --- a/src/steam/er-type1933_use.pnml +++ b/src/steam/er-type1933_use.pnml @@ -65,7 +65,7 @@ item (FEAT_TRAINS, er_type1933, 333) { additional_text: er_type1933_additional_text; articulated_part: er_type1933_articulated_part; bitmask_vehicle_info: er_type1933_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_er_type1933_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -75,7 +75,7 @@ item (FEAT_TRAINS, er_type1933, 333) { purchase: er_type1933_purchase_sprites; running_cost_factor: er_type1933_running_cost_factor; speed: er_type1933_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/er-type1946_use.pnml b/src/steam/er-type1946_use.pnml index b6b84e341..1101b9d60 100644 --- a/src/steam/er-type1946_use.pnml +++ b/src/steam/er-type1946_use.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, er_type1946, 1146) { additional_text: er_type1946_additional_text; articulated_part: er_type1946_articulated_part; bitmask_vehicle_info: er_type1946_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_er_type1946_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, er_type1946, 1146) { purchase: er_type1946_purchase_sprites; running_cost_factor: er_type1946_running_cost_factor; speed: er_type1946_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/er-type1948_use.pnml b/src/steam/er-type1948_use.pnml index 34f3b9032..55bd6e7aa 100644 --- a/src/steam/er-type1948_use.pnml +++ b/src/steam/er-type1948_use.pnml @@ -61,7 +61,7 @@ item (FEAT_TRAINS, er_type1948, 1147) { additional_text: er_type1948_additional_text; articulated_part: er_type1948_articulated_part; bitmask_vehicle_info: er_type1948_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_er_type1948_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -71,7 +71,7 @@ item (FEAT_TRAINS, er_type1948, 1147) { purchase: er_type1948_purchase_sprites; running_cost_factor: er_type1948_running_cost_factor; speed: er_type1948_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/eu.pnml b/src/steam/eu.pnml index 8d45ff036..313d93e1a 100644 --- a/src/steam/eu.pnml +++ b/src/steam/eu.pnml @@ -67,7 +67,7 @@ item (FEAT_TRAINS, steam_eu, 331) { additional_text: steam_eu_additional_text; articulated_part: steam_eu_articulated_part; bitmask_vehicle_info: steam_eu_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_eu_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, steam_eu, 331) { purchase: steam_eu_purchase_sprites; running_cost_factor: steam_eu_running_cost_factor; speed: steam_eu_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/f-type1871.pnml b/src/steam/f-type1871.pnml index 3c4f70d1f..8b60dcf0e 100644 --- a/src/steam/f-type1871.pnml +++ b/src/steam/f-type1871.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, f_type1871, 581) { additional_text: f_type1871_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: f_type1871_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_f_type1871_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, f_type1871, 581) { purchase: f_type1871_purchase_sprites; running_cost_factor: f_type1871_running_cost_factor; speed: f_type1871_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/f-type1879_use.pnml b/src/steam/f-type1879_use.pnml index 272d9ccd5..422d111fb 100644 --- a/src/steam/f-type1879_use.pnml +++ b/src/steam/f-type1879_use.pnml @@ -50,7 +50,7 @@ item (FEAT_TRAINS, f_type1879, 1143) { additional_text: f_type1879_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: f_type1879_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_f_type1879_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -60,7 +60,7 @@ item (FEAT_TRAINS, f_type1879, 1143) { purchase: f_type1879_purchase_sprites; running_cost_factor: f_type1879_running_cost_factor; speed: f_type1879_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/h.pnml b/src/steam/h.pnml index 9f12545ea..768f157c2 100644 --- a/src/steam/h.pnml +++ b/src/steam/h.pnml @@ -44,7 +44,7 @@ item (FEAT_TRAINS, steam_h, 585) { additional_text: steam_h_additional_text; articulated_part: steam_h_articulated_part; bitmask_vehicle_info: steam_h_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -55,7 +55,7 @@ item (FEAT_TRAINS, steam_h, 585) { purchase_speed: return 53; running_cost_factor: steam_h_running_cost_factor; speed: steam_h_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/is20-6p_use.pnml b/src/steam/is20-6p_use.pnml index 0e6525bb9..73fa77433 100644 --- a/src/steam/is20-6p_use.pnml +++ b/src/steam/is20-6p_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, is20_6p, 765) { additional_text: is20_6p_additional_text; articulated_part: is20_6p_articulated_part; bitmask_vehicle_info: is20_6p_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_red_arrow_cargo_subtype_text; colour_mapping: steam_pass_red_arrow_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, is20_6p, 765) { purchase: is20_6p_purchase_sprites; running_cost_factor: is20_6p_running_cost_factor; speed: is20_6p_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/is20.pnml b/src/steam/is20.pnml index 3d7d898ec..15f2efa93 100644 --- a/src/steam/is20.pnml +++ b/src/steam/is20.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, is20, 292) { additional_text: is20_additional_text; articulated_part: is20_articulated_part; bitmask_vehicle_info: is20_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_red_arrow_cargo_subtype_text; colour_mapping: steam_pass_red_arrow_colour_mapping; @@ -75,7 +75,7 @@ item (FEAT_TRAINS, is20, 292) { purchase: is20_purchase_sprites; running_cost_factor: is20_running_cost_factor; speed: is20_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/is21_use.pnml b/src/steam/is21_use.pnml index 3d5c6817e..59beec6bb 100644 --- a/src/steam/is21_use.pnml +++ b/src/steam/is21_use.pnml @@ -49,7 +49,7 @@ item (FEAT_TRAINS, is21, 293) { additional_text: is21_additional_text; articulated_part: is21_articulated_part; bitmask_vehicle_info: is21_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_red_arrow_cargo_subtype_text; colour_mapping: steam_pass_red_arrow_colour_mapping; @@ -60,7 +60,7 @@ item (FEAT_TRAINS, is21, 293) { purchase: is20_6p_purchase_sprites; running_cost_factor: is21_running_cost_factor; speed: is21_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/f-type1884_use.pnml b/src/steam/kolomna/f-type1884_use.pnml index a2182643b..3ea128610 100644 --- a/src/steam/kolomna/f-type1884_use.pnml +++ b/src/steam/kolomna/f-type1884_use.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, f_type1884, 1144) { additional_text: f_type1884_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: f_type1884_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_f_type1884_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, f_type1884, 1144) { purchase: f_type1884_purchase_sprites; running_cost_factor: f_type1884_running_cost_factor; speed: f_type1884_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/izhitsa-type1908.pnml b/src/steam/kolomna/izhitsa-type1908.pnml index 2d4607a98..41aff2551 100644 --- a/src/steam/kolomna/izhitsa-type1908.pnml +++ b/src/steam/kolomna/izhitsa-type1908.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, izhitsa_type1908, 1140) { additional_text: izhitsa_type1908_additional_text; articulated_part: izhitsa_type1908_articulated_part; bitmask_vehicle_info: izhitsa_type1908_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_izhitsa_type1908_CC; colour_mapping: any_cc_colour; create_effect: izhitsa_type1908_create_effect; @@ -74,7 +74,7 @@ item (FEAT_TRAINS, izhitsa_type1908, 1140) { purchase: izhitsa_type1908_purchase_sprites; running_cost_factor: izhitsa_type1908_running_cost_factor; speed: izhitsa_type1908_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/izhitsa-type1914_use.pnml b/src/steam/kolomna/izhitsa-type1914_use.pnml index 2640b5eda..1ef025a17 100644 --- a/src/steam/kolomna/izhitsa-type1914_use.pnml +++ b/src/steam/kolomna/izhitsa-type1914_use.pnml @@ -62,7 +62,7 @@ item (FEAT_TRAINS, izhitsa_type1914, 504) { additional_text: izhitsa_type1914_additional_text; articulated_part: izhitsa_type1914_articulated_part; bitmask_vehicle_info: izhitsa_type1914_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_izhitsa_type1914_CC; colour_mapping: any_cc_colour; create_effect: izhitsa_type1914_create_effect; @@ -72,7 +72,7 @@ item (FEAT_TRAINS, izhitsa_type1914, 504) { purchase: izhitsa_type1914_purchase_sprites; running_cost_factor: izhitsa_type1914_running_cost_factor; speed: izhitsa_type1914_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p12.pnml b/src/steam/kolomna/p12.pnml index c03831d48..ebaf68eca 100644 --- a/src/steam/kolomna/p12.pnml +++ b/src/steam/kolomna/p12.pnml @@ -139,7 +139,7 @@ item (FEAT_TRAINS, p12, 491) { additional_text: p12_additional_text; articulated_part: p12_articulated_part; bitmask_vehicle_info: p12_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: p12_cargo_subtype_text; colour_mapping: p12_colour_mapping; @@ -151,7 +151,7 @@ item (FEAT_TRAINS, p12, 491) { refit_cost: p12_refit_cost; running_cost_factor: p12_running_cost_factor; speed: p12_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p28-type1943_use.pnml b/src/steam/kolomna/p28-type1943_use.pnml index 9f1eae7e1..4751deb04 100644 --- a/src/steam/kolomna/p28-type1943_use.pnml +++ b/src/steam/kolomna/p28-type1943_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, p28_type1943, 1145) { additional_text: p28_type1943_additional_text; articulated_part: p28_type1943_articulated_part; bitmask_vehicle_info: p28_type1943_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_p28_type1943_CC; colour_mapping: any_cc_colour; create_effect: steam_e_6606_create_effect; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, p28_type1943, 1145) { purchase: p28_type1943_purchase_sprites; running_cost_factor: p28_type1943_running_cost_factor; speed: p28_type1943_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p32-type1945.pnml b/src/steam/kolomna/p32-type1945.pnml index 0671e1b6c..8b6343509 100644 --- a/src/steam/kolomna/p32-type1945.pnml +++ b/src/steam/kolomna/p32-type1945.pnml @@ -67,7 +67,7 @@ item (FEAT_TRAINS, p32_type1945, 408) { additional_text: p32_type1945_additional_text; articulated_part: p32_type1945_articulated_part; bitmask_vehicle_info: p32_type1945_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_p32_type1945_CC; colour_mapping: any_cc_colour; create_effect: p32_type1945_create_effect; @@ -77,7 +77,7 @@ item (FEAT_TRAINS, p32_type1945, 408) { purchase: p32_type1945_purchase_sprites; running_cost_factor: p32_type1945_running_cost_factor; speed: p32_type1945_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p32-type1947_use.pnml b/src/steam/kolomna/p32-type1947_use.pnml index 5f797fcfd..a27d9aa52 100644 --- a/src/steam/kolomna/p32-type1947_use.pnml +++ b/src/steam/kolomna/p32-type1947_use.pnml @@ -66,7 +66,7 @@ item (FEAT_TRAINS, p32_type1947, 1132) { additional_text: p32_type1947_additional_text; articulated_part: p32_type1947_articulated_part; bitmask_vehicle_info: p32_type1947_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_p32_type1947_CC; colour_mapping: any_cc_colour; create_effect: p32_type1947_create_effect; @@ -76,7 +76,7 @@ item (FEAT_TRAINS, p32_type1947, 1132) { purchase: p32_type1947_purchase_sprites; running_cost_factor: p32_type1947_running_cost_factor; speed: p32_type1947_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p36-pre.pnml b/src/steam/kolomna/p36-pre.pnml index be23ce53a..358ba0dd1 100644 --- a/src/steam/kolomna/p36-pre.pnml +++ b/src/steam/kolomna/p36-pre.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, p36_pre, 1128) { additional_text: p36_pre_additional_text; articulated_part: p36_pre_articulated_part; bitmask_vehicle_info: p36_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_p36_pre_CC; colour_mapping: return ttd_cc2 + 0x37; create_effect: p36_pre_create_effect; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, p36_pre, 1128) { purchase: p36_pre_purchase_sprites; running_cost_factor: p36_pre_running_cost_factor; speed: p36_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p36-type1953.pnml b/src/steam/kolomna/p36-type1953.pnml index c60ccb9fd..d02e9a53f 100644 --- a/src/steam/kolomna/p36-type1953.pnml +++ b/src/steam/kolomna/p36-type1953.pnml @@ -81,7 +81,7 @@ item (FEAT_TRAINS, p36_type1953, 1127) { additional_text: p36_type1953_additional_text; articulated_part: p36_type1953_articulated_part; bitmask_vehicle_info: p36_type1953_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_p36_type1953_CC; cargo_subtype_text: steam_pass_red_arrow_cargo_subtype_text; colour_mapping: p36_type1953_colour_mapping; @@ -92,7 +92,7 @@ item (FEAT_TRAINS, p36_type1953, 1127) { purchase: p36_type1953_purchase_sprites; running_cost_factor: p36_type1953_running_cost_factor; speed: p36_type1953_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p36-type1954.pnml b/src/steam/kolomna/p36-type1954.pnml index e6e51db5d..1dd1e48d4 100644 --- a/src/steam/kolomna/p36-type1954.pnml +++ b/src/steam/kolomna/p36-type1954.pnml @@ -81,7 +81,7 @@ item (FEAT_TRAINS, p36_type1954, 583) { additional_text: p36_type1954_additional_text; articulated_part: p36_type1954_articulated_part; bitmask_vehicle_info: p36_type1954_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_p36_type1954_CC; cargo_subtype_text: steam_pass_red_arrow_cargo_subtype_text; colour_mapping: p36_type1954_colour_mapping; @@ -92,7 +92,7 @@ item (FEAT_TRAINS, p36_type1954, 583) { purchase: p36_type1954_purchase_sprites; running_cost_factor: p36_type1954_running_cost_factor; speed: p36_type1954_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/kolomna/p38.pnml b/src/steam/kolomna/p38.pnml index 02153be69..18894dac7 100644 --- a/src/steam/kolomna/p38.pnml +++ b/src/steam/kolomna/p38.pnml @@ -44,7 +44,7 @@ item (FEAT_TRAINS, p38, 654) { additional_text: p38_additional_text; articulated_part: p38_articulated_part; bitmask_vehicle_info: p38_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; colour_mapping: any_cc_colour; create_effect: p38_create_effect; @@ -54,7 +54,7 @@ item (FEAT_TRAINS, p38, 654) { purchase_speed: return 85; running_cost_factor: p38_running_cost_factor; speed: p38_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/l.pnml b/src/steam/l.pnml index 77befb77e..4780cc0a2 100644 --- a/src/steam/l.pnml +++ b/src/steam/l.pnml @@ -52,7 +52,7 @@ item (FEAT_TRAINS, l231, 142) { additional_text: l231_additional_text; articulated_part: l231_articulated_part; bitmask_vehicle_info: l231_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, l231, 142) { purchase_speed: return 105; running_cost_factor: l231_running_cost_factor; speed: l231_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/fd20-pre.pnml b/src/steam/luhansk/fd20-pre.pnml index 9333434f1..5dd863adc 100644 --- a/src/steam/luhansk/fd20-pre.pnml +++ b/src/steam/luhansk/fd20-pre.pnml @@ -71,7 +71,7 @@ item (FEAT_TRAINS, fd20_pre, 828) { additional_text: fd20_pre_additional_text; articulated_part: fd20_pre_articulated_part; bitmask_vehicle_info: fd20_pre_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_fd20_pre_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, fd20_pre, 828) { purchase: fd20_pre_purchase_sprites; running_cost_factor: fd20_pre_running_cost_factor; speed: fd20_pre_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/fd20-type1932.pnml b/src/steam/luhansk/fd20-type1932.pnml index 2d9cc28e4..685767516 100644 --- a/src/steam/luhansk/fd20-type1932.pnml +++ b/src/steam/luhansk/fd20-type1932.pnml @@ -71,7 +71,7 @@ item (FEAT_TRAINS, fd20_type1932, 283) { additional_text: fd20_type1932_additional_text; articulated_part: fd20_type1932_articulated_part; bitmask_vehicle_info: fd20_type1932_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_fd20_type1932_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, fd20_type1932, 283) { purchase: fd20_type1932_purchase_sprites; running_cost_factor: fd20_type1932_running_cost_factor; speed: fd20_type1932_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/fd20-type1934_use.pnml b/src/steam/luhansk/fd20-type1934_use.pnml index ad333e83b..ca18fc68a 100644 --- a/src/steam/luhansk/fd20-type1934_use.pnml +++ b/src/steam/luhansk/fd20-type1934_use.pnml @@ -71,7 +71,7 @@ item (FEAT_TRAINS, fd20_type1934, 829) { additional_text: fd20_type1934_additional_text; articulated_part: fd20_type1934_articulated_part; bitmask_vehicle_info: fd20_type1934_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_fd20_type1934_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, fd20_type1934, 829) { purchase: fd20_type1934_purchase_sprites; running_cost_factor: fd20_type1934_running_cost_factor; speed: fd20_type1934_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/fd20-type1936.pnml b/src/steam/luhansk/fd20-type1936.pnml index e4b6ee384..6da94bba8 100644 --- a/src/steam/luhansk/fd20-type1936.pnml +++ b/src/steam/luhansk/fd20-type1936.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, fd20_type1936, 830) { additional_text: fd20_type1936_additional_text; articulated_part: fd20_type1936_articulated_part; bitmask_vehicle_info: fd20_type1936_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_fd20_type1936_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -74,7 +74,7 @@ item (FEAT_TRAINS, fd20_type1936, 830) { purchase: fd20_type1936_purchase_sprites; running_cost_factor: fd20_type1936_running_cost_factor; speed: fd20_type1936_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/fd21_use.pnml b/src/steam/luhansk/fd21_use.pnml index d0b043e41..ac0539d59 100644 --- a/src/steam/luhansk/fd21_use.pnml +++ b/src/steam/luhansk/fd21_use.pnml @@ -64,7 +64,7 @@ item (FEAT_TRAINS, fd21, 284) { additional_text: fd21_additional_text; articulated_part: fd21_articulated_part; bitmask_vehicle_info: fd21_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_fd21_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -75,7 +75,7 @@ item (FEAT_TRAINS, fd21, 284) { purchase: fd21_purchase_sprites; running_cost_factor: fd21_running_cost_factor; speed: fd21_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/l-type1950_use.pnml b/src/steam/luhansk/l-type1950_use.pnml index ebbae1232..56274d007 100644 --- a/src/steam/luhansk/l-type1950_use.pnml +++ b/src/steam/luhansk/l-type1950_use.pnml @@ -63,7 +63,7 @@ item (FEAT_TRAINS, l_type1950, 1135) { additional_text: l_type1950_additional_text; articulated_part: l_type1950_articulated_part; bitmask_vehicle_info: l_type1950_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_l_type1950_CC; colour_mapping: any_cc_colour; create_effect: l_type1950_create_effect; @@ -73,7 +73,7 @@ item (FEAT_TRAINS, l_type1950, 1135) { purchase: l_type1950_purchase_sprites; running_cost_factor: l_type1950_running_cost_factor; speed: l_type1950_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/lv-type1951_use.pnml b/src/steam/luhansk/lv-type1951_use.pnml index 1c694544a..fa64db1ee 100644 --- a/src/steam/luhansk/lv-type1951_use.pnml +++ b/src/steam/luhansk/lv-type1951_use.pnml @@ -65,7 +65,7 @@ item (FEAT_TRAINS, lv_type1951, 552) { additional_text: lv_type1951_additional_text; articulated_part: lv_type1951_articulated_part; bitmask_vehicle_info: lv_type1951_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_lv_type1951_CC; colour_mapping: return ttdall_cc + 0x03; create_effect: lv_type1951_create_effect; @@ -75,7 +75,7 @@ item (FEAT_TRAINS, lv_type1951, 552) { purchase: lv_type1951_purchase_sprites; running_cost_factor: lv_type1951_running_cost_factor; speed: lv_type1951_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/luhansk/lv-type1954_use.pnml b/src/steam/luhansk/lv-type1954_use.pnml index 05bbd7f6c..04537ee0e 100644 --- a/src/steam/luhansk/lv-type1954_use.pnml +++ b/src/steam/luhansk/lv-type1954_use.pnml @@ -65,7 +65,7 @@ item (FEAT_TRAINS, lv_type1954, 1130) { additional_text: lv_type1954_additional_text; articulated_part: lv_type1954_articulated_part; bitmask_vehicle_info: lv_type1954_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_lv_type1954_CC; colour_mapping: return ttdall_cc + 0x03; create_effect: lv_type1954_create_effect; @@ -75,7 +75,7 @@ item (FEAT_TRAINS, lv_type1954, 1130) { purchase: lv_type1954_purchase_sprites; running_cost_factor: lv_type1954_running_cost_factor; speed: lv_type1954_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/mzk-type1877.pnml b/src/steam/mzk-type1877.pnml index 1dedb75a5..3d1ec7cc9 100644 --- a/src/steam/mzk-type1877.pnml +++ b/src/steam/mzk-type1877.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, mzk_type1877, 574) { additional_text: mzk_type1877_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: mzk_type1877_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_mzk_type1877_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, mzk_type1877, 574) { purchase: mzk_type1877_purchase_sprites; running_cost_factor: mzk_type1877_running_cost_factor; speed: mzk_type1877_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/mzk-type1883.pnml b/src/steam/mzk-type1883.pnml index b9256bced..f049fbf9e 100644 --- a/src/steam/mzk-type1883.pnml +++ b/src/steam/mzk-type1883.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, mzk_type1883, 771) { additional_text: mzk_type1883_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: mzk_type1883_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_mzk_type1883_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, mzk_type1883, 771) { purchase: mzk_type1883_purchase_sprites; running_cost_factor: mzk_type1883_running_cost_factor; speed: mzk_type1883_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/mzk-type1897.pnml b/src/steam/mzk-type1897.pnml index a1956711e..f1c8fde42 100644 --- a/src/steam/mzk-type1897.pnml +++ b/src/steam/mzk-type1897.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, mzk_type1897, 772) { additional_text: mzk_type1897_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: mzk_type1897_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_mzk_type1897_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, mzk_type1897, 772) { purchase: mzk_type1897_purchase_sprites; running_cost_factor: mzk_type1897_running_cost_factor; speed: mzk_type1897_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/mzk-type1912.pnml b/src/steam/mzk-type1912.pnml index 8e78984d0..baf2d1692 100644 --- a/src/steam/mzk-type1912.pnml +++ b/src/steam/mzk-type1912.pnml @@ -52,7 +52,7 @@ item (FEAT_TRAINS, mzk_type1912, 773) { additional_text: mzk_type1912_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: mzk_type1912_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_mzk_type1912_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -62,7 +62,7 @@ item (FEAT_TRAINS, mzk_type1912, 773) { purchase: mzk_type1912_purchase_sprites; running_cost_factor: mzk_type1912_running_cost_factor; speed: mzk_type1912_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/mzk-type1926.pnml b/src/steam/mzk-type1926.pnml index e42de508d..e428bd2f2 100644 --- a/src/steam/mzk-type1926.pnml +++ b/src/steam/mzk-type1926.pnml @@ -53,7 +53,7 @@ item (FEAT_TRAINS, mzk_type1926, 774) { additional_text: mzk_type1926_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: mzk_type1926_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_mzk_type1926_CC; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, mzk_type1926, 774) { purchase: mzk_type1926_purchase_sprites; running_cost_factor: mzk_type1926_running_cost_factor; speed: mzk_type1926_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/nd-53.pnml b/src/steam/nd-53.pnml index 5a1eb5637..2a96805b5 100644 --- a/src/steam/nd-53.pnml +++ b/src/steam/nd-53.pnml @@ -96,7 +96,7 @@ item (FEAT_TRAINS, steam_nd_53, 505) { additional_text: steam_nd_53_additional_text; articulated_part: steam_nd_53_articulated_part; bitmask_vehicle_info: steam_nd_53_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -107,7 +107,7 @@ item (FEAT_TRAINS, steam_nd_53, 505) { purchase: steam_nd_53_purchase_sprites; running_cost_factor: steam_nd_53_running_cost_factor; speed: steam_nd_53_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/nd-67_use.pnml b/src/steam/nd-67_use.pnml index f2db89a44..5af5836a7 100644 --- a/src/steam/nd-67_use.pnml +++ b/src/steam/nd-67_use.pnml @@ -99,7 +99,7 @@ item (FEAT_TRAINS, steam_nd_67, 761) { additional_text: steam_nd_67_additional_text; articulated_part: steam_nd_67_articulated_part; bitmask_vehicle_info: steam_nd_67_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -110,7 +110,7 @@ item (FEAT_TRAINS, steam_nd_67, 761) { purchase: steam_nd_67_purchase_sprites; running_cost_factor: steam_nd_67_running_cost_factor; speed: steam_nd_67_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/nu_use.pnml b/src/steam/nu_use.pnml index 3e27e46d2..3331dd353 100644 --- a/src/steam/nu_use.pnml +++ b/src/steam/nu_use.pnml @@ -79,7 +79,7 @@ item (FEAT_TRAINS, steam_nu, 762) { additional_text: steam_nu_additional_text; articulated_part: steam_nu_articulated_part; bitmask_vehicle_info: steam_nu_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -90,7 +90,7 @@ item (FEAT_TRAINS, steam_nu, 762) { purchase: steam_nu_purchase_sprites; running_cost_factor: steam_nu_running_cost_factor; speed: steam_nu_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/nv.pnml b/src/steam/nv.pnml index 135476de4..b655a8f45 100644 --- a/src/steam/nv.pnml +++ b/src/steam/nv.pnml @@ -84,7 +84,7 @@ item (FEAT_TRAINS, steam_nv, 431) { additional_text: steam_nv_additional_text; articulated_part: steam_nv_articulated_part; bitmask_vehicle_info: steam_nv_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -95,7 +95,7 @@ item (FEAT_TRAINS, steam_nv, 431) { purchase: steam_nv_purchase_sprites; running_cost_factor: steam_nv_running_cost_factor; speed: steam_nv_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/od.pnml b/src/steam/od.pnml index 7ae690996..e8325cff0 100644 --- a/src/steam/od.pnml +++ b/src/steam/od.pnml @@ -84,7 +84,7 @@ item (FEAT_TRAINS, steam_od, 725) { additional_text: steam_od_additional_text; articulated_part: steam_od_articulated_part; bitmask_vehicle_info: steam_od_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_od_CC; colour_mapping: any_cc_colour; create_effect: steam_od_create_effect; @@ -94,7 +94,7 @@ item (FEAT_TRAINS, steam_od, 725) { purchase: steam_od_purchase_sprites; running_cost_factor: steam_od_running_cost_factor; speed: steam_od_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/od_lw.pnml b/src/steam/od_lw.pnml index b1bffcfdc..efd6f0ce3 100644 --- a/src/steam/od_lw.pnml +++ b/src/steam/od_lw.pnml @@ -85,7 +85,7 @@ item (FEAT_TRAINS, steam_od_lw, 726) { additional_text: steam_od_lw_additional_text; articulated_part: steam_od_lw_articulated_part; bitmask_vehicle_info: steam_od_lw_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -96,7 +96,7 @@ item (FEAT_TRAINS, steam_od_lw, 726) { purchase: steam_od_lw_purchase_sprites; running_cost_factor: steam_od_lw_running_cost_factor; speed: steam_od_lw_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/ov.pnml b/src/steam/ov.pnml index 5cd459a86..28ddff4ff 100644 --- a/src/steam/ov.pnml +++ b/src/steam/ov.pnml @@ -99,7 +99,7 @@ item (FEAT_TRAINS, steam_ov, 432) { additional_text: steam_ov_additional_text; articulated_part: steam_ov_articulated_part; bitmask_vehicle_info: steam_ov_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_ov_CC; colour_mapping: any_cc_colour; create_effect: steam_ov_create_effect; @@ -110,7 +110,7 @@ item (FEAT_TRAINS, steam_ov, 432) { purchase: steam_ov_purchase_sprites; running_cost_factor: steam_ov_running_cost_factor; speed: steam_ov_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/r_use.pnml b/src/steam/r_use.pnml index d97902072..ba787affb 100644 --- a/src/steam/r_use.pnml +++ b/src/steam/r_use.pnml @@ -52,7 +52,7 @@ item (FEAT_TRAINS, steam_r, 584) { additional_text: steam_r_additional_text; articulated_part: steam_r_articulated_part; bitmask_vehicle_info: steam_r_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -63,7 +63,7 @@ item (FEAT_TRAINS, steam_r, 584) { purchase_speed: return 50; running_cost_factor: steam_r_running_cost_factor; speed: steam_r_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/s.pnml b/src/steam/s.pnml index 22097094b..a36ddff9b 100644 --- a/src/steam/s.pnml +++ b/src/steam/s.pnml @@ -68,7 +68,7 @@ item (FEAT_TRAINS, steam_s, 433) { additional_text: steam_s_additional_text; articulated_part: steam_s_articulated_part; bitmask_vehicle_info: steam_s_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_s_CC; cargo_subtype_text: steam_pass_extra_cargo_subtype_text; colour_mapping: steam_pass_extra_colour_mapping; @@ -79,7 +79,7 @@ item (FEAT_TRAINS, steam_s, 433) { purchase: steam_s_purchase_sprites; running_cost_factor: steam_s_running_cost_factor; speed: steam_s_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/sch.pnml b/src/steam/sch.pnml index 4c865acfb..1705b16f3 100644 --- a/src/steam/sch.pnml +++ b/src/steam/sch.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, sch, 627) { additional_text: sch_additional_text; articulated_part: sch_articulated_part; bitmask_vehicle_info: sch_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_sch_CC; colour_mapping: return ttdall_cc + 0x02; create_effect: sch_create_effect; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, sch, 627) { purchase: sch_purchase_sprites; running_cost_factor: sch_running_cost_factor; speed: sch_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/schch_use.pnml b/src/steam/schch_use.pnml index 8306803fd..f4ec3ad99 100644 --- a/src/steam/schch_use.pnml +++ b/src/steam/schch_use.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, schch, 560) { additional_text: schch_additional_text; articulated_part: schch_articulated_part; bitmask_vehicle_info: schch_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_schch_CC; colour_mapping: steam_freight_colour_mapping; create_effect: schch_create_effect; @@ -82,7 +82,7 @@ item (FEAT_TRAINS, schch, 560) { purchase: schch_purchase_sprites; running_cost_factor: schch_running_cost_factor; speed: schch_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/schp.pnml b/src/steam/schp.pnml index ad87e7b0c..7f7fb069a 100644 --- a/src/steam/schp.pnml +++ b/src/steam/schp.pnml @@ -66,7 +66,7 @@ item (FEAT_TRAINS, schp, 535) { additional_text: schp_additional_text; articulated_part: schp_articulated_part; bitmask_vehicle_info: schp_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_schp_CC; colour_mapping: any_cc_colour; create_effect: schp_create_effect; @@ -76,7 +76,7 @@ item (FEAT_TRAINS, schp, 535) { purchase: schp_purchase_sprites; running_cost_factor: schp_running_cost_factor; speed: schp_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/so17-type1934_use.pnml b/src/steam/so17-type1934_use.pnml index ab1a78df7..f9885bfa8 100644 --- a/src/steam/so17-type1934_use.pnml +++ b/src/steam/so17-type1934_use.pnml @@ -71,7 +71,7 @@ item (FEAT_TRAINS, so17_type1934, 386) { additional_text: so17_type1934_additional_text; articulated_part: so17_type1934_articulated_part; bitmask_vehicle_info: so17_type1934_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_so17_type1934_CC; colour_mapping: any_cc_colour; create_effect: so17_type1934_create_effect; @@ -81,7 +81,7 @@ item (FEAT_TRAINS, so17_type1934, 386) { purchase: so17_type1934_purchase_sprites; running_cost_factor: so17_type1934_running_cost_factor; speed: so17_type1934_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/so17-type1942_use.pnml b/src/steam/so17-type1942_use.pnml index 6b473396a..9f2bbbffc 100644 --- a/src/steam/so17-type1942_use.pnml +++ b/src/steam/so17-type1942_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, so17_type1942, 1117) { additional_text: so17_type1942_additional_text; articulated_part: so17_type1942_articulated_part; bitmask_vehicle_info: so17_type1942_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_so17_type1942_CC; colour_mapping: any_cc_colour; create_effect: so17_type1942_create_effect; @@ -65,7 +65,7 @@ item (FEAT_TRAINS, so17_type1942, 1117) { purchase: so17_type1942_purchase_sprites; running_cost_factor: so17_type1942_running_cost_factor; speed: so17_type1942_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/so17-type1946_use.pnml b/src/steam/so17-type1946_use.pnml index c6de802a7..1ba9df2af 100644 --- a/src/steam/so17-type1946_use.pnml +++ b/src/steam/so17-type1946_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, so17_type1946, 1118) { additional_text: so17_type1946_additional_text; articulated_part: so17_type1946_articulated_part; bitmask_vehicle_info: so17_type1946_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_so17_type1946_CC; colour_mapping: any_cc_colour; create_effect: so17_type1946_create_effect; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, so17_type1946, 1118) { purchase: so17_type1946_purchase_sprites; running_cost_factor: so17_type1946_running_cost_factor; speed: so17_type1946_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/so17-type1948_use.pnml b/src/steam/so17-type1948_use.pnml index a39cc9f37..e506842d8 100644 --- a/src/steam/so17-type1948_use.pnml +++ b/src/steam/so17-type1948_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, so17_type1948, 1119) { additional_text: so17_type1948_additional_text; articulated_part: so17_type1948_articulated_part; bitmask_vehicle_info: so17_type1948_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_so17_type1948_CC; colour_mapping: any_cc_colour; create_effect: so17_type1948_create_effect; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, so17_type1948, 1119) { purchase: so17_type1948_purchase_sprites; running_cost_factor: so17_type1948_running_cost_factor; speed: so17_type1948_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/steam-middle-units.pnml b/src/steam/steam-middle-units.pnml index 93e58cc01..6a8358cde 100644 --- a/src/steam/steam-middle-units.pnml +++ b/src/steam/steam-middle-units.pnml @@ -1,6 +1,6 @@ // некорректные грузы / составы (собранные из разных сетов) -switch (FEAT_TRAINS, PARENT, any_start_stop, +switch (FEAT_TRAINS, PARENT, any_start_stop_steam, has_inadmissible_cargo() + 2 * is_wrong_consist()) { @@ -11,7 +11,7 @@ switch (FEAT_TRAINS, PARENT, any_start_stop, // any wagon can be attached -switch (FEAT_TRAINS, SELF, any_can_attach_wagon, 0) +switch (FEAT_TRAINS, SELF, any_can_attach_wagon_steam, 0) { loco_can_attach_wagon; } diff --git a/src/steam/su-type1924.pnml b/src/steam/su-type1924.pnml index 76ce75701..8511380bc 100644 --- a/src/steam/su-type1924.pnml +++ b/src/steam/su-type1924.pnml @@ -80,7 +80,7 @@ item (FEAT_TRAINS, steam_su_152, 437) { additional_text: steam_su_152_additional_text; articulated_part: steam_su_152_articulated_part; bitmask_vehicle_info: steam_su_152_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_su_152_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -91,7 +91,7 @@ item (FEAT_TRAINS, steam_su_152, 437) { purchase: steam_su_152_purchase_sprites; running_cost_factor: steam_su_152_running_cost_factor; speed: steam_su_152_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/su-type1932.pnml b/src/steam/su-type1932.pnml index 97a14c355..cdceb4816 100644 --- a/src/steam/su-type1932.pnml +++ b/src/steam/su-type1932.pnml @@ -69,7 +69,7 @@ item (FEAT_TRAINS, steam_su_162, 768) { additional_text: steam_su_162_additional_text; articulated_part: steam_su_162_articulated_part; bitmask_vehicle_info: steam_su_162_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_su_162_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -80,7 +80,7 @@ item (FEAT_TRAINS, steam_su_162, 768) { purchase: steam_su_162_purchase_sprites; running_cost_factor: steam_su_162_running_cost_factor; speed: steam_su_162_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/su-type1935_use.pnml b/src/steam/su-type1935_use.pnml index 255f49824..64a74dbd2 100644 --- a/src/steam/su-type1935_use.pnml +++ b/src/steam/su-type1935_use.pnml @@ -72,7 +72,7 @@ item (FEAT_TRAINS, steam_su_163, 769) { additional_text: steam_su_163_additional_text; articulated_part: steam_su_163_articulated_part; bitmask_vehicle_info: steam_su_163_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_su_163_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -83,7 +83,7 @@ item (FEAT_TRAINS, steam_su_163, 769) { purchase: steam_su_163_purchase_sprites; running_cost_factor: steam_su_163_running_cost_factor; speed: steam_su_163_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/su-type1947.pnml b/src/steam/su-type1947.pnml index 1bfa8e98d..c086acd3a 100644 --- a/src/steam/su-type1947.pnml +++ b/src/steam/su-type1947.pnml @@ -60,7 +60,7 @@ item (FEAT_TRAINS, steam_su_x, 770) { additional_text: steam_su_x_additional_text; articulated_part: steam_su_x_articulated_part; bitmask_vehicle_info: steam_su_x_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_steam_su_x_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -71,7 +71,7 @@ item (FEAT_TRAINS, steam_su_x, 770) { purchase: steam_su_x_purchase_sprites; running_cost_factor: steam_su_x_running_cost_factor; speed: steam_su_x_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/te.pnml b/src/steam/te.pnml index 4d1503eb5..1c09480bb 100644 --- a/src/steam/te.pnml +++ b/src/steam/te.pnml @@ -49,7 +49,7 @@ item (FEAT_TRAINS, steam_te, 512) { additional_text: steam_te_additional_text; articulated_part: steam_te_articulated_part; bitmask_vehicle_info: steam_te_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_freight_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -60,7 +60,7 @@ item (FEAT_TRAINS, steam_te, 512) { purchase_speed: return 80; running_cost_factor: steam_te_running_cost_factor; speed: steam_te_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/tk.pnml b/src/steam/tk.pnml index d0c8e8391..01300c256 100644 --- a/src/steam/tk.pnml +++ b/src/steam/tk.pnml @@ -54,7 +54,7 @@ item (FEAT_TRAINS, steam_tk, 477) { additional_text: steam_tk_additional_text; articulated_part: articulated_part_dummy1; bitmask_vehicle_info: steam_tk_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -64,7 +64,7 @@ item (FEAT_TRAINS, steam_tk, 477) { purchase_speed: return 75; running_cost_factor: steam_tk_running_cost_factor; speed: steam_tk_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/tk030-type1870_use.pnml b/src/steam/tk030-type1870_use.pnml index 8d5f44557..b7db9be97 100644 --- a/src/steam/tk030-type1870_use.pnml +++ b/src/steam/tk030-type1870_use.pnml @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tk030_type1870, 513) { additional_text: tk030_type1870_additional_text; articulated_part: tk030_type1870_articulated_part; bitmask_vehicle_info: tk030_type1870_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_tk030_type1870_CC; cargo_subtype_text: tk030_type1870_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -70,7 +70,7 @@ item (FEAT_TRAINS, tk030_type1870, 513) { purchase: tk030_type1870_purchase_sprites; running_cost_factor: tk030_type1870_running_cost_factor; speed: tk030_type1870_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/tk030-type1873_use.pnml b/src/steam/tk030-type1873_use.pnml index a4cafc092..1382148bf 100644 --- a/src/steam/tk030-type1873_use.pnml +++ b/src/steam/tk030-type1873_use.pnml @@ -48,7 +48,7 @@ item (FEAT_TRAINS, tk030_type1873, 777) { additional_text: tk030_type1873_additional_text; articulated_part: tk030_type1873_articulated_part; bitmask_vehicle_info: tk030_type1873_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_tk030_type1873_CC; cargo_subtype_text: tk030_type1870_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -59,7 +59,7 @@ item (FEAT_TRAINS, tk030_type1873, 777) { purchase: tk030_type1873_purchase_sprites; running_cost_factor: tk030_type1873_running_cost_factor; speed: tk030_type1873_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/tk030-type1875_use.pnml b/src/steam/tk030-type1875_use.pnml index 080427fec..a79d6b4d8 100644 --- a/src/steam/tk030-type1875_use.pnml +++ b/src/steam/tk030-type1875_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tk030_type1875, 776) { additional_text: tk030_type1875_additional_text; articulated_part: tk030_type1875_articulated_part; bitmask_vehicle_info: tk030_type1875_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_tk030_type1875_CC; cargo_subtype_text: tk030_type1870_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -69,7 +69,7 @@ item (FEAT_TRAINS, tk030_type1875, 776) { purchase: tk030_type1875_purchase_sprites; running_cost_factor: tk030_type1875_running_cost_factor; speed: tk030_type1875_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/tk030-type1892_use.pnml b/src/steam/tk030-type1892_use.pnml index 107813845..855321363 100644 --- a/src/steam/tk030-type1892_use.pnml +++ b/src/steam/tk030-type1892_use.pnml @@ -58,7 +58,7 @@ item (FEAT_TRAINS, tk030_type1892, 775) { additional_text: tk030_type1892_additional_text; articulated_part: tk030_type1892_articulated_part; bitmask_vehicle_info: tk030_type1892_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_tk030_type1892_CC; cargo_subtype_text: tk030_type1870_cargo_subtype_text; colour_mapping: steam_freight_colour_mapping; @@ -69,7 +69,7 @@ item (FEAT_TRAINS, tk030_type1892, 775) { purchase: tk030_type1892_purchase_sprites; running_cost_factor: tk030_type1892_running_cost_factor; speed: tk030_type1892_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/u-type1906.pnml b/src/steam/u-type1906.pnml index 5c6b6997b..e91884991 100644 --- a/src/steam/u-type1906.pnml +++ b/src/steam/u-type1906.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, steam_u, 434) { additional_text: steam_u_additional_text; articulated_part: steam_u_articulated_part; bitmask_vehicle_info: steam_u_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_extra_cargo_subtype_text; colour_mapping: steam_pass_extra_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, steam_u, 434) { purchase: steam_u_purchase_sprites; running_cost_factor: steam_u_running_cost_factor; speed: steam_u_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/u-type1909_use.pnml b/src/steam/u-type1909_use.pnml index ef521547a..4bce6af67 100644 --- a/src/steam/u-type1909_use.pnml +++ b/src/steam/u-type1909_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, steam_u_3a, 784) { additional_text: steam_u_3a_additional_text; articulated_part: steam_u_3a_articulated_part; bitmask_vehicle_info: steam_u_3a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_extra_cargo_subtype_text; colour_mapping: steam_pass_extra_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, steam_u_3a, 784) { purchase: steam_u_3a_purchase_sprites; running_cost_factor: steam_u_3a_running_cost_factor; speed: steam_u_3a_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/uu-type1911_use.pnml b/src/steam/uu-type1911_use.pnml index 66e19233a..9ed3eeea2 100644 --- a/src/steam/uu-type1911_use.pnml +++ b/src/steam/uu-type1911_use.pnml @@ -47,7 +47,7 @@ item (FEAT_TRAINS, steam_uu, 787) { additional_text: steam_uu_additional_text; articulated_part: steam_uu_articulated_part; bitmask_vehicle_info: steam_uu_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_extra_cargo_subtype_text; colour_mapping: steam_pass_extra_colour_mapping; @@ -58,7 +58,7 @@ item (FEAT_TRAINS, steam_uu, 787) { purchase: steam_u_purchase_sprites; running_cost_factor: steam_uu_running_cost_factor; speed: steam_uu_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/uu-type1912_use.pnml b/src/steam/uu-type1912_use.pnml index 838959331..864a0c9f5 100644 --- a/src/steam/uu-type1912_use.pnml +++ b/src/steam/uu-type1912_use.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, steam_uu_4a, 785) { additional_text: steam_uu_4a_additional_text; articulated_part: steam_uu_4a_articulated_part; bitmask_vehicle_info: steam_uu_4a_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return 0; cargo_subtype_text: steam_pass_extra_cargo_subtype_text; colour_mapping: steam_pass_extra_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, steam_uu_4a, 785) { purchase: steam_uu_4a_purchase_sprites; running_cost_factor: steam_uu_4a_running_cost_factor; speed: steam_uu_4a_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/y-type1910.pnml b/src/steam/y-type1910.pnml index ae0edc6d8..cf31c817c 100644 --- a/src/steam/y-type1910.pnml +++ b/src/steam/y-type1910.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, y_type1910, 419) { additional_text: y_type1910_additional_text; articulated_part: y_type1910_articulated_part; bitmask_vehicle_info: y_type1910_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_y_type1910_CC; colour_mapping: any_cc_colour; create_effect: y_type1910_create_effect; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, y_type1910, 419) { purchase: y_type1910_purchase_sprites; running_cost_factor: y_type1910_running_cost_factor; speed: y_type1910_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/y-type1914.pnml b/src/steam/y-type1914.pnml index f328d2471..331a4fe6b 100644 --- a/src/steam/y-type1914.pnml +++ b/src/steam/y-type1914.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, y_type1914, 1125) { additional_text: y_type1914_additional_text; articulated_part: y_type1914_articulated_part; bitmask_vehicle_info: y_type1914_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_y_type1914_CC; colour_mapping: any_cc_colour; create_effect: y_type1914_create_effect; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, y_type1914, 1125) { purchase: y_type1914_purchase_sprites; running_cost_factor: y_type1914_running_cost_factor; speed: y_type1914_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/zh-type1896.pnml b/src/steam/zh-type1896.pnml index e7f256e57..a7e3479f0 100644 --- a/src/steam/zh-type1896.pnml +++ b/src/steam/zh-type1896.pnml @@ -56,7 +56,7 @@ item (FEAT_TRAINS, zh_type1896, 586) { additional_text: zh_type1896_additional_text; articulated_part: zh_type1896_articulated_part; bitmask_vehicle_info: zh_type1896_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_zh_type1896_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -67,7 +67,7 @@ item (FEAT_TRAINS, zh_type1896, 586) { purchase: zh_type1896_purchase_sprites; running_cost_factor: zh_type1896_running_cost_factor; speed: zh_type1896_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/zh-type1897_use.pnml b/src/steam/zh-type1897_use.pnml index 3570601c3..3c0bd7e34 100644 --- a/src/steam/zh-type1897_use.pnml +++ b/src/steam/zh-type1897_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, zh_type1897, 1121) { additional_text: zh_type1897_additional_text; articulated_part: zh_type1897_articulated_part; bitmask_vehicle_info: zh_type1897_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_zh_type1897_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, zh_type1897, 1121) { purchase: zh_type1897_purchase_sprites; running_cost_factor: zh_type1897_running_cost_factor; speed: zh_type1897_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/zh-type1903_use.pnml b/src/steam/zh-type1903_use.pnml index 7248bb257..1b2120b1a 100644 --- a/src/steam/zh-type1903_use.pnml +++ b/src/steam/zh-type1903_use.pnml @@ -55,7 +55,7 @@ item (FEAT_TRAINS, zh_type1903, 1123) { additional_text: zh_type1903_additional_text; articulated_part: zh_type1903_articulated_part; bitmask_vehicle_info: zh_type1903_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_zh_type1903_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -66,7 +66,7 @@ item (FEAT_TRAINS, zh_type1903, 1123) { purchase: zh_type1903_purchase_sprites; running_cost_factor: zh_type1903_running_cost_factor; speed: zh_type1903_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/steam/zh-type1907_use.pnml b/src/steam/zh-type1907_use.pnml index 2d2cd5a5f..b9db19f07 100644 --- a/src/steam/zh-type1907_use.pnml +++ b/src/steam/zh-type1907_use.pnml @@ -57,7 +57,7 @@ item (FEAT_TRAINS, zh_type1907, 1122) { additional_text: zh_type1907_additional_text; articulated_part: zh_type1907_articulated_part; bitmask_vehicle_info: zh_type1907_bitmask_vehicle_info; - can_attach_wagon: any_can_attach_wagon; + can_attach_wagon: any_can_attach_wagon_steam; cargo_capacity: return PROP_zh_type1907_CC; cargo_subtype_text: steam_pass_cargo_subtype_text; colour_mapping: steam_pass_colour_mapping; @@ -68,7 +68,7 @@ item (FEAT_TRAINS, zh_type1907, 1122) { purchase: zh_type1907_purchase_sprites; running_cost_factor: zh_type1907_running_cost_factor; speed: zh_type1907_speed; - start_stop: any_start_stop; + start_stop: any_start_stop_steam; } } diff --git a/src/xussr.pnml b/src/xussr.pnml index a65a0210e..ec64274d5 100644 --- a/src/xussr.pnml +++ b/src/xussr.pnml @@ -59,6 +59,8 @@ #include "dmu/dmu-list.pnml" #include "emu/emu-list.pnml" #include "subway/subway-list.pnml" +#include "wagons/cargoes9/cargoes7_9/cargoes-gondola.pnml" +#include "electric/industrial/pwd-dumpcar.pnml" // Грузы для грузовых вагонов #include "wagons/cargoes5/cargoes.pnml" @@ -84,10 +86,8 @@ #include "wagons/cargoes14/cargoes.pnml" // ПС -#include "electric/industrial/pwd-dumpcar.pnml" -#include "cars/cars-list.pnml" #include "wagons/wagons-list.pnml" - +#include "cars/cars-list.pnml" sort (FEAT_TRAINS, [ // модельки