release branch init

lua/metrostroi/maps/crossline.lua

@@ -49,8 +49,6 @@ Metrostroi.AddANSPAnnouncer("ASNP Boiko + Pyaseckaya",{
     click1 = {"subway_announcers/asnp/boiko_new/click1.mp3",0.5},
     click2 = {"subway_announcers/asnp/boiko_new/click2.mp3",0.3},
     click3 = {"subway_announcers/asnp/boiko_new/click3.mp3",0.3},
-    click_start = {"subway_announcers/asnp/boiko_new/click1.mp3",0.5},
-    click_end = {"subway_announcers/asnp/boiko_new/click3.mp3",0.3},
 
 
     announcer_ready = {"subway_announcers/asnp/boiko_new/announcer_ready.mp3",3.295479},
@@ -158,47 +156,44 @@ Metrostroi.AddANSPAnnouncer("ASNP Boiko + Pyaseckaya",{
         LED = {5,4,4,4,5,4,2,2}, --FIXME
         Name = "Линия 1",
         spec_last = {"last_m",0.5,"things_m"},
-        spec_last_f = {"last_f",0.5,"things_f"},
         spec_wait = {{"train_stop_m"},{"train_depeat_m"}},
-        spec_wait_f = {{"train_stop_f"},{"train_depeat_f"}},
         Loop = false,
         BlockDoors = true,
         {
             110,"Международная",
             arrlast = {nil,{"arr_mejdunarodnaya_f",0.5,"last_f",2,"things_f",2,"deadlock_f"},"mejdunarodnaya_m"},
             dep = {{"doors_closing_m","park_kultury_m"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
         },
         {
             111,"Парк Культуры",
             arr = {{"station_m","park_kultury_m"},"arr_park_kultury_f"},
             dep = {{"doors_closing_m","politehnicheskaya_m",0.2,"politeness_m"},{"doors_closing_f","next_mejdunarodnaya_f",0.2,"politeness_f"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
+            not_last_c = {nil,"not_last_f"}
         },
         {
             112,"Политехнич.",
             arr = {{"station_m","politehnicheskaya_m",0.2,"things_m"},{"arr_politehnicheskaya_f",0.2,"objects_f"}},
             dep = {{"doors_closing_m","prospekt_suvorova_m"},{"doors_closing_f","next_park_kultury_f"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
+            not_last_c = {nil,"not_last_f"}
         },
         {
             113,"Пр. Суворова",
             arr = {{"station_m","prospekt_suvorova_m",0.2,"objects_m"},{"station_m","prospekt_suvorova_m",0.2,"things_m"}},
             dep = {{"doors_closing_m","nahimovskaya_m"},{"doors_closing_m","politehnicheskaya_m"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
+            not_last_c = {nil,"not_last_f"}
         },
         {
             114,"Нахимовская",
             arr = {"arr_nahimovskaya_f",{"station_m","nahimovskaya_m"}},
             dep = {{"doors_closing_f","next_oktyabrskaya_f",0.2,"politeness_f"},{"doors_closing_m","prospekt_suvorova_m"}},
-            not_last_c = {"not_last_f"},spec_last_c = {"spec_last_f"}, spec_wait_c = {"spec_wait_f"},
+            not_last_c = {"not_last_f"}
         },
         {
             115,"Октябрьская",
             arr = {"arr_oktyabrskaya_f",{"station_m","oktyabrskaya_arr_m",0.2,"exit_m"}},
             dep = {{"doors_closing_f","next_rechnaya_f","spec_rechnaya_doors_f"},{"doors_closing_m","nahimovskaya_m"}},
             arrlast = {{"arr_oktyabrskaya_f",0.5,"last_f",2,"things_f",2,"deadlock_f"},{"station","oktyabrskaya_arr_m",0.5,"last_m",2,"things_m",2,"deadlock_m"},"oktyabrskaya_next_m"},
-            not_last_c = {"not_last_f"},spec_last_c = {"spec_last_f"}, spec_wait_c = {"spec_wait_f"},
+            not_last_c = {"not_last_f"},
             not_last = {3,"train_goes_to_m","oktyabrskaya_next_m"},
             not_last_f = {3,"to_oktyabrskaya_f"},
         },
@@ -208,7 +203,6 @@ Metrostroi.AddANSPAnnouncer("ASNP Boiko + Pyaseckaya",{
             arrlast = {{"arr_rechnaya_f",0.5,"last_f",2,"things_f",2,"deadlock_f"},{"station","rechnaya_arr_m",0.5,"last_m",2,"things_m",2,"deadlock_m"},"rechnaya_m"},
             dep = {{"doors_closing_f","next_proletarskaya_f"},{"doors_closing_m","oktyabrskaya_next_m",0.2}},
             not_last = {3,"train_goes_to_m","rechnaya_m"},
-            not_last_c = {"not_last_f"},spec_last_c = {"spec_last_f"}, spec_wait_c = {"spec_wait_f"},
             not_last_f = {3,"to_rechnaya_f"},
             right_doors = true,
         },
@@ -216,7 +210,6 @@ Metrostroi.AddANSPAnnouncer("ASNP Boiko + Pyaseckaya",{
             117,"Пролетарская",
             --arr = {"arr_rechnaya",{"arr_rechnaya"}},
             arrlast = {{"arr_proletarskaya_f",0.5,"last_f",2,"things_f",2,"deadlock_f"},nil,"proletarskaya_m"},
-            not_last_c = {"not_last_f"},spec_last_c = {"spec_last_f"}, spec_wait_c = {"spec_wait_f"},
             dep = {nil,{"doors_closing_m","rechnaya_m",0.2,"politeness_m"}},
         },
     },
@@ -319,9 +312,7 @@ Metrostroi.AddANSPAnnouncer("RIU Boiko + Pyaseckaya",{
         Name = "Линия 1",
         NameEn = "Line 1",
         spec_last = {"last_m",0.5,"things_m"},
-        spec_last_f = {"last_f",0.5,"things_f"},
         spec_wait = {{"train_stop_m"},{"train_depeat_m"}},
-        spec_wait_f = {{"train_stop_f"},{"train_depeat_f"}},
         Loop = false,
         BlockDoors = true,
         {
@@ -333,32 +324,32 @@ Metrostroi.AddANSPAnnouncer("RIU Boiko + Pyaseckaya",{
             111,"Парк Культуры","Park Kultury",
             arr = {{"station_m","park_kultury_m"},"arr_park_kultury_f"},
             dep = {{"doors_closing_m","politehnicheskaya_m",0.2,"politeness_m"},{"doors_closing_f","next_mejdunarodnaya_f",0.2,"politeness_f"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
+            not_last_c = {nil,"not_last_f"}
         },
         {
             112,"Политехнич.","Politehnich.",
             arr = {{"station_m","politehnicheskaya_m",0.2,"things_m"},{"arr_politehnicheskaya_f",0.2,"objects_f"}},
             dep = {{"doors_closing_m","prospekt_suvorova_m"},{"doors_closing_f","next_park_kultury_f"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
+            not_last_c = {nil,"not_last_f"}
         },
         {
             113,"Пр. Суворова","Pr. Suvorova",
             arr = {{"station_m","prospekt_suvorova_m",0.2,"objects_m"},{"station_m","prospekt_suvorova_m",0.2,"things_m"}},
             dep = {{"doors_closing_m","nahimovskaya_m"},{"doors_closing_m","politehnicheskaya_m"}},
-            not_last_c = {nil,"not_last_f"},spec_last_c = {nil,"spec_last_f"}, spec_wait_c = {nil,"spec_wait_f"},
+            not_last_c = {nil,"not_last_f"}
         },
         {
             114,"Нахимовская","Nahimovskaya",
             arr = {"arr_nahimovskaya_f",{"station_m","nahimovskaya_m"}},
             dep = {{"doors_closing_f","next_oktyabrskaya_f",0.2,"politeness_f"},{"doors_closing_m","prospekt_suvorova_m"}},
-            not_last_c = {"not_last_f"},spec_last_c = {"spec_last_f"}, spec_wait_c = {"spec_wait_f"},
+            not_last_c = {"not_last_f"}
         },
         {
             115,"Октябрьская","Oktabrskaya",
             arr = {"arr_oktyabrskaya_f",{"station_m","oktyabrskaya_arr_m",0.2,"exit_m"}},
             dep = {{"doors_closing_f","next_rechnaya_f","spec_rechnaya_doors_f"},{"doors_closing_m","nahimovskaya_m"}},
             arrlast = {{"arr_oktyabrskaya_f",0.5,"last_f",2,"things_f",2,"deadlock_f"},{"station","oktyabrskaya_arr_m",0.5,"last_m",2,"things_m",2,"deadlock_m"},"oktyabrskaya_next_m"},
-            not_last_c = {"not_last_f"},spec_last_c = {"spec_last_f"}, spec_wait_c = {"spec_wait_f"},
+            not_last_c = {"not_last_f"},
             not_last = {3,"train_goes_to_m","oktyabrskaya_next_m"},
             not_last_f = {3,"to_oktyabrskaya_f"},
         },