Basic Controller Support (#1)

* Repaired refereance to ScriptHookVDotNet

* Moved toggle arguments into their own method.

* Added basic controller support.

Author: FrayedFunction

EnhancedVehicleLightingControls.csproj

@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ScriptHookVDotNet3">
-      <HintPath>..\..\Production\Vehicle-Ragdoll Master\ScriptHookVDotNet3.dll</HintPath>
+      <HintPath>.\ScriptHookVDotNet3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

main.cs

@@ -15,82 +15,121 @@ public class Main : Script
         bool leftIndicator, rightIndicator;
 
         Keys sirenToggleKey, beamToggleKey, interiorLightToggleKey, leftIndicatorKey, rightIndicatorKey;
+        GTA.Control sirenToggleButton, beamToggleButton, leftIndicatorButton, rightIndicatorButton;
 
         public Main()
         {
             this.Tick += OnTick;
             this.KeyDown += OnKeyDown;
 
             ScriptSettings config = ScriptSettings.Load("scripts\\EVLC_Settings.ini");
-            
+
+            #region Keys
             sirenToggleKey = config.GetValue<Keys>("Emergency Vehicles", "Siren_Toggle_Key", Keys.Tab);
             beamToggleKey = config.GetValue<Keys>("All", "Beam_Toggle_Key", Keys.CapsLock);
             interiorLightToggleKey = config.GetValue<Keys>("All", "Interior_Light_Toggle_Key", Keys.I);
             leftIndicatorKey = config.GetValue<Keys>("All", "Left_Indicator_key", Keys.Left);
             rightIndicatorKey = config.GetValue<Keys>("All", "Right_Indicator_key", Keys.Right);
-
+            #endregion
+
+            #region Buttons
+            sirenToggleButton = config.GetValue<GTA.Control>("Emergency Vehicles", "Siren_Toggle_Button", GTA.Control.ScriptPadDown);
+            beamToggleButton = config.GetValue<GTA.Control>("All", "Beam_Toggle_Button", GTA.Control.ScriptRLeft);
+            leftIndicatorButton = config.GetValue<GTA.Control>("All", "Left_Indicator_Button", GTA.Control.ScriptPadLeft);
+            rightIndicatorButton = config.GetValue<GTA.Control>("All", "Right_Indicator_Button", GTA.Control.ScriptPadRight);
+            #endregion
         }
 
         private void OnTick(object sender, EventArgs e)
         {
             string modName = "Enhanced Vehicle Lighting Controls";
-            string version = "PreRelease v0.2.0";
+            string version = "PreRelease v0.2.3";
             string developer = "MccDev260";
 
             if (firstTime)
             {
                 Notification.Show(NotificationIcon.Blocked, modName, developer, version + " " + "loaded!!", false, true);
                 firstTime = false;
             }
+
+            if (Game.LastInputMethod == InputMethod.GamePad && playerCharacter.CurrentVehicle != null)
+                GamePad();
         }
 
         private void OnKeyDown(object sender, KeyEventArgs e)
-        { 
-                
+        {   
             if (playerCharacter.CurrentVehicle != null)
             {
-                if (playerCharacter.CurrentVehicle.HasSiren)
-                {
-                    if (e.KeyCode == sirenToggleKey)
-                    {
-                        isSirenSilent = !isSirenSilent;
-                        playerCharacter.CurrentVehicle.IsSirenSilent = isSirenSilent;
-                    }
-                }
-
-                if (playerCharacter.CurrentVehicle.AreLightsOn)
-                {
-                    if (e.KeyCode == beamToggleKey)
-                        playerCharacter.CurrentVehicle.AreHighBeamsOn = !playerCharacter.CurrentVehicle.AreHighBeamsOn;
-                }
+                if (e.KeyCode == sirenToggleKey)
+                    ToggleSiren();
+
+                if (e.KeyCode == beamToggleKey)
+                    ToggleFullBeams();
 
                 if (e.KeyCode == interiorLightToggleKey)
-                    playerCharacter.CurrentVehicle.IsInteriorLightOn = !playerCharacter.CurrentVehicle.IsInteriorLightOn;
+                    ToggleInteriorLights();
 
                 if (e.KeyCode == rightIndicatorKey)
-                {
-                    rightIndicator = !rightIndicator;
-                    playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
-
-                    if (leftIndicator)
-                    {
-                        leftIndicator = !leftIndicator;
-                        playerCharacter.CurrentVehicle.IsLeftIndicatorLightOn = leftIndicator;
-                    }
-                }
+                    ToggleRightIndicator();
 
                 if (e.KeyCode == leftIndicatorKey)
-                {
-                    leftIndicator = !leftIndicator;
-                    playerCharacter.CurrentVehicle.IsLeftIndicatorLightOn = leftIndicator;
-
-                    if (rightIndicator)
-                    {
-                        rightIndicator = !rightIndicator;
-                        playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
-                    }
-                }
+                    ToggleLeftIndicator();
+            }
+        }
+
+        private void GamePad()
+        {
+            if (Game.IsControlJustReleased(sirenToggleButton))
+                ToggleSiren();
+
+            if (Game.IsControlJustReleased(beamToggleButton))
+                ToggleFullBeams();
+
+            if (Game.IsControlJustPressed(leftIndicatorButton))
+                ToggleLeftIndicator();
+
+            if (Game.IsControlJustPressed(rightIndicatorButton))
+                ToggleRightIndicator();
+        }
+
+        private void ToggleSiren()
+        {
+            if (playerCharacter.CurrentVehicle.HasSiren)
+            {
+                isSirenSilent = !isSirenSilent;
+                playerCharacter.CurrentVehicle.IsSirenSilent = isSirenSilent;
             }
         }
+
+        private void ToggleFullBeams()
+        {
+            if (playerCharacter.CurrentVehicle.AreLightsOn)
+            {
+                playerCharacter.CurrentVehicle.AreHighBeamsOn = !playerCharacter.CurrentVehicle.AreHighBeamsOn;
+            }
+        }
+
+        private void ToggleInteriorLights()
+        {
+            playerCharacter.CurrentVehicle.IsInteriorLightOn = !playerCharacter.CurrentVehicle.IsInteriorLightOn;
+        }
+
+        private void ToggleRightIndicator()
+        {
+            rightIndicator = !rightIndicator;
+            playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
+
+            if (leftIndicator)
+                ToggleLeftIndicator();
+        }
+
+        private void ToggleLeftIndicator()
+        {
+            leftIndicator = !leftIndicator;
+            playerCharacter.CurrentVehicle.IsLeftIndicatorLightOn = leftIndicator;
+
+            if (rightIndicator)
+                ToggleRightIndicator();
+        }
     }
 }