Merge branch 'development' into update-vMenu-to-SA-Mercenaries-DLC

TomGrobbe · Jul 27, 2023 · 7af027b · 7af027b
2 parents 318576b + 336bdb0
commit 7af027b
Show file tree

Hide file tree

Showing 4 changed files with 2,335 additions and 2,230 deletions.
diff --git a/SharedClasses/ConfigManager.cs b/SharedClasses/ConfigManager.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
-
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using CitizenFX.Core;
-
-using Newtonsoft.Json;
-
 using static CitizenFX.Core.Native.API;
+using Newtonsoft.Json;
 
 namespace vMenuShared
 {
@@ -33,13 +33,16 @@ public enum Setting
  vmenu_disable_entity_outlines_tool,
  vmenu_disable_player_stats_setup,
 
+ // Vehicle Chameleon Colours
+ vmenu_using_chameleon_colours,
+
  // Kick & ban settings
  vmenu_default_ban_message_information,
  vmenu_auto_ban_cheaters,
  vmenu_auto_ban_cheaters_ban_message,
  vmenu_log_ban_actions,
  vmenu_log_kick_actions,
-
+ 
  // Weather settings
  vmenu_enable_weather_sync,
  vmenu_enable_dynamic_weather,

diff --git a/vMenu/data/VehicleData.cs b/vMenu/data/VehicleData.cs
@@ -38,6 +38,71 @@ public VehicleColor(int id, string label)
  CitizenFX.Core.Native.API.AddTextEntry("VERY_DARK_BLUE", "Very Dark Blue");
  }
  }
+ // Chameleon Colour Labels //
+ else if (label == "G9_PAINT01")
+ {
+ AddTextEntry("G9_PAINT01", "Monochrome");
+ }
+ else if (label == "G9_PAINT02")
+ {
+ AddTextEntry("G9_PAINT02", "Night & Day");
+ }
+ else if (label == "G9_PAINT03")
+ {
+ AddTextEntry("G9_PAINT03", "The Verlierer");
+ }
+ else if (label == "G9_PAINT04")
+ {
+ AddTextEntry("G9_PAINT04", "Sprunk Extreme");
+ }
+ else if (label == "G9_PAINT05")
+ {
+ AddTextEntry("G9_PAINT05", "Vice City");
+ }
+ else if (label == "G9_PAINT06")
+ {
+ AddTextEntry("G9_PAINT06", "Synthwave Nights");
+ }
+ else if (label == "G9_PAINT07")
+ {
+ AddTextEntry("G9_PAINT07", "Four Seasons");
+ }
+ else if (label == "G9_PAINT08")
+ {
+ AddTextEntry("G9_PAINT08", "Maisonette 9 Throwback");
+ }
+ else if (label == "G9_PAINT09")
+ {
+ AddTextEntry("G9_PAINT09", "Bubblegum");
+ }
+ else if (label == "G9_PAINT10")
+ {
+ AddTextEntry("G9_PAINT10", "Full Rainbow");
+ }
+ else if (label == "G9_PAINT11")
+ {
+ AddTextEntry("G9_PAINT11", "Sunset");
+ }
+ else if (label == "G9_PAINT12")
+ {
+ AddTextEntry("G9_PAINT12", "The Seven");
+ }
+ else if (label == "G9_PAINT13")
+ {
+ AddTextEntry("G9_PAINT13", "Kamen Rider");
+ }
+ else if (label == "G9_PAINT14")
+ {
+ AddTextEntry("G9_PAINT14", "Chromatic Aberration");
+ }
+ else if (label == "G9_PAINT15")
+ {
+ AddTextEntry("G9_PAINT15", "It's Christmas!");
+ }
+ else if (label == "G9_PAINT16")
+ {
+ AddTextEntry("G9_PAINT16", "Temperature");
+ }
 
  this.label = label;
  this.id = id;
@@ -260,6 +325,27 @@ public VehicleColor(int id, string label)
  new VehicleColor(132, "FROST_WHITE"),
  new VehicleColor(133, "OLIVE_GREEN"),
  };
+
+ // Chameleon Colour List //
+ public static readonly List<VehicleColor> ChameleonColors = new List<VehicleColor>()
+ {
+ new VehicleColor(223, "G9_PAINT01"),
+ new VehicleColor(224, "G9_PAINT02"),
+ new VehicleColor(225, "G9_PAINT03"),
+ new VehicleColor(226, "G9_PAINT04"),
+ new VehicleColor(227, "G9_PAINT05"),
+ new VehicleColor(228, "G9_PAINT06"),
+ new VehicleColor(229, "G9_PAINT07"),
+ new VehicleColor(230, "G9_PAINT08"),
+ new VehicleColor(231, "G9_PAINT09"),
+ new VehicleColor(232, "G9_PAINT10"),
+ new VehicleColor(233, "G9_PAINT11"),
+ new VehicleColor(234, "G9_PAINT12"),
+ new VehicleColor(235, "G9_PAINT13"),
+ new VehicleColor(236, "G9_PAINT14"),
+ new VehicleColor(237, "G9_PAINT15"),
+ new VehicleColor(238, "G9_PAINT16"),
+ };
 
  public static class Vehicles
  {