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

add armor as lonley item

Browse Source
This commit is contained in:
Michael
2020-06-08 18:07:36 +02:00
parent 2cf5d979dc
commit ee90e85ebd
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,8 @@ export default function weaponList(globalData: IGlobalData) {
var melees;
var specialsWep;
var time;
var armor;
var primary = "";
var secondary = "";
var melee = "";
@@ -43,7 +44,7 @@ export default function weaponList(globalData: IGlobalData) {
//Weapon Menu
mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr, 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) => {
if (!globalData.InMenu) {
globalData.InMenu = true;
@@ -53,7 +54,7 @@ export default function weaponList(globalData: IGlobalData) {
melees = meleesArr;
specialsWep = specialsArr;
time = JSON.parse(jsonTime);
armor = armorArr;
let dealItem = new UIMenuListItem("Waffentransport", "", new ItemsCollection(time));
dealItem.BackColor = new Color(204, 170, 0);
@@ -65,10 +66,11 @@ export default function weaponList(globalData: IGlobalData) {
weaponMenu.AddItem(new UIMenuListItem("Sekundäre", "", new ItemsCollection(primaries)));
weaponMenu.AddItem(new UIMenuListItem("Nahkampf", "", new ItemsCollection(melees)));
weaponMenu.AddItem(new UIMenuListItem("Spezial", "", new ItemsCollection(specialsWep)));
weaponMenu.AddItem(new UIMenuListItem("Schutzweste", "", new ItemsCollection(armor)));
weaponMenu.AddItem(saveItem);
weaponMenu.AddItem(WeaponStockItem);
weaponMenu.BindMenuToItem(getWeaponStockMenu(weaponMenu), WeaponStockItem);
weaponMenu.AddItem(dealItem);
weaponMenu.AddItem(saveItem);
weaponMenu.AddItem(cancelItem);
weaponMenu.Visible = true;
@@ -102,6 +104,13 @@ export default function weaponList(globalData: IGlobalData) {
specialWep = String(item.SelectedItem.DisplayText);
}
break;
case "Schutzweste":
if (item.SelectedItem.DisplayText === "Keine") {
armor = "";
} else {
armor = String(item.SelectedItem.DisplayText);
}
break;
}
});
@@ -149,7 +158,7 @@ export default function weaponList(globalData: IGlobalData) {
weaponMenu.ItemSelect.on((item) => {
if (item.Text === "Waffen Nehmen") {
mp.events.callRemote("saveWeaponSelection", primary, secondary, melee, specialWep);
mp.events.callRemote("saveWeaponSelection", primary, secondary, melee, specialWep, armor);
weaponMenu.Close();
globalData.InMenu = false;
} else if (item.Text === "Abbrechen") {