From 4ef28ae9b20d78fa500d252c1dd614083cf22612 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Wed, 27 Jan 2021 22:24:41 +0100 Subject: [PATCH] try fix friseur --- .../Interaction/friseur/friseur.ts | 2 +- .../Events/UpdateCharacterCloth.cs | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/Interaction/friseur/friseur.ts b/ReallifeGamemode.Client/Interaction/friseur/friseur.ts index ba64df88..a6dd70a3 100644 --- a/ReallifeGamemode.Client/Interaction/friseur/friseur.ts +++ b/ReallifeGamemode.Client/Interaction/friseur/friseur.ts @@ -279,7 +279,7 @@ export default function friseurShopList(globalData: IGlobalData) { if (lastClothing.drawable == currentItem.ClotheId && lastClothing.texture == currentTexture) { mp.game.audio.playSoundFrontend(1, "Hack_Failed", "DLC_HEIST_BIOLAB_PREP_HACKING_SOUNDS", true); } else { - mp.events.callRemote("SERVER:BuyCharacterClothes", "clothe", JSON.stringify(serverData), currentItem.CloteID); + mp.events.callRemote("SERVER:BuyHair", "clothe", JSON.stringify(serverData), currentItem.CloteID); mp.events.call("friseurMenu:close"); } diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index 5b403165..c35787fe 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -278,6 +278,7 @@ namespace ReallifeGamemode.Server.Events undershirt.Texture = data[5]; } } + client.GetUser(dbContext).Handmoney -= data[6]; dbContext.SaveChanges(); //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); @@ -285,6 +286,43 @@ namespace ReallifeGamemode.Server.Events client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]); } } + [RemoteEvent("SERVER:BuyHair")] + public void RmtEvent_BuyHair(Player client, string type, string jsonData, byte hair) + { + /* + * [0] ComponentID + * [1] TextureID + * [2] ClotheID + * [3] TorsoID + * [4] UndershirtID + * [5] UndershirtTextureID + * [6] Price + */ + + int[] data = JsonConvert.DeserializeObject(jsonData); + User user = client.GetUser(); + if (user.Handmoney < data[6]) + { + client.TriggerEvent("clothesMenu:Error"); + return; + } + + if (type == "clothe") + { + + client.SetClothes(data[0], data[2], data[1]); + + using (var dbContext = new DatabaseContext()) + { + User payer = client.GetUser(dbContext); + + client.GetUser(dbContext).Handmoney -= data[6]; + payer.Character.Hair = hair; + dbContext.SaveChanges(); + //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); + } + } + } [RemoteEvent("SERVER:BuyHairColor")] public void BuyHairColor(Player client, byte HairColor)