TEE (#390)

* +SNCF CC 40100 Nez Cassé desired for #389 * +SBB RAe TEE II * +SBB RAm TEE aka NS DE IV * fix typo in job description (#391) * +VT 11.5 * BR 407 mit Zusatz Velaro D ergänzt (fix #387) - BR 187 um DACH-Zulassung und Last Mile ergänzt * remove TVM until proven otherwise * +DR 175 SVT (VT 18.16, aka Delfin) * Fehlerhafte Elektrifizierung Pirmasens Hbf-Kaiserslautern entfernt * +VT 08.5 * +VT 10 551 Komet * +FS ALn 448 * VT 10 551 made it to Paris (and Athens too) * +SNCF X 2770 * +Talgo III RD incl. related locos * Paris-Calais (#388) * Add stations on Paris-Lille route * Add classique line Paris-Lille * Add Long... Boulogne stations * Remove/replace Long... * Add Route Amiens-Calais * Shift coordinates * Fixes, shifted stations, etc. * Update pathSuggestions * Add Lille-Calais * Add XFHZ-XFDK * Korrekturen Nord-Frankreich * +TEE Catalan Talgo Barcelona-Genf * remove missing stations until route is available * adjust path suggestion * fix missing comma * PathSuggestions über französischen Altbau ergänzt * +Berlinaren Berlin-Malmö, Neptun Berlin-Kopenhagen * +TEE Merkur Kopenhagen-Heidelberg-(Stuttgart) * fix station/waypoint code * Mehr Details auf Mittenwaldbahn (#395) * AT Tasks * detailed Mittenwaldbahn * Projected coordinates Co-authored-by: TrainCompany <train-company@c1710.de> * +TEE Helvetia Hamburg-Zürich * Add Görlitz-Dresden (#396) * Add Görlitz-Dresden * Projected coordinates Co-authored-by: TrainCompany <train-company@c1710.de> * Add data source licenses (#400) * Dresden-Neustadt entfernt * ICNG (#393) * ICNG Könnte man es so hinzufügen? * Verschiebung der niederländischen Elektrotriebzüge Ich habe die niederländischen Elektrotriebzüge zu den restlichen Elektrotriebzügen verschoben. Ich habe mich ehrlich gesagt schon gefragt, warum die sich zwischen den Dieseltriebzügen befanden. * Update issue templates (#401) (cherry picked from commit 9365303) * +TEE Albert Schweitzer Dortmund-Straßbourg * Weg mit Checkboxen (#403) * Update issue templates (cherry picked from commit 9365303) * Don't use checkboxes for now, as they are presented as subtasks * +TEE Gottardo (Genoa)-Mailand-Zürich-(Basel) * +TEE Ligure Avignon-Mailand (San Remo missing) * +TEE Bavaria München-Zürich * +TEE Prinz Eugen Bremen-Wien * +Württemberische Allgäubahn und Zollernalbbahn (#369) * +Würthemberische Allgäubahn Kißlegg-Aulendorf-Herbertingen * Projected coordinates * +RB 53, RB 53 a, RB53 b * +IRE 6 a, needs additional route * +RB66, needs additional route * +Zollernalbbahn * Projected coordinates Co-authored-by: TrainCompany <train-company@c1710.de> * Abzwstellen entfernt und PathSuggestions ergänzt * Bahnsteiglänge Figueres korrigiert * Add Paris-Orléans-Tours (#385) * Orléans sein Akzent zurückgegeben * fix typo in job description (#391) * BR 407 mit Zusatz Velaro D ergänzt (fix #387) - BR 187 um DACH-Zulassung und Last Mile ergänzt * Fehlerhafte Elektrifizierung Pirmasens Hbf-Kaiserslautern entfernt * Paris-Calais (#388) * Add stations on Paris-Lille route * Add classique line Paris-Lille * Add Long... Boulogne stations * Remove/replace Long... * Add Route Amiens-Calais * Shift coordinates * Fixes, shifted stations, etc. * Update pathSuggestions * Add Lille-Calais * Add XFHZ-XFDK * Korrekturen Nord-Frankreich * PathSuggestions über französischen Altbau ergänzt * Mehr Details auf Mittenwaldbahn (#395) * AT Tasks * detailed Mittenwaldbahn * Projected coordinates Co-authored-by: TrainCompany <train-company@c1710.de> * Add Görlitz-Dresden (#396) * Add Görlitz-Dresden * Projected coordinates Co-authored-by: TrainCompany <train-company@c1710.de> * Add data source licenses (#400) * Dresden-Neustadt entfernt * ICNG (#393) * ICNG Könnte man es so hinzufügen? * Verschiebung der niederländischen Elektrotriebzüge Ich habe die niederländischen Elektrotriebzüge zu den restlichen Elektrotriebzügen verschoben. Ich habe mich ehrlich gesagt schon gefragt, warum die sich zwischen den Dieseltriebzügen befanden. FYI: I hate merge conflicts! * Update issue templates (#401) (cherry picked from commit 9365303) * Weg mit Checkboxen (#403) * Update issue templates (cherry picked from commit 9365303) * Don't use checkboxes for now, as they are presented as subtasks * remove dupes caused by merge conflict * reformat to ease conflic resolution * fix station/waypoint Co-authored-by: Marcel Heisinger <marhei@users.noreply.github.com> Co-authored-by: Constantin A <10349490+C1710@users.noreply.github.com> Co-authored-by: LandroMitMate <73739219+LandroMitMate@users.noreply.github.com> Co-authored-by: TrainCompany <train-company@c1710.de> Co-authored-by: Isabelle <hi@f2k1.de> Co-authored-by: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
marhei · Jul 26, 2022 · 5292829 · 5292829
1 parent 6629708
commit 5292829
Show file tree

Hide file tree

Showing 2 changed files with 364 additions and 0 deletions.
diff --git a/TaskModel.json b/TaskModel.json
@@ -3932,6 +3932,80 @@
 				{ "name": "beds", "value": 0 }
 			]
 		},
