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

Merge branch 'hotfix/sitzung-2021-05-16' into 'master'

Browse Source 
improve paycheck and weapondeal logs

See merge request log-gtav/reallife-gamemode!71
This commit is contained in:
hydrant
2021-05-16 23:44:28 +00:00
parent 96f3ac7663 3b63ff9f32
commit 10b8bc6453
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using GTANetworkAPI; using GTANetworkAPI;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
@@ -19,6 +20,7 @@ using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.WeaponDeal; using ReallifeGamemode.Server.WeaponDeal;
using ReallifeGamemode.Server.Log;
/** /**
* @overview Life of German Reallife - Event Key (Key.cs) * @overview Life of German Reallife - Event Key (Key.cs)
@@ -30,6 +32,8 @@ namespace ReallifeGamemode.Server.Events
{ {
public class Key : Script public class Key : Script
{ {
private static readonly ILogger logger = LogManager.GetLogger<Key>();
#region User Key #region User Key
[RemoteEvent("keyPress:NUM2")] [RemoteEvent("keyPress:NUM2")]
@@ -293,6 +297,8 @@ namespace ReallifeGamemode.Server.Events
dbContext.VehicleItems.Remove(v); dbContext.VehicleItems.Remove(v);
} }
logger.LogInformation("Player {0} took the weapon deal item {1} (amount: {2}) out of weapon vehicle {3}", player.Name, v.VehicleId, itemToAdd, v.VehicleId);
InventoryManager.AddItemToInventory(player, v.ItemId, itemToAdd); InventoryManager.AddItemToInventory(player, v.ItemId, itemToAdd);
nearestBehindVehiclePoint.usePoint(player); nearestBehindVehiclePoint.usePoint(player);
dbContext.SaveChanges(); dbContext.SaveChanges();
@@ -392,6 +398,8 @@ namespace ReallifeGamemode.Server.Events
continue; continue;
} }
logger.LogInformation("Player {0} put the weapon deal item \"{1}\" (amount: {2}) in weapon rack of faction {3}", player.Name, weapon.WeaponModel, item.Amount, user.FactionId);
weapon.Ammount += item.Amount; weapon.Ammount += item.Amount;
ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt."); ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt.");
unloadedWeaponPackage = true; unloadedWeaponPackage = true;

9
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -166,7 +166,14 @@ namespace ReallifeGamemode.Server.Finance
} }
} }
logger.LogInformation("Player {0} has a payday of {1} dollars. old balance: {2}, new balance: {3}", client.Name, paycheck.Amount, u.BankAccount.Balance, u.BankAccount.Balance + paycheck.Amount); logger.LogInformation("Player {0} has a payday of {1} dollars. old balance: {2}, new balance: {3}, wage: {4}, interest: {5}, other: {6}",
client.Name,
paycheck.Amount,
u.BankAccount.Balance,
u.BankAccount.Balance + paycheck.Amount,
paycheck.Wage,
paycheck.FinancialInterest,
paycheck.otheramount);
u.BankAccount.Balance += paycheck.Amount; u.BankAccount.Balance += paycheck.Amount;
u.Wage = 0; u.Wage = 0;