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

try fix müllmann

Browse Source
This commit is contained in:
Michael
2020-06-30 20:18:42 +02:00
parent 7a356598a6
commit ec898c8a5d
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/util/attachmentMngr.ts
View File

@@ -40,9 +40,9 @@ export default function attachmentManager(game: IGame) {
e.__attachmentObjects[id] = object; e.__attachmentObjects[id] = object;
} }
} }
else { /* else {
mp.game.graphics.notify(`Static Attachments Error: ~r~Unknown Attachment Used: ~w~0x${id.toString(16)}`); mp.game.graphics.notify(`Static Attachments Error: ~r~Unknown Attachment Used: ~w~0x${id.toString(16)}`);
} } */
}, },
removeFor: function (entityRage, id) { removeFor: function (entityRage, id) {

1
ReallifeGamemode.Database/Entities/User.cs
View File

@@ -92,6 +92,7 @@ namespace ReallifeGamemode.Database.Entities
public int BusSkill { get; set; } public int BusSkill { get; set; }
public int PilotSkill { get; set; } public int PilotSkill { get; set; }
public int trashcount { get; set; }
public int Wanteds public int Wanteds
{ {

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

@@ -5,6 +5,8 @@ using GTANetworkAPI;
using Newtonsoft.Json; using Newtonsoft.Json;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Server.Job namespace ReallifeGamemode.Server.Job
{ {
@@ -211,15 +213,28 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannAddSack")] [RemoteEvent("CLIENT:MuellmannAddSack")]
public void MuellmannAddSack(Player player) public void MuellmannAddSack(Player player)
{ {
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
data.setTrashCount(data.getTrashCount() + 1);
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
data.setTrashCount(data.getTrashCount() + 1);
User user1 = player.GetUser();
User user2 = target.GetUser();
using (var dbContext = new DatabaseContext())
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount += 1;
if (target != null)
user2.trashcount += 1;
dbContext.SaveChanges();
}
player.AddAttachment("binbag", true); player.AddAttachment("binbag", true);
if (data.getTrashCount() >= 20) if (target != null)
ChatService.SendMessage((Player)target, $"Du hast soviele Säcke: {target.GetUser().trashcount}");
ChatService.SendMessage((Player)player, $"Du hast soviele Säcke: {player.GetUser().trashcount}");
if (player.GetUser().trashcount >= 5)
{ {
ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base."); ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base.");
if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); } if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); }
@@ -231,6 +246,7 @@ namespace ReallifeGamemode.Server.Job
{ {
player.GetUser().Wage += 10; player.GetUser().Wage += 10;
target.GetUser().Wage += 10; target.GetUser().Wage += 10;
} }
else else
{ {
@@ -251,8 +267,8 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}"); if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}"); ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}");
//bonus pro sack //bonus pro sack
if (target != null) if (target != null)
{ {
@@ -263,7 +279,18 @@ namespace ReallifeGamemode.Server.Job
{ {
player.GetUser().Wage += 200; player.GetUser().Wage += 200;
} }
data.setTrashCount(0); User user1 = player.GetUser();
User user2 = target.GetUser();
using (var dbContext = new DatabaseContext())
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount -= 5;
if (target != null)
user2.trashcount -= 5;
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()}");
return; return;
} }