+		{
+			"group": 1,
+			"name": "Trans EU-Opa Express von %s bis %s",
+			"service": 1,
+			"objects": [
+				{
+					"descriptions": [ "Fahre den TEE Catalán-Talgo von %s bis %s" ],
+					"stations": [ "XSGE", "XFBA", "XFCZ",
+						"XFVCV", "XFAVV", "🇫🇷NPG", "🇫🇷MHV", "XFBZ", "XFNB", "XFPE", "XEB"
+				    ],
+					"pathSuggestion": [ "XSGE", "XFBA", "XFCZ",
+						"XFAE", "XFLPD", "XFVI",
+						"XFVCV", "XFMN", "🇫🇷BLN", "XFOR",
+						"XFAVV", "XFARL",
+						"🇫🇷NPG", "🇫🇷MHV", "XFBZ", "XFNB", "XFPE", "XEB"
+					]
+				},
+				{
+					"descriptions": [ "Fahre den Neptun-Express von %s bis %s" ],
+					"stations": [ "BHF", "XDKH" ],
+					"pathSuggestion": [ "BHF", "BL", "WNT", "WG", "WSN", "WR", "WK", "AL", "AK", "AF", "XRDI", "XRDK", "XDKH" ]
+				},
+				{
+					"descriptions": [ "Fahre den Berlinaren-Express von %s bis %s" ],
+					"stations": [ "BHF", "XVM" ],
+					"pathSuggestion": [ "BHF", "BL", "WNT", "WG", "WSN", "WR", "WK", "AL", "AK", "AF", "XRDI", "XRDK", "XDKH", "XVM" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Merkur von %s bis %s" ],
+					"stations": [ "XDKH", "AL", "AH", "HB", "HO", "EMST", "EDO", "EE", "EDG", "KD", "KK", "KB", "KKO", "FMZ", "RM", "RK", "TS" ],
+					"pathSuggestion": [ "XDKH",
+						 "XRDK", "AF", "AK", 
+						 "AL", "AH", "AHAR", "ABLZ", "AROG", "HB", "HO", "EMST", "EDO", "EE", "EDG", "KD", "KK", "KKAS", "KB", "KKO", "FBGK", "FMZ", "FWOR", "RFT", "RM", "RMF", "RH", "RNZ", "TH", "TS" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Helvetia von %s bis %s" ],
+					"stations": [ "AA", "AH", "HH", "HG", "FF", "RM", "RK", "RO", "RF", "RB", "XSB", "XSZH" ],
+					"pathSuggestion": [ "AA", "AH", "ABLZ", "HH", "HELZ", "HK", "HG", "HEBG", "FB", "FFU", "FFD", "FH", "FF", "FFLF", "FBL", "RM", "RMF", "RH", "RBR", "RK", "RAP", "RO", "RF", "RML", "RB", "XSB", "XSKS", "XSZH" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Albert Schweitzer von %s bis %s" ],
+					"stations": [ "EDO", "EE", "EDG", "KD", "KK", "KKO", "FMZ", "FD", "RH", "RK", "RBB", "RKL", "XFSTG" ],
+					"pathSuggestion": [ "EDO", "EE", "EDG", "KD", "KK", "KKAS", "KB", "KKO", "FBGK", "FMZ",
+						 "FFLF", "FF",
+						 "FD", "RMF", "RH", "RBR", "RK", "RBB", "RAP", "RKL", "XFSTG" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Gottardo von %s bis %s" ],
+					"stations": [ "XIGP", "XIMB", "XSL", "XSZB", "XSZH", "XSB" ],
+					"pathSuggestion": [ "XIGP", "XIAQ", "XITOR", "XIMB", "XSL", "XSZB", "XSAI", "XSAG", "XSTW", "XSZH", "XSKS", "XSB" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Ligure von %s bis %s" ],
+					"stations": [ "XFAVV", "XFM", "XFTO", "XFSR", "XFCA", "XFAN", "XFNC", "XFMC", "XIVT",
+					    "XIIO", "XISAV", "XIGP", "XIMB" ],
+					"pathSuggestion": [ "XFAVV", "XFARL", "XFM", "XFTO", "XFSR", "XFCA", "XFAN", "XFNC", "XFMC", "XIVT",
+					    "XIIO", "XISAV", "XIGP", "XIAQ", "XITOR", "XIMB" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Bavaria von %s bis %s" ],
+					"stations": [ "MH", "MKP", "MLIR", "XAB", "XSSM", "XSSG", "XSWT", "XSZH" ],
+					"pathSuggestion": [ "MH", "MGE", "MKFG", "MBU", "MBIH", "MKP", "MIMS", "MGHZ", "MLIR", "XAB", "XSSM", "XSRS", "XSSG", "XSWT", "XSZO", "XSZH" ]
+				},
+				{
+					"descriptions": [ "Fahre den TEE Prinz Eugen von %s bis %s" ],
+					"stations": [ "HB", "HH", "HG", "FB", "NWH", "NN", "NRH", "NPA", "XAWE", "XAL", "XAWW" ],
+					"pathSuggestion": [ "HB", "HV", "HWUN", "HH", "HELZ", "HK", "HG", "HEBG", "FB", "FFU", "FFD", "NBN", "NGM", "NWH", "NRTD", "NF", "NN", "NRH", "NOT", "NPL", "NPA", "XASH", "🇦🇹Neu H1", "XAWE", "XAL", "XAWW" ]
+				}
+			],
+			"neededCapacity": [
+				{ "name": "passengers", "value": 0 },
+				{ "name": "bistroseats", "value": 0 }
+			]
+		},
 		{
 			"group": 1,
 			"name": "Fernverkehrsleistung im Schweden",

diff --git a/Train.json b/Train.json
@@ -1430,6 +1430,209 @@
 				{"name": "passengers", "value": 86}
 			]
 		},
+		{
+			"id": 613,
+			"group": 2,
+			"name": "DB VT 08.5 (3 tlg.)",
+			"shortcut": "613",
+			"speed": 140,
+			"weight": 121,
+			"force": 42,
+			"length": 80,
+			"drive": 2,
+			"reliability": 0.85,
+			"cost": 495000,
+			"operationCosts": 110,
+			"equipments": ["CH", "FR", "DE", "AT", "IT", "BE", "LU", "NL"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 108 },
+				{"name": "bistroseats", "value": 24 }
+			]
+		},
+		{
+			"id": 551,
+			"group": 2,
+			"name": "DB VT 10.5 Komet",
+			"shortcut": "VT 10 551",
+			"speed": 160,
+			"weight": 120,
+			"force": 38,
+			"length": 109,
+			"drive": 2,
+			"reliability": 0.82,
+			"cost": 525000,
+			"operationCosts": 105,
+			"equipments": ["DE", "AT", "CH", "FR"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 56 },
+				{"name": "beds", "value": 42 },
+				{"name": "bistroseats", "value": 21 }
+			]
+		},
+		{
+			"id": 601,
+			"group": 2,
+			"name": "DB VT 11.5 / DSB MA",
+			"shortcut": "601",
+			"speed": 160,
+			"weight": 214,
+			"force": 80,
+			"length": 131,
+			"drive": 2,
+			"reliability": 0.9,
+			"cost": 540000,
+			"operationCosts": 135,
+			"equipments": ["CH", "FR", "DE", "AT", "IT", "BE", "LU", "NL", "DK", "PL"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 122 },
+				{"name": "bistroseats", "value": 46 }
+			]
+		},
+		{
+			"id": 675,
+			"group": 2,
+			"name": "DR 175 VT 18.16 (4 tlg.)",
+			"shortcut": "SVT",
+			"speed": 160,
+			"weight": 214,
+			"force": 78,
+			"length": 98,
+			"drive": 2,
+			"reliability": 0.9,
+			"cost": 480000,
+			"operationCosts": 135,
+			"equipments": ["DE", "AT", "DK", "SE", "CZ"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 134 },
+				{"name": "bistroseats", "value": 23 }
+			]
+		},
+		{
+			"id": 67505,
+			"group": 2,
+			"name": "DR 175 VT 18.16 (5 tlg.)",
+			"shortcut": "SVT 5t",
+			"speed": 160,
+			"weight": 255,
+			"force": 78,
+			"length": 122,
+			"drive": 2,
+			"reliability": 0.9,
+			"cost": 490000,
+			"operationCosts": 135,
+			"equipments": ["DE", "AT", "DK", "SE", "CZ"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 206 },
+				{"name": "bistroseats", "value": 23 }
+			]
+		},
+		{
+			"id": 67506,
+			"group": 2,
+			"name": "DR 175 VT 18.16 (6 tlg.)",
+			"shortcut": "SVT 6t",
+			"speed": 140,
+			"weight": 296,
+			"force": 78,
+			"length": 145,
+			"drive": 2,
+			"reliability": 0.9,
+			"cost": 490000,
+			"operationCosts": 135,
+			"equipments": ["DE", "AT", "DK", "SE", "CZ"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 278 },
+				{"name": "bistroseats", "value": 23 }
+			]
+		},
+		{
+			"id": 1001,
+			"group": 2,
+			"name": "SBB RAm TEE / NS DE IV",
+			"shortcut": "RAm TEE",
+			"speed": 140,
+			"weight": 229,
+			"force": 79,
+			"length": 98,
+			"drive": 2,
+			"reliability": 0.9,
+			"cost": 480000,
+			"operationCosts": 125,
+			"equipments": ["CH", "FR", "DE", "AT", "IT", "BE", "LU", "NL"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 114 },
+				{"name": "bistroseats", "value": 32 }
+			]
+		},
+		{
+			"id": 1050,
+			"group": 2,
+			"name": "SBB RAe TEE II",
+			"shortcut": "RAe TEE II",
+			"speed": 160,
+			"weight": 296,
+			"force": 82,
+			"length": 143,
+			"drive": 1,
+			"reliability": 0.95,
+			"cost": 950000,
+			"operationCosts": 90,
+			"equipments": ["CH", "FR", "DE", "AT", "IT", "BE", "LU", "NL"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 168 },
+				{"name": "bistroseats", "value": 54 }
+			]
+		},
+		{
+			"id": 448,
+			"group": 2,
+			"name": "FS ALn 448 Binato Breda",
+			"shortcut": "FS ALn 448",
+			"speed": 140,
+			"weight": 104,
+			"force": 44,
+			"length": 56,
+			"drive": 2,
+			"reliability": 0.87,
+			"cost": 390000,
+			"operationCosts": 100,
+			"maxConnectedUnits": 2,
+			"equipments": ["IT", "CH", "FR", "DE", "AT"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 106 },
+				{"name": "bistroseats", "value": 4 }
+			]
+		},
+		{
+			"id": 2770,
+			"group": 2,
+			"name": "SNCF 2770 (3 tlg.)",
+			"shortcut": "X 2770",
+			"speed": 140,
+			"weight": 130,
+			"force": 72,
+			"length": 79,
+			"drive": 2,
+			"reliability": 0.9,
+			"cost": 530000,
+			"operationCosts": 125,
+			"maxConnectedUnits": 3,
+			"equipments": ["FR", "IT", "CH", "BE", "NL", "DE", "ES"],
+			"exchangeTime": 90,
+			"capacity": [
+				{"name": "passengers", "value": 168 },
+				{"name": "bistroseats", "value": 1 }
+			]
+		},
 		{
 			"id": 33,
 			"group": 2,
@@ -1519,6 +1722,51 @@
 			"operationCosts": 120,
 			"equipments": ["FR","LU"]
 		},
