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

Nachträgliche Migrationsänderung

Browse Source
This commit is contained in:
Mac_Slash
2020-04-28 18:53:22 +02:00
parent d7f45de417
commit bba265f9d9
11 changed files with 413 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
namespace ReallifeGamemode.Server.Job
{
class BusDriverJob : JobBase
public class BusDriverJob : JobBase
{
public override int Id => 4;
@@ -108,14 +108,14 @@ namespace ReallifeGamemode.Server.Job
Vehicle veh = player.Vehicle;
if (veh.DisplayName == "Bus")
if ((VehicleHash)veh.Model == VehicleHash.Bus)
{
listRouteTexts2.Add("Kurz 1");
listRouteTexts2.Add("Kurz 2"); ;
player.TriggerEvent("showBusRouteMenu", JsonConvert.SerializeObject(listRouteTexts2));
}
else if (veh.DisplayName == "Tourbus")
else if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
{
listRouteTexts3.Add("Mittel 1");
player.TriggerEvent("showBusRouteMenu", JsonConvert.SerializeObject(listRouteTexts3));
@@ -134,23 +134,23 @@ namespace ReallifeGamemode.Server.Job
{
if (type == "Kurz 1")
{
CheckPointHandle.StartCheckPointRoute(player, Route1, 3000, 1, 7, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, Route1, 3000, 1, 7, 5, "busDriverJob");
}
else if (type == "Kurz 2")
{
CheckPointHandle.StartCheckPointRoute(player, Route2, 3000, 1, 7, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, Route2, 3000, 1, 7, 5, "busDriverJob");
}
else if (type == "Mittel 1")
{
CheckPointHandle.StartCheckPointRoute(player, Route3, 3000, 1, 7, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, Route3, 3000, 1, 7, 5, "busDriverJob");
}
else if (type == "Lang 1")
{
CheckPointHandle.StartCheckPointRoute(player, RouteLong, 3000, 1, 7, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, RouteLong, 3000, 1, 7, 5, "busDriverJob");
}
else if (type == "Lang 2")
{
CheckPointHandle.StartCheckPointRoute(player, RouteVeryLong, 3000, 1, 7, "busDriverJob");
CheckPointHandle.StartCheckPointRoute(player, RouteVeryLong, 3000, 1, 7, 5, "busDriverJob");
}
}
@@ -160,6 +160,9 @@ namespace ReallifeGamemode.Server.Job
using (var dbContext = new DatabaseContext())
{
jobber.GetUser(dbContext).BankAccount.Balance += wage;
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast ~g~${wage} ~w~bekommen.");
jobber.GetUser(dbContext).BusSkill++;
dbContext.SaveChanges();
if (jobber.GetUser(dbContext).BusSkill == 300)
{
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast nun ~g~Skill-Level 2 ~w~erreicht!");
@@ -170,13 +173,15 @@ namespace ReallifeGamemode.Server.Job
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast nun ~g~Skill-Level 3 ~w~erreicht!");
jobber.SendChatMessage($"~y~[JOB] ~w~Du kannst jetzt mit dem Coach, und dem Tourbus fahren!");
}
jobber.GetUser(dbContext).BusSkill++;
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast ~g~${wage} ~w~bekommen.");
dbContext.SaveChanges();
//BusLetzterCheckpoint(jobber);
//BusDriverJob rt = null;
//rt.BusLetzterCheckpoint()
}
}
public void BusLetzterCheckpoint(Player player)
[RemoteEvent("BusLetzterCheckpoint")]
public static void BusLetzterCheckpoint(Player player)
{
BusDriverJob c = new BusDriverJob();
Vehicle v = player.Vehicle;
if (v.Model == (uint)Types.VehicleModel.Bus)
{
@@ -186,13 +191,15 @@ namespace ReallifeGamemode.Server.Job
{
case 1:
{
StartBusRoute(player, "Kurz 1");
c.StartBusRoute(player, "Kurz 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Kurz 1");
break;
}
case 2:
{
StartBusRoute(player, "Kurz 2");
break;
c.StartBusRoute(player, "Kurz 2");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Kurz 2");
break;
}
}
}
@@ -204,19 +211,22 @@ namespace ReallifeGamemode.Server.Job
{
case 1:
{
StartBusRoute(player, "Lang 1");
c.StartBusRoute(player, "Lang 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Lang 1");
break;
}
case 2:
{
StartBusRoute(player, "Lang 2");
c.StartBusRoute(player, "Lang 2");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Lang 2");
break;
}
}
}
if (v.Model == (uint)Types.VehicleModel.Tourbus)
{
StartBusRoute(player, "Mittel 1");
c.StartBusRoute(player, "Mittel 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Mittel 1");
}
}
}

