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

Fix Weapon Buy

Browse Source
This commit is contained in:
VegaZ
2021-04-17 01:26:33 +02:00
parent 9a5df05b65
commit c823dab9e0
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReallifeGamemode.Client/Interaction/ammunation/ammunation.ts
View File

@@ -66,15 +66,12 @@ export default function ammunation(globalData: IGlobalData) {
if (category < 9) { //Weapons aus Datenbank if (category < 9) { //Weapons aus Datenbank
cWeapons.forEach(weapon => { cWeapons.forEach(weapon => {
var weaponItem: NativeUI.UIMenuItem = new MenuItem(weapon.WeaponModel, "Munition: " + weapon.Ammo, [weapon.WeaponModel, weapon.Ammo, weapon.Price]); var weaponItem: NativeUI.UIMenuItem = new MenuItem(weapon.WeaponModel, "Du erhältst " + weapon.Ammo + " Munition", [weapon.WeaponModel, weapon.Ammo, weapon.Price]);
categoryMenu.AddItem(weaponItem); categoryMenu.AddItem(weaponItem);
weaponItem.SetRightLabel("~g~$" + weapon.Price.toString()); weaponItem.SetRightLabel("~g~$" + weapon.Price.toString());
}) })
categoryMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
mp.events.callRemote("CLIENT:Ammunation_BuyWeapon", item.Data[0], item.Data[1], item.Data[2]); //weaponmodel / ammo / price
});
} else { //Sonstiges = Schutzwesten / Fallschirme } else { //Sonstiges = Schutzwesten / Fallschirme
var armorItem = new MenuItem("Schutzweste", "Sch\u00fctzt dich"); var armorItem = new MenuItem("Schutzweste", "Sch\u00fctzt dich","armor",);
categoryMenu.AddItem(armorItem); categoryMenu.AddItem(armorItem);
armorItem.SetRightLabel("~g~$3000"); armorItem.SetRightLabel("~g~$3000");
@@ -83,7 +80,9 @@ export default function ammunation(globalData: IGlobalData) {
parachuteItem.SetRightLabel("~g~$500"); parachuteItem.SetRightLabel("~g~$500");
} }
categoryMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
mp.events.callRemote("CLIENT:Ammunation_BuyWeapon", item.Data[0], item.Data[1], item.Data[2]); //weaponmodel / ammo / price
});
return categoryMenu; return categoryMenu;
}; };

19
ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
View File

@@ -118,5 +118,24 @@ namespace ReallifeGamemode.Server.Events
context.SaveChanges(); context.SaveChanges();
} }
} }
[RemoteEvent("CLIENT:Ammunation_BuyWeapon")]
public void AmmunationBuyWeapoon(Player player, string weaponmodel, int ammo, int price)
{
using (var dbContext = new DatabaseContext())
{
User user = player.GetUser(dbContext);
if (user.Handmoney < price)
{
player.SendNotification("Du hast nicht genügend Geld bei dir");
return;
}
user.Handmoney -= price;
dbContext.SaveChanges();
player.GiveWeapon(NAPI.Util.WeaponNameToModel(weaponmodel), ammo);
//client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
}
}
} }
} }

20
ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs
View File

@@ -36,25 +36,5 @@ namespace ReallifeGamemode.Server.Shop.Ammunation
List<Weapon> shopWeapons = weaponList.ToList(); List<Weapon> shopWeapons = weaponList.ToList();
client.TriggerEvent("AmmunationShop:LoadNativeUI", JsonConvert.SerializeObject(shopWeapons)); client.TriggerEvent("AmmunationShop:LoadNativeUI", JsonConvert.SerializeObject(shopWeapons));
} }
[RemoteEvent("CLIENT:Ammunation_BuyWeapon")]
public void AmmunationBuyWeapoon(Player player, WeaponHash weaponmodel, int ammo , int price)
{
player.SendChatMessage("JO IS ANGEKOMMEN" + weaponmodel + " " + ammo + " " + price);
using (var dbContext = new DatabaseContext())
{
User user = player.GetUser(dbContext);
if (user.Handmoney < price)
{
player.SendNotification("Du hast nicht genügend Geld bei dir");
return;
}
user.Handmoney -= price;
dbContext.SaveChanges();
player.GiveWeapon((WeaponHash)weaponmodel, ammo);
//client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
}
}
} }
} }