diff --git a/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts b/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts index 9f09ddcc..6f8db6db 100644 --- a/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts +++ b/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts @@ -38,7 +38,7 @@ export default function PilotRouteList(globalData: GlobalData) { routeMenu.AddItem(sendItem); routeMenu.AddItem(cancelItem); routeMenu.Visible = true; - routeText = "Kurz 1"; + routeText = "Route 1"; routeMenu.ListChange.on((item, index) => { switch (item.Text) { diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index 2ecae7cf..cc2dd148 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -81,7 +81,6 @@ namespace ReallifeGamemode.Server.DrivingSchool { ChatService.SendMessage(user, "Gut nun kann die Prüfung losgehen."); user.TriggerEvent("stopTimer"); - CheckPointHandle.StartCheckPointRoute(user, planeRoute, 0, 6, "planeSchoolEvent"); } } @@ -96,8 +95,16 @@ namespace ReallifeGamemode.Server.DrivingSchool else if(checkpoint == 10 || checkpoint == 14) { ChatService.SendMessage(user, "Setze zum landeflug an."); + + } + else if (checkpoint == 15) + { + ChatService.SendMessage(user, "Du hast deinen Flugschein bestanden."); + + } + } } } diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index 38255f53..ca856dea 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -57,6 +57,18 @@ namespace ReallifeGamemode.Server.Job new Vector3(2028.63, 4842.29, 437.01), }.AsReadOnly(); + private readonly IReadOnlyCollection Route4 = new List + { + new Vector3(893.99, -3091.43, 326.67), + new Vector3(1712.6, -1676.47, 384.2), + new Vector3(2501.18, -446.15, 339.48), + new Vector3(2706.43, 1408.93, 251.08), + new Vector3(3568.08, 3644.51, 326.06), + new Vector3(314.92, 2877.15, 173.73), + new Vector3(-2044.89, 3141.58, 378.07), + new Vector3(-2333.96, 510.26, 660.64), + }.AsReadOnly(); + public PilotJob() @@ -67,11 +79,26 @@ namespace ReallifeGamemode.Server.Job private void PilotJob_JobStart(Client player) { List listRouteTexts = new List(); - listRouteTexts.Add("Route 1"); - listRouteTexts.Add("Route 2"); - listRouteTexts.Add("Route 3"); + List listRouteTexts2 = new List(); - player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts)); + Vehicle veh = player.Vehicle; + + if (veh.DisplayName == "Velum") + { + + listRouteTexts2.Add("Route 4"); + + player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts2)); + } + else + { + listRouteTexts.Add("Route 1"); + listRouteTexts.Add("Route 2"); + listRouteTexts.Add("Route 3"); + + player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts)); + } + } [RemoteEvent("startPilotRoute")] public void StartPilotRoute(Client player, string type) @@ -88,6 +115,10 @@ namespace ReallifeGamemode.Server.Job { CheckPointHandle.StartCheckPointRoute(player, Route3, 0, 6, ""); } + else if (type == "Route 4") + { + CheckPointHandle.StartCheckPointRoute(player, Route4, 0, 6, ""); + } } } }