From a2e53dd64e2054ffa8a8285983820a40e4de8b8a Mon Sep 17 00:00:00 2001
From: renaiku <corbeau.lenaic@gmail.com>
Date: Wed, 30 Aug 2017 12:57:48 +0200
Subject: [PATCH] paint colors and return bugfixes

---
 client/main.lua |  6 ++++--
 config.lua      | 22 ++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 3938d12b..1178ce49 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -110,8 +110,7 @@ function GetAction(data)
 	local vehicle = GetVehiclePedIsIn(playerPed, false)
 	local currentMods = ESX.Game.GetVehicleProperties(vehicle)
 
-	for k,v in pairs(Config
-		.Menus) do
+	for k,v in pairs(Config.Menus) do
 
 		if data.value == k then
 
@@ -123,6 +122,9 @@ function GetAction(data)
 
 				if v.modType == 22 then
 					table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = false})
+				elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then
+					local num = myCar[v.modType]
+					table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = num})
 				else
 					table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1})
 				end
diff --git a/config.lua b/config.lua
index aef63381..67cfa883 100644
--- a/config.lua
+++ b/config.lua
@@ -418,37 +418,37 @@ Config.Menus = {
 	},
 	modEngine = {
 		label = _U('engine'),
-		parent = 'modEngine',
+		parent = 'upgrades',
 		modType = 11,
 		price = 500
 	},
 	modBrakes = {
 		label = _U('brakes'),
-		parent = 'modBrakes',
+		parent = 'upgrades',
 		modType = 12,
 		price = 500
 	},
 	modTransmission = {
 		label = _U('transmission'),
-		parent = 'modTransmission',
+		parent = 'upgrades',
 		modType = 13,
 		price = 500
 	},
 	modSuspension = {
 		label = _U('suspension'),
-		parent = 'modSuspension',
+		parent = 'upgrades',
 		modType = 15,
 		price = 500
 	},
 	modArmor = {
 		label = _U('armor'),
-		parent = 'modArmor',
+		parent = 'upgrades',
 		modType = 16,
 		price = 500
 	},
 	modTurbo = {
 		label = _U('turbo'),
-		parent = 'modTurbo',
+		parent = 'upgrades',
 		modType = 18,
 		price = 500
 	},
@@ -621,51 +621,61 @@ Config.Menus = {
 	},
 	modFrontBumper = {
 		label = _U('frontbumper'),
+		parent = 'bodyparts',
 		modType = 1,
 		price = 500
 	},
 	modRearBumper = {
 		label = _U('rearbumper'),
+		parent = 'bodyparts',
 		modType = 2,
 		price = 500
 	},
 	modSideSkirt = {
 		label = _U('sideskirt'),
+		parent = 'bodyparts',
 		modType = 3,
 		price = 500
 	},
 	modExhaust = {
 		label = _U('exhaust'),
+		parent = 'bodyparts',
 		modType = 4,
 		price = 500
 	},
 	modFrame = {
 		label = _U('cage'),
+		parent = 'bodyparts',
 		modType = 5,
 		price = 500
 	},
 	modGrille = {
 		label = _U('grille'),
+		parent = 'bodyparts',
 		modType = 6,
 		price = 500
 	},
 	modHood = {
 		label = _U('hood'),
+		parent = 'bodyparts',
 		modType = 7,
 		price = 500
 	},
 	modFender = {
 		label = _U('leftfender'),
+		parent = 'bodyparts',
 		modType = 8,
 		price = 500
 	},
 	modRightFender = {
 		label = _U('rightfender'),
+		parent = 'bodyparts',
 		modType = 9,
 		price = 500
 	},
 	modRoof = {
 		label = _U('roof'),
+		parent = 'bodyparts',
 		modType = 10,
 		price = 500
 	},