Merge pull request #492 from TomGrobbe/development

v3.7.0-pre release

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);
@@ -27,6 +28,7 @@ public class EventManager : BaseScript
         public static string GetServerWeather => GetSettingsString(Setting.vmenu_current_weather, "CLEAR");
         public static bool DynamicWeatherEnabled => GetSettingsBool(Setting.vmenu_enable_dynamic_weather);
         public static bool IsBlackoutEnabled => GetSettingsBool(Setting.vmenu_blackout_enabled);
+        public static bool IsVehicleLightsEnabled { get; set; } = GetSettingsBool(Setting.vmenu_vehicle_blackout_enabled);
         public static int WeatherChangeTime => MathUtil.Clamp(GetSettingsInt(Setting.vmenu_weather_change_duration), 0, 45);
 
         /// <summary>
@@ -282,18 +284,27 @@ private async Task UpdateWeatherParticles()
         /// <returns></returns>
         private async Task WeatherSync()
         {
+            if (MainMenu.WeatherOptionsMenu == null)
+            {
+                return;
+            }
+
             await UpdateWeatherParticles();
             SetArtificialLightsState(IsBlackoutEnabled);
+            SetArtificialLightsStateAffectsVehicles(!IsVehicleLightsEnabled);
+
             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/data/PedModels.cs

@@ -43,6 +43,7 @@ public static class PedModels
             (uint)GetHashKey("a_c_retriever"),
             (uint)GetHashKey("a_c_rhesus"),
             (uint)GetHashKey("a_c_rottweiler"),
+            (uint)GetHashKey("a_c_rottweiler_02"), // mp2025_01
             (uint)GetHashKey("a_c_seagull"),
             (uint)GetHashKey("a_c_sharkhammer"),
             (uint)GetHashKey("a_c_sharktiger"),

vMenu/data/VehicleData.cs

@@ -384,17 +384,21 @@ public static class Vehicles
                 "COGNOSCENTI",
                 "COGNOSCENTI2",
                 "DEITY", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
+                "DRIFTCHAVOSV6", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
+                "DRIFTHARDY", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "DRIFTVORSCHLAG", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258
                 "EMPEROR",
                 "EMPEROR2",
                 "EMPEROR3",
                 "FUGITIVE",
                 "GLENDALE",
                 "GLENDALE2", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
+                "HARDY", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "IMPALER5", // CHOP SHOP (MP2023_02) DLC - Requires b3095
                 "INGOT",
                 "INTRUDER",
                 "LIMO2",
+                "MINIMUS", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "PREMIER",
                 "PRIMO",
                 "PRIMO2",
@@ -440,6 +444,7 @@ public static class Vehicles
                 "DORADO", // CHOP SHOP (MP2023_02) DLC - Requires b3095
                 "DUBSTA",
                 "DUBSTA2",
+                "EVERON3", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "FQ2",
                 "GRANGER",
                 "GRANGER2", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
@@ -465,6 +470,7 @@ public static class Vehicles
                 "SQUADDIE", // CAYO PERICO (MPHEIST4) DLC - Requires b2189
                 "TOROS",
                 "VIVANITE", // CHOP SHOP (MP2023_02) DLC - Requires b3095
+                "WOODLANDER", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "XLS",
                 "XLS2",
             };
@@ -520,6 +526,8 @@ public static class Vehicles
                 "DOMINATOR7", // LS TUNERS (MPTUNER) DLC - Requires b2372
                 "DOMINATOR8", // LS TUNERS (MPTUNER) DLC - Requires b2372
                 "DOMINATOR9", // CHOP SHOP (MP2023_02) DLC - Requires b3095
+                "DRIFTDOMINATOR10", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
+                "DRIFTGAUNTLET4", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "DRIFTYOSEMITE", // CHOP SHOP (MP2023_02) DLC - Requires b3095
                 "DUKES",
                 "DUKES2",
@@ -573,6 +581,7 @@ public static class Vehicles
                 "TAHOMA", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802
                 "TAMPA",
                 "TAMPA3",
+                "TAMPA4", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "TULIP",
                 "TULIP2", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802
                 "VAMOS",
@@ -599,6 +608,7 @@ public static class Vehicles
                 "CASCO",
                 "CHEBUREK",
                 "CHEETAH2",
+                "CHEETAH3", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "COQUETTE2",
                 "COQUETTE5", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258
                 "DELUXO",
@@ -731,6 +741,7 @@ public static class Vehicles
                 "RAIDEN",
                 "RAPIDGT",
                 "RAPIDGT2",
+                "RAPIDGT4", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "RAPTOR",
                 "REMUS", // LS TUNERS (MPTUNER) DLC - Requires b2372
                 "REVOLTER",
@@ -744,6 +755,7 @@ public static class Vehicles
                 "SCHWARZER",
                 "SENTINEL3",
                 "SENTINEL4", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
+                "SENTINEL5", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "SEVEN70",
                 "SM722", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
                 "SPECTER",
@@ -807,6 +819,7 @@ public static class Vehicles
                 "SCRAMJET",
                 "SHEAVA", // ETR1
                 "SULTANRS",
+                "SUZUME", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "T20",
                 "TAIPAN",
                 "TEMPESTA",
@@ -918,6 +931,7 @@ public static class Vehicles
                 "CARACARA2", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060
                 "DLOADER",
                 "DRAUGUR", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
+                "DRIFTL352", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "DUBSTA3",
                 "DUNE",
                 "DUNE2",
@@ -934,6 +948,7 @@ public static class Vehicles
                 "INSURGENT3",
                 "KALAHARI",
                 "KAMACHO",
+                "L352", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "MARSHALL",
                 "MENACER",
                 "MESA3",
@@ -975,6 +990,7 @@ public static class Vehicles
                 "CUTTER",
                 "DUMP",
                 "FLATBED",
+                "FLATBED2", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "GUARDIAN",
                 "HANDLER",
                 "MIXER",
@@ -1162,6 +1178,7 @@ public static class Vehicles
                 "HAVOK",
                 "HUNTER",
                 "MAVERICK",
+                "MAVERICK2", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "POLMAV",
                 "SAVAGE",
                 "SEASPARROW",
@@ -1268,6 +1285,7 @@ public static class Vehicles
                 "POLICE4",
                 "POLICE5", // CHOP SHOP (MP2023_02) DLC - Requires b3095
                 "POLICEB",
+                "POLICEB2", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "POLICEOLD1",
                 "POLICEOLD2",
                 "POLICET",
@@ -1331,6 +1349,7 @@ public static class Vehicles
                 "POUNDER2",
                 "STOCKADE",
                 "STOCKADE3",
+                "STOCKADE4", // MONEY FRONTS (MP2025_01) DLC - Requires b3570
                 "TERBYTE",
             };
             #endregion

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);