From d1c5320059548bbf92d07a45dd42cb96ea94f33e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 29 Jul 2018 15:40:58 +0200 Subject: [PATCH] Changed rewards, added extra store --- config.lua | 121 +++++++++++++++++++++++++----------------------- server/main.lua | 4 +- 2 files changed, 65 insertions(+), 60 deletions(-) diff --git a/config.lua b/config.lua index 500f9a31..5e56242d 100644 --- a/config.lua +++ b/config.lua @@ -4,63 +4,68 @@ Config.Locale = 'fr' Config.PoliceNumberRequired = 2 Config.TimerBeforeNewRob = 1800 -- seconds - --- Change secondsRemaining if you want another timer Stores = { - --[["paleto_twentyfourseven"] = { - position = { ['x'] = 1736.32092285156, ['y'] = 6419.4970703125, ['z'] = 35.037223815918 }, - reward = math.random(100,1000), - nameofstore = "24/7. (Paleto Bay)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - },]] - ["sandyshores_twentyfoursever"] = { - position = { ['x'] = 1961.24682617188, ['y'] = 3749.46069335938, ['z'] = 32.3437461853027 }, - reward = math.random(500,2500), - nameofstore = "24/7. (Sandy Shores)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - }, - ["bar_one"] = { - position = { ['x'] = 1990.579, ['y'] = 3044.957, ['z'] = 47.215171813965 }, - reward = math.random(500,2500), - nameofstore = "Yellow Jack. (Sandy Shores)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - }, - ["ocean_liquor"] = { - position = { ['x'] = -2959.33715820313, ['y'] = 388.214172363281, ['z'] = 14.0432071685791 }, - reward = math.random(1000,3000), - nameofstore = "Robs Liquor. (Great Ocean Higway)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - }, - ["sanandreas_liquor"] = { - position = { ['x'] = -1219.85607910156, ['y'] = -916.276550292969, ['z'] = 11.3262157440186 }, - reward = math.random(3000,8000), - nameofstore = "Robs Liquor. (San andreas Avenue)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - }, - ["grove_ltd"] = { - position = { ['x'] = -43.4035377502441, ['y'] = -1749.20922851563, ['z'] = 29.421012878418 }, - reward = math.random(3000,8000), - nameofstore = "LTD Gasoline. (Grove Street)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - }, - ["mirror_ltd"] = { - position = { ['x'] = 1160.67578125, ['y'] = -314.400451660156, ['z'] = 69.2050552368164 }, - reward = math.random(3000,8000), - nameofstore = "LTD Gasoline. (Mirror Park Boulevard)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - }, - ["littleseoul_twentyfourseven"] = { - position = { ['x'] = -709.17022705078, ['y'] = -904.21722412109, ['z'] = 19.215591430664 }, - reward = math.random(3000,8000), - nameofstore = "24/7. (Little Seoul)", - secondsRemaining = 200, -- seconds - lastrobbed = 0 - } + ["paleto_twentyfourseven"] = { + position = { ['x'] = 1736.32, ['y'] = 6419.47, ['z'] = 35.03 }, + reward = math.random(5000, 35000), + nameofstore = "24/7. (Paleto Bay)", + secondsRemaining = 350, -- seconds + lastrobbed = 0 + }, + ["sandyshores_twentyfoursever"] = { + position = { ['x'] = 1961.24, ['y'] = 3749.46, ['z'] = 32.34 }, + reward = math.random(3000, 20000), + nameofstore = "24/7. (Sandy Shores)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + }, + ["littleseoul_twentyfourseven"] = { + position = { ['x'] = -709.17, ['y'] = -904.21, ['z'] = 19.21 }, + reward = math.random(3000, 20000), + nameofstore = "24/7. (Little Seoul)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + }, + ["bar_one"] = { + position = { ['x'] = 1990.57, ['y'] = 3044.95, ['z'] = 47.21 }, + reward = math.random(5000, 35000), + nameofstore = "Yellow Jack. (Sandy Shores)", + secondsRemaining = 300, -- seconds + lastrobbed = 0 + }, + ["ocean_liquor"] = { + position = { ['x'] = -2959.33, ['y'] = 388.21, ['z'] = 14.00 }, + reward = math.random(3000, 30000), + nameofstore = "Robs Liquor. (Great Ocean Highway)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + }, + ["rancho_liquor"] = { + position = { ['x'] = 1126.80, ['y'] = -980.40, ['z'] = 45.41 }, + reward = math.random(3000, 50000), + nameofstore = "Robs Liquor. (El Rancho Blvd)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + }, + ["sanandreas_liquor"] = { + position = { ['x'] = -1219.85, ['y'] = -916.27, ['z'] = 11.32 }, + reward = math.random(3000, 30000), + nameofstore = "Robs Liquor. (San Andreas Avenue)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + }, + ["grove_ltd"] = { + position = { ['x'] = -43.40, ['y'] = -1749.20, ['z'] = 29.42 }, + reward = math.random(3000, 15000), + nameofstore = "LTD Gasoline. (Grove Street)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + }, + ["mirror_ltd"] = { + position = { ['x'] = 1160.67, ['y'] = -314.40, ['z'] = 69.20 }, + reward = math.random(3000, 15000), + nameofstore = "LTD Gasoline. (Mirror Park Boulevard)", + secondsRemaining = 200, -- seconds + lastrobbed = 0 + } } diff --git a/server/main.lua b/server/main.lua index 6448f1ea..792edba7 100644 --- a/server/main.lua +++ b/server/main.lua @@ -26,7 +26,7 @@ end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - local _source = source + local _source = source local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() @@ -46,7 +46,7 @@ AddEventHandler('esx_holdup:rob', function(robb) end end - if rob == false then + if not rob then if cops >= Config.PoliceNumberRequired then rob = true for i=1, #xPlayers, 1 do