diff --git a/ReallifeGamemode.Client/Player/weaponlist.ts b/ReallifeGamemode.Client/Player/weaponlist.ts index cb7f8ac0..1627b91e 100644 --- a/ReallifeGamemode.Client/Player/weaponlist.ts +++ b/ReallifeGamemode.Client/Player/weaponlist.ts @@ -44,7 +44,7 @@ export default function weaponList(globalData: IGlobalData) { //Weapon Menu - mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr, armorArr, jsonTime, pistol_Amount, pistol50_Amount, Pistol_mk2_Amount, Combatpistol_Amount, SMG_Amount, Carbinerifle_Amount, Compactrifle_Amount, sniperrifle_Amount, Pumpshotgun_Amount, Schutzweste_Amount, Stungun_Amount) => { + mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr, armorArr, jsonTime, pistol_Amount, pistol50_Amount, Pistol_mk2_Amount, Combatpistol_Amount, SMG_Amount, Carbinerifle_Amount, Compactrifle_Amount, sniperrifle_Amount, Pumpshotgun_Amount, Schutzweste_Amount, Stungun_Amount, CombatPDW_Amount, assaultrifle_Amount) => { if (!globalData.InMenu) { globalData.InMenu = true; @@ -133,9 +133,15 @@ export default function weaponList(globalData: IGlobalData) { var menuItem = new UIMenuItem("SMG"); menuItem.SetRightLabel(SMG_Amount); weaponStockMenu.AddItem(menuItem); + var menuItem = new UIMenuItem("Combat PDW"); + menuItem.SetRightLabel(CombatPDW_Amount); + weaponStockMenu.AddItem(menuItem); var menuItem = new UIMenuItem("Carbinerifle"); menuItem.SetRightLabel(Carbinerifle_Amount); weaponStockMenu.AddItem(menuItem); + var menuItem = new UIMenuItem("Assaultrifle"); + menuItem.SetRightLabel(assaultrifle_Amount); + weaponStockMenu.AddItem(menuItem); var menuItem = new UIMenuItem("Compactrifle"); menuItem.SetRightLabel(Compactrifle_Amount); weaponStockMenu.AddItem(menuItem); diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg new file mode 100644 index 00000000..9a66c011 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg new file mode 100644 index 00000000..9a66c011 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index c60d0c01..0838a977 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -45,6 +45,14 @@ modifier = 0.25; meelemodifier = 1; break; + case 0x0A3D4D34: //Combat PDW + modifier = 0.185; + meelemodifier = 1; + break; + case 0xBFEFFF6D: //assaultrifle + modifier = 0.225; + meelemodifier = 1; + break; case 0x1D073A89: //Pumpshotgun modifier = 0.2; meelemodifier = 1; diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index c1867b2a..ca1b6d59 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -361,6 +361,8 @@ namespace ReallifeGamemode.Server.Events int Pumpshotgun_Amount = 0; int Schutzweste_Amount = 0; int Stungun_Amount = 0; + int CombatPDW_Amount = 0; + int Assaultrifle_Amount = 0; string dealTime = "Starten"; primarys.Add("Keine"); secondarys.Add("Keine"); @@ -489,10 +491,18 @@ namespace ReallifeGamemode.Server.Events { Stungun_Amount = weapon.Ammount; } + else if (weapon.WeaponModel == "assaultrifle") + { + Assaultrifle_Amount = weapon.Ammount; + } + else if (weapon.WeaponModel == "CombatPDW") + { + CombatPDW_Amount = weapon.Ammount; + } } } - player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), pistol_Amount.ToString(), pistol50_Amount.ToString(), Pistol_mk2_Amount.ToString(), Combatpistol_Amount.ToString(), SMG_Amount.ToString(), Carbinerifle_Amount.ToString(), Compactrifle_Amount.ToString(), sniperrifle_Amount.ToString(), Pumpshotgun_Amount.ToString(), Schutzweste_Amount.ToString(), Stungun_Amount.ToString()); ; + player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), pistol_Amount.ToString(), pistol50_Amount.ToString(), Pistol_mk2_Amount.ToString(), Combatpistol_Amount.ToString(), SMG_Amount.ToString(), Carbinerifle_Amount.ToString(), Compactrifle_Amount.ToString(), sniperrifle_Amount.ToString(), Pumpshotgun_Amount.ToString(), Schutzweste_Amount.ToString(), Stungun_Amount.ToString(), CombatPDW_Amount.ToString(), Assaultrifle_Amount.ToString()); ; } if (nearestJailReleasePoint != null) { diff --git a/ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs b/ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs new file mode 100644 index 00000000..ba5ded6a --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class AssaultRifle : WeaponDealItem + { + public override int Id => 13; + public override string Name => "AssaultRifle"; + public override string Description => "Waffe"; + 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/CombatPDW.cs b/ReallifeGamemode.Server/Inventory/Items/CombatPDW.cs new file mode 100644 index 00000000..7247cbcd --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/CombatPDW.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class CombatPDW : WeaponDealItem + { + public override int Id => 12; + public override string Name => "CombatPDW"; + public override string Description => "Waffe"; + 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/Compactrifle.cs b/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs index 43faf49f..2db9394c 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs @@ -9,7 +9,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Id => 7; public override string Name => "CompactRifle"; public override string Description => "Waffe"; - public override int Gewicht => 3080; + 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 e6f28349..c6f7b723 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -13,8 +13,8 @@ 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_STUNGUN = 12; + private const int WEAPON_AMOUNT_COP = 4; + private const int WEAPON_AMOUNT_COP_STUNGUN = 4; public static bool checkWeaponDbyVehicle(Vehicle vehicle) { if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData("WeaponDealLoad") == false) @@ -201,6 +201,8 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount); VehicleItem item4 = new VehicleItem() { ItemId = 7, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //CompactRifle InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount); + VehicleItem item5 = new VehicleItem() { ItemId = 13, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //AssaultRifle + InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount); } else if (factionVehicle.GetOwners().Contains(1)) { @@ -231,6 +233,8 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount); VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP_STUNGUN * oMembers }; //Stungun InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount); + VehicleItem item7 = new VehicleItem() { ItemId = 12, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //CombatPDW + InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount); } ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id });