Merge pull request #2 from MccDev260/HazardLights

Hazard lights

Author: FrayedFunction

EVLC_Settings.ini

@@ -7,11 +7,14 @@ Beam_Toggle_Key=CapsLock
 Beam_Toggle_Button=ScriptRLeft
 
 [Interior]
-Interior_Light_toggle_key=I
+Interior_Light_toggle_Key=I
 
 [Indicators]
 Left_Indicator_Key=Left
 Left_Indicator_Button=ScriptPadLeft
 
 Right_Indicator_Key=Right
-Right_Indicator_Button=ScriptPadRight
+Right_Indicator_Button=ScriptPadRight
+
+Hazard_Lights_Key=Down
+Hazard_Lights_Button=ScriptRB

Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("EnhancedVehicleControls")]
+[assembly: AssemblyTitle("EnhancedVehicleLightingControls")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("MccDev260")]
-[assembly: AssemblyProduct("EnhancedVehicleControls")]
+[assembly: AssemblyProduct("EnhancedVehicleLightingControls")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.2.3.0")]
+[assembly: AssemblyFileVersion("0.3.0.0")]

docs/README.md

@@ -26,15 +26,16 @@ As of v0.2.0 this mod has basic controller support. Despite this, i still recomm
 - **Siren Toggle**: Tab
 - **Beam Toggle**: CapsLock
 - **Interior Light Toggle**: I
-- **Left Indicator**: Left Arrow
-- **Right Indicator**: Right Arrow
+- **Left Indicator**: Left
+- **Right Indicator**: Right
+- **Hazard lights**: Down 
 
 #### *Controller*:
 - **Siren Toggle**: DPadDown
 - **Beam Toggle**: x button
 - **Left Indicator**: DPadLeft
 - **Right Indicator**: DPadRight
-
+- **Hazard lights**: RB
 
 
 #### *Custom Bindings*:
@@ -44,6 +45,7 @@ See '\docs\ControllerButtonList.pdf' for a list of valid button binds.
 --- 
 
 ## Changelog
+- **v0.3.0**: Added hazard light features.
 - **v0.2.3.0**: Added basic controller support.
 
 ---

main.cs

@@ -13,9 +13,10 @@ public class Main : Script
         Ped playerCharacter = Game.Player.Character;
         bool isSirenSilent;
         bool leftIndicator, rightIndicator;
+        bool hazards;
 
-        Keys sirenToggleKey, beamToggleKey, interiorLightToggleKey, leftIndicatorKey, rightIndicatorKey;
-        GTA.Control sirenToggleButton, beamToggleButton, leftIndicatorButton, rightIndicatorButton;
+        Keys sirenToggleKey, beamToggleKey, interiorLightToggleKey, leftIndicatorKey, rightIndicatorKey, hazardsKey;
+        GTA.Control sirenToggleButton, beamToggleButton, leftIndicatorButton, rightIndicatorButton, hazardsButton;
 
         public Main()
         {
@@ -29,21 +30,23 @@ public Main()
             beamToggleKey = config.GetValue<Keys>("Headlights", "Beam_Toggle_Key", Keys.CapsLock);
             interiorLightToggleKey = config.GetValue<Keys>("Interior", "Interior_Light_Toggle_Key", Keys.I);
             leftIndicatorKey = config.GetValue<Keys>("Indicators", "Left_Indicator_key", Keys.Left);
-            rightIndicatorKey = config.GetValue<Keys>("Indicators", "Right_Indicator_key", Keys.Right);
+            rightIndicatorKey = config.GetValue<Keys>("Indicators", "Right_Indicator_Key", Keys.Right);
+            hazardsKey = config.GetValue<Keys>("Indicators", "Hazard_Lights_Key", Keys.Down);
             #endregion
 
             #region Buttons
             sirenToggleButton = config.GetValue<GTA.Control>("Emergency Vehicles", "Siren_Toggle_Button", GTA.Control.ScriptPadDown);
             beamToggleButton = config.GetValue<GTA.Control>("Headlights", "Beam_Toggle_Button", GTA.Control.ScriptRLeft);
             leftIndicatorButton = config.GetValue<GTA.Control>("Indicators", "Left_Indicator_Button", GTA.Control.ScriptPadLeft);
             rightIndicatorButton = config.GetValue<GTA.Control>("Indicators", "Right_Indicator_Button", GTA.Control.ScriptPadRight);
+            hazardsButton = config.GetValue<GTA.Control>("Indicators", "Hazard_Lights_Button", GTA.Control.ScriptRB);
             #endregion
         }
 
         private void OnTick(object sender, EventArgs e)
         {
             string modName = "Enhanced Vehicle Lighting Controls";
-            string version = "PreRelease v0.2.3";
+            string version = "PreRelease v0.3.0";
             string developer = "MccDev260";
 
             if (firstTime)
@@ -56,6 +59,7 @@ private void OnTick(object sender, EventArgs e)
                 GamePad();
         }
 
+        #region Input
         private void OnKeyDown(object sender, KeyEventArgs e)
         {   
             if (playerCharacter.CurrentVehicle != null)
@@ -74,6 +78,9 @@ private void OnKeyDown(object sender, KeyEventArgs e)
 
                 if (e.KeyCode == leftIndicatorKey)
                     ToggleLeftIndicator();
+
+                if (e.KeyCode == hazardsKey)
+                    ToggleHazards();
             }
         }
 
@@ -90,7 +97,11 @@ private void GamePad()
 
             if (Game.IsControlJustPressed(rightIndicatorButton))
                 ToggleRightIndicator();
+
+            if (Game.IsControlJustPressed(hazardsButton))
+                ToggleHazards();
         }
+        #endregion
 
         private void ToggleSiren()
         {
@@ -114,22 +125,36 @@ private void ToggleInteriorLights()
             playerCharacter.CurrentVehicle.IsInteriorLightOn = !playerCharacter.CurrentVehicle.IsInteriorLightOn;
         }
 
-        private void ToggleRightIndicator()
+        #region Indicators
+        private void ToggleHazards()
         {
-            rightIndicator = !rightIndicator;
-            playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
+            hazards = !hazards;
+            SetIndicators(hazards, hazards);
+        }
 
+        private void ToggleRightIndicator()
+        {
             if (leftIndicator)
                 ToggleLeftIndicator();
+            
+            rightIndicator = !rightIndicator;
+            SetIndicators(false, rightIndicator);
         }
 
         private void ToggleLeftIndicator()
         {
-            leftIndicator = !leftIndicator;
-            playerCharacter.CurrentVehicle.IsLeftIndicatorLightOn = leftIndicator;
-
             if (rightIndicator)
                 ToggleRightIndicator();
+
+            leftIndicator = !leftIndicator;
+            SetIndicators(leftIndicator);
+        }
+
+        private void SetIndicators(bool leftIndicator = false, bool rightIndicator = false)
+        {
+            playerCharacter.CurrentVehicle.IsLeftIndicatorLightOn = leftIndicator;
+            playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
         }
+        #endregion
     }
 }