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

simplify weapon rack amount

Browse Source
This commit is contained in:
hydrant
2021-04-11 05:06:11 +02:00
parent 3702b571da
commit c82bc12bcd
2 changed files with 32 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ReallifeGamemode.Client/Player/weaponlist.ts
View File

@@ -44,7 +44,7 @@ export default function weaponList(globalData: IGlobalData) {
//Weapon Menu //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, CombatPDW_Amount, assaultrifle_Amount) => { mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr, armorArr, jsonTime, jsonAmountInfos) => {
if (!globalData.InMenu) { if (!globalData.InMenu) {
globalData.InMenu = true; globalData.InMenu = true;
@@ -118,45 +118,13 @@ export default function weaponList(globalData: IGlobalData) {
function getWeaponStockMenu(parentMenu: NativeUI.Menu, ): NativeUI.Menu { function getWeaponStockMenu(parentMenu: NativeUI.Menu, ): NativeUI.Menu {
var weaponStockMenu = new NativeUI.Menu("Bestand","", new Point(0, screenRes.y / 3), null, null); var weaponStockMenu = new NativeUI.Menu("Bestand","", new Point(0, screenRes.y / 3), null, null);
var menuItem = new UIMenuItem("Pistol"); var amountInfos: { WeaponModel: string, Amount: number }[] = JSON.parse(jsonAmountInfos);
menuItem.SetRightLabel(pistol_Amount); amountInfos.forEach(amount => {
weaponStockMenu.AddItem(menuItem); var amountItem = new NativeUI.UIMenuItem(amount.WeaponModel);
var menuItem = new UIMenuItem("Pistol50"); amountItem.SetRightLabel(amount.Amount.toString());
menuItem.SetRightLabel(pistol50_Amount); weaponStockMenu.AddItem(amountItem);
weaponStockMenu.AddItem(menuItem); });
var menuItem = new UIMenuItem("Pistol_mk2");
menuItem.SetRightLabel(Pistol_mk2_Amount);
weaponStockMenu.AddItem(menuItem);
var menuItem = new UIMenuItem("Combatpistol");
menuItem.SetRightLabel(Combatpistol_Amount);
weaponStockMenu.AddItem(menuItem);
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);
var menuItem = new UIMenuItem("Sniperrifle");
menuItem.SetRightLabel(sniperrifle_Amount);
weaponStockMenu.AddItem(menuItem);
var menuItem = new UIMenuItem("Pumpshotgun");
menuItem.SetRightLabel(Pumpshotgun_Amount);
weaponStockMenu.AddItem(menuItem);
var menuItem = new UIMenuItem("Schutzweste");
menuItem.SetRightLabel(Schutzweste_Amount);
weaponStockMenu.AddItem(menuItem);
var menuItem = new UIMenuItem("Stungun");
menuItem.SetRightLabel(Stungun_Amount);
weaponStockMenu.AddItem(menuItem);
weaponStockMenu.Visible = false; weaponStockMenu.Visible = false;
return weaponStockMenu; return weaponStockMenu;
} }

94
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -359,19 +359,6 @@ namespace ReallifeGamemode.Server.Events
List<string> specials = new List<string>(); List<string> specials = new List<string>();
List<string> armor = new List<string>(); List<string> armor = new List<string>();
List<string> timer = new List<string>(); List<string> timer = new List<string>();
int pistol_Amount = 0;
int pistol50_Amount = 0;
int Pistol_mk2_Amount = 0;
int Combatpistol_Amount = 0;
int SMG_Amount = 0;
int Carbinerifle_Amount = 0;
int Compactrifle_Amount = 0;
int sniperrifle_Amount = 0;
int Pumpshotgun_Amount = 0;
int Schutzweste_Amount = 0;
int Stungun_Amount = 0;
int CombatPDW_Amount = 0;
int Assaultrifle_Amount = 0;
string dealTime = "Starten"; string dealTime = "Starten";
primarys.Add("Keine"); primarys.Add("Keine");
secondarys.Add("Keine"); secondarys.Add("Keine");
@@ -454,64 +441,31 @@ namespace ReallifeGamemode.Server.Events
break; break;
} }
} }
foreach (var weapon in weapons)
{
if (weapon.WeaponModel == "Pistol")
{
pistol_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "Pistol50")
{
pistol50_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "Pistol_MK2")
{
Pistol_mk2_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "Combatpistol")
{
Combatpistol_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "SMG")
{
SMG_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "CarbineRifle")
{
Carbinerifle_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "CompactRifle")
{
Compactrifle_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "sniperrifle")
{
sniperrifle_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "PumpShotgun")
{
Pumpshotgun_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "Schutzweste")
{
Schutzweste_Amount = weapon.Ammount;
}
else if (weapon.WeaponModel == "Stungun")
{
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(), CombatPDW_Amount.ToString(), Assaultrifle_Amount.ToString()); ; List<string> allWeapons = context.FactionWeapons.Select(w => w.WeaponModel).Distinct().ToList();
List<WeaponRackWeaponAmountInfo> amountInfos = new List<WeaponRackWeaponAmountInfo>();
foreach (var weapon in allWeapons)
{
int amount = 0;
var tempFactionWeapon = weapons.Where(f => f.WeaponModel == weapon).FirstOrDefault();
if(tempFactionWeapon != null)
{
amount = tempFactionWeapon.Ammount;
}
amountInfos.Add(new WeaponRackWeaponAmountInfo()
{
WeaponModel = weapon,
Amount = amount
});
}
player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), JsonConvert.SerializeObject(amountInfos));
}
} }
if (nearestJailReleasePoint != null) if (nearestJailReleasePoint != null)
{ {