From 210a5a84bdbd0f9d0114a1f8d478bf0e5ddee3dd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 16:15:21 +0100 Subject: [PATCH] New owned_vehicles columns --- client/main.lua | 2 +- esx_vehicleshop.sql | 6 ++++-- localization/de_esx_vehicleshop.sql | 10 ++++++---- localization/en_esx_vehicleshop.sql | 10 ++++++---- localization/fi_esx_vehicleshop.sql | 10 ++++++---- localization/pl_esx_vehicleshop.sql | 17 +++++++++-------- localization/sv_esx_vehicleshop.sql | 10 ++++++---- server/main.lua | 2 +- 8 files changed, 39 insertions(+), 28 deletions(-) diff --git a/client/main.lua b/client/main.lua index 988b6eb4..6dac949a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -957,7 +957,7 @@ Citizen.CreateThread(function () for k,v in pairs(Config.Zones) do if(v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then - DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end end end diff --git a/esx_vehicleshop.sql b/esx_vehicleshop.sql index 2bac38b4..611bde2c 100644 --- a/esx_vehicleshop.sql +++ b/esx_vehicleshop.sql @@ -38,9 +38,11 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(30) NOT NULL, + `owner` varchar(22) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, + `type` VARCHAR(20) NOT NULL DEFAULT 'car', + `stored` TINYINT(1) NOT NULL DEFAULT '0' PRIMARY KEY (`plate`) ); @@ -51,7 +53,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int(11) NOT NULL, `rent_price` int(11) NOT NULL, - `owner` varchar(30) NOT NULL, + `owner` varchar(22) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/localization/de_esx_vehicleshop.sql b/localization/de_esx_vehicleshop.sql index d21b6915..8ae6e946 100644 --- a/localization/de_esx_vehicleshop.sql +++ b/localization/de_esx_vehicleshop.sql @@ -38,9 +38,11 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(30) DEFAULT NULL, - `plate` varchar(12) DEFAULT NULL, - `vehicle` longtext DEFAULT NULL, + `owner` varchar(22) NOT NULL, + `plate` varchar(12) NOT NULL, + `vehicle` longtext, + `type` VARCHAR(20) NOT NULL DEFAULT 'car', + `stored` TINYINT(1) NOT NULL DEFAULT '0' PRIMARY KEY (`plate`) ); @@ -51,7 +53,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int(11) NOT NULL, `rent_price` int(11) NOT NULL, - `owner` varchar(30) NOT NULL, + `owner` varchar(22) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/localization/en_esx_vehicleshop.sql b/localization/en_esx_vehicleshop.sql index 3520bd46..d7bffc9f 100644 --- a/localization/en_esx_vehicleshop.sql +++ b/localization/en_esx_vehicleshop.sql @@ -38,9 +38,11 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(30) DEFAULT NULL, - `plate` varchar(12) DEFAULT NULL, - `vehicle` longtext DEFAULT NULL, + `owner` varchar(22) NOT NULL, + `plate` varchar(12) NOT NULL, + `vehicle` longtext, + `type` VARCHAR(20) NOT NULL DEFAULT 'car', + `stored` TINYINT(1) NOT NULL DEFAULT '0' PRIMARY KEY (`plate`) ); @@ -51,7 +53,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int(11) NOT NULL, `rent_price` int(11) NOT NULL, - `owner` varchar(30) NOT NULL, + `owner` varchar(22) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/localization/fi_esx_vehicleshop.sql b/localization/fi_esx_vehicleshop.sql index 1ead6fb7..4a6c4f69 100644 --- a/localization/fi_esx_vehicleshop.sql +++ b/localization/fi_esx_vehicleshop.sql @@ -38,9 +38,11 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(30) DEFAULT NULL, - `plate` varchar(12) DEFAULT NULL, - `vehicle` longtext DEFAULT NULL, + `owner` varchar(22) NOT NULL, + `plate` varchar(12) NOT NULL, + `vehicle` longtext, + `type` VARCHAR(20) NOT NULL DEFAULT 'car', + `stored` TINYINT(1) NOT NULL DEFAULT '0' PRIMARY KEY (`plate`) ); @@ -51,7 +53,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int(11) NOT NULL, `rent_price` int(11) NOT NULL, - `owner` varchar(30) NOT NULL, + `owner` varchar(22) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/localization/pl_esx_vehicleshop.sql b/localization/pl_esx_vehicleshop.sql index ec031d02..dcd46919 100644 --- a/localization/pl_esx_vehicleshop.sql +++ b/localization/pl_esx_vehicleshop.sql @@ -38,23 +38,24 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `vehicle` longtext NOT NULL, - `owner` varchar(60) NOT NULL, + `owner` varchar(22) NOT NULL, + `plate` varchar(12) NOT NULL, + `vehicle` longtext, + `type` VARCHAR(20) NOT NULL DEFAULT 'car', + `stored` TINYINT(1) NOT NULL DEFAULT '0' - PRIMARY KEY (`id`) + PRIMARY KEY (`plate`) ); CREATE TABLE `rented_vehicles` ( - `id` int(11) NOT NULL AUTO_INCREMENT, `vehicle` varchar(60) NOT NULL, - `plate` varchar(10) NOT NULL, + `plate` varchar(12) NOT NULL, `player_name` varchar(255) NOT NULL, `base_price` int(11) NOT NULL, `rent_price` int(11) NOT NULL, - `owner` varchar(255) NOT NULL, + `owner` varchar(22) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`plate`) ); CREATE TABLE `vehicle_categories` ( diff --git a/localization/sv_esx_vehicleshop.sql b/localization/sv_esx_vehicleshop.sql index a957ae50..adabfa89 100644 --- a/localization/sv_esx_vehicleshop.sql +++ b/localization/sv_esx_vehicleshop.sql @@ -38,9 +38,11 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(30) DEFAULT NULL, - `plate` varchar(12) DEFAULT NULL, - `vehicle` longtext DEFAULT NULL, + `owner` varchar(22) NOT NULL, + `plate` varchar(12) NOT NULL, + `vehicle` longtext, + `type` VARCHAR(20) NOT NULL DEFAULT 'car', + `stored` TINYINT(1) NOT NULL DEFAULT '0' PRIMARY KEY (`plate`) ); @@ -51,7 +53,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int(11) NOT NULL, `rent_price` int(11) NOT NULL, - `owner` varchar(30) NOT NULL, + `owner` varchar(22) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/server/main.lua b/server/main.lua index c14ae386..4dff25a8 100644 --- a/server/main.lua +++ b/server/main.lua @@ -280,7 +280,7 @@ AddEventHandler('esx_vehicleshop:returnProvider', function(vehicleModel) if result[1] then local id = result[1].id - local price = ESX.Round(result[1].price * 0.75) + local price = ESX.Math.Round(result[1].price * 0.75) TriggerEvent('esx_addonaccount:getSharedAccount', 'society_cardealer', function(account) account.addMoney(price)