From 94bcfa55510bc78ed6c95f0814eebdb6fd8353ab Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 11 Apr 2021 05:05:38 +0200 Subject: [PATCH] add assaultsmg to pd wt --- ReallifeGamemode.Client/admin/anticheat.ts | 3 ++- .../assets/html/inventory/img/inventory/14.svg | 1 + .../Inventory/Items/AssaultSmg.cs | 18 ++++++++++++++++++ .../WeaponDeal/WeaponDealManager.cs | 8 ++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg create mode 100644 ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs diff --git a/ReallifeGamemode.Client/admin/anticheat.ts b/ReallifeGamemode.Client/admin/anticheat.ts index ebe95e13..6694eb2d 100644 --- a/ReallifeGamemode.Client/admin/anticheat.ts +++ b/ReallifeGamemode.Client/admin/anticheat.ts @@ -16,7 +16,8 @@ 2508868239, 2343591895, 3638508604, - 1737195953 + 1737195953, + 4024951519 ] mp.events.add("playerJoin", () => { diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg new file mode 100644 index 00000000..9a66c011 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs b/ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs new file mode 100644 index 00000000..573b8349 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class AssaultSmg : WeaponDealItem + { + public override int Id => 14; + public override string Name => "AssaultSmg"; + 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/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index c6f7b723..096e59de 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -218,6 +218,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 = 14, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP_STUNGUN * oMembers }; // AssaultSmg + InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount); } else if (factionVehicle.GetOwners().Contains(3)) { @@ -244,4 +246,10 @@ namespace ReallifeGamemode.Server.WeaponDeal } } } + + public class WeaponRackWeaponAmountInfo + { + public string WeaponModel { get; set; } + public int Amount { get; set; } + } }