diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index 0c1efa69..e3135d51 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -50,23 +50,33 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); return; } + else if(u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty()) + { + } else { - if ((VehicleHash)vehicle.Model == VehicleHash.Velum || (VehicleHash)vehicle.Model == VehicleHash.Velum2 && player.GetUser().PilotSkill < 300 || !player.IsAdminDuty()) + if ((VehicleHash)vehicle.Model == VehicleHash.Velum && player.GetUser().PilotSkill < 300) + { + player.SetData("JobVehicleFrei", true); + player.StopAnimation(); + player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); + return; + } + if ((VehicleHash)vehicle.Model == VehicleHash.Velum2 && player.GetUser().PilotSkill < 300) { player.SetData("JobVehicleFrei", true); player.StopAnimation(); player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); return; } - if ((VehicleHash)vehicle.Model == VehicleHash.Coach && player.GetUser().BusSkill < 300 || !player.IsAdminDuty()) + if ((VehicleHash)vehicle.Model == VehicleHash.Coach && player.GetUser().BusSkill < 300) { player.SetData("JobVehicleFrei", true); player.StopAnimation(); player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); return; } - if ((VehicleHash)vehicle.Model == VehicleHash.Tourbus && player.GetUser().BusSkill < 800 || !player.IsAdminDuty()) + if ((VehicleHash)vehicle.Model == VehicleHash.Tourbus && player.GetUser().BusSkill < 800) { player.SetData("JobVehicleFrei", true); player.StopAnimation(); diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index b9e15f53..dbecf46c 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -95,7 +95,13 @@ namespace ReallifeGamemode.Server.Job private readonly IReadOnlyCollection Skill2Route2 = new List//Bus_Skill_2_Route_2 { - new Vector3(-562.68, -2203.85, 5.5), + new Vector3(1925.767333984375, 2614.566162109375, 46.16560363769531), + new Vector3(299.0667419433594, 2642.93798828125, 44.60177993774414), + new Vector3(1162.4556884765625, 1806.3663330078125, 74.3133773803711), + new Vector3(1297.0450439453125, 1105.742919921875, 105.6315689086914), + new Vector3(-524.4381103515625, -268.2084045410156, 35.28974533081055), + new Vector3(427.09521484375, -960.2006225585938, 29.13089942932129), + new Vector3(-567.5792846679688, -2212.6533203125, 5.859220504760742), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route3 = new List//Bus_Skill_2_Route_3 { @@ -110,12 +116,40 @@ namespace ReallifeGamemode.Server.Job private readonly IReadOnlyCollection Skill3Route1 = new List//Bus_Skill_3_Route_1 { - new Vector3(-562.68, -2203.85, 5.5), + new Vector3(-598.849365234375, -2053.087646484375, 5.8428778648376465), + new Vector3(-229.679931640625, -2049.821533203125, 27.384798049926758), + new Vector3(-72.33480834960938, -615.8173217773438, 35.91234588623047), + new Vector3(-176.9166717529297, -153.85665893554688, 43.38493728637695), + new Vector3(-508.5746765136719, -261.1121826171875, 35.247962951660156), + new Vector3(-1396.5457763671875, 51.69581604003906, 53.21350860595703), + new Vector3(-1911.845458984375, 205.62884521484375, 84.06185150146484), + new Vector3(-1675.4029541015625, 488.7856140136719, 128.6395721435547), + new Vector3(-995.8155517578125, 589.4381713867188, 102.18698120117188), + new Vector3(-314.6571350097656, 451.9184875488281, 107.99801635742188), + new Vector3(211.09194946289062, 350.1848449707031, 105.41163635253906), + new Vector3(599.4515380859375, 626.0756225585938, 128.6754608154297), + new Vector3(969.324462890625, 164.03329467773438, 80.59388732910156), + new Vector3(1069.521240234375, -763.7572631835938, 57.43597412109375), + new Vector3(1421.075927734375, -1854.2821044921875, 70.56175994873047), + new Vector3(268.5604248046875, -2070.274169921875, 16.816179275512695), + new Vector3(-147.51795959472656, -1974.3182373046875, 22.48438262939453), + new Vector3(-569.0294189453125, -2210.80908203125, 5.571292877197266), }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route2 = new List//Bus_Skill_3_Route_2 { - new Vector3(-562.68, -2203.85, 5.5), + new Vector3(-597.8766479492188, -2053.534423828125, 5.853154182434082), + new Vector3(-895.4871826171875, -2074.380126953125, 8.602267265319824), + new Vector3(-667.8001708984375, -1233.9366455078125, 10.274462699890137), + new Vector3(-1349.004150390625, -1119.2432861328125, 4.00660514831543), + new Vector3(-2127.448974609375, -333.7845153808594, 13.013818740844727), + new Vector3(-1426.419189453125, -90.23416137695312, 51.81801223754883), + new Vector3(-827.4555053710938, -235.72817993164062, 36.84095764160156), + new Vector3(-558.2310791015625, -161.801513671875, 37.93125534057617), + new Vector3(220.4048309326172, -852.0598754882812, 29.874643325805664), + new Vector3(363.25042724609375, -1470.600830078125, 28.91864776611328), + new Vector3(-200.07644653320312, -1941.02783203125, 27.382631301879883), + new Vector3(-605.2278442382812, -2087.974853515625, 5.752280235290527), }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route3 = new List//Bus_Skill_3_Route_3 { diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index 53450ce3..62fa0160 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -167,7 +167,7 @@ namespace ReallifeGamemode.Server.Job if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 1) { Random rnd = new Random(); - int rroute = rnd.Next(1, 4); + int rroute = rnd.Next(1, 3); switch (rroute) { case 1: @@ -184,19 +184,19 @@ namespace ReallifeGamemode.Server.Job player.SetData("Route", "Skill1Route2"); break; } - case 3: + /*case 3: { CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 3"); player.SetData("Route", "Skill1Route3"); break; - } + }*/ } } if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2) { Random rnd = new Random(); - int rroute = rnd.Next(1, 4); + int rroute = rnd.Next(1, 3); switch (rroute) { case 1: @@ -213,13 +213,13 @@ namespace ReallifeGamemode.Server.Job player.SetData("Route", "Skill2Route2"); break; } - case 3: + /*case 3: { CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 3"); player.SetData("Route", "Skill2Route3"); break; - } + }*/ } } } diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 2652883d..fce5dcf4 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -225,14 +225,17 @@ namespace ReallifeGamemode.Server.Job if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); } player.TriggerEvent("SERVER:MuellmannZuBase"); } - if(target != null) - { - player.GetUser().Wage += 10; - target.GetUser().Wage += 10; - } else { - player.GetUser().Wage += 20; + if (target != null) + { + player.GetUser().Wage += 10; + target.GetUser().Wage += 10; + } + else + { + player.GetUser().Wage += 20; + } } return; } diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 7fb50d4b..5bb1e4bb 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -307,7 +307,7 @@ namespace ReallifeGamemode.Server.Managers }*/ if (player.GetUser().JobId == 2)//Müllmann { - player.Position = new Vector3(-428.9902038574219, -1726.5357666015625, 19.783836364746094); + player.Position = new Vector3(485.4114685058594, -2173.25, 5.918273448944092); player.Heading = (-15.922085762023926f); } if (player.GetUser().JobId == 3)//Pilot