State at 2021-08-17

1 files changed, 24 insertions, 34 deletions

diff --git a/Crossroads/init_code.lua b/Crossroads/init_code.lua
index 75eda79..e3b8a06 100644
--- a/Crossroads/init_code.lua
+++ b/Crossroads/init_code.lua
@@ -170,8 +170,8 @@ function F.stn2gen(stn, trk, door, ret, chout, depspeed)
           nxtdisp = intext_nxt
         end
         local intext = ("%s\n%s\nDebug: %d %d"):format(F.stnlist[stn] or stn, intext_nxt, arroff or timenow, interval)
-        local outtext = string.format("%s (%06d)",F.lines[l].name or l, atc_id)
-        if t[i][4] then outtext = outtext.." - "..(F.stnlist[t[i][4]] or t[i][4]) end
+        local outtext = F.lines[l].name or l
+        if t[i][4] then outtext = outtext..": "..(F.stnlist[t[i][4]] or t[i][4]) end
         t[i][5] = t[i][5] or (timenow-(F.depint[l] or 300))
         -- note that the "average" time is weighted
         t[i][6] = t[i][6] and (t[i][6]+timenow-t[i][5]+30)/2 or (timenow-t[i][5])
@@ -316,24 +316,20 @@ end
 
 F.stnlist = {
   ["N/A"]          = "N/A",
-  Bts              = "Origin Berton St.",
+  Bts              = "Berton St.",
   cg               = "Colored Grasses",
-  clockwise        = "Clockwise Route",
-  counterclockwise = "Counterclockwise Route",
-  cras             = "Crossroads ARSE7's Shop",
-  crbfost          = "Crossroads Station East",
-  crbfsm           = "Crossroads Station St. Central",
-  crbfso           = "Crossroads Station St. East",
-  crbfsw           = "Crossroads Station St. West",
+  clockwise        = "Clockwise",
+  counterclockwise = "Counterclockwise",
+  cras             = "ARSE7's Shop",
+  crbfost          = "Station East",
+  crbfsm           = "Station St. Central",
+  crbfso           = "Station St. East",
+  crbfsw           = "Station St. West",
   crch             = "Crossroads City Hall",
-  crchs            = "Crossroads City Hall South",
-  crmtrail         = "Crossroads Mountain Railway Terminus",
-  crnsw            = "Crossroads North Station St. 9th Alley",
-  crnsw2           = "Crossroads C. 2nd St./Station St. 9th Alley",
-  crrathaus        = "Crossroads City Hall",
-  crsmacker        = "Crossroads Smacker's Station",
-  crwm             = "Crossroads West Mountains",
-  crzn             = "Crossroads Central/North",
+  crchs            = "City Hall South",
+  crmtrail         = "Mountain Railway Terminus",
+  crsmacker        = "Smacker's Station",
+  crwm             = "CR West Mountains",
   elchateau        = "Erstaziland-Chateau d'Erstazi",
   elgp             = "Erstaziland-Greener Pastures",
   elsf             = "Erstaziland-Salt Factory",
@@ -342,17 +338,17 @@ F.stnlist = {
   mushroom         = "Mushroom Land",
   neverbuild       = "Neverbuild",
   nvbcentral       = "Neverbuild Central",
-  nvbold           = "Neverbuild Old Terminus",
+  nvbold           = "Old Terminus",
   nvboutskirts     = "Neverbuild Outskirts",
   ["NRG-museum"]   = "Museum",
   ["NRG-south"]    = "New Roses Gardens South",
   ["NRG-townhall"] = "Town Hall",
   oc               = "Ocean City",
-  occh             = "Ocean City City Hall",
-  occrt            = "Ocean City CRT Office",
-  ocmushroom       = "Ocean City Mushroom Market",
+  occh             = "City Hall",
+  occrt            = "CRT Office",
+  ocmushroom       = "Mushroom Market",
   ocoutskirts      = "Ocean City Outskirts",
-  phsc             = "Personhood Southern Crossing",
+  phsc             = "Southern Crossing",
   phwest           = "Personhood West",
   scc              = "Silver Coast Central",
   scn              = "Silver Coast North",
@@ -362,13 +358,13 @@ F.stnlist = {
 
 for k, v in pairs{[1] = "Station",} do
   for _, i in pairs{6,} do
-    F.stnlist[string.format("crc_%d_%d", k, i)] = string.format("Crossroads %d %s St.", i, v)
+    F.stnlist[string.format("crc_%d_%d", k, i)] = string.format("%d %s St.", i, v)
   end
 end
 
 for k, v in pairs{[5] = "Fifth", [6] = "Sixth", [7] = "Seventh", [8] = "Eighth",} do
   for l, w in pairs{[3] = "Third", [5] = "Fifth",} do
-    F.stnlist[string.format("crs_%d_%d", k, l)] = string.format("Crossroads %s St./%s Alley", v, w)
+    F.stnlist[string.format("crs_%d_%d", k, l)] = string.format("%s St./%s Alley", v, w)
   end
 end
 
@@ -388,24 +384,18 @@ F.lines = {
     [2] = {{"phwest", "2"}, {"thecube", "1"}, {"cg", "2"}, {"scc", "S2"}, {"crch", "1"}},
   },
   ["AZ"] = {
-    name = "ATL Zinc Line", short = "ATL-Z",
+    name = "ATL-Z", short = "ATL-Z",
     ring = false,
     interval = 480,
     [1] = { {"Bts","3"}, {"evo","N/A"}, {"scs","N1"}, {"scc","N1"}, {"scn","N1"}, {"oc","N"}, {"elgp","N"}, {"elsf","E"}, {"elchateau","S"} },
     [2] = { {"elchateau","S"}, {"elsf","W"}, {"elgp","S"}, {"oc","S"}, {"scn","S1"}, {"scc", "S1"}, {"scs","S1"}, {"evo","N/A"}, {"Bts","3"}, },
   },
   ["CRT1"] = {
-    name = "CRT 1",
+    name = "1",
     ring = false,
     [1] = { {"crsmacker", "R3"}, --[[{"crch", "U1"},]] {"crchs", "W"}, {"cras", "N"} },
     [2] = { {"cras", "N"}, {"crchs", "E"}, --[[{"crch", "U2"},]] {"crsmacker", "R3"} },
   },
-  ['CRT2'] = {
-    name = 'CRT 2',
-    ring = false,
-    [1] = { {'crch', 'U6'}, {'crbfsw', 'E'}, {'crnsw', 'R1'} },
-    [2] = { {'crnsw', 'R1'}, {'crbfsw', 'W'}, {'crch', 'U6'} },
-  },
   ["NRG1"] = {
     name = "1",
     ring = "counterclockwise",
@@ -424,7 +414,7 @@ for k, v in pairs{["B"] = {6, 5, 3, 20},} do
     t[#t+1] = {string.format("crs_%d_%d", i, v[3]),"N", v[4] + 175 + (8-i)*30}
   end
   F.lines["CRT1"..k] = {
-    name = "CRT 1"..k,
+    name = "1"..k,
     ring = "clockwise",
     rtt = 320,
     interval = 80,