Resolve merge conflict

Client/DoorManager/doormanager.js

@@ -2,4 +2,4 @@
     locked === 1 ? locked = true : locked = false;
 
     mp.game.object.doorControl(doorHash, x, y, z, locked, p5, p6, p7);
-});
+});

Client/Gui/interiors.js

@@ -0,0 +1,31 @@
+var keyBound = false;
+var interiorId = -1;
+var enterExit = undefined;
+
+mp.events.add('InteriorManager_ClearHelpText', () => {
+    mp.game.ui.clearHelp(true);
+
+    enterExit = undefined;
+
+    if (keyBound) {
+        mp.keys.unbind(0x45, false, keyPressHandler);
+        keyBound = false;
+    }
+});
+
+mp.events.add('InteriorManager_ShowHelpText', (interior, intId, entEx) => {
+    mp.game.ui.setTextComponentFormat('STRING');
+    mp.game.ui.addTextComponentSubstringPlayerName('Drücke ~INPUT_CONTEXT~, um ~b~' + interior + ' ~s~zu ' + (entEx === 0 ? 'betreten' : 'verlassen'));
+    mp.game.ui.displayHelpTextFromStringLabel(0, true, true, -1);
+
+    interiorId = intId;
+    enterExit = entEx;
+
+    mp.keys.bind(0x45, false, keyPressHandler);
+    keyBound = true;
+});
+
+function keyPressHandler() {
+    if (globalData.InChat) return;
+    mp.events.callRemote('InteriorManager_UseTeleport', interiorId, enterExit);
+}

Client/Gui/vehiclemenu/main.js

@@ -1,5 +1,17 @@
 let menuBrowser = null;
 