89
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -3,6 +3,8 @@ using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Server.Job
{
class PilotJob : JobBase
@@ -115,7 +117,7 @@ namespace ReallifeGamemode.Server.Job
Vehicle veh = player.Vehicle;
if (veh.DisplayName == "Velum")
if ((VehicleHash)veh.Model == VehicleHash.Velum || (VehicleHash)veh.Model == VehicleHash.Velum2)
{
listRouteTexts2.Add("Route 4");
@@ -139,27 +141,100 @@ namespace ReallifeGamemode.Server.Job
{
if (type == "Route 1")
{
CheckPointHandle.StartCheckPointRoute(player, Route1, 0, 6, 12, "");
CheckPointHandle.StartCheckPointRoute(player, Route1, 0, 6, 40, 40, "pilotJob"); //6, 23, 25, 26, 27, 28
}
else if (type == "Route 2")
{
CheckPointHandle.StartCheckPointRoute(player, Route2, 0, 6, 12, "");
CheckPointHandle.StartCheckPointRoute(player, Route2, 0, 6, 40, 40, "pilotJob");
}
else if (type == "Route 3")
{
CheckPointHandle.StartCheckPointRoute(player, Route3, 0, 6, 12, "");
CheckPointHandle.StartCheckPointRoute(player, Route3, 0, 6, 40, 40, "pilotJob");
}
else if (type == "Route 4")
{
CheckPointHandle.StartCheckPointRoute(player, Route4, 0, 6, 12, "");
CheckPointHandle.StartCheckPointRoute(player, Route4, 0, 6, 40, 40, "pilotJob");
}
else if (type == "Route 5")
{
CheckPointHandle.StartCheckPointRoute(player, Route5, 0, 6, 12, "");
CheckPointHandle.StartCheckPointRoute(player, Route5, 0, 6, 40, 40, "pilotJob");
}
else if (type == "Route 6")
{
CheckPointHandle.StartCheckPointRoute(player, Route6, 0, 6, 12, "");
CheckPointHandle.StartCheckPointRoute(player, Route6, 0, 6, 40, 40, "pilotJob");
}
}
public static void payWage(Player jobber, int wage)
{
using (var dbContext = new DatabaseContext())
{
jobber.GetUser(dbContext).BankAccount.Balance += wage;
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast ~g~${wage} ~w~bekommen.");
jobber.GetUser(dbContext).PilotSkill++;
dbContext.SaveChanges();
if (jobber.GetUser(dbContext).PilotSkill == 300)
{
jobber.SendChatMessage($"~y~[JOB] ~w~Du hast nun ~g~Skill-Level 2 ~w~erreicht!");
jobber.SendChatMessage($"~y~[JOB] ~w~Du kannst jetzt auch mit dem Velum Flugzeug (LS Airport) fliegen!");
}
}
}
[RemoteEvent("PilotLetzterCheckpoint")]
public static void PilotLetzterCheckpoint(Player player)
{
PilotJob c = new PilotJob();
Vehicle v = player.Vehicle;
if (v.Model == (uint)Types.VehicleModel.Cuban800)
{
Random rnd = new Random();
int rroute = rnd.Next(1, 4);
switch (rroute)
{
case 1:
{
c.StartPilotRoute(player, "Route 1");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 1");
break;
}
case 2:
{
c.StartPilotRoute(player, "Route 2");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 2");
break;
}
case 3:
{
c.StartPilotRoute(player, "Route 3");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 2");
break;
}
}
}
if (v.Model == (uint)Types.VehicleModel.Velum || v.Model == (uint)Types.VehicleModel.Velum2)
{
Random rnd = new Random();
int rroute = rnd.Next(1, 4);
switch (rroute)
{
case 1:
{
c.StartPilotRoute(player, "Route 4");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 4");
break;
}
case 2:
{
c.StartPilotRoute(player, "Route 5");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 5");
break;
}
case 3:
{
c.StartPilotRoute(player, "Route 6");
player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt.: ~g~Route 6");
break;
}
}
}
}
}