diff --git a/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts b/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts index 3657c32e..f7c8088c 100644 --- a/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts +++ b/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts @@ -178,13 +178,13 @@ export default function clotheShopList(globalData: IGlobalData) { var txData = getClothingName(key, item.ClotheId, gender); for (const x of txData) { - //var itemDescription = (key === 11 ? mp.game.ui.getLabelText(x.undershirt[1].GXT) : "Clothing item."); - var itemDescription = (key === 11 ? x.undershirt[1].GXT + " - " + x.id: "Clothing item."); + var itemDescription = (key === 11 ? mp.game.ui.getLabelText(x.undershirt[1].GXT) : "Clothing item."); + //var itemDescription = (key === 11 ? x.undershirt[1].GXT + " - " + x.id: "Clothing item."); if (itemDescription == "NULL") { itemDescription = "Clothing item."; } - //const tempItem = new UIMenuItem(mp.game.ui.getLabelText(x.data[0].GXT), itemDescription); - const tempItem = new UIMenuItem(x.data[0].GXT + " - " + x.id , itemDescription); + const tempItem = new UIMenuItem(mp.game.ui.getLabelText(x.data[0].GXT), itemDescription); + //const tempItem = new UIMenuItem(x.data[0].GXT + " - " + x.id , itemDescription); tempItem.SetRightLabel(`${item.Price > 0 ? `$${item.Price}` : "FREE"}`); diff --git a/ReallifeGamemode.Client/Interaction/friseur/friseur.ts b/ReallifeGamemode.Client/Interaction/friseur/friseur.ts index 48331aea..ba64df88 100644 --- a/ReallifeGamemode.Client/Interaction/friseur/friseur.ts +++ b/ReallifeGamemode.Client/Interaction/friseur/friseur.ts @@ -116,8 +116,8 @@ export default function friseurShopList(globalData: IGlobalData) { if (itemDescription == "NULL") { itemDescription = "Clothing item."; } - //const tempItem = new UIMenuItem(mp.game.ui.getLabelText(x.data[0].GXT), itemDescription); - const tempItem = new UIMenuItem(x.data[0].GXT + " - " + x.id, itemDescription); + const tempItem = new UIMenuItem(mp.game.ui.getLabelText(x.data[0].GXT), itemDescription); + //const tempItem = new UIMenuItem(x.data[0].GXT + " - " + x.id, itemDescription); tempItem.SetRightLabel(`${item.Price > 0 ? `$${item.Price}` : "FREE"}`); diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index 5b403165..ea2d67d6 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using System; namespace ReallifeGamemode.Server.Events { @@ -278,6 +279,14 @@ namespace ReallifeGamemode.Server.Events undershirt.Texture = data[5]; } } + + if(data[0] == 2){ + User payer = client.GetUser(dbContext); + payer.GetCharacter(dbContext); + payer.Character.Hair = Convert.ToByte(data[2]); + dbContext.SaveChanges(); + } + client.GetUser(dbContext).Handmoney -= data[6]; dbContext.SaveChanges(); //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); @@ -285,6 +294,7 @@ namespace ReallifeGamemode.Server.Events client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]); } } + [RemoteEvent("SERVER:BuyHairColor")] public void BuyHairColor(Player client, byte HairColor) diff --git a/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs b/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs index dbe3503f..b37f581b 100644 --- a/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs +++ b/ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs @@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Id => 6; public override string Name => "CarbineRifle"; public override string Description => "Waffe"; - public override int Gewicht => 4000; + public override int Gewicht => 500; public override string Einheit => "g"; public override uint Object => 3666746839; //3061944032 public override int Price => 0; diff --git a/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs b/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs index 3d04cdc5..f2034664 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs @@ -9,7 +9,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Id => 4; public override string Name => "Combatpistol"; public override string Description => "Waffe"; - public override int Gewicht => 1180; + public override int Gewicht => 500; public override string Einheit => "g"; public override uint Object => 3666746839; //3061944032 public override int Price => 0; diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index 737b70ad..0dc41119 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.WeaponDeal public class WeaponDealManager : Script { private const int WEAPON_AMOUNT_GANG = 2; - private const int WEAPON_AMOUNT_COP = 8; + private const int WEAPON_AMOUNT_COP = 5; private const int WEAPON_AMOUNT_COP_STUNGUN = 2; public static bool checkWeaponDbyVehicle(Vehicle vehicle) {