From 3b63ff9f325fef52d659adc4f7c52f21904d3d75 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 17 May 2021 01:42:45 +0200 Subject: [PATCH] improve paycheck and weapondeal logs --- ReallifeGamemode.Server/Events/Key.cs | 8 ++++++++ ReallifeGamemode.Server/Finance/Economy.cs | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 697b904a..bc347c28 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; @@ -19,6 +20,7 @@ using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; +using ReallifeGamemode.Server.Log; /** * @overview Life of German Reallife - Event Key (Key.cs) @@ -30,6 +32,8 @@ namespace ReallifeGamemode.Server.Events { public class Key : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + #region User Key [RemoteEvent("keyPress:NUM2")] @@ -293,6 +297,8 @@ namespace ReallifeGamemode.Server.Events 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); nearestBehindVehiclePoint.usePoint(player); dbContext.SaveChanges(); @@ -392,6 +398,8 @@ namespace ReallifeGamemode.Server.Events 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; ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt."); unloadedWeaponPackage = true; diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 90d204bc..860f3c05 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -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.Wage = 0;