diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index ff14fa29..569b71e7 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -45,26 +45,17 @@ namespace ReallifeGamemode.Server.DrivingSchool new Vector3(4.841759, -1761.316, 28.91519), new Vector3(44.69115, -1805.247, 25.07369), new Vector3(111.6519, -1822.466, 26.03703), - //SCHROTTPLATZ - new Vector3(-394.8713, -1734.21, 19.23653), - new Vector3(-459.7604, -1696.029, 18.62012), - new Vector3(-475.5448, -1670.373, 18.34653), - new Vector3(-453.5338, -1665.695, 18.64714), - new Vector3(-449.6863, -1680.451, 18.66275), - new Vector3(-467.9489, -1728.37, 18.27419), - new Vector3(-520.4453, -1703.146, 18.80065), - new Vector3(-522.3558, -1680.122, 18.88261), - new Vector3(-509.998, -1691.828, 18.91303), - new Vector3(-526.3292, -1685.291, 18.83323), - new Vector3(-551.9138, -1651.865, 18.81676), - new Vector3(-529.8453, -1626.317, 17.41884), - new Vector3(-491.7721, -1648.275, 17.43219), - new Vector3(-550.9622, -1662.636, 18.82121), - new Vector3(-496.3094, -1736.833, 18.33857), - new Vector3(-417.4822, -1712.987, 19.10845), - //ENDE - new Vector3(-498.1252, -1879.154, 17.22348), - new Vector3(-754.5391, -1300.816, 4.617907) + //AUTOBAHN-ENDE + new Vector3(-270.89, -1461.01, 30.81), + new Vector3(-369.08, -1415.37, 28.68), + new Vector3(-114.48, -1251.43, 36.59), + new Vector3(59.22, -1261.71, 28.84), + new Vector3(39.12, -1165.28, 28.87), + new Vector3(-307.52, -1200.85, 36.79), + new Vector3(-441.79, -1251.67, 45.37), + new Vector3(-463.77, -1405.07, 28.71), + new Vector3(-617.66, -1259.34, 10.82), + new Vector3(-758.35, -1285.03, 4.48), }.AsReadOnly(); public static void Setup() @@ -97,9 +88,7 @@ namespace ReallifeGamemode.Server.DrivingSchool if (user.DriverLicenseVehicle) return; - ChatService.SendMessage(client, "Du hast die Führerscheinprüfung gestartet."); - ChatService.SendMessage(client, "Steige nun in eines der Fahrschulautos"); - + client.TriggerEvent("renderTextOnScreen", "Sie haben die Führerscheinprüfung gestartet. Steigen Sie in eines der Fahrschulautos ein."); client.TriggerEvent("waitPlayerEntersVehicle"); } @@ -114,7 +103,7 @@ namespace ReallifeGamemode.Server.DrivingSchool } else { - ChatService.SendMessage(user, "Gut nun kann die Prüfung losgehen"); + user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen"); user.TriggerEvent("stopTimer"); CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 1, "drivingSchoolEvent"); @@ -125,73 +114,24 @@ namespace ReallifeGamemode.Server.DrivingSchool public void DrivingSchoolEvent(Client user, int checkpoint) { ChatService.Broadcast("CP " + checkpoint); - if (checkpoint == 0 || checkpoint == 4) - { - ChatService.SendMessage(user, "Halte an der Kreuzung kurz an"); - } - else if (checkpoint == 1 || checkpoint == 5) - { - user.TriggerEvent("waitHere", user, DrivingRoute.ElementAt(checkpoint), 2000); - } - else if (checkpoint == 2) - { - user.TriggerEvent("checkWait"); - ChatService.SendMessage(user, "Schaue an der nächsten Kreuzung nach rechts"); - } - else if (checkpoint == 3) - { - //0.74850505590443884 -0.04975615441799164 - Single angle1 = (float)0.7485050; - Single angle2 = (float)-0.0497561; - user.TriggerEvent("lookDirection", "rechts", angle1, angle2); - } - else if (checkpoint == 6) - { - user.TriggerEvent("checkWait"); - } - else if (checkpoint == 7) + + if (checkpoint == 7) { user.TriggerEvent("checkWait"); ChatService.SendMessage(user, "Schaue an der nächsten Kreuzung nach links"); } - else if (checkpoint == 8) - { - Single angle1 = (float)0.9669561; - Single angle2 = (float)0.3818159; - user.TriggerEvent("lookDirection", "links", angle1, angle2); - } else if (checkpoint == 9) { - ChatService.SendMessage(user, "Fahre nun Slalom an den Laternen"); + user.TriggerEvent("renderTextOnScreen", "Fahre zwischen den Laternen Slalom"); } else if (checkpoint == 20) { - ChatService.SendMessage(user, "Verlasse nun den Parkplatz"); + user.TriggerEvent("renderTextOnScreen", "Verlasse nun den Parkplatz"); } - else if (checkpoint == 24) - { - ChatService.SendMessage(user, "Parke gleich seitlich ein"); - } - /* else if (checkpoint == 25) + else if (checkpoint == 32) { - bool parked = false; - float rotation; - - while (!parked) - { - rotation = user.Vehicle.Rotation.Z; - if (rotation >= 333.913 && rotation <= 354.6108) - { - ChatService.SendMessage(user, "Perfekt!"); - parked = true; - } - System.Threading.Thread.Sleep(100); - } - }*/ - else if (checkpoint == 26) - { - ChatService.SendMessage(user, "Bestanden!"); - User spieler = user.GetUser(); + user.TriggerEvent("renderTextOnScreen", "Du hast den Führerschein bestanden. Glückwunsch"); + User spieler = user.GetUser(); using (var dbContext = new DatabaseContext()) { User drivingUser = dbContext.Users.Where(u => u.Id == spieler.Id).FirstOrDefault();