Merge branch 'development' into XdGoldenTigerOfficial-patch-7

Author: christopher-nzcs

SharedClasses/ConfigManager.cs

@@ -54,6 +54,7 @@ public enum Setting
             vmenu_dynamic_weather_timer,
             vmenu_current_weather,
             vmenu_blackout_enabled,
+            vmenu_vehicle_blackout_enabled,
             vmenu_weather_change_duration,
             vmenu_enable_snow,
 

SharedClasses/PermissionsManager.cs

@@ -186,6 +186,7 @@ public enum Permission
             WOAll,
             WODynamic,
             WOBlackout,
+            WOVehBlackout,
             WOSetWeather,
             WORemoveClouds,
             WORandomizeClouds,

vMenu/EventManager.cs

@@ -18,6 +18,7 @@ namespace vMenuClient
 {
     public class EventManager : BaseScript
     {
+        public static WeatherOptions WeatherOptionsMenu { get; private set; }
         public static bool IsSnowEnabled => GetSettingsBool(Setting.vmenu_enable_snow);
         public static int GetServerMinutes => MathUtil.Clamp(GetSettingsInt(Setting.vmenu_current_minute), 0, 59);
         public static int GetServerHours => MathUtil.Clamp(GetSettingsInt(Setting.vmenu_current_hour), 0, 23);
@@ -283,18 +284,29 @@ private async Task UpdateWeatherParticles()
         /// <returns></returns>
         private async Task WeatherSync()
         {
+            if (MainMenu.WeatherOptionsMenu == null)
+            {
+                return;
+            }
+
+            bool isEnabled = MainMenu.WeatherOptionsMenu.IsVehicleLightsEnabled;
+
             await UpdateWeatherParticles();
             SetArtificialLightsState(IsBlackoutEnabled);
+            SetArtificialLightsStateAffectsVehicles(!isEnabled);
+
             if (GetNextWeatherType() != GetHashKey(GetServerWeather))
             {
                 SetWeatherTypeOvertimePersist(GetServerWeather, (float)WeatherChangeTime);
                 await Delay((WeatherChangeTime * 1000) + 2000);
 
                 TriggerEvent("vMenu:WeatherChangeComplete", GetServerWeather);
             }
+
             await Delay(1000);
         }
 
+
         /// <summary>
         /// This function will take care of time sync. It'll be called once, and never stop.
         /// </summary>

vMenu/menus/MpPedCustomization.cs

@@ -2194,6 +2194,10 @@ private void CreateSavedPedsMenu()
             var clonePed = new MenuItem("Clone Saved Character", "This will make a clone of your saved character. It will ask you to provide a name for that character. If that name is already taken the action will be canceled.");
             var setAsDefaultPed = new MenuItem("Set As Default Character", "If you set this character as your default character, and you enable the 'Respawn As Default MP Character' option in the Misc Settings menu, then you will be set as this character whenever you (re)spawn.");
             var renameCharacter = new MenuItem("Rename Saved Character", "You can rename this saved character. If the name is already taken then the action will be canceled.");
+            var saveCurrentPedAsCharacter = new MenuItem("Update Character Clothing", "This applies your current clothing to this saved ped. ~r~This will overwrite this saved ped's clothing.~w~ Only clothing is updated, no other appearance features.")
+            {
+                LeftIcon = MenuItem.Icon.WARNING
+            };
             var delPed = new MenuItem("Delete Saved Character", "Deletes the selected saved character. This can not be undone!")
             {
                 LeftIcon = MenuItem.Icon.WARNING
@@ -2204,6 +2208,7 @@ private void CreateSavedPedsMenu()
             manageSavedCharacterMenu.AddMenuItem(setCategoryBtn);
             manageSavedCharacterMenu.AddMenuItem(setAsDefaultPed);
             manageSavedCharacterMenu.AddMenuItem(renameCharacter);
+            manageSavedCharacterMenu.AddMenuItem(saveCurrentPedAsCharacter);
             manageSavedCharacterMenu.AddMenuItem(delPed);
 
             MenuController.BindMenuItem(manageSavedCharacterMenu, createCharacterMenu, editPedBtn);
@@ -2290,6 +2295,30 @@ private void CreateSavedPedsMenu()
                         }
                     }
                 }
+                else if (item == saveCurrentPedAsCharacter)
+                {
+                    if (saveCurrentPedAsCharacter.Label == "Are you sure?")
+                    {
+                        saveCurrentPedAsCharacter.Label = "";
+                        var tmpCharacter = StorageManager.GetSavedMpCharacterData("mp_ped_" + selectedSavedCharacterManageName);
+
+                        tmpCharacter = ReplacePedDataClothing(tmpCharacter);
+
+                        if (StorageManager.SaveJsonData(tmpCharacter.SaveName, JsonConvert.SerializeObject(tmpCharacter), true))
+                        {
+                            Notify.Success($"This character's clothing has been updated!");
+                            UpdateSavedPedsMenu();
+                        }
+                        else
+                        {
+                            Notify.Error("Unable to update this character's clothing. The reason is unknown.");
+                        }
+                    }
+                    else
+                    {
+                        saveCurrentPedAsCharacter.Label = "Are you sure?";
+                    }
+                }
                 else if (item == delPed)
                 {
                     if (delPed.Label == "Are you sure?")
@@ -2319,6 +2348,14 @@ private void CreateSavedPedsMenu()
                         delPed.Label = "";
                     }
                 }
+
+                if (item != saveCurrentPedAsCharacter)
+                {
+                    if (saveCurrentPedAsCharacter.Label == "Are you sure?")
+                    {
+                        saveCurrentPedAsCharacter.Label = "";
+                    }
+                }
             };
 
             // Update category preview icon
@@ -2387,7 +2424,13 @@ private void CreateSavedPedsMenu()
             // reset the "are you sure" state.
             manageSavedCharacterMenu.OnMenuClose += (sender) =>
             {
-                manageSavedCharacterMenu.GetMenuItems().Last().Label = "";
+                foreach (MenuItem item in manageSavedCharacterMenu.GetMenuItems())
+                {
+                    if (item.Label == "Are you sure?")
+                    {
+                        item.Label = "";
+                    }
+                }
             };
 
             // Load selected category
@@ -2930,6 +2973,28 @@ private List<string> GetAllMpCharacterNames()
             return names;
         }
 
+        private MultiplayerPedData ReplacePedDataClothing(MultiplayerPedData character)
+        {
+            int handle = Game.PlayerPed.Handle;
+
+            // Drawables
+            for (int i = 0; i < 12; i++)
+            {
+                int drawable = GetPedDrawableVariation(handle, i);
+                int texture = GetPedTextureVariation(handle, i);
+                character.DrawableVariations.clothes[i] = new KeyValuePair<int, int>(drawable, texture);
+            }
+
+            for (int i = 0; i < 8; i++)
+            {
+                int prop = GetPedPropIndex(handle, i);
+                int texture = GetPedPropTextureIndex(handle, i);
+                character.PropVariations.props[i] = new KeyValuePair<int, int>(prop, texture);
+            }
+
+            return character;
+        }
+
         internal void SetHeadBlend()
         {
             SetPedHeadBlendData(Game.PlayerPed.Handle, _dadSelection, _mumSelection, 0, _dadSelection, _mumSelection, 0, _shapeMixValue, _skinMixValue, 0f, false);