+		{
+			"id": 40100,
+			"group": 0,
+			"name": "SNCF CC 40100 Nez Cassé",
+			"shortcut": "CC 40100",
+			"speed": 240,
+			"weight": 110,
+			"force": 210,
+			"length": 22,
+			"drive": 1,
+			"reliability": 0.95,
+			"cost": 550000,
+			"operationCosts": 120,
+			"equipments": ["FR", "CH", "BE", "LU", "NL", "DE", "AT", "IT"]
+		},
+		{
+			"id": 9300,
+			"group": 0,
+			"name": "SNCF BB 9300",
+			"shortcut": "BB 9300",
+			"speed": 160,
+			"weight": 82,
+			"force": 260,
+			"length": 16,
+			"drive": 1,
+			"reliability": 0.96,
+			"cost": 370000,
+			"operationCosts": 105,
+			"equipments": ["FR", "CH", "ES" ]
+		},
+		{
+			"id": 353,
+			"group": 0,
+			"name": "RENFE 353 T-3000",
+			"shortcut": "T-3000",
+			"speed": 180,
+			"weight": 88,
+			"force": 268,
+			"length": 19,
+			"drive": 2,
+			"reliability": 0.90,
+			"cost": 320000,
+			"operationCosts": 125,
+			"equipments": ["ES", "FR"]
+		},
 		{
 			"id": 111,
 			"group": 0,
@@ -2467,6 +2715,48 @@
 				{"name": "passengers", "value": 570},
 				{"name": "bistroseats", "value": 20}
 			]
