#238 WIP

George-VB · Apr 24, 2024 · 8c700c3 · 8c700c3
1 parent 8c1c052
commit 8c700c3
Show file tree

Hide file tree

Showing 440 changed files with 914 additions and 914 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
   }
 }