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

fix some things

Browse Source
This commit is contained in:
Michael
2020-08-01 00:29:31 +02:00
parent 6f57c8c93b
commit 4ec055a341
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -542,6 +542,7 @@ namespace ReallifeGamemode.Server.Events
if (!job.GetUsersInJob().Contains(player)) if (!job.GetUsersInJob().Contains(player))
{ {
jobb.StartJobEvent(player); jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }
@@ -559,6 +560,7 @@ namespace ReallifeGamemode.Server.Events
{ {
player.SetData("PilotenBase", 1); player.SetData("PilotenBase", 1);
jobb.StartJobEvent(player); jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }
@@ -574,6 +576,7 @@ namespace ReallifeGamemode.Server.Events
{ {
player.SetData("PilotenBase", 2); player.SetData("PilotenBase", 2);
jobb.StartJobEvent(player); jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }

4
ReallifeGamemode.Server/Events/Vehicle.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
@@ -15,6 +15,7 @@ namespace ReallifeGamemode.Server.Events
{ {
if (player.IsInVehicle && player.VehicleSeat == 0) if (player.IsInVehicle && player.VehicleSeat == 0)
{ {
player.TriggerEvent("CLIENT:SELECT_ROUTE");
GTANetworkAPI.Vehicle v = player.Vehicle; GTANetworkAPI.Vehicle v = player.Vehicle;
User u = player.GetUser(); User u = player.GetUser();
@@ -68,6 +69,7 @@ namespace ReallifeGamemode.Server.Events
} }
} }
VehicleStreaming.SetEngineState(v, !state); VehicleStreaming.SetEngineState(v, !state);
} }
} }

4
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -154,11 +154,11 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score);
} }
if (this.Att_Score >= 5) if (this.Att_Score >= 200)
{ {
this.takeOver(this.Attacker); this.takeOver(this.Attacker);
} }
else if (this.Def_Score >= 5) else if (this.Def_Score >= 200)
{ {
this.takeOver(this.Owner); this.takeOver(this.Owner);
} }

2
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -458,7 +458,7 @@ namespace ReallifeGamemode.Server.Managers
} }
else else
{ {
if (amount > 0 && amount < 10000) if (amount > 0 && amount <= 10000)
{ {
player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~."); player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~.");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true); target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true);

27
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -11,6 +11,9 @@ using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Services; using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Types;
namespace ReallifeGamemode.Server.Managers namespace ReallifeGamemode.Server.Managers
{ {
@@ -223,7 +226,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
if (!player.HasData("JobVehicleFrei") || player.GetData<bool>("JobVehicleFrei") == false) if (!player.HasData("JobVehicleFrei") || player.GetData<bool>("JobVehicleFrei") == false)
{ {
player.SetData("DelayTime", 60000*5); player.SetData("DelayTime", 60000 * 5);
veh.SetData("timerJobVehicleRespawn", true); veh.SetData("timerJobVehicleRespawn", true);
player.SetData("LastVehicle", veh); player.SetData("LastVehicle", veh);
player.SetData("LastSVehicle", sVeh); player.SetData("LastSVehicle", sVeh);
@@ -231,7 +234,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
playerTimersJobVehicleRespawn[player].Stop(); playerTimersJobVehicleRespawn[player].Stop();
} }
PlayerTimer playerTimer = new PlayerTimer(player, veh, 60000*5); PlayerTimer playerTimer = new PlayerTimer(player, veh, 60000 * 5);
playerTimer.Elapsed += PlayerTimer_Elapsed; playerTimer.Elapsed += PlayerTimer_Elapsed;
playerTimersJobVehicleRespawn[player] = playerTimer; playerTimersJobVehicleRespawn[player] = playerTimer;
//player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,"); //player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,");
@@ -333,7 +336,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
player.Position = new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471); player.Position = new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471);
player.Heading = (-171.50303649902344f); player.Heading = (-171.50303649902344f);
} }
if (player.GetUser().JobId == 2)//Müllmann if (player.GetUser().JobId == 2)//Müllmann
{ {
@@ -395,15 +398,15 @@ namespace ReallifeGamemode.Server.Managers
if (driver.HasData("Passager")) return; if (driver.HasData("Passager")) return;
driver.SetData<int>("Passager", player.GetUser().Id); driver.SetData<int>("Passager", player.GetUser().Id);
driver.SetData<bool>("hasPassager", true); driver.SetData<bool>("hasPassager", true);
/* using (var dbContext = new DatabaseContext()) /* using (var dbContext = new DatabaseContext())
{ {
int amount = (int)Math.Round(km * taxiPrice); int amount = (int)Math.Round(km * taxiPrice);
User contractUser = player.GetUser(dbContext); User contractUser = player.GetUser(dbContext);
contractUser.Handmoney -= amount; contractUser.Handmoney -= amount;
driver.GetUser(dbContext).Wage += amount; driver.GetUser(dbContext).Wage += amount;
dbContext.SaveChanges(); dbContext.SaveChanges();
//contractUser.Player.TriggerEvent("SERVER:SET_HANDMONEY", contractUser.Handmoney); //contractUser.Player.TriggerEvent("SERVER:SET_HANDMONEY", contractUser.Handmoney);
} */ } */
player.TriggerEvent("CLIENT:startCustomerFare", taxiPrice, km); player.TriggerEvent("CLIENT:startCustomerFare", taxiPrice, km);
var taxiContracts = taxiJob.TaxiContracts.Where(t => t.Name == player.Name); var taxiContracts = taxiJob.TaxiContracts.Where(t => t.Name == player.Name);