Merge pull request #7 from TanguyOrtegat/master

fix turbo

client/main.lua

@@ -129,6 +129,10 @@ function GetAction(data)
 				else
 					table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1})
 				end
+				
+				if v.modType == 17 then
+					table.insert(elements, {label = " " .. _U('no_turbo'), modType = k, modNum = false})
+				end
 
 				if v.modType == 14 then -- HORNS
 					for j = 0, 51, 1 do
@@ -205,7 +209,7 @@ function GetAction(data)
 							table.insert(elements, {label = _label, modType = 'modFrontWheels', modNum = j, wheelType = v.wheelType, price = v.price})
 						end
 					end
-				elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 18 then
+				elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then
 					local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES
 					for j = 0, modCount-1, 1 do
 						local _label = ''
@@ -216,6 +220,14 @@ function GetAction(data)
 						end
 						table.insert(elements, {label = _label, modType = k, modNum = j})
 					end
+				elseif v.modType == 17 then -- TURBO
+					local _label = ''
+					if currentMods.modTurbo then
+						_label = 'Turbo - <span style="color:cornflowerblue;">'.. _U('installed') ..'</span>'
+					else
+						_label = 'Turbo - <span style="color:green;">$' .. v.price .. ' </span>'
+					end
+					table.insert(elements, {label = _label, modType = k, modNum = true})
 				else
 					local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS
 					for j = 0, modCount, 1 do

config.lua

@@ -12,36 +12,36 @@ Config.Zones = {
         Hint  = _U('press_custom')
     },
      ls2 = {
-	Pos   = { x = -1155.536, y = -2007.183, z = 12.744},
-	Size  = {x = 3.0, y = 3.0, z = 0.2},
-	Color = {r = 204, g = 204, b = 0},
-	Marker= 1,
-	Name  = "Los Santos Customs",
-	Hint  = _U('press_custom')
+		Pos   = { x = -1155.536, y = -2007.183, z = 12.744},
+		Size  = {x = 3.0, y = 3.0, z = 0.2},
+		Color = {r = 204, g = 204, b = 0},
+		Marker= 1,
+		Name  = "Los Santos Customs",
+		Hint  = _U('press_custom')
     },
      ls3 = {
-	Pos   = { x = 731.8163, y = -1088.822, z = 21.733},
-	Size  = {x = 3.0, y = 3.0, z = 0.2},
-	Color = {r = 204, g = 204, b = 0},
-	Marker= 1,
-	Name  = "Los Santos Customs",
-	Hint  = _U('press_custom')
+		Pos   = { x = 731.8163, y = -1088.822, z = 21.733},
+		Size  = {x = 3.0, y = 3.0, z = 0.2},
+		Color = {r = 204, g = 204, b = 0},
+		Marker= 1,
+		Name  = "Los Santos Customs",
+		Hint  = _U('press_custom')
     },
      ls4 = {
-	Pos   = { x = 1175.04, y = 2640.216, z = 37.32177},
-	Size  = {x = 3.0, y = 3.0, z = 0.2},
-	Color = {r = 204, g = 204, b = 0},
-	Marker= 1,
-	Name  = "Los Santos Customs",
-	Hint  = _U('press_custom')
+		Pos   = { x = 1175.04, y = 2640.216, z = 37.32177},
+		Size  = {x = 3.0, y = 3.0, z = 0.2},
+		Color = {r = 204, g = 204, b = 0},
+		Marker= 1,
+		Name  = "Los Santos Customs",
+		Hint  = _U('press_custom')
     },
      ls5 = {
-	Pos   = { x = 110.99, y = 6626.39, z = 30.89},
-	Size  = {x = 3.0, y = 3.0, z = 0.2},
-	Color = {r = 204, g = 204, b = 0},
-	Marker= 1,
-	Name  = "Los Santos Customs",
-	Hint  = _U('press_custom')
+		Pos   = { x = 110.99, y = 6626.39, z = 30.89},
+		Size  = {x = 3.0, y = 3.0, z = 0.2},
+		Color = {r = 204, g = 204, b = 0},
+		Marker= 1,
+		Name  = "Los Santos Customs",
+		Hint  = _U('press_custom')
     },
 }
 
@@ -481,7 +481,7 @@ Config.Menus = {
 	modTurbo = {
 		label = _U('turbo'),
 		parent = 'upgrades',
-		modType = 18,
+		modType = 17,
 		price = 500
 	},
 	cosmetics = {

locales/de.lua

@@ -138,6 +138,7 @@ Locales['de'] = {
 	['suspension'] = 'suspension',
 	['armor'] = 'armor',
 	['turbo'] = 'turbo',
+	['no_turbo'] = 'keine turbo',
 -- Cosmetics
 	['cosmetics'] = 'cosmetics',
 	-- Body Parts

locales/en.lua

@@ -200,6 +200,7 @@ Locales['en'] = {
 	['suspension'] = 'suspension',
 	['armor'] = 'armor',
 	['turbo'] = 'turbo',
+	['no_turbo'] = 'no turbo',
 -- Cosmetics
 	['cosmetics'] = 'cosmetics',
 	-- Body Parts

locales/fr.lua

@@ -200,6 +200,7 @@ Locales['fr'] = {
 	['suspension'] = 'suspension',
 	['armor'] = 'armure',
 	['turbo'] = 'turbo',
+	['no_turbo'] = 'pas de turbo',
 -- Cosmetics
 	['cosmetics'] = 'cosmétiques',
 	-- Body Parts