Merge develop into feature/inventory-system

Client/Player/dutycloth.js

@@ -0,0 +1,108 @@
+/**
+ * @overview Life of German Reallife - Player DutyClothes dutyclothes.js
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+const NativeUI = require("nativeui");
+const Menu = NativeUI.Menu;
+const UIMenuItem = NativeUI.UIMenuItem;
+const UIMenuListItem = NativeUI.UIMenuListItem;
+const UIMenuCheckboxItem = NativeUI.UIMenuCheckboxItem;
+const BadgeStyle = NativeUI.BadgeStyle;
+const Point = NativeUI.Point;
+const ItemsCollection = NativeUI.ItemsCollection;
+const Color = NativeUI.Color;
+
+var hats;
+var tops;
+var legs;
+var shoes;
+
+var hat = -1;
+var top;
+var leg;
+var shoe;
+
+let screenRes = mp.game.graphics.getScreenResolution(0, 0);
+
+var dutyMenu;
+let saveItem = new UIMenuItem("Speichern", "Speichert deine Dienstkleidung");
+saveItem.BackColor = new Color(13, 71, 161);
+saveItem.HighlightedBackColor = new Color(25, 118, 210);
+
+let cancelItem = new UIMenuItem("Abbrechen", "");
+cancelItem.BackColor = new Color(213, 0, 0);
+cancelItem.HighlightedBackColor = new Color(229, 57, 53);
+
+
+//Cloth Menu
+
+mp.events.add('showDutyClothMenu', (hatsArr, topsArr, legsArr, shoesArr) => {
+
+    mp.gui.chat.activate(false);
+    hats = hatsArr;
+    tops = topsArr;
+    legs = legsArr;
+    shoes = shoesArr;
+
+    dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(0, screenRes.y/2));
+
+    dutyMenu.AddItem(new UIMenuListItem("Hut", "", new ItemsCollection(hats)));
+    dutyMenu.AddItem(new UIMenuListItem("Top", "", new ItemsCollection(tops)));
+    dutyMenu.AddItem(new UIMenuListItem("Hose", "", new ItemsCollection(legs)));
+    dutyMenu.AddItem(new UIMenuListItem("Schuhe", "", new ItemsCollection(shoes)));   
+    dutyMenu.AddItem(saveItem);
+    dutyMenu.AddItem(cancelItem);
+    dutyMenu.Visible = true;
+
+    dutyMenu.ListChange.on((item, index) => {
+        switch (item.Text) {
+            case "Hut":
+                if (item.SelectedItem.DisplayText === "Keinen") {
+                    hat = -1;
+                    mp.events.callRemote("updateDutyProp", 0, -1);
+                } else {
+                    hat = parseInt(item.SelectedItem.DisplayText);
+                    mp.events.callRemote("updateDutyProp", 0, hat);                    
+                }                
+                break;
+            case "Top":
+                top = parseInt(item.SelectedItem.DisplayText);
+                mp.events.callRemote("updateDutyCloth", 11, top);              
+                break;
+            case "Hose":
+                leg = parseInt(item.SelectedItem.DisplayText);
+                mp.events.callRemote("updateDutyCloth", 4, leg);                
+                break;
+            case "Schuhe":
+                shoe = parseInt(item.SelectedItem.DisplayText);
+                mp.events.callRemote("updateDutyCloth", 6, shoe);               
+                break;
+        }
+    });
+
+    dutyMenu.ItemSelect.on((item) => {
+        if (item.Text === "Speichern") {
+            var slotType = [1, 0, 0, 0];
+            var slotId = [0, 11, 4, 6];
+            var clothId = [hat, top, leg, shoe];
+            mp.events.callRemote("saveCharacterCloth", JSON.stringify(slotType), JSON.stringify(slotId), JSON.stringify(clothId));
+            dutyMenu.Visible = false;
+            mp.gui.chat.activate(true);
+        } else if (item.Text === "Abbrechen") {
+            dutyMenu.Visible = false;
+            mp.gui.chat.activate(true);
+            mp.events.callRemote("defaultCharacterCloth");
+        }
+    });
+
+
+    dutyMenu.MenuClose.on(() => {
+        dutyMenu.Visible = false;
+        mp.gui.chat.activate(true);
+        mp.events.callRemote("defaultCharacterCloth");
+    });
+});
+
+

Client/Player/keys.js

@@ -7,7 +7,11 @@
 //https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes
 
 var chat = false;
+<<<<<<< HEAD
 var showInventory = false;
+=======
+var showGui = true;
+>>>>>>> develop
 
 //ENTER
 mp.keys.bind(0x0D, false, function () {
@@ -16,7 +20,32 @@ mp.keys.bind(0x0D, false, function () {
     }
 });
 
-//I
+
+//F7 //Unshowalles
+mp.keys.bind(0x76, false, function () {
+    if (showGui === true) {
+        showGui = false;
+        mp.events.call("toggleUi", false);
+    } else {
+        showGui = true;
+        mp.events.call("toggleUi", true);
+    }
+});
+
+//NUM2 //Save Blips in Edit Mode
+mp.keys.bind(0x62, false, function () {
+    mp.events.callRemote("keyPress:NUM2");
+});
+
+//E
+mp.keys.bind(0x45, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:E");
+    }
+});
+
+
+//I //Spielerliste
 mp.keys.bind(0x49, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:I");
@@ -24,6 +53,7 @@ mp.keys.bind(0x49, false, function () {
     }
 });
 
+<<<<<<< HEAD
 //J
 mp.keys.bind(0x4A, false, function () {
     if (showInventory === false) {
@@ -36,6 +66,23 @@ mp.keys.bind(0x4A, false, function () {
 });
 
 //N
+=======
+//K //Dienstkleidung
+mp.keys.bind(0x4B, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:K");
+    }
+});
+
+//L //Türen auf / zuschließen
+mp.keys.bind(0x4C, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:L");
+    }
+});
+
+//N //Motor Starten
+>>>>>>> develop
 mp.keys.bind(0x4E, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:N");
@@ -49,9 +96,10 @@ mp.keys.bind(0x54, false, function () {
     }
 });
 
-//X
+//X //Anschnallen 
 mp.keys.bind(0x58, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:X");
     }
 });
+