add more stops

sdiaz · Dec 22, 2018 · 62040f1 · 62040f1
1 parent 58e79f7
commit 62040f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -124,7 +124,8 @@ function startRoute(route)
     isRouteFinished = false
     activeRoute = Config.Routes[route]
     activeRouteLine = activeRoute.Lines[math.random(1, #activeRoute.Lines)]
-    ESX.ShowNotification(_U('drive_to_first_marker', _U(activeRouteLine.Name), _U(activeRouteLine.Stops[1].name)))
+    ESX.ShowNotification(_U('route_assigned', _U(activeRouteLine.Name)))
+    ESX.ShowNotification(_U('drive_to_first_marker', _U(activeRouteLine.Stops[1].name)))
     Bus.CreateBus(activeRoute.SpawnPoint, activeRoute.BusModel, activeRouteLine.BusColor)
 
     stopNumber = 0

diff --git a/config/routes/metro.lua b/config/routes/metro.lua
@@ -2,7 +2,7 @@ MetroStops = {
     {x = -526.2774, y = -263.5606, z = 35.4519, unloadType = UnloadType.Some, name = 'stop_metro_carcer_way'},
     {x = -681.5269, y = -381.7944, z = 34.2315, unloadType = UnloadType.Some, name = 'stop_tbd'},
     {x = -1418.3283, y = -91.1142, z = 52.4513, unloadType = UnloadType.Some, name = 'stop_tbd'},
-    {x = -1475.4442, y = -635.4663, z = 31.0511, unloadType = UnloadType.Some, name = 'stop_tbd'},
+    {x = -1475.4442, y = -635.4663, z = 31.0511, unloadType = UnloadType.Some, name = 'stop_metro_marathon_baycity'},
     {x = -1413.7164, y = -566.5466, z = 30.8335, unloadType = UnloadType.Some, name = 'stop_tbd'},
     {x = -1169.3343, y = -396.8692, z = 35.5438, unloadType = UnloadType.Some, name = 'stop_tbd'},
     {x = -692.2866, y = -671.1650, z = 31.2891, unloadType = UnloadType.Some, name = 'stop_metro_sanandreas_ginger'},
@@ -14,7 +14,7 @@ MetroStops = {
     {x = 355.2163, y = -1067.8500, z = 29.9783, unloadType = UnloadType.Some, name = 'stop_metro_vespucci_sinner'},
     {x = -713.2615, y = -823.8684, z = 23.5511, unloadType = UnloadType.Some, name = 'stop_metro_vespucci_ginger'},
     {x = -932.4981, y = -120.2621, z = 37.7789, unloadType = UnloadType.Some, name = 'stop_metro_delperro_madwayne'},
-    {x = -1528.3587, y = -463.6042, z = 35.8467, unloadType = UnloadType.Some, name = 'stop_tbd'},
+    {x = -1528.3587, y = -463.6042, z = 35.8467, unloadType = UnloadType.Some, name = 'stop_metro_delperro_plaza'},
     {x = -642.2674, y = -135.7480, z = 37.8349, unloadType = UnloadType.Some, name = 'stop_metro_rockford_eastbourne'},
     {x = -681.7453, y = -381.3421, z = 34.2342, unloadType = UnloadType.Some, name = 'stop_metro_dorset_palomino'},
     {x = -179.0992, y = -818.2785, z = 31.0558, unloadType = UnloadType.Some, name = 'stop_metro_alta_gruppe'},
@@ -30,7 +30,7 @@ MetroStops = {
     {x = 66.2063, y = -966.0771, z = 29.3575, unloadType = UnloadType.Some, name = 'stop_tbd'},
     {x = -552.4656, y = -983.4564, z = 23.3074, unloadType = UnloadType.Some, name = 'stop_tbd'},
     {x = -569.0639, y = -968.0662, z = 23.3099, unloadType = UnloadType.Some, name = 'stop_tbd'},
-    {x = -1281.3592, y = -317.1460, z = 36.7809, unloadType = UnloadType.Some, name = 'stop_tbd'},
+    {x = -1281.3592, y = -317.1460, z = 36.7809, unloadType = UnloadType.Some, name = 'stop_metro_delperro_morningwood'},
     {x = -1346.4733, y = -387.8778, z = 36.7419, unloadType = UnloadType.Some, name = 'stop_tbd'},
     {x = 321.7252, y = -241.9803, z = 53.9631, unloadType = UnloadType.Some, name = 'stop_metro_hawick_meteor'},
     {x = -658.3767, y = -144.1313, z = 37.8550, unloadType = UnloadType.Some, name = 'stop_tbd'},
@@ -43,7 +43,7 @@ MetroStops = {
     {x = 263.5511, y = -1210.4304, z = 29.3386, unloadType = UnloadType.All, name = 'stop_metro_station_arrivals'},
     {x = 263.7222, y = -1194.2947, z = 29.3560, unloadType = UnloadType.All, name = 'stop_metro_station_departures'},
     {x = -216.5875, y = -600.5554, z = 34.2638, unloadType = UnloadType.Some, name = 'stop_metro_business_center'},
-    {x = -698.0225, y = -0.4975, z = 38.2428, unloadType = UnloadType.Some, name = 'stop_tbd'},
+    {x = -698.0225, y = -0.4975, z = 38.2428, unloadType = UnloadType.Some, name = 'stop_metro_delperro_rockford'},
     {x = -735.3663, y = -750.2927, z = 26.8735, unloadType = UnloadType.Some, name = 'stop_metro_ginger'},
     {x = -249.4506, y = -337.0251, z = 29.9658, unloadType = UnloadType.Some, name = 'stop_metro_rockford_plaza'},
     {x = 303.4519, y = -765.7985, z = 29.3109, unloadType = UnloadType.Some, name = 'stop_metro_strawberry_ave'},

diff --git a/locales/en.lua b/locales/en.lua
@@ -1,5 +1,6 @@
 Locales['en'] = {
-    ['drive_to_first_marker']               = 'You have been assigned ~g~%s~s~. Get in bus and drive to first stop at ~g~%s~.',
+    ['route_assigned']                      = 'You have been assigned ~g~%s~s~.',
+    ['drive_to_first_marker']               = 'Get in bus and drive to first stop at ~g~%s~.',
     ['drive_to_next_marker']                = 'Continue to next stop at ~g~%s~.',
     ['no_passengers_loading_or_unloading']  = 'No passengers loading or unloading on this stop',
     ['no_passengers_unloading']             = 'Wait for passengers to finish loading',
@@ -62,8 +63,11 @@ Locales['en'] = {
     ['stop_metro_vespucci_ginger']          = 'Vespucci Blvd / Ginger St',
     ['stop_metro_ginger']                   = 'Ginger St',
     ['stop_metro_sanandreas_ginger']        = 'San Andreas Ave / Ginger St',
-    ['stop_metro_alta_gruppe']              = 'Alta St at Gruppe Sehs',
-    ['stop_metro_fib']                      = 'San Andreas Ave at FIB'
-
+    ['stop_metro_alta_gruppe']              = 'Alta St at Gruppe Sechs',
+    ['stop_metro_fib']                      = 'San Andreas Ave at FIB',
+    ['stop_metro_delperro_rockford']        = 'Del Perro Blvd / Rockford Dr',
+    ['stop_metro_delperro_morningwood']     = 'Del Perro Blvd / Morningwood Blvd',
+    ['stop_metro_delperro_plaza']           = 'Del Perro Plaza',
+    ['stop_metro_marathon_baycity']         = 'Marathon Ave / Bay City Ave',
     ['stop_tbd'] = 'todo'
 }