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

*Fix Müllmann / *Load Casino IPL / *Fix GangwarTakeover

Browse Source
This commit is contained in:
VegaZ
2021-04-02 15:38:46 +02:00
parent 21a9a4b995
commit 04e4e9dc86
4 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/util/Gangwar.ts
View File

@@ -263,7 +263,7 @@
self.attacker = null; self.attacker = null;
//self.blip.setFlashes(false); //self.blip.setFlashes(false);
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false); mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false);
self.blip.destroy(); //self.blip.destroy();
self.setColor(self.owner); self.setColor(self.owner);
self.blip.setColour(self.color); self.blip.setColour(self.color);
mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color); mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color);

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

@@ -546,8 +546,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
}else } else {
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return; return;
} }
@@ -569,7 +568,8 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
}else }
else
{ {
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return; return;
@@ -590,14 +590,11 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} } else {
else
{
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return; return;
} }
}else } else {
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return; return;
} }

66
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -220,18 +220,18 @@ namespace ReallifeGamemode.Server.Job
{ {
return; return;
} }
using (var dbContext = new DatabaseContext())
{
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
User user1 = player.GetUser(); User user1 = player.GetUser(dbContext);
User user2 = target.GetUser(); User user2 = target.GetUser(dbContext);
using (var dbContext = new DatabaseContext())
{ //user1 = player.GetUser(dbContext);
user1 = player.GetUser(dbContext); //user2 = target.GetUser(dbContext);
user2 = target.GetUser(dbContext); /*user1.trashcount += 1;
user1.trashcount += 1;
if (user1.trashcount == 20) if (user1.trashcount == 20)
{ {
@@ -249,11 +249,12 @@ namespace ReallifeGamemode.Server.Job
target.SendChatMessage("~y~Dies ist dein 20ter Müllsack."); target.SendChatMessage("~y~Dies ist dein 20ter Müllsack.");
} }
} }
dbContext.SaveChanges(); dbContext.SaveChanges();
}
player.AddAttachment("binbag", true); player.AddAttachment("binbag", true);
if (target != null) */
if (player.GetUser().trashcount >= 20)
if (player.GetUser(dbContext).trashcount >= 20)
{ {
ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
if (target != null) if (target != null)
@@ -265,10 +266,8 @@ namespace ReallifeGamemode.Server.Job
} }
else else
{ {
using (var dbContext = new DatabaseContext()) //user1 = player.GetUser(dbContext);
{ //user2 = target.GetUser(dbContext);
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount += 1; user1.trashcount += 1;
player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
if (target != null) if (target != null)
@@ -278,10 +277,9 @@ namespace ReallifeGamemode.Server.Job
} }
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
}
player.AddAttachment("binbag", true); player.AddAttachment("binbag", true);
if (target != null)
if (player.GetUser().trashcount >= 20) if (player.GetUser(dbContext).trashcount >= 20)
{ {
ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
if (target != null) if (target != null)
@@ -293,15 +291,20 @@ namespace ReallifeGamemode.Server.Job
} }
else else
{ {
//user1 = player.GetUser(dbContext);
//user2 = target.GetUser(dbContext);
if (target != null) if (target != null)
{ {
player.GetUser().Wage += 10; user1.Wage += 10;
target.GetUser().Wage += 10; user2.Wage += 10;
} }
else else
{ {
player.GetUser().Wage += 20; user1.Wage += 20;
}
dbContext.SaveChanges();
} }
} }
return; return;
@@ -321,25 +324,24 @@ namespace ReallifeGamemode.Server.Job
if (target != null) ChatService.SendMessage((Player)target, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}"); if (target != null) ChatService.SendMessage((Player)target, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}"); ChatService.SendMessage((Player)player, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}");
//bonus pro sack //bonus pro sack
using (var dbContext = new DatabaseContext())
{
User user1 = player.GetUser(dbContext);
User user2 = target.GetUser(dbContext);
if (target != null) if (target != null)
{ {
player.GetUser().Wage += 100; user1.Wage += 100;
target.GetUser().Wage += 100; user2.Wage += 100;
} }
else else
{ {
player.GetUser().Wage += 200; user1.Wage += 200;
} }
User user1 = player.GetUser();
User user2 = target.GetUser();
using (var dbContext = new DatabaseContext())
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount -= user1.trashcount; user1.trashcount -= user1.trashcount;
if (target != null) if (target != null) user2.trashcount -= user2.trashcount;
user2.trashcount -= user2.trashcount;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}"); Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}");

3
ReallifeGamemode.Server/Main.cs
View File

@@ -169,6 +169,9 @@ namespace ReallifeGamemode.Server
{ {
user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
}; };
//IPLS
NAPI.World.RequestIpl("vw_casino_garage");
} }
[RemoteEvent("CLIENT:Event")] [RemoteEvent("CLIENT:Event")]