From df66b0e2a5b16a72a3915a9e332598f34ec07c46 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 7 May 2020 23:08:15 +0200 Subject: [PATCH] car verkaufen richtigen preis anzeigen --- ReallifeGamemode.Client/Interaction/interactionmenu.ts | 2 +- ReallifeGamemode.Server/Commands/FactionCommands.cs | 10 +++++----- ReallifeGamemode.Server/Events/Key.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index f3fca627..f7ab1e74 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -365,7 +365,7 @@ export default function (globalData: IGlobalData) { confirmMenu.AddItem(descItem); var priceItem = new UIMenuItem("Verkaufspreis"); - priceItem.SetRightLabel("~g~$ " + moneyFormat(vehicles.find(x => x.Id == id).Price * 0.6)); + priceItem.SetRightLabel("~g~$ " + moneyFormat(vehicles.find(x => x.Id == id).Price)); confirmMenu.AddItem(priceItem); var yesItem = new UIMenuItem("Verkaufen"); diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 780de9ec..26739f2b 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -209,25 +209,25 @@ namespace ReallifeGamemode.Server.Commands var deadPlayerUser = deadPlayer.GetUser(dbContext); - int factionMoney = 100; - if (deadPlayerUser.Handmoney >= 100) { deadPlayerUser.Handmoney -= 100; } else { - factionMoney = deadPlayerUser.Handmoney; + int bankMoney = 100 - deadPlayerUser.Handmoney; deadPlayerUser.Handmoney = 0; + deadPlayerUser.BankAccount.Balance -= bankMoney; } - dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += factionMoney; + dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += 100; + dbContext.SaveChanges(); player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0); deadPlayer.TriggerEvent("onPlayerRevived"); - ChatService.SendMessage(deadPlayer, $"Du wurdest von ~y~{player.Name}~s~ für ~g~{factionMoney.ToMoneyString()} wiederbelebt."); + ChatService.SendMessage(deadPlayer, $"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt."); ChatService.SendMessage(player, $"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt."); deadPlayer.SetData("isDead", false); NAPI.Player.SpawnPlayer(deadPlayer, deadPlayer.Position); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 168234f0..3a1751a6 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -129,7 +129,7 @@ namespace ReallifeGamemode.Server.Events { v.Id, v.Model, - Price = v.Price ?? 0 + Price = (v.Price ?? 0) * 0.6 }); var factionVehicles = dbContext.FactionVehicles.ToList().Where(f => f.GetOwners().Contains(u.FactionId ?? -1)).Select(f => new