Merge branch 'main' into lint-fixes

AUT0CR4T · May 9, 2022 · 2dfabdd · 2dfabdd
2 parents 3b24f84 + c122a12
commit 2dfabdd
Showing 1 changed file with 43 additions and 148 deletions.
diff --git a/config.lua b/config.lua
@@ -5,7 +5,6 @@ Config.MoneyType = 'bank'
 Config.RepairMoneyType = 'cash'
 Config.UseRadial = false -- Will use qb-radial menu for entering instead of press E
 Config.allowGovPlateIndex = false -- Setting this to true will allow all vehicles to purchase gov plate index "Blue on White #3" (only for emergency vehicles otherwise)
-
 maxVehiclePerformanceUpgrades = 0 -- | All Upgrades: 0 | No Upgrades: -1 | Can be -1 to 4
 
 -- ADJUST PRICING
@@ -40,18 +39,18 @@ vehicleWindowTintOptions = {
 vehicleXenonOptions = {
     xenonColours = {
         {name = "Stock", id = 255},
-        {name = "White",id = 0}, {name = "Blue",id = 1},
-        {name = "Electric Blue",id = 2},
-        {name = "Mint Green",id = 3},
-        {name = "Lime Green",id = 4},
-        {name = "Yellow",id = 5},
-        {name = "Golden Shower",id = 6},
-        {name = "Orange",id = 7},
-        {name = "Red",id = 8},
-        {name = "Pony Pink",id = 9},
-        {name = "Hot Pink",id = 10},
-        {name = "Purple",id = 11},
-        {name = "Blacklight",id = 12}
+        {name = "White", id = 0}, {name = "Blue", id = 1},
+        {name = "Electric Blue", id = 2},
+        {name = "Mint Green", id = 3},
+        {name = "Lime Green", id = 4},
+        {name = "Yellow", id = 5},
+        {name = "Golden Shower", id = 6},
+        {name = "Orange", id = 7},
+        {name = "Red", id = 8},
+        {name = "Pony Pink", id = 9},
+        {name = "Hot Pink", id = 10},
+        {name = "Purple", id = 11},
+        {name = "Blacklight", id = 12}
     }
 }
 
@@ -78,145 +77,42 @@ vehicleWheelOptions = {
 -- TIRE SMOKE
 
 vehicleTyreSmokeOptions = {
-    {
-        name = "White Smoke",
-        r = 254,
-        g = 254,
-        b = 254
-    },
-    {
-        name = "Black Smoke",
-        r = 1,
-        g = 1,
-        b = 1
-    },
-    {
-        name = "Blue Smoke",
-        r = 0,
-        g = 150,
-        b = 255
-    },
-    {
-        name = "Yellow Smoke",
-        r = 255,
-        g = 255,
-        b = 50
-    },
-    {
-        name = "Orange Smoke",
-        r = 255,
-        g = 153,
-        b = 51
-    },
-    {
-        name = "Red Smoke",
-        r = 255,
-        g = 10,
-        b = 10
-    },
-    {
-        name = "Green Smoke",
-        r = 10,
-        g = 255,
-        b = 10
-    },
-    {
-        name = "Purple Smoke",
-        r = 153,
-        g = 10,
-        b = 153
-    },
-    {
-        name = "Pink Smoke",
-        r = 255,
-        g = 102,
-        b = 178
-    },
-    {
-        name = "Gray Smoke",
-        r = 128,
-        g = 128,
-        b = 128
-    }
+    { name = "White Smoke", r = 254, g = 254, b = 254},
+    { name = "Black Smoke", r = 1, g = 1, b = 1},
+    { name = "Blue Smoke", r = 0, g = 150, b = 255},
+    { name = "Yellow Smoke", r = 255, g = 255, b = 50},
+    { name = "Orange Smoke", r = 255, g = 153, b = 51},
+    { name = "Red Smoke", r = 255, g = 10, b = 10},
+    { name = "Green Smoke", r = 10, g = 255, b = 10},
+    { name = "Purple Smoke", r = 153, g = 10, b = 153},
+    { name = "Pink Smoke", r = 255, g = 102, b = 178},
+    { name = "Gray Smoke", r = 128, g = 128, b = 128}
 }
 
 -- NEONS
 
 vehicleNeonOptions = {
     category = "Neons",
-        neonTypes = {
-            {name = "Front Neon", id = 2},
-            {name = "Rear Neon", id = 3},
-            {name = "Left Neon", id = 0},
-            {name = "Right Neon", id = 1}
-        },
+    neonTypes = {
+        {name = "Front Neon", id = 2},
+        {name = "Rear Neon", id = 3},
+        {name = "Left Neon", id = 0},
+        {name = "Right Neon", id = 1}
+    },
     neonColours = {
-        {
-            name = "White",
-            r = 222,
-            g = 222,
-            b = 255
-        }, {
-            name = "Blue",
-            r = 2,
-            g = 21,
-            b = 255
-        }, {
-            name = "Electric Blue",
-            r = 3,
-            g = 83,
-            b = 255
-        }, {
-            name = "Mint Green",
-            r = 0,
-            g = 255,
-            b = 140
-        }, {
-            name = "Lime Green",
-            r = 94,
-            g = 255,
-            b = 1
-        }, {
-            name = "Yellow",
-            r = 255,
-            g = 255,
-            b = 0
-        }, {
-            name = "Golden Shower",
-            r = 255,
-            g = 150,
-            b = 0
-        }, {
-            name = "Orange",
-            r = 255,
-            g = 62,
-            b = 0
-        }, {
-            name = "Red",
-            r = 255,
-            g = 1,
-            b = 1
-        }, {
-            name = "Pony Pink",
-            r = 255,
-            g = 50,
-            b = 100
-        }, {
-            name = "Hot Pink",
-            r = 255,
-            g = 5,
-            b = 190
-        }, {
-            name = "Purple",
-            r = 35,
-            g = 1,
-            b = 255
-        }, {
-            name = "Blacklight",
-            r = 15,
-            g = 3,
-            b = 255
-        }
+        { name = "White", r = 222, g = 222, b = 255},
+        { name = "Blue", r = 2, g = 21, b = 255},
+        { name = "Electric Blue", r = 3, g = 83, b = 255},
+        { name = "Mint Green", r = 0, g = 255, b = 140},
+        { name = "Lime Green", r = 94, g = 255, b = 1},
+        { name = "Yellow", r = 255, g = 255, b = 0},
+        { name = "Golden Shower", r = 255, g = 150, b = 0},
+        { name = "Orange", r = 255, g = 62, b = 0},
+        { name = "Red", r = 255, g = 1, b = 1},
+        { name = "Pony Pink", r = 255, g = 50, b = 100},
+        { name = "Hot Pink", r = 255, g = 5, b = 190},
+        { name = "Purple", r = 35, g = 1, b = 255},
+        { name = "Blacklight", r = 15, g = 3, b = 255}
     }
 }
 
@@ -233,14 +129,14 @@ vehicleCustomisation = {
     {category = "Hood", id = 7},
     {category = "Left Fender", id = 8},
     {category = "Right Fender", id = 9},
-    {category = "Roof",id = 10},
+    {category = "Roof", id = 10},
     {category = "Engine Upgrade", id = 11},
     {category = "Brake Upgrade", id = 12},
     {category = "Transmission Upgrade", id = 13},
     {category = "Suspension Upgrade", id = 15},
     {category = "Armour Upgrade", id = 16},
     {category = "Turbo Upgrade", id = 18},
-    {category = "Vanity Plates",id = 25},
+    {category = "Vanity Plates", id = 25},
     {category = "Trim A", id = 27},
     {category = "Ornaments", id = 28},
     {category = "Dashboard", id = 29},
@@ -263,7 +159,6 @@ vehicleCustomisation = {
     {category = "Window", id = 46},
     {category = "Livery", id = 48},
     {category = "Horns", id = 14,
-
         hornNames = {
             {name = "Truck Horn", id = 0},
             {name = "Cop Horn", id = 1},