+const NativeUI = require('nativeui');
+const Menu = NativeUI.Menu;
+const UIMenuItem = NativeUI.UIMenuItem;
+const UIMenuListItem = NativeUI.UIMenuListItem;
+const UIMenuCheckboxItem = NativeUI.UIMenuCheckboxItem;
+const UIMenuSliderItem = NativeUI.UIMenuSliderItem;
+const BadgeStyle = NativeUI.BadgeStyle;
+const Point = NativeUI.Point;
+const ItemsCollection = NativeUI.ItemsCollection;
+const Color = NativeUI.Color;
+const ListItem = NativeUI.ListItem;
+
 mp.events.add('ToggleVehicleMenu', () => {
     if (menuBrowser !== null) {
         menuBrowser.destroy();
@@ -24,15 +36,68 @@ mp.events.add('doAction', (action) => {
         case 8: // Motor
             mp.events.callRemote("VehicleMenu_ToggleEngine");
             break;
-        case 5:
+        case 5: // Auf -/ Abschließen
             mp.events.callRemote("VehicleMenu_LockCar");
             break;
-        case 3:
+        case 3: // Türen
             showDoorsMenu();
             break;
     }
 });
 
 function showDoorsMenu() {
+    mp.gui.chat.show(false);
 
+    var doorMenu = new Menu("Türen", "Türen verwalten", new Point(50, 50));
+
+    doorMenu.AddItem(new UIMenuListItem("Tür", "Welche Tür darf's sein?", new ItemsCollection([
+        " Fahrertür",
+        " Beifahrertür",
+        "Hinten links",
+        "Hinten rechts",
+        "Motorhaube",
+        "Kofferraum"
+    ])));
+
+    doorMenu.AddItem(new UIMenuItem("Alle öffnen", "Öffnet alle Türen"));
+    doorMenu.AddItem(new UIMenuItem("Alle schließen", "Schließt alle Türen"));
+
+    doorMenu.ItemSelect.on((item, index) => {
+        if (index === 0) {
+            var doorId = -1;
+            switch (item.SelectedItem.DisplayText) {
+                case " Fahrertür":
+                    doorId = 0;
+                    break;
+                case " Beifahrertür":
+                    doorId = 1;
+                    break;
+                case "Hinten links":
+                    doorId = 2;
+                    break;
+                case "Hinten rechts":
+                    doorId = 3;
+                    break;
+                case "Motorhaube":
+                    doorId = 4;
+                    break;
+                case "Kofferraum":
+                    doorId = 5;
+                    break;
+            }
+            if (doorId !== -1) {
+                mp.events.callRemote("VehicleMenu_ToggleSingleDoor", doorId);
+            }
+        } else if (index === 1) {
+            mp.events.callRemote("VehicleMenu_OpenAllDoors");
+        } else if (index === 2) {
+            mp.events.callRemote("VehicleMenu_CloseAllDoors");
+        }
+    });
+
+    doorMenu.MenuClose.on(() => {
+        mp.gui.chat.show(true);
+    });
+
+    doorMenu.Open();
 }

Client/Player/keys.js

@@ -17,6 +17,7 @@ const player = mp.players.local;
 mp.keys.bind(0x0D, false, function () {
     if (chat === true) {
         chat = false;
+        globalData.InChat = false;
     }
 });
 
@@ -102,6 +103,7 @@ mp.keys.bind(0x4E, false, function () {
 mp.keys.bind(0x54, false, function () {
     if (chat === false && showInv === false) {
         chat = true;
+        globalData.InChat = true;
     }
 });
 

Client/index.js

@@ -7,7 +7,8 @@
 let globalData = {
     InTuning: false,
     HideGui: false,
-    PlayerInteraction: false
+    PlayerInteraction: false,
+    InChat: false
 };
 
 mp.game.gameplay.enableMpDlcMaps(true);
@@ -30,6 +31,7 @@ require('./Gui/nametags.js');
 require('./Gui/playerlist.js');
 require('./Gui/Inventory/inventory.js');
 require('./Gui/vehiclemenu/main.js');
+require('./Gui/interiors.js');
 
 require('./Interaction/interaction.js');
 
@@ -47,4 +49,5 @@ require('./Tuning/main.js');
 require('./Tuning/sync.js');
 require('./Tuning/sirensilence.js');
 
-require('./vehiclesync/vehiclesync.js');
+require('./vehiclesync/vehiclesync.js');
+require('./vehiclesync/smoothtrottle.js');

Client/vehiclesync/smoothtrottle.js

@@ -0,0 +1,137 @@
+//This script will make vehicles have smoother acceleration.
+//To disable the script call an event and set "GlobalDisable" to true.
+//To disable individual sections, set "DisableAntiReverse" or "DisableSmoothThrottle" to true.
+
+//This script includes an anti-reverse brake system with automatic brake lights.
+
+//When you brake, while holding brake you will come to a complete stop and won't reverse until you
+//release the brake button and press it again.
+
+mp.events.add("SmoothThrottle_PlayerEnterVehicle", (entity, seat) =>
+{
+	BrakeSystem = true;
+});
+
+mp.events.add("SmoothThrottle_PlayerExitVehicle", (entity) =>
+{
+	BrakeSystem = false;
+});
+
+mp.events.add("SmoothThrottle_SetSmoothThrottle", (turnedOn) =>
+{
+	DisableSmoothThrottle = !turnedOn;
+});
+
+mp.events.add("SmoothThrottle_SetAntiReverse", (turnedOn) =>
+{
+	DisableAntiReverse = !turnedOn;
+});
+
+mp.events.add("SmoothThrottle_SetGlobal", (turnedOn) =>
+{
+	GlobalDisable = !turnedOn;
+});
+
+let GlobalDisable = false;
+let DisableAntiReverse = false;
+let DisableSmoothThrottle = false;
+
+let BrakeSystem = false;
+let vehicleStopped = false;
+let vehicleStoppedOnOwn = false;
+let constantStart = 0.25; //starts at 0.25 and increases to 1
+let constantStep = 0.135; //You can change this for a faster throttle response (Will cause more skidding)
+
+let deltaAmount = constantStart; 
+let prevTime = mp.game.invoke('0x9CD27B0045628463');
+let diffToggle = false;
+
+mp.events.add("render", () =>
+{
+	if(GlobalDisable)
+		return;
+	
+	if(BrakeSystem)
+	{
+		if(mp.players.local.vehicle !== null)
+		{
+			if(!mp.players.local.vehicle.isSeatFree(-1)) //only do this if the vehicle has a driver (doesn't have to be the player who is rendering this)
+			{
+				//Optimize function calls to variables (probably doesn't make a difference)
+				let vehClass = mp.players.local.vehicle.getClass();
+				let isControl71Pressed = mp.game.controls.isControlPressed(0, 71); //accelerate
+				let isControl72Pressed = mp.game.controls.isControlPressed(0, 72); //brake
+				let isControl76Pressed = mp.game.controls.isControlPressed(0, 76); //handbrake
+				let speed = mp.players.local.vehicle.getSpeed();
+				
+				//Only do it to car classes
+				if(!DisableSmoothThrottle && ((vehClass >= 0 && vehClass <= 12) || vehClass === 18 || vehClass === 19 || vehClass === 20))
+				{
+					if(isControl71Pressed || isControl72Pressed)
+					{
+						if(isControl76Pressed)
+						{
+							deltaAmount = 1.0; //If people are buffering their throttle up
+						}
+						
+						mp.players.local.vehicle.setEngineTorqueMultiplier(deltaAmount);
+						
+						//Calculate tick time and step every 250ms
+                        if (mp.game.invoke('0x9CD27B0045628463') - prevTime > 250)
+						{
+                            prevTime = mp.game.invoke('0x9CD27B0045628463');
+							deltaAmount += constantStep * speed; //Curve
+							if(deltaAmount > 1.0)
+							{
+								deltaAmount = 1.0;
+							}
+						}
+					}
+					else
+					{
+						deltaAmount = constantStart; //Reset when they let go of throttle
+						//mp.game.controls.setControlNormal(0, 71, amount);
+					}
+				}
+				
+				//THIS IS THE BRAKE LIGHT SYSTEM WITH ANTI-REVERSE
+				if(DisableAntiReverse)
+					return;
+				
+				if(speed < 1)
+				{
+					vehicleStopped = true;
+				}
+				else
+				{
+					vehicleStopped = false;
+					vehicleStoppedOnOwn = false;
+					diffToggle = false;
+				}
+				
+				if((!isControl72Pressed && mp.game.controls.isControlEnabled(0, 72)) && !isControl76Pressed && vehicleStopped)
+				{
+					vehicleStoppedOnOwn = true;
+					mp.players.local.vehicle.setBrakeLights(true);
+				}
+				
+				if(vehicleStopped && !vehicleStoppedOnOwn && !mp.players.local.vehicle.isInBurnout() && !diffToggle)
+				{
+					mp.players.local.vehicle.setBrakeLights(true);
+					mp.game.controls.disableControlAction(0, 72, true);
+				}
+				
+				if((isControl71Pressed && !isControl72Pressed) || isControl76Pressed)
+				{
+					mp.players.local.vehicle.setBrakeLights(false);
+				}
+				
+				if(mp.game.controls.isDisabledControlJustReleased(0, 72) && vehicleStopped)
+				{
+					mp.game.controls.enableControlAction(0, 72, true);
+					diffToggle = true;
+				}
+			}
+		}
+	}
+});