+		},
+		{
+			"id": 35301,
+			"group": 3,
+			"name": "RENFE Talgo III RD (16 tlg.)",
+			"shortcut": "Talgo III RD",
+			"speed": 220,
+			"weight": 408,
+			"force": 0,
+			"length": 184,
+			"drive": 0,
+			"reliability": 0.9,
+			"cost": 1300000,
+			"maxConnectedUnits": 1,
+			"compatibleWith": [ 40100, 9300, 353 ],
+			"exchangeTime": 90,
+			"equivalentTo": 16,
+			"capacity": [
+				{"name": "passengers", "value": 432 },
+				{"name": "bistroseats", "value": 40 }
+			]
+		},
+		{
+			"id": 35302,
+			"group": 3,
+			"name": "RENFE Talgo III RD (21 tlg.)",
+			"shortcut": "Talgo III RD+",
+			"speed": 220,
+			"weight": 534,
+			"force": 0,
+			"length": 242,
+			"drive": 0,
+			"reliability": 0.9,
+			"cost": 1450000,
+			"maxConnectedUnits": 1,
+			"compatibleWith": [ 40100, 9300, 353 ],
+			"exchangeTime": 90,
+			"equivalentTo": 21,
+			"capacity": [
+				{"name": "passengers", "value": 612 },
+				{"name": "bistroseats", "value": 40 }
+			]
 		}
 	]
 }