From af2a25767bcc288dd5bc54b2eb223af1f7e7e6a0 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Mon, 26 Apr 2021 23:50:47 +0100
Subject: [PATCH] fixes

---
 client/main.lua |  8 ++++----
 config.lua      | 30 +++++++++++++++---------------
 esx_shops.sql   | 19 -------------------
 3 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100644 esx_shops.sql

diff --git a/client/main.lua b/client/main.lua
index 579b3469..049a35eb 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -20,7 +20,7 @@ function OpenShopMenu(zone)
 		table.insert(elements, {
 			label      = ('%s - <span style="color:green;">%s</span>'):format(item.label, _U('shop_item', ESX.Math.GroupDigits(item.price))),
 			itemLabel = item.label,
-			item       = item.item,
+			item       = item.name,
 			price      = item.price,
 
 			-- menu properties
@@ -79,9 +79,9 @@ Citizen.CreateThread(function()
 		for i = 1, #v.Pos, 1 do
 			local blip = AddBlipForCoord(v.Pos[i])
 
-			SetBlipSprite (blip, v.Type[i])
-			SetBlipScale  (blip, v.Size[i])
-			SetBlipColour (blip, v.Color[i])
+			SetBlipSprite (blip, v.Type)
+			SetBlipScale  (blip, v.Size)
+			SetBlipColour (blip, v.Color)
 			SetBlipAsShortRange(blip, true)
 
 			BeginTextCommandSetBlipName('STRING')
diff --git a/config.lua b/config.lua
index c69fd272..4ae11565 100644
--- a/config.lua
+++ b/config.lua
@@ -10,13 +10,13 @@ Config.Zones = {
 	TwentyFourSeven = {
 		Items = {
 			{
-				name = bread,
-				label = bread,
+				name = "bread",
+				label = "bread",
 				price = 100
 			},
 			{
-				name = water,
-				label = bread,
+				name = "water",
+				label = "water",
 				price = 100
 			}
 		},
@@ -32,19 +32,19 @@ Config.Zones = {
 	},
 	Size  = 1.0,
 	Type  = 59,
-	Color = {r = 102, g = 102, b = 204, a = 255}
+	Color = 25
 },
 
 	RobsLiquor = {
 		Items = {
 			{
-				name = bread,
-				label = bread,
+				name = "bread",
+				label = "bread",
 				price = 100
 			},
 			{
-				name = water,
-				label = bread,
+				name = "water",
+				label = "water",
 				price = 100
 			}
 		},
@@ -61,19 +61,19 @@ Config.Zones = {
 	},
 	Size  = 1.0,
 	Type  = 59,
-	Color = {r = 102, g = 102, b = 204, a = 255}
+	Color = 25
 },
 
 	LTDgasoline = {
 		Items = {
 			{
-				name = bread,
-				label = bread,
+				name = "bread",
+				label = "bread",
 				price = 100
 			},
 			{
-				name = water,
-				label = bread,
+				name = "water",
+				label = "water",
 				price = 100
 			}
 		},
@@ -86,6 +86,6 @@ Config.Zones = {
 	},
 	Size  = 1.0,
 	Type  = 59,
-	Color = {r = 102, g = 102, b = 204, a = 255}
+	Color = 25
 }
 }
diff --git a/esx_shops.sql b/esx_shops.sql
deleted file mode 100644
index e60fdd04..00000000
--- a/esx_shops.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-USE `es_extended`;
-
-CREATE TABLE `shops` (
-	`id` int NOT NULL AUTO_INCREMENT,
-	`store` varchar(100) NOT NULL,
-	`item` varchar(100) NOT NULL,
-	`price` int NOT NULL,
-
-	PRIMARY KEY (`id`)
-);
-
-INSERT INTO `shops` (store, item, price) VALUES
-	('TwentyFourSeven','bread',30),
-	('TwentyFourSeven','water',15),
-	('RobsLiquor','bread',30),
-	('RobsLiquor','water',15),
-	('LTDgasoline','bread',30),
-	('LTDgasoline','water',15)
-;