Busfahrer und PilotenSystem überarbeitet, LoginAmbiente eingefügt, Überarbeitung der Türen

This commit is contained in:
Mac_Slash
2020-04-30 03:54:20 +02:00
parent ef7cde3db5
commit 51fdc16a6f
16 changed files with 516 additions and 230 deletions

View File

@@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Job
public override string Name => "Busfahrer";
public override bool NeedVehicleToStart => true;
public override bool NeedVehicleToStart => false;
private readonly IReadOnlyCollection<Vector3> Route1 = new List<Vector3>
{
@@ -104,7 +104,7 @@ namespace ReallifeGamemode.Server.Job
private void BusDriverJob_JobStart(Player player)
{
List<String> listRouteTexts = new List<string>();
/*List<String> listRouteTexts = new List<string>();
List<String> listRouteTexts2 = new List<string>();
List<String> listRouteTexts3 = new List<string>();
@@ -128,36 +128,106 @@ namespace ReallifeGamemode.Server.Job
listRouteTexts.Add("Lang 2");
player.TriggerEvent("showBusRouteMenu", JsonConvert.SerializeObject(listRouteTexts));
}*/
/*Random rnd = new Random();
int rroute = rnd.Next(1, 6);
switch (rroute)
{
case 1:
{
StartBusRoute(player, "Route1");
break;
}
case 2:
{
StartBusRoute(player, "Route2");
break;
}
case 3:
{
StartBusRoute(player, "Route3");
break;
}
case 4:
{
StartBusRoute(player, "Route4");
break;
}
case 5:
{
StartBusRoute(player, "Route5");
break;
}
}*/
if (player.GetUser().BusSkill < 300)
{
Random rnd = new Random();
int rroute = rnd.Next(1, 3);
switch (rroute)
{
case 1:
{
StartBusRoute(player, "Route1");
break;
}
case 2:
{
StartBusRoute(player, "Route2");
break;
}
}
}
if (player.GetUser().BusSkill > 300 && player.GetUser().BusSkill < 300)
{
Random rnd = new Random();
int rroute = rnd.Next(1, 3);
switch (rroute)
{
case 1:
{
StartBusRoute(player, "Route3");
break;
}
case 2:
{
StartBusRoute(player, "Route4");
break;
}
}
}
if (player.GetUser().BusSkill >= 800)
{
StartBusRoute(player, "Route5");
}
}
[RemoteEvent("startBusRoute")]
public void StartBusRoute(Player player, string type)
{
if (player.VehicleSeat == 0)
{
if (type == "Kurz 1")
//if (player.VehicleSeat == 0)
//{
if (type == "Route1")
{
CheckPointHandle.StartCheckPointRoute(player, Route1, 4000, 1, 7, 5, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, Route1, 5000, 1, 7, 5, "busDriverJob");
}
else if (type == "Kurz 2")
else if (type == "Route2")
{
CheckPointHandle.StartCheckPointRoute(player, Route2, 4000, 1, 7, 5, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, Route2, 5000, 1, 7, 5, "busDriverJob");
}
else if (type == "Mittel 1")
else if (type == "Route3")
{
CheckPointHandle.StartCheckPointRoute(player, Route3, 4000, 1, 7, 5, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, Route3, 5000, 1, 7, 5, "busDriverJob");
}
else if (type == "Lang 1")
else if (type == "Route4")
{
CheckPointHandle.StartCheckPointRoute(player, RouteLong, 4000, 1, 7, 5, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, RouteLong, 5000, 1, 7, 5, "busDriverJob");
}
else if (type == "Lang 2")
else if (type == "Route5")
{
CheckPointHandle.StartCheckPointRoute(player, RouteVeryLong, 4000, 1, 7, 5, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, RouteVeryLong, 5000, 1, 7, 5, "busDriverJob");
}
player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 50);
}
//}
}
public static void payWage(Player jobber, int wage)
@@ -166,8 +236,8 @@ namespace ReallifeGamemode.Server.Job
{
if (jobber.VehicleSeat == 0)
{
jobber.GetUser(dbContext).BankAccount.Balance += wage;
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast ~g~${wage} ~w~bekommen.");
jobber.GetUser(dbContext).Wage += wage;
jobber.SendNotification($"~y~[JOB] ~g~+{wage}$");
jobber.GetUser(dbContext).BusSkill++;
dbContext.SaveChanges();
if (jobber.GetUser(dbContext).BusSkill == 300)
@@ -206,14 +276,24 @@ namespace ReallifeGamemode.Server.Job
{
case 1:
{
c.StartBusRoute(player, "Kurz 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Kurz 1");
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, "Route1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 1");
}, delayTime: 30000);
break;
}
case 2:
{
c.StartBusRoute(player, "Kurz 2");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Kurz 2");
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, "Route2");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 2");
}, delayTime: 30000);
break;
}
}
@@ -226,22 +306,37 @@ namespace ReallifeGamemode.Server.Job
{
case 1:
{
c.StartBusRoute(player, "Lang 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Lang 1");
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, "Route3");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 3");
}, delayTime: 30000);
break;
}
case 2:
{
c.StartBusRoute(player, "Lang 2");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Lang 2");
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, "Route4");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 4");
}, delayTime: 30000);
break;
}
}
}
if (v.Model == (uint)Types.VehicleModel.Tourbus)
{
c.StartBusRoute(player, "Mittel 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Mittel 1");
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, "Route5");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 5");
}, delayTime: 30000);
}
}
}