Skip to content

Commit

Permalink
Add some new Amtrak routes
Browse files Browse the repository at this point in the history
  • Loading branch information
@C1710
C1710 committed Sep 9, 2022
1 parent 4802238 commit f90e4dd
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 36 deletions.
4 changes: 2 additions & 2 deletions Path.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29025,14 +29025,14 @@
},
{
"start": "🇺🇸HPT",
"end": "🇺🇸O7022934272",
"end": "🇺🇸SAL",
"name": "Danville District",
"length": 55,
"maxSpeed": 100,
"twistingFactor": 0.15
},
{
"start": "🇺🇸O7022934272",
"start": "🇺🇸SAL",
"end": "🇺🇸CLT",
"name": "Charlotte District",
"length": 67,
Expand Down
2 changes: 1 addition & 1 deletion Station.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9979,7 +9979,7 @@
},
{
"name": "Salisbury",
"ril100": "🇺🇸O7022934272",
"ril100": "🇺🇸SAL",
"group": 1,
"x": -12883,
"y": 2723,
Expand Down
115 changes: 82 additions & 33 deletions TaskModel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@
},
{
"name": "Crescent von %s nach %s",
"stations": [ "🇺🇸NYP", "🇺🇸NWK", "🇺🇸MET", "🇺🇸NBK", "🇺🇸PJC", "🇺🇸TRE", "🇺🇸PHL", "🇺🇸WIL", "🇺🇸BAL", "🇺🇸WAS", "🇺🇸ALX", "🇺🇸MSS", "🇺🇸CLP", "🇺🇸CVS", "🇺🇸O4565139205", "🇺🇸HPT", "🇺🇸O7022934272", "🇺🇸CLT", "🇺🇸GAS", "🇺🇸SPB", "🇺🇸GRV", "🇺🇸CSN", "🇺🇸TCA", "🇺🇸GLE", "🇺🇸ATL", "🇺🇸ATN", "🇺🇸BHM", "🇺🇸TCL", "🇺🇸MEI", "🇺🇸LAU", "🇺🇸HBG", "🇺🇸PIC", "🇺🇸SDL", "🇺🇸NOL" ]
"stations": [ "🇺🇸NYP", "🇺🇸NWK", "🇺🇸MET", "🇺🇸NBK", "🇺🇸PJC", "🇺🇸TRE", "🇺🇸PHL", "🇺🇸WIL", "🇺🇸BAL", "🇺🇸WAS", "🇺🇸ALX", "🇺🇸MSS", "🇺🇸CLP", "🇺🇸CVS", "🇺🇸O4565139205", "🇺🇸HPT", "🇺🇸SAL", "🇺🇸CLT", "🇺🇸GAS", "🇺🇸SPB", "🇺🇸GRV", "🇺🇸CSN", "🇺🇸TCA", "🇺🇸GLE", "🇺🇸ATL", "🇺🇸ATN", "🇺🇸BHM", "🇺🇸TCL", "🇺🇸MEI", "🇺🇸LAU", "🇺🇸HBG", "🇺🇸PIC", "🇺🇸SDL", "🇺🇸NOL" ]
},
{
"name": "Coast Starlight von %s nach %s",
Expand All @@ -981,6 +981,22 @@
{
"name": "Sunset Limited von %s nach %s",
"stations": [ "🇺🇸NOL", "🇺🇸SCH", "🇺🇸NIB", "🇺🇸LFT", "🇺🇸LCH", "🇺🇸BMT", "🇺🇸HOS", "🇺🇸SAS", "🇺🇸DRT", "🇺🇸SND", "🇺🇸ALP", "🇺🇸ELP", "🇺🇸DEM", "🇺🇸LDB", "🇺🇸BEN", "🇺🇸TUS", "🇺🇸MRC", "🇺🇸YUM", "🇺🇸PSN", "🇺🇸ONA", "🇺🇸POS", "🇺🇸LAX" ]
},
{
"name": "Southwest Chief von %s nach %s",
"stations": [ "🇺🇸CHI", "🇺🇸NPV", "🇺🇸MDT", "🇺🇸PCT", "🇺🇸GBB", "🇺🇸FMD", "🇺🇸LAP", "🇺🇸KCY", "🇺🇸LRC", "🇺🇸TOP", "🇺🇸NEW", "🇺🇸HUT", "🇺🇸DDG", "🇺🇸GCK", "🇺🇸LMR", "🇺🇸LAJ", "🇺🇸TRI", "🇺🇸RAT", "🇺🇸LSV", "🇺🇸LMY", "🇺🇸ABQ", "🇺🇸GLP", "🇺🇸WLO", "🇺🇸FLG", "🇺🇸KNG", "🇺🇸NDL", "🇺🇸VRV", "🇺🇸SNB", "🇺🇸RIV", "🇺🇸FUL", "🇺🇸LAX" ]
},
{
"name": "Texas Eagle von %s nach %s",
"stations": [ "🇺🇸CHI", "🇺🇸JOL", "🇺🇸PNT", "🇺🇸BNL", "🇺🇸LCN", "🇺🇸SPI", "🇺🇸CRV", "🇺🇸ALN", "🇺🇸STL", "🇺🇸ACD", "🇺🇸PBF", "🇺🇸WNR", "🇺🇸LRK", "🇺🇸MVN", "🇺🇸ARK", "🇺🇸HOP", "🇺🇸TXA", "🇺🇸MHL", "🇺🇸LVW", "🇺🇸MIN", "🇺🇸DAL", "🇺🇸FTW", "🇺🇸CBR", "🇺🇸MCG", "🇺🇸TPL", "🇺🇸TAY", "🇺🇸AUS", "🇺🇸SMC", "🇺🇸SAS", "🇺🇸DRT", "🇺🇸SND", "🇺🇸ALP", "🇺🇸ELP", "🇺🇸DEM", "🇺🇸LDB", "🇺🇸BEN", "🇺🇸TUS", "🇺🇸MRC", "🇺🇸YUM", "🇺🇸PSN", "🇺🇸ONA", "🇺🇸POS", "🇺🇸LAX" ]
},
{
"name": "Cardinal von %s nach %s",
"stations": [ "🇺🇸NYP", "🇺🇸NWK", "🇺🇸TRE", "🇺🇸PHL", "🇺🇸WIL", "🇺🇸BAL", "🇺🇸WAS", "🇺🇸ALX", "🇺🇸MSS", "🇺🇸CLP", "🇺🇸CVS", "🇺🇸STA", "🇺🇸CLF", "🇺🇸WSS", "🇺🇸ALD", "🇺🇸HIN", "🇺🇸PRC", "🇺🇸THN", "🇺🇸MNG", "🇺🇸CHW", "🇺🇸HUN", "🇺🇸AKY", "🇺🇸SPM", "🇺🇸MAY", "🇺🇸CIN", "🇺🇸COI", "🇺🇸IND", "🇺🇸CRF", "🇺🇸LAF", "🇺🇸REN", "🇺🇸DYE", "🇺🇸CHI" ]
},
{
"name": "Adirondack von %s nach %s",
"stations": [ "🇨🇦O6298031649", "🇨🇦O5225350011", "🇺🇸RSP", "🇺🇸PLB", "🇺🇸PRK", "🇺🇸WSP", "🇺🇸POH", "🇺🇸FTC", "🇺🇸WHL", "🇺🇸O1011889402", "🇺🇸SAR", "🇺🇸SDY", "🇺🇸ALB", "🇺🇸HUD", "🇺🇸RHI", "🇺🇸POU", "🇺🇸CRT", "🇺🇸YNY", "🇺🇸NYP" ]
}
]
},
Expand Down Expand Up @@ -1023,6 +1039,22 @@
{
"name": "Missouri River Runner von %s nach %s",
"stations": [ "🇺🇸KCY", "🇺🇸IDP", "🇺🇸LEE", "🇺🇸WAR", "🇺🇸SED", "🇺🇸JEF", "🇺🇸HEM", "🇺🇸WAH", "🇺🇸KWD", "🇺🇸STL" ]
},
{
"name": "Palmetto von %s nach %s",
"stations": [ "🇺🇸NYP", "🇺🇸NWK", "🇺🇸MET", "🇺🇸NBK", "🇺🇸PJC", "🇺🇸TRE", "🇺🇸PHL", "🇺🇸WIL", "🇺🇸BAL", "🇺🇸NCR", "🇺🇸WAS", "🇺🇸ALX", "🇺🇸RVR", "🇺🇸PTB", "🇺🇸RMT", "🇺🇸WLN", "🇺🇸SSM", "🇺🇸FAY", "🇺🇸DIL", "🇺🇸FLO", "🇺🇸KTR", "🇺🇸CHS", "🇺🇸YEM", "🇺🇸SAV" ]
},
{
"name": "Carolinian von %s nach %s",
"stations": [ "🇺🇸NYP", "🇺🇸NWK", "🇺🇸TRE", "🇺🇸PHL", "🇺🇸WIL", "🇺🇸BAL", "🇺🇸WAS", "🇺🇸ALX", "🇺🇸FBG", "🇺🇸RVR", "🇺🇸PTB", "🇺🇸RMT", "🇺🇸WLN", "🇺🇸SSM", "🇺🇸RGH", "🇺🇸CYN", "🇺🇸DNC", "🇺🇸BNC", "🇺🇸GRO", "🇺🇸HPT", "🇺🇸SAL", "🇺🇸CLT" ]
},
{
"name": "Pacific Surfliner von %s nach %s",
"stations": [ "🇺🇸SLO", "🇺🇸GUA", "🇺🇸LPS", "🇺🇸SBA", "🇺🇸OXN", "🇺🇸SIM", "🇺🇸VNC", "🇺🇸BUR", "🇺🇸LAX", "🇺🇸FUL", "🇺🇸ANA", "🇺🇸SNA", "🇺🇸IRV", "🇺🇸SNC", "🇺🇸OSD", "🇺🇸SOL", "🇺🇸OLT", "🇺🇸SAN" ]
},
{
"name": "Downeaster von %s nach %s",
"stations": [ "🇺🇸BRK", "🇺🇸FRE", "🇺🇸POR", "🇺🇸ORB", "🇺🇸SAO", "🇺🇸WEM", "🇺🇸DOV", "🇺🇸DHM", "🇺🇸EXR", "🇺🇸HHL", "🇺🇸WOB", "🇺🇸BOS" ]
}
]
},
Expand All @@ -1042,6 +1074,23 @@
"group": 1,
"service": 5
},
{
"name": "Auto-Train von %s nach %s",
"descriptions": [
"Bringe die Fahrgäste im Auftrag von Amtrak von %s nach %s.",
"Bring den Autozug von %s nach %s.",
"Fahre den einzigen AUtozug von Amtrak zwischen %s und %s."
],
"stations": [ "🇺🇸LOR", "🇺🇸SFA" ],
"pathSuggestion": [ "🇺🇸LOR", "🇺🇸RMT", "🇺🇸SSM", "🇺🇸RGH", "🇺🇸CYN", "🇺🇸SFA" ],
"neededCapacity": [
{ "name": "passengers" },
{ "name": "bistroseats" },
{ "name": "cars", "value": 20 }
],
"group": 1,
"service": 1
},
{
"name": "Brightline von %s nach %s",
"descriptions": [
Expand Down Expand Up @@ -1485,14 +1534,14 @@
],
"objects": [
{
"stations": [ "🇱🇻RIX", "🇱🇻KRS", "🇱🇻DGP", "🇷🇺O907297496", "🇷🇺O6524674898", "🇷🇺O1994609598", "🇷🇺O473887668"],
"pathSuggestion": [ "🇱🇻RIX", "🇱🇻KRS", "🇱🇻DGP", "🇷🇺O907297496", "🇷🇺O6524674898", "🇷🇺O1994609598", "🇷🇺O2000431023", "🇷🇺O473887668"]
"stations": [ "🇱🇻RIX", "🇱🇻KRS", "🇱🇻DGP", "🇷🇺O907297496", "🇷🇺O6524674898", "🇷🇺O1994609598", "🇷🇺O473887668" ],
"pathSuggestion": [ "🇱🇻RIX", "🇱🇻KRS", "🇱🇻DGP", "🇷🇺O907297496", "🇷🇺O6524674898", "🇷🇺O1994609598", "🇷🇺O2000431023", "🇷🇺O473887668" ]
}
],
"neededCapacity": [
{ "name": "passengers" },
{ "name": "bistroseats" },
{ "name": "beds"}
{ "name": "beds" }
]
},
{
Expand All @@ -1504,16 +1553,16 @@
],
"objects": [
{
"stations": [ "🇷🇺O21596808", "🇷🇺O1987674962", "🇷🇺O473887668"]
"stations": [ "🇷🇺O21596808", "🇷🇺O1987674962", "🇷🇺O473887668" ]
},
{
"stations": [ "🇷🇺O6429297365", "🇷🇺O2023211041", "🇷🇺O4375869577", "🇷🇺O2000431023", "🇷🇺O473887668"]
"stations": [ "🇷🇺O6429297365", "🇷🇺O2023211041", "🇷🇺O4375869577", "🇷🇺O2000431023", "🇷🇺O473887668" ]
},
{
"stations": [ "XCUF", "🇷🇺O473887668"]
"stations": [ "XCUF", "🇷🇺O473887668" ]
},
{
"stations": [ "🇺🇦O2644051429", "🇺🇦O394980121"]
"stations": [ "🇺🇦O2644051429", "🇺🇦O394980121" ]
}
],
"neededCapacity": [
Expand All @@ -1530,24 +1579,24 @@
],
"objects": [
{
"stations": [ "🇱🇻O252636397", "🇱🇻RIX"],
"pathSuggestion": [ "🇱🇻O252636397", "🇱🇻RIX"]
"stations": [ "🇱🇻O252636397", "🇱🇻RIX" ],
"pathSuggestion": [ "🇱🇻O252636397", "🇱🇻RIX" ]
},
{
"stations": [ "🇱🇻RIHA", "🇱🇻RIX"],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX"]
"stations": [ "🇱🇻RIHA", "🇱🇻RIX" ],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX" ]
},
{
"stations": [ "🇱🇻O7799314251", "🇱🇻RIX"],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX"]
"stations": [ "🇱🇻O7799314251", "🇱🇻RIX" ],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX" ]
},
{
"stations": [ "🇱🇻O7799314251", "🇱🇻SKL"],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX", "🇱🇻ZMB", "🇱🇻SKL"]
"stations": [ "🇱🇻O7799314251", "🇱🇻SKL" ],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX", "🇱🇻ZMB", "🇱🇻SKL" ]
},
{
"stations": [ "🇱🇻RIHA", "🇱🇻IMT"],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX", "🇱🇻IMT"]
"stations": [ "🇱🇻RIHA", "🇱🇻IMT" ],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX", "🇱🇻IMT" ]
}
],
"neededCapacity": [
Expand All @@ -1563,24 +1612,24 @@
],
"objects": [
{
"stations": [ "🇱🇻O252636397", "🇱🇻RIX"],
"pathSuggestion": [ "🇱🇻O252636397", "🇱🇻RIX"]
"stations": [ "🇱🇻O252636397", "🇱🇻RIX" ],
"pathSuggestion": [ "🇱🇻O252636397", "🇱🇻RIX" ]
},
{
"stations": [ "🇱🇻RIHA", "🇱🇻RIX"],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX"]
"stations": [ "🇱🇻RIHA", "🇱🇻RIX" ],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX" ]
},
{
"stations": [ "🇱🇻O7799314251", "🇱🇻RIX"],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX"]
"stations": [ "🇱🇻O7799314251", "🇱🇻RIX" ],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX" ]
},
{
"stations": [ "🇱🇻O7799314251", "🇱🇻SKL"],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX", "🇱🇻ZMB", "🇱🇻SKL"]
"stations": [ "🇱🇻O7799314251", "🇱🇻SKL" ],
"pathSuggestion": [ "🇱🇻O7799314251", "🇱🇻JEL", "🇱🇻RIX", "🇱🇻ZMB", "🇱🇻SKL" ]
},
{
"stations": [ "🇱🇻RIHA", "🇱🇻IMT"],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX", "🇱🇻IMT"]
"stations": [ "🇱🇻RIHA", "🇱🇻IMT" ],
"pathSuggestion": [ "🇱🇻RIHA", "🇱🇻ZMB", "🇱🇻RIX", "🇱🇻IMT" ]
}
],
"neededCapacity": [
Expand Down Expand Up @@ -2585,7 +2634,7 @@
"Bringe den Regional-Express der Linie 3 pünktlich von %s nach %s."
],
"stations": [ "FF", "FFLF", "FRUE", "FMZ", "FBGK", "SBKN", "SBMS", "SIDO", "SNK", "SSH" ],
"pathSuggestion": ["FF", "FFLF", "FRUE", "FMB", "FMZ", "FBGK", "SBKN", "SBMS", "SIDO", "SNK", "SSH"],
"pathSuggestion": [ "FF", "FFLF", "FRUE", "FMB", "FMZ", "FBGK", "SBKN", "SBMS", "SIDO", "SNK", "SSH" ],
"neededCapacity": [
{ "name": "passengers" }
]
Expand Down Expand Up @@ -7999,7 +8048,7 @@
"Mache eine Testfahrt für ETCS mit dem TGV durch Deutschland von %s nach %s."
],
"stations": [ "UE P", "LH", "BL" ],
"pathSuggestion": [ "UE P", "LPLN", "LH", "LBT", "LW", "BJUE", "BLF", "BL"],
"pathSuggestion": [ "UE P", "LPLN", "LH", "LBT", "LW", "BJUE", "BLF", "BL" ],
"neededCapacity": [
{ "name": "passengers" }
]
Expand Down Expand Up @@ -8290,7 +8339,7 @@
],
"objects": [
{
"stations": [ "TS", "RH", "FD", "FMZ", "FF", "FO", "FH", "FFU", "FKW", "HG", "HHI", "HBS", "HWOB", "BSPD", "BL"],
"stations": [ "TS", "RH", "FD", "FMZ", "FF", "FO", "FH", "FFU", "FKW", "HG", "HHI", "HBS", "HWOB", "BSPD", "BL" ],
"pathSuggestion": [ "TS", "TV", "RUW", "RH", "RMF", "FBH", "FD", "FDG", "FMB", "FMZ", "FW", "FHOE", "FF", "FO", "FH", "FGEL", "FFD", "FFU", "FKW", "HG", "HN", "HK", "HELZ", "HHI", "HBS", "HWOB", "LS", "BSPD", "BL" ]
}
],
Expand Down Expand Up @@ -8349,10 +8398,10 @@
"Pendele zwischen Flughafen und Hauptbahnhof."
],
"stations": [ "BL", "BFBI" ],
"pathSuggestion": ["BL", "BBF", "BFBI"],
"pathSuggestion": [ "BL", "BBF", "BFBI" ],
"neededCapacity": [
{ "name": "passengers" }
]
}
]
}
}

0 comments on commit f90e4dd

Please sign in to comment.