aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Busfahrer, Pilot, Bugfix + Neue Routen + Routenfix

Browse Source
This commit is contained in:
Mac_Slash
2020-05-14 00:07:05 +02:00
parent 7692c86f68
commit e2f6edd099
10 changed files with 166 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -8,6 +8,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Server.Job
{
@@ -21,73 +23,74 @@ namespace ReallifeGamemode.Server.Job
private readonly IReadOnlyCollection<Vector3> Skill1Route1 = new List<Vector3>//Bus_Skill_1_Route_1
{
new Vector3(-1018.1577758789062, -2732.403564453125, 13.658967971801758),
new Vector3(-153.04013061523438, -2033.8385009765625, 22.712543487548828),
new Vector3(50.42457580566406, -1536.9090576171875, 29.184476852416992),
new Vector3(361.1451721191406, -1064.6044921875, 29.36113166809082),
new Vector3(119.01465606689453, -785.609619140625, 31.267763137817383),
new Vector3(-172.00689697265625, -815.9910888671875, 31.13607406616211),
new Vector3(-707.7088623046875, -826.9969482421875, 23.451000213623047),
new Vector3(-658.1038818359375, -1393.321533203125, 10.509778022766113),
new Vector3(-1018.1826171875, -2732.371826171875, 13.656649589538574),
new Vector3(-647.2696533203125, -2215.64501953125, 5.989798069000244),
new Vector3(-1018.1577758789062, -2732.403564453125, 10.658967971801758),
new Vector3(-153.04013061523438, -2033.8385009765625, 19.712543487548828),
new Vector3(50.42457580566406, -1536.9090576171875, 26.184476852416992),
new Vector3(361.1451721191406, -1064.6044921875, 26.36113166809082),
new Vector3(119.01465606689453, -785.609619140625, 28.267763137817383),
new Vector3(-172.00689697265625, -815.9910888671875, 28.13607406616211),
new Vector3(-707.7088623046875, -826.9969482421875, 20.451000213623047),
new Vector3(-658.1038818359375, -1393.321533203125, 7.509778022766113),
new Vector3(-1018.1826171875, -2732.371826171875, 10.656649589538574),
new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill1Route2 = new List<Vector3>//Bus_Skill_1_Route_2
{
new Vector3(-567.6445922851562, -1233.4453125, 15.050300598144531),
new Vector3(-509.224609375, -668.373291015625, 33.02402877807617),
new Vector3(55.00559997558594, -749.8328247070312, 44.11421203613281),
new Vector3(-173.65509033203125, -152.5533905029297, 43.615516662597656),
new Vector3(-523.8310546875, -266.884033203125, 35.291507720947266),
new Vector3(-1167.646728515625, -400.75, 35.39745330810547),
new Vector3(-1408.329345703125, -567.8721923828125, 30.22767448425293),
new Vector3(-1213.3565673828125, -1214.755859375, 7.5853986740112305),
new Vector3(-746.8554077148438, -2372.227783203125, 14.740862846374512),
new Vector3(-660.7366333007812, -2206.03662109375, 5.988998889923096),
new Vector3(-567.6445922851562, -1233.4453125, 12.050300598144531),
new Vector3(-509.224609375, -668.373291015625, 30.02402877807617),
new Vector3(55.00559997558594, -749.8328247070312, 41.11421203613281),
new Vector3(-173.65509033203125, -152.5533905029297, 40.615516662597656),
new Vector3(-523.8310546875, -266.884033203125, 32.291507720947266),
new Vector3(-1167.646728515625, -400.75, 32.39745330810547),
new Vector3(-1408.329345703125, -567.8721923828125, 27.22767448425293),
new Vector3(-1213.3565673828125, -1214.755859375, 4.5853986740112305),
new Vector3(-746.8554077148438, -2372.227783203125, 11.740862846374512),
new Vector3(-660.7366333007812, -2206.03662109375, 2.988998889923096),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill1Route3 = new List<Vector3>//Bus_Skill_1_Route_3
{
new Vector3(423.4793395996094, -2143.4169921875, 18.23659896850586),
new Vector3(875.1618041992188, -1766.7913818359375, 29.780052185058594),
new Vector3(1166.110107421875, -1422.72265625, 34.477935791015625),
new Vector3(807.715087890625, -1356.7987060546875, 26.29298210144043),
new Vector3(785.9387817382812, -780.5958251953125, 26.333005905151367),
new Vector3(895.2793579101562, 55.24346923828125, 78.82550048828125),
new Vector3(775.8052368164062, 596.2352905273438, 125.77734375),
new Vector3(307.64422607421875, -762.0469360351562, 29.197702407836914),
new Vector3(-105.66091918945312, -1683.9630126953125, 29.190542221069336),
new Vector3(-644.0516967773438, -2218.673828125, 5.991928577423096),
new Vector3(423.4793395996094, -2143.4169921875, 15.23659896850586),
new Vector3(875.1618041992188, -1766.7913818359375, 26.780052185058594),
new Vector3(1166.110107421875, -1422.72265625, 31.477935791015625),
new Vector3(807.715087890625, -1356.7987060546875, 23.29298210144043),
new Vector3(785.9387817382812, -780.5958251953125, 23.333005905151367),
new Vector3(895.2793579101562, 55.24346923828125, 75.82550048828125),
new Vector3(775.8052368164062, 596.2352905273438, 122.77734375),
new Vector3(307.64422607421875, -762.0469360351562, 26.197702407836914),
new Vector3(-105.66091918945312, -1683.9630126953125, 26.190542221069336),
new Vector3(-644.0516967773438, -2218.673828125, 2.991928577423096),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill1Route4 = new List<Vector3>//Bus_Skill_1_Route_4
{
new Vector3(-694.1781616210938, -1199.3873291015625, 10.50633716583252),
new Vector3(-1408.264892578125, -567.5278930664062, 30.21875),
new Vector3(-1681.6112060546875, -503.3702392578125, 37.79117965698242),
new Vector3(-1427.05712890625, -90.17198181152344, 52.015113830566406),
new Vector3(-686.4015502929688, -374.3297424316406, 34.17094802856445),
new Vector3(-509.60107421875, -668.41796875, 33.02873229980469),
new Vector3(234.6927032470703, -857.5449829101562, 29.747934341430664),
new Vector3(787.8258666992188, -1364.9345703125, 26.424083709716797),
new Vector3(825.1477661132812, -1634.5733642578125, 30.521774291992188),
new Vector3(-105.38816833496094, -1683.646728515625, 29.19083023071289),
new Vector3(-655.6530151367188, -2209.579345703125, 5.98785924911499),
new Vector3(-694.1781616210938, -1199.3873291015625, 7.50633716583252),
new Vector3(-1408.264892578125, -567.5278930664062, 27.21875),
new Vector3(-1681.6112060546875, -503.3702392578125, 34.79117965698242),
new Vector3(-1427.05712890625, -90.17198181152344, 49.015113830566406),
new Vector3(-686.4015502929688, -374.3297424316406, 31.17094802856445),
new Vector3(-509.60107421875, -668.41796875, 30.02873229980469),
new Vector3(234.6927032470703, -857.5449829101562, 26.747934341430664),
new Vector3(787.8258666992188, -1364.9345703125, 23.424083709716797),
new Vector3(825.1477661132812, -1634.5733642578125, 27.521774291992188),
new Vector3(-105.38816833496094, -1683.646728515625, 26.19083023071289),
new Vector3(-655.6530151367188, -2209.579345703125, 2.98785924911499),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill2Route1 = new List<Vector3>//Bus_Skill_2_Route_1
{
new Vector3(-1042.6405029296875, -2718.244384765625, 14.493847846984863),
new Vector3(832.205322265625, -11.559977531433105, 79.72754669189453),
new Vector3(2563.96826171875, 2633.976806640625, 37.279945373535156),
new Vector3(1684.845947265625, 6402.1533203125, 30.877294540405273),
new Vector3(-170.82965087890625, 6374.9560546875, 30.695466995239258),
new Vector3(-1524.5302734375, 4998.1220703125, 62.54846954345703),
new Vector3(-3234.168701171875, 974.0481567382812, 12.890801429748535),
new Vector3(-1331.8995361328125, -1052.2794189453125, 7.4408793449401855),
new Vector3(-1042.6405029296875, -2718.244384765625, 9.493847846984863),
new Vector3(832.205322265625, -11.559977531433105, 76.72754669189453),
new Vector3(2563.96826171875, 2633.976806640625, 35.279945373535156),
new Vector3(1684.845947265625, 6402.1533203125, 28.877294540405273),
new Vector3(-170.82965087890625, 6374.9560546875, 28.695466995239258),
new Vector3(-1524.5302734375, 4998.1220703125, 60.54846954345703),
new Vector3(-3234.168701171875, 974.0481567382812, 10.890801429748535),
new Vector3(-1331.8995361328125, -1052.2794189453125, 5.4408793449401855),
new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244),
}.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill2Route2 = new List<Vector3>//Bus_Skill_2_Route_2
{
@@ -429,8 +432,63 @@ namespace ReallifeGamemode.Server.Job
player.SendChatMessage("~y~[JOB] ~w~Die neue Route Lädt. Bitte Warten...");
NAPI.Task.Run(() =>
{
player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
c.StartBusRoute(player, "RouteStart");
if (player.VehicleSeat == 0)
{
player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
c.StartBusRoute(player, "RouteStart");
}
else
{
Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
if (LastVehicle.GetServerVehicle() is JobVehicle vehJ)
{
if (LastVehicle.GetData<bool>("timerJobVehicleRespawn") == true)
{
if (vehJ.GetJob().GetUsersInJob().Contains(player))
{
if (LastVehicle != null)
{
LastVehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle);
ServerVehicleExtensions.Spawn(sVeh, LastVehicle);
job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player);
if (!player.HasData("isDead") || player.GetData<bool>("isDead") == false)
{
if (player.GetUser().JobId == 1)//Taxifahrer
{
//VehicleManager.DeleteVehicle(v);
}
if (player.GetUser().JobId == 2)//Müllmann
{
//VehicleManager.DeleteVehicle(v);
}
if (player.GetUser().JobId == 3)//Pilot
{
if (!player.HasData("PilotenBase") || player.GetData<int>("PilotenBase") == 1) //Sandyshores
{
player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406);
player.Heading = (-154.65234375f);
}
if (player.HasData("PilotenBase") && player.GetData<int>("PilotenBase") == 2) //LS Airport
{
player.Position = new Vector3(-1622.48, -3151.58, 13);
player.Heading = (48.44f);
}
}
if (player.GetUser().JobId == 4)//Busfahrer
{
player.Position = new Vector3(-535.46, -2144.97, 5.95);
player.Heading = (57.03f);
}
}
}
}
}
}
}
/*if (v.Model == (uint)Types.VehicleModel.Bus)
{
player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);