From 05ea4d2de6dfe25ed41a58707a40eeadcfe6f486 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 02:44:44 +0200 Subject: [PATCH 01/44] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..2967f0af --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver_esx_holdup +FXserver ESX Hold Up From 64969144c9f84eb0c7fa8f313f4deb05e6061e92 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 02:45:41 +0200 Subject: [PATCH 02/44] Add files via upload --- esx_holdup/__resource.lua | 11 +++ esx_holdup/client/esx_holdup_cl.lua | 142 ++++++++++++++++++++++++++++ esx_holdup/config.lua | 50 ++++++++++ esx_holdup/server/esx_holdup_sv.lua | 102 ++++++++++++++++++++ 4 files changed, 305 insertions(+) create mode 100644 esx_holdup/__resource.lua create mode 100644 esx_holdup/client/esx_holdup_cl.lua create mode 100644 esx_holdup/config.lua create mode 100644 esx_holdup/server/esx_holdup_sv.lua diff --git a/esx_holdup/__resource.lua b/esx_holdup/__resource.lua new file mode 100644 index 00000000..6bc532a3 --- /dev/null +++ b/esx_holdup/__resource.lua @@ -0,0 +1,11 @@ +dependency 'essentialmode' + +client_script { + 'config.lua', + 'client/esx_holdup_cl.lua' +} + +server_script { + 'config.lua', + 'server/esx_holdup_sv.lua' +} diff --git a/esx_holdup/client/esx_holdup_cl.lua b/esx_holdup/client/esx_holdup_cl.lua new file mode 100644 index 00000000..684625bd --- /dev/null +++ b/esx_holdup/client/esx_holdup_cl.lua @@ -0,0 +1,142 @@ +local holdingup = false +local store = "" +local secondsRemaining = 0 +local blipRobbery = nil +ESX = nil + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function DisplayHelpText(str) + SetTextComponentFormat("STRING") + AddTextComponentString(str) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) +end + +function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) + SetTextFont(0) + SetTextProportional(0) + SetTextScale(scale, scale) + SetTextColour(r, g, b, a) + SetTextDropShadow(0, 0, 0, 0,255) + SetTextEdge(1, 0, 0, 0, 255) + SetTextDropShadow() + if(outline)then + SetTextOutline() + end + SetTextEntry("STRING") + AddTextComponentString(text) + DrawText(x - width/2, y - height/2 + 0.005) +end + +RegisterNetEvent('esx_holdup:currentlyrobbing') +AddEventHandler('esx_holdup:currentlyrobbing', function(robb) + holdingup = true + store = robb + secondsRemaining = 300 +end) + +RegisterNetEvent('esx_holdup:killblip') +AddEventHandler('esx_holdup:killblip', function() + RemoveBlip(blipRobbery) +end) + +RegisterNetEvent('esx_holdup:setblip') +AddEventHandler('esx_holdup:setblip', function(position) + blipRobbery = AddBlipForCoord(position.x, position.y, position.z) + SetBlipSprite(blipRobbery , 161) + SetBlipScale(blipRobbery , 2.0) + SetBlipColour(blipRobbery, 3) + PulseBlip(blipRobbery) +end) + +RegisterNetEvent('esx_holdup:toofarlocal') +AddEventHandler('esx_holdup:toofarlocal', function(robb) + holdingup = false + ESX.ShowNotification('Le braquage vas être annulé, vous ne gagnerez rien!') + robbingName = "" + secondsRemaining = 0 + incircle = false +end) + + +RegisterNetEvent('esx_holdup:robberycomplete') +AddEventHandler('esx_holdup:robberycomplete', function(robb) + holdingup = false + ESX.ShowNotification('Braquage réussi vous avez gagné ~g~$' .. Stores[store].reward) + store = "" + secondsRemaining = 0 + incircle = false +end) + +Citizen.CreateThread(function() + while true do + Citizen.Wait(0) + if holdingup then + Citizen.Wait(1000) + if(secondsRemaining > 0)then + secondsRemaining = secondsRemaining - 1 + end + end + end +end) + +Citizen.CreateThread(function() + for k,v in pairs(Stores)do + local ve = v.position + + local blip = AddBlipForCoord(ve.x, ve.y, ve.z) + SetBlipSprite(blip, 156) + SetBlipScale(blip, 0.8) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString("Braquage magasin") + EndTextCommandSetBlipName(blip) + end +end) +incircle = false + +Citizen.CreateThread(function() + while true do + local pos = GetEntityCoords(GetPlayerPed(-1), true) + + for k,v in pairs(Stores)do + local pos2 = v.position + + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then + if not holdingup then + DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) + + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then + if (incircle == false) then + DisplayHelpText("Appuyer sur ~INPUT_CONTEXT~ pour braquer ~b~" .. v.nameofstore) + end + incircle = true + if IsControlJustReleased(1, 51) then + TriggerServerEvent('esx_holdup:rob', k) + end + elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then + incircle = false + end + end + end + end + + if holdingup then + + drawTxt(0.66, 1.44, 1.0,1.0,0.4, "Braquage de magasin: ~r~" .. secondsRemaining .. "~w~ secondes restantes", 255, 255, 255, 255) + + local pos2 = Stores[store].position + + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 7.5)then + TriggerServerEvent('esx_holdup:toofar', store) + end + end + + Citizen.Wait(0) + end +end) diff --git a/esx_holdup/config.lua b/esx_holdup/config.lua new file mode 100644 index 00000000..a740c8ba --- /dev/null +++ b/esx_holdup/config.lua @@ -0,0 +1,50 @@ +Stores = { + --[["paleto_twentyfourseven"] = { + position = { ['x'] = 1736.32092285156, ['y'] = 6419.4970703125, ['z'] = 35.037223815918 }, + reward = math.random(100,1000), + nameofstore = "24/7. (Paleto Bay)", + lastrobbed = 0 + },]] + ["sandyshores_twentyfoursever"] = { + position = { ['x'] = 1961.24682617188, ['y'] = 3749.46069335938, ['z'] = 32.3437461853027 }, + reward = math.random(500,5000), + nameofstore = "24/7. (Sandy Shores)", + lastrobbed = 0 + }, + ["bar_one"] = { + position = { ['x'] = 1986.1240234375, ['y'] = 3053.8747558594, ['z'] = 47.215171813965 }, + reward = math.random(500,5000), + nameofstore = "Yellow Jack. (Sandy Shores)", + lastrobbed = 0 + }, + ["ocean_liquor"] = { + position = { ['x'] = -2959.33715820313, ['y'] = 388.214172363281, ['z'] = 14.0432071685791 }, + reward = math.random(1000,10000), + nameofstore = "Robs Liquor. (Great Ocean Higway)", + lastrobbed = 0 + }, + ["sanandreas_liquor"] = { + position = { ['x'] = -1219.85607910156, ['y'] = -916.276550292969, ['z'] = 11.3262157440186 }, + reward = math.random(1000,10000), + nameofstore = "Robs Liquor. (San andreas Avenue)", + lastrobbed = 0 + }, + ["grove_ltd"] = { + position = { ['x'] = -43.4035377502441, ['y'] = -1749.20922851563, ['z'] = 29.421012878418 }, + reward = math.random(1000,10000), + nameofstore = "LTD Gasoline. (Grove Street)", + lastrobbed = 0 + }, + ["mirror_ltd"] = { + position = { ['x'] = 1160.67578125, ['y'] = -314.400451660156, ['z'] = 69.2050552368164 }, + reward = math.random(1000,10000), + nameofstore = "LTD Gasoline. (Mirror Park Boulevard)", + lastrobbed = 0 + }, + ["littleseoul_twentyfourseven"] = { + position = { ['x'] = -709.17022705078, ['y'] = -904.21722412109, ['z'] = 19.215591430664 }, + reward = math.random(1000,10000), + nameofstore = "24/7. (Little Seoul)", + lastrobbed = 0 + } +} \ No newline at end of file diff --git a/esx_holdup/server/esx_holdup_sv.lua b/esx_holdup/server/esx_holdup_sv.lua new file mode 100644 index 00000000..b81ff260 --- /dev/null +++ b/esx_holdup/server/esx_holdup_sv.lua @@ -0,0 +1,102 @@ +local rob = false +local robbers = {} +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +function get3DDistance(x1, y1, z1, x2, y2, z2) + return math.sqrt(math.pow(x1 - x2, 2) + math.pow(y1 - y2, 2) + math.pow(z1 - z2, 2)) +end + +RegisterServerEvent('esx_holdup:toofar') +AddEventHandler('esx_holdup:toofar', function(robb) + local source = source + local xPlayers = ESX.GetPlayers() + rob = false + for k, v in pairs(xPlayers) do + if v.job.name == 'police' then + TriggerClientEvent('esx:showNotification', k, '~r~ Braquage annulé à: ~b~' .. Stores[robb].nameofstore) + TriggerClientEvent('esx_holdup:killblip', k) + end + end + if(robbers[source])then + TriggerClientEvent('esx_holdup:toofarlocal', source) + robbers[source] = nil + TriggerClientEvent('esx:showNotification', source, '~r~ Le braquage à été annulé: ~b~' .. Stores[robb].nameofstore) + end +end) + +RegisterServerEvent('esx_holdup:rob') +AddEventHandler('esx_holdup:rob', function(robb) + + local source = source + local xPlayer = ESX.GetPlayerFromId(source) + local xPlayers = ESX.GetPlayers() + + if Stores[robb] then + + local store = Stores[robb] + + if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then + + + TriggerClientEvent('esx:showNotification', source, 'Ce magasin a déjà été braqué. Veuillez attendre: ' .. (1800 - (os.time() - store.lastrobbed)) .. "secondes.") + return + end + + + local cops = 0 + for k, v in pairs(xPlayers) do + if v.job.name == 'police' then + cops = cops + 1 + end + end + + + if rob == false then + + if(cops > 1)then + + rob = true + for k, v in pairs(xPlayers) do + if v.job.name == 'police' then + TriggerClientEvent('esx:showNotification', k, '~r~ Braquage en cours à: ~b~' .. store.nameofstore) + TriggerClientEvent('esx_holdup:setblip', k, Stores[robb].position) + end + end + + TriggerClientEvent('esx:showNotification', source, 'Vous avez commencé à braquer ' .. store.nameofstore .. ', ne vous éloignez pas!') + TriggerClientEvent('esx:showNotification', source, 'L\'alarme à été déclenché ') + TriggerClientEvent('esx:showNotification', source, 'Tenez la position pendant 5min et l\'argent est à vous! ') + TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) + Stores[robb].lastrobbed = os.time() + robbers[source] = robb + local savedSource = source + SetTimeout(300000, function() + + if(robbers[savedSource])then + + rob = false + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) + if(xPlayer)then + + xPlayer.addAccountMoney('black_money', store.reward) + TriggerClientEvent('esx:showNotification', source, '~r~ Braquage terminé.~s~ ~h~ Fuie!') + for k, v in pairs(xPlayers) do + if v.job.name == 'police' then + TriggerClientEvent('esx:showNotification', k, '~r~ Braquage terminé à: ~b~' .. store.nameofstore) + TriggerClientEvent('esx_holdup:killblip', k) + end + end + + end + end + end) + else + TriggerClientEvent('esx:showNotification', source, 'Il faut minimum ~b~2 policiers~s~ en ville pour braquer.') + end + else + TriggerClientEvent('esx:showNotification', source, '~r~Un braquage est déjà en cours.') + end + end +end) \ No newline at end of file From 4b2699cdf8e5aae94f2b4e59afc0bfd1c7446825 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 02:49:42 +0200 Subject: [PATCH 03/44] Update README.md --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 2967f0af..631b0713 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,20 @@ # fxserver_esx_holdup FXserver ESX Hold Up + +[REQUIREMENTS] + + * esx_policejob => https://github.com/FXServer-ESX/fxserver-esx_policejob + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver_esx_holdup esx_holdup +``` + +3) Add this in your server.cfg : + +``` +start esx_holdup +``` From 48b57a1494c5cad96943782c4afde30c835c2c77 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 07:27:33 +0200 Subject: [PATCH 04/44] Rename esx_holdup/config.lua to config.lua --- esx_holdup/config.lua => config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename esx_holdup/config.lua => config.lua (97%) diff --git a/esx_holdup/config.lua b/config.lua similarity index 97% rename from esx_holdup/config.lua rename to config.lua index a740c8ba..36d3e732 100644 --- a/esx_holdup/config.lua +++ b/config.lua @@ -47,4 +47,4 @@ Stores = { nameofstore = "24/7. (Little Seoul)", lastrobbed = 0 } -} \ No newline at end of file +} From f423afe14d557c3a39f5adcac567a6981ce33202 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 07:28:16 +0200 Subject: [PATCH 05/44] Rename esx_holdup/__resource.lua to __resource.lua --- esx_holdup/__resource.lua => __resource.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename esx_holdup/__resource.lua => __resource.lua (100%) diff --git a/esx_holdup/__resource.lua b/__resource.lua similarity index 100% rename from esx_holdup/__resource.lua rename to __resource.lua From f8798a8c2ecf373145eb52c2d26072c0e6128405 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 07:28:46 +0200 Subject: [PATCH 06/44] Rename esx_holdup/client/esx_holdup_cl.lua to client/esx_holdup_cl.lua --- {esx_holdup/client => client}/esx_holdup_cl.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {esx_holdup/client => client}/esx_holdup_cl.lua (100%) diff --git a/esx_holdup/client/esx_holdup_cl.lua b/client/esx_holdup_cl.lua similarity index 100% rename from esx_holdup/client/esx_holdup_cl.lua rename to client/esx_holdup_cl.lua From eb7bcf36eba7da758c6508e8db23b2f296fd4123 Mon Sep 17 00:00:00 2001 From: ig0ne Date: Thu, 10 Aug 2017 07:29:11 +0200 Subject: [PATCH 07/44] Rename esx_holdup/server/esx_holdup_sv.lua to server/esx_holdup_sv.lua --- {esx_holdup/server => server}/esx_holdup_sv.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {esx_holdup/server => server}/esx_holdup_sv.lua (96%) diff --git a/esx_holdup/server/esx_holdup_sv.lua b/server/esx_holdup_sv.lua similarity index 96% rename from esx_holdup/server/esx_holdup_sv.lua rename to server/esx_holdup_sv.lua index b81ff260..f58e3f49 100644 --- a/esx_holdup/server/esx_holdup_sv.lua +++ b/server/esx_holdup_sv.lua @@ -99,4 +99,4 @@ AddEventHandler('esx_holdup:rob', function(robb) TriggerClientEvent('esx:showNotification', source, '~r~Un braquage est déjà en cours.') end end -end) \ No newline at end of file +end) From 61b65663a44b35c3914fa393e5f083ed4dd35de2 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Wed, 16 Aug 2017 21:44:39 -0400 Subject: [PATCH 08/44] Multi-language support --- __resource.lua | 10 ++++++-- client/esx_holdup_cl.lua | 14 +++++------ config.lua | 3 +++ locales/en.lua | 23 ++++++++++++++++++ locales/fr.lua | 23 ++++++++++++++++++ server/esx_holdup_sv.lua | 52 ++++++++++++++++++++-------------------- 6 files changed, 90 insertions(+), 35 deletions(-) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 6bc532a3..1ea8c6b8 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,11 +1,17 @@ dependency 'essentialmode' -client_script { +client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/esx_holdup_cl.lua' } -server_script { +server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'server/esx_holdup_sv.lua' } diff --git a/client/esx_holdup_cl.lua b/client/esx_holdup_cl.lua index 684625bd..059b8fda 100644 --- a/client/esx_holdup_cl.lua +++ b/client/esx_holdup_cl.lua @@ -57,7 +57,7 @@ end) RegisterNetEvent('esx_holdup:toofarlocal') AddEventHandler('esx_holdup:toofarlocal', function(robb) holdingup = false - ESX.ShowNotification('Le braquage vas être annulé, vous ne gagnerez rien!') + ESX.ShowNotification(_U('robbery_cancelled')) robbingName = "" secondsRemaining = 0 incircle = false @@ -67,7 +67,7 @@ end) RegisterNetEvent('esx_holdup:robberycomplete') AddEventHandler('esx_holdup:robberycomplete', function(robb) holdingup = false - ESX.ShowNotification('Braquage réussi vous avez gagné ~g~$' .. Stores[store].reward) + ESX.ShowNotification(_U('robbery_cancelled') .. Stores[store].reward) store = "" secondsRemaining = 0 incircle = false @@ -94,7 +94,7 @@ Citizen.CreateThread(function() SetBlipScale(blip, 0.8) SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString("Braquage magasin") + AddTextComponentString(_U('shop_robbery')) EndTextCommandSetBlipName(blip) end end) @@ -110,10 +110,10 @@ Citizen.CreateThread(function() if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then if not holdingup then DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) - + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then if (incircle == false) then - DisplayHelpText("Appuyer sur ~INPUT_CONTEXT~ pour braquer ~b~" .. v.nameofstore) + DisplayHelpText(_U('press_to_rob') .. v.nameofstore) end incircle = true if IsControlJustReleased(1, 51) then @@ -128,8 +128,8 @@ Citizen.CreateThread(function() if holdingup then - drawTxt(0.66, 1.44, 1.0,1.0,0.4, "Braquage de magasin: ~r~" .. secondsRemaining .. "~w~ secondes restantes", 255, 255, 255, 255) - + drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_of') .. secondsRemaining .. _U('seconds_remaining'), 255, 255, 255, 255) + local pos2 = Stores[store].position if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 7.5)then diff --git a/config.lua b/config.lua index 36d3e732..2ac8d1c9 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,6 @@ +Config = {} +Config.Locale = 'fr' + Stores = { --[["paleto_twentyfourseven"] = { position = { ['x'] = 1736.32092285156, ['y'] = 6419.4970703125, ['z'] = 35.037223815918 }, diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..6e6ce02d --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,23 @@ +Locales['en'] = { + + ['robbery_cancelled'] = 'the robbery will be cancelled, you will gain nothing!', + ['robbery_successful'] = 'successful robbery you have gained ~g~$', + ['shop_robbery'] = 'shop Robbery', + ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to rob ~b~', + ['robbery_of'] = 'store robbery: ~r~', + ['seconds_remaining'] = '~w~ seconds remaning', + ['robbery_cancelled_at'] = '~r~ Robbery cancelled at: ~b~', + ['robbery_has_cancelled'] = '~r~ robbery has been cancelled: ~b~', + ['already_robbed'] = 'this store has already been robbed. Please wait: ', + ['seconds'] = 'seconds.', + ['rob_in_prog'] = '~r~ robbery in progress at: ~b~', + ['started_to_rob'] = 'you started to rob ', + ['do_not_move'] = ', do not move away!', + ['alarm_triggered'] = 'the alarm has been triggered', + ['hold_pos'] = 'hold for 5 minutes and the money is yours!', + ['robbery_complete'] = '~r~ Robbery complete.~s~ ~h~ Run!', + ['robbery_complete_at'] = '~r~ Robbery complete at: ~b~', + ['min_two_police'] = 'there must be at least ~b~2 policemen~s~ in town to rob.', + ['robbery_already'] = '~r~A robbery is already in progress.', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..ceb928af --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,23 @@ +Locales['fr'] = { + + ['robbery_cancelled'] = 'le braquage vas être annulé, vous ne gagnerez rien!', + ['robbery_successful'] = 'braquage réussi vous avez gagné ~g~$', + ['shop_robbery'] = 'braquage magasin', + ['press_to_rob'] = 'appuyer sur ~INPUT_CONTEXT~ pour braquer ~b~', + ['robbery_of'] = 'braquage de magasin: ~r~', + ['seconds_remaining'] = '~w~ secondes restantes', + ['robbery_cancelled_at'] = '~r~ Braquage annulé à: ~b~', + ['robbery_has_cancelled'] = '~r~ le braquage à été annulé: ~b~', + ['already_robbed'] = 'ce magasin a déjà été braqué. Veuillez attendre: ', + ['seconds'] = 'secondes.', + ['rob_in_prog'] = '~r~ braquage en cours à: ~b~', + ['started_to_rob'] = 'vous avez commencé à braquer ', + ['do_not_move'] = ', ne vous éloignez pas!', + ['alarm_triggered'] = 'l\'alarme à été déclenché', + ['hold_pos'] = 'tenez la position pendant 5min et l\'argent est à vous!', + ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Fuie!', + ['robbery_complete_at'] = '~r~ Braquage terminé à: ~b~' + ['min_two_police'] = 'il faut minimum ~b~2 policiers~s~ en ville pour braquer.', + ['robbery_already'] = '~r~Un braquage est déjà en cours.', + +} diff --git a/server/esx_holdup_sv.lua b/server/esx_holdup_sv.lua index f58e3f49..721ef341 100644 --- a/server/esx_holdup_sv.lua +++ b/server/esx_holdup_sv.lua @@ -15,36 +15,36 @@ AddEventHandler('esx_holdup:toofar', function(robb) rob = false for k, v in pairs(xPlayers) do if v.job.name == 'police' then - TriggerClientEvent('esx:showNotification', k, '~r~ Braquage annulé à: ~b~' .. Stores[robb].nameofstore) + TriggerClientEvent('esx:showNotification', k, _U('robbery_cancelled_at') .. Stores[robb].nameofstore) TriggerClientEvent('esx_holdup:killblip', k) end end if(robbers[source])then TriggerClientEvent('esx_holdup:toofarlocal', source) robbers[source] = nil - TriggerClientEvent('esx:showNotification', source, '~r~ Le braquage à été annulé: ~b~' .. Stores[robb].nameofstore) + TriggerClientEvent('esx:showNotification', source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) end end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - + local source = source local xPlayer = ESX.GetPlayerFromId(source) local xPlayers = ESX.GetPlayers() - + if Stores[robb] then - + local store = Stores[robb] if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then - - TriggerClientEvent('esx:showNotification', source, 'Ce magasin a déjà été braqué. Veuillez attendre: ' .. (1800 - (os.time() - store.lastrobbed)) .. "secondes.") + + TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (1800 - (os.time() - store.lastrobbed)) .. _U('seconds')) return end - + local cops = 0 for k, v in pairs(xPlayers) do if v.job.name == 'police' then @@ -52,51 +52,51 @@ AddEventHandler('esx_holdup:rob', function(robb) end end - + if rob == false then - + if(cops > 1)then - + rob = true for k, v in pairs(xPlayers) do if v.job.name == 'police' then - TriggerClientEvent('esx:showNotification', k, '~r~ Braquage en cours à: ~b~' .. store.nameofstore) + TriggerClientEvent('esx:showNotification', k, _U('rob_in_prog') .. store.nameofstore) TriggerClientEvent('esx_holdup:setblip', k, Stores[robb].position) end - end - - TriggerClientEvent('esx:showNotification', source, 'Vous avez commencé à braquer ' .. store.nameofstore .. ', ne vous éloignez pas!') - TriggerClientEvent('esx:showNotification', source, 'L\'alarme à été déclenché ') - TriggerClientEvent('esx:showNotification', source, 'Tenez la position pendant 5min et l\'argent est à vous! ') + end + + TriggerClientEvent('esx:showNotification', source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) + TriggerClientEvent('esx:showNotification', source, _U('alarm_triggered')) + TriggerClientEvent('esx:showNotification', source, _U('hold_pos')) TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) Stores[robb].lastrobbed = os.time() robbers[source] = robb local savedSource = source SetTimeout(300000, function() - + if(robbers[savedSource])then - + rob = false TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) - if(xPlayer)then - + if(xPlayer)then + xPlayer.addAccountMoney('black_money', store.reward) - TriggerClientEvent('esx:showNotification', source, '~r~ Braquage terminé.~s~ ~h~ Fuie!') + TriggerClientEvent('esx:showNotification', source, _U('robbery_complete')) for k, v in pairs(xPlayers) do if v.job.name == 'police' then - TriggerClientEvent('esx:showNotification', k, '~r~ Braquage terminé à: ~b~' .. store.nameofstore) + TriggerClientEvent('esx:showNotification', k, _U('robbery_complete_at') .. store.nameofstore) TriggerClientEvent('esx_holdup:killblip', k) end end - + end end end) else - TriggerClientEvent('esx:showNotification', source, 'Il faut minimum ~b~2 policiers~s~ en ville pour braquer.') + TriggerClientEvent('esx:showNotification', source, _U('min_two_police')) end else - TriggerClientEvent('esx:showNotification', source, '~r~Un braquage est déjà en cours.') + TriggerClientEvent('esx:showNotification', source, _U('robbery_already')) end end end) From 96651bf7991ccf85e2f08a550ea1c50709683798 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Wed, 16 Aug 2017 23:29:27 -0400 Subject: [PATCH 09/44] Fix error in fr.lua --- locales/fr.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.lua b/locales/fr.lua index ceb928af..a88233ec 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -16,7 +16,7 @@ Locales['fr'] = { ['alarm_triggered'] = 'l\'alarme à été déclenché', ['hold_pos'] = 'tenez la position pendant 5min et l\'argent est à vous!', ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Fuie!', - ['robbery_complete_at'] = '~r~ Braquage terminé à: ~b~' + ['robbery_complete_at'] = '~r~ Braquage terminé à: ~b~', ['min_two_police'] = 'il faut minimum ~b~2 policiers~s~ en ville pour braquer.', ['robbery_already'] = '~r~Un braquage est déjà en cours.', From afdebe587697fef4ef992470e20f4dc15c17e807 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:46:05 -0700 Subject: [PATCH 10/44] Multi-language support Brazilian Portuguese translation. --- __resource.lua | 2 ++ locales/br.lua | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index 1ea8c6b8..87810e29 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,7 @@ dependency 'essentialmode' client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', @@ -10,6 +11,7 @@ client_scripts { server_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..f6c50ecb --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,23 @@ +Locales['br'] = { + + ['robbery_cancelled'] = 'O roubo será cancelado, você não ganhará nada!', + ['robbery_successful'] = 'O roubo foi um sucesso. Você ganhou ~g~$', + ['shop_robbery'] = 'Loja roubavel', + ['press_to_rob'] = 'Pressione ~INPUT_CONTEXT~ para roubar ~b~', + ['robbery_of'] = 'Loja roubavel: ~r~', + ['seconds_remaining'] = '~w~ segundos restantes', + ['robbery_cancelled_at'] = '~r~ Roubo cancelado em: ~b~', + ['robbery_has_cancelled'] = '~r~ O assalto foi cancelado: ~b~', + ['already_robbed'] = 'Esta loja já foi roubada. Por favor, espere: ', + ['seconds'] = 'segundos.', + ['rob_in_prog'] = '~r~ Assalto em curso em: ~b~', + ['started_to_rob'] = 'Você começou a roubar ', + ['do_not_move'] = ', Não se afaste!', + ['alarm_triggered'] = 'O alarme foi disparado', + ['hold_pos'] = 'Segure por 5 minutos e o dinheiro é seu!', + ['robbery_complete'] = '~r~ Roubo completo.~s~ ~h~ Corre!', + ['robbery_complete_at'] = '~r~ Roubo completo em: ~b~', + ['min_two_police'] = 'Deve haver pelo menos ~b~2 policiais~s~ na cidade para roubar.', + ['robbery_already'] = '~r~Um assalto já está em andamento.', + +} From 00f2f02750eeebd770c670aeb3746f8b65f4f655 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 22 Aug 2017 03:41:31 +0300 Subject: [PATCH 11/44] getplayer loop fix --- server/esx_holdup_sv.lua | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/server/esx_holdup_sv.lua b/server/esx_holdup_sv.lua index 721ef341..c8da7d35 100644 --- a/server/esx_holdup_sv.lua +++ b/server/esx_holdup_sv.lua @@ -13,8 +13,9 @@ AddEventHandler('esx_holdup:toofar', function(robb) local source = source local xPlayers = ESX.GetPlayers() rob = false - for k, v in pairs(xPlayers) do - if v.job.name == 'police' then + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', k, _U('robbery_cancelled_at') .. Stores[robb].nameofstore) TriggerClientEvent('esx_holdup:killblip', k) end @@ -46,8 +47,9 @@ AddEventHandler('esx_holdup:rob', function(robb) local cops = 0 - for k, v in pairs(xPlayers) do - if v.job.name == 'police' then + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then cops = cops + 1 end end @@ -58,8 +60,9 @@ AddEventHandler('esx_holdup:rob', function(robb) if(cops > 1)then rob = true - for k, v in pairs(xPlayers) do - if v.job.name == 'police' then + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', k, _U('rob_in_prog') .. store.nameofstore) TriggerClientEvent('esx_holdup:setblip', k, Stores[robb].position) end @@ -82,8 +85,9 @@ AddEventHandler('esx_holdup:rob', function(robb) xPlayer.addAccountMoney('black_money', store.reward) TriggerClientEvent('esx:showNotification', source, _U('robbery_complete')) - for k, v in pairs(xPlayers) do - if v.job.name == 'police' then + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', k, _U('robbery_complete_at') .. store.nameofstore) TriggerClientEvent('esx_holdup:killblip', k) end From cca9c70de6fbfd18109c1b22898f32f6d930e34b Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 12:55:32 +0200 Subject: [PATCH 12/44] Add German Language --- __resource.lua | 2 ++ locales/de.lua | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index 87810e29..1eb7a203 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,7 @@ dependency 'essentialmode' client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -11,6 +12,7 @@ client_scripts { server_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..900f6d53 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,23 @@ +Locales['de'] = { + + ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', + ['robbery_successful'] = 'Raub erfolgreich du erbeutest ~g~$', + ['shop_robbery'] = 'Ladenraub', + ['press_to_rob'] = 'Drücke ~INPUT_CONTEXT~ zum ausrauben ~b~', + ['robbery_of'] = 'Ladenraub: ~r~', + ['seconds_remaining'] = '~w~ sekunden übrig', + ['robbery_cancelled_at'] = '~r~ Raub abgebrochen bei: ~b~', + ['robbery_has_cancelled'] = '~r~ Raub wurde abgebrochen: ~b~', + ['already_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte: ', + ['seconds'] = 'sekunden.', + ['rob_in_prog'] = '~r~ Raub im gange bei: ~b~', + ['started_to_rob'] = 'du hast einen Raub gestartet ', + ['do_not_move'] = ', laufe nicht weg!', + ['alarm_triggered'] = 'der Alarm wurde ausgelöst', + ['hold_pos'] = 'halte 5 Minuten lang durch, und die Beute gehört dir!', + ['robbery_complete'] = '~r~ Raub erfolgreich.~s~ ~h~ LAUF!', + ['robbery_complete_at'] = '~r~ Raub erfolgreich bei: ~b~', + ['min_two_police'] = 'es müssen mindestens ~b~2 Polizisten~s~ im Dienst sein um einen Raub starten zu können.', + ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', + +} From 22d29eeeee4a8e6686aef84277b93e707ea22737 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Sat, 9 Sep 2017 16:12:21 +0300 Subject: [PATCH 13/44] fix, fully working now. --- server/esx_holdup_sv.lua | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/server/esx_holdup_sv.lua b/server/esx_holdup_sv.lua index c8da7d35..50205e24 100644 --- a/server/esx_holdup_sv.lua +++ b/server/esx_holdup_sv.lua @@ -16,8 +16,8 @@ AddEventHandler('esx_holdup:toofar', function(robb) for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', k, _U('robbery_cancelled_at') .. Stores[robb].nameofstore) - TriggerClientEvent('esx_holdup:killblip', k) + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end if(robbers[source])then @@ -40,7 +40,6 @@ AddEventHandler('esx_holdup:rob', function(robb) if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (1800 - (os.time() - store.lastrobbed)) .. _U('seconds')) return end @@ -61,10 +60,10 @@ AddEventHandler('esx_holdup:rob', function(robb) rob = true for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', k, _U('rob_in_prog') .. store.nameofstore) - TriggerClientEvent('esx_holdup:setblip', k, Stores[robb].position) + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore) + TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) end end @@ -84,15 +83,14 @@ AddEventHandler('esx_holdup:rob', function(robb) if(xPlayer)then xPlayer.addAccountMoney('black_money', store.reward) - TriggerClientEvent('esx:showNotification', source, _U('robbery_complete')) + local xPlayers = ESX.GetPlayers() for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', k, _U('robbery_complete_at') .. store.nameofstore) - TriggerClientEvent('esx_holdup:killblip', k) + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end - end end end) From 664a638e3a065f0ca1b6d1164b22cb07f5a07193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:15:57 +0200 Subject: [PATCH 14/44] Update LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..71b4479e --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + fxserver_esx_holdup + Copyright (C) 2015 Jérémie N'gadi + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + fxserver_esx_holdup Copyright (C) 2015 Jérémie N'gadi + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 06e2708c3bbac547911cab478c5f511ce8b162be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:26:16 +0200 Subject: [PATCH 15/44] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 1eb7a203..f159d027 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,3 +1,5 @@ +version '1.0.0' + dependency 'essentialmode' client_scripts { From ab2b32b2304ff6107576ecb2c790d86e354650ea Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Thu, 2 Nov 2017 00:04:36 +0100 Subject: [PATCH 16/44] chore(coding-style): correct indentation --- __resource.lua | 28 ++++---- client/esx_holdup_cl.lua | 142 ++++++++++++++++++------------------- config.lua | 96 ++++++++++++------------- locales/br.lua | 38 +++++----- locales/de.lua | 38 +++++----- locales/en.lua | 38 +++++----- locales/fr.lua | 38 +++++----- server/esx_holdup_sv.lua | 146 +++++++++++++++++++-------------------- 8 files changed, 282 insertions(+), 282 deletions(-) diff --git a/__resource.lua b/__resource.lua index f159d027..c2697d45 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,21 +3,21 @@ version '1.0.0' dependency 'essentialmode' client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'client/esx_holdup_cl.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'client/esx_holdup_cl.lua' } server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'server/esx_holdup_sv.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'server/esx_holdup_sv.lua' } diff --git a/client/esx_holdup_cl.lua b/client/esx_holdup_cl.lua index 059b8fda..23e287a5 100644 --- a/client/esx_holdup_cl.lua +++ b/client/esx_holdup_cl.lua @@ -5,16 +5,16 @@ local blipRobbery = nil ESX = nil Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function DisplayHelpText(str) - SetTextComponentFormat("STRING") - AddTextComponentString(str) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + SetTextComponentFormat("STRING") + AddTextComponentString(str) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) end function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) @@ -26,8 +26,8 @@ function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() if(outline)then - SetTextOutline() - end + SetTextOutline() + end SetTextEntry("STRING") AddTextComponentString(text) DrawText(x - width/2, y - height/2 + 0.005) @@ -35,9 +35,9 @@ end RegisterNetEvent('esx_holdup:currentlyrobbing') AddEventHandler('esx_holdup:currentlyrobbing', function(robb) - holdingup = true - store = robb - secondsRemaining = 300 + holdingup = true + store = robb + secondsRemaining = 300 end) RegisterNetEvent('esx_holdup:killblip') @@ -56,87 +56,87 @@ end) RegisterNetEvent('esx_holdup:toofarlocal') AddEventHandler('esx_holdup:toofarlocal', function(robb) - holdingup = false - ESX.ShowNotification(_U('robbery_cancelled')) - robbingName = "" - secondsRemaining = 0 - incircle = false + holdingup = false + ESX.ShowNotification(_U('robbery_cancelled')) + robbingName = "" + secondsRemaining = 0 + incircle = false end) RegisterNetEvent('esx_holdup:robberycomplete') AddEventHandler('esx_holdup:robberycomplete', function(robb) - holdingup = false - ESX.ShowNotification(_U('robbery_cancelled') .. Stores[store].reward) - store = "" - secondsRemaining = 0 - incircle = false + holdingup = false + ESX.ShowNotification(_U('robbery_cancelled') .. Stores[store].reward) + store = "" + secondsRemaining = 0 + incircle = false end) Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if holdingup then - Citizen.Wait(1000) - if(secondsRemaining > 0)then - secondsRemaining = secondsRemaining - 1 - end - end - end + while true do + Citizen.Wait(0) + if holdingup then + Citizen.Wait(1000) + if(secondsRemaining > 0)then + secondsRemaining = secondsRemaining - 1 + end + end + end end) Citizen.CreateThread(function() - for k,v in pairs(Stores)do - local ve = v.position + for k,v in pairs(Stores)do + local ve = v.position - local blip = AddBlipForCoord(ve.x, ve.y, ve.z) - SetBlipSprite(blip, 156) - SetBlipScale(blip, 0.8) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop_robbery')) - EndTextCommandSetBlipName(blip) - end + local blip = AddBlipForCoord(ve.x, ve.y, ve.z) + SetBlipSprite(blip, 156) + SetBlipScale(blip, 0.8) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('shop_robbery')) + EndTextCommandSetBlipName(blip) + end end) incircle = false Citizen.CreateThread(function() - while true do - local pos = GetEntityCoords(GetPlayerPed(-1), true) + while true do + local pos = GetEntityCoords(GetPlayerPed(-1), true) - for k,v in pairs(Stores)do - local pos2 = v.position + for k,v in pairs(Stores)do + local pos2 = v.position - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then - if not holdingup then - DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then + if not holdingup then + DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then - if (incircle == false) then - DisplayHelpText(_U('press_to_rob') .. v.nameofstore) - end - incircle = true - if IsControlJustReleased(1, 51) then - TriggerServerEvent('esx_holdup:rob', k) - end - elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then - incircle = false - end - end - end - end + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then + if (incircle == false) then + DisplayHelpText(_U('press_to_rob') .. v.nameofstore) + end + incircle = true + if IsControlJustReleased(1, 51) then + TriggerServerEvent('esx_holdup:rob', k) + end + elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then + incircle = false + end + end + end + end - if holdingup then + if holdingup then - drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_of') .. secondsRemaining .. _U('seconds_remaining'), 255, 255, 255, 255) + drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_of') .. secondsRemaining .. _U('seconds_remaining'), 255, 255, 255, 255) - local pos2 = Stores[store].position + local pos2 = Stores[store].position - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 7.5)then - TriggerServerEvent('esx_holdup:toofar', store) - end - end + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 7.5)then + TriggerServerEvent('esx_holdup:toofar', store) + end + end - Citizen.Wait(0) - end + Citizen.Wait(0) + end end) diff --git a/config.lua b/config.lua index 2ac8d1c9..98332dd7 100644 --- a/config.lua +++ b/config.lua @@ -2,52 +2,52 @@ Config = {} Config.Locale = 'fr' Stores = { - --[["paleto_twentyfourseven"] = { - position = { ['x'] = 1736.32092285156, ['y'] = 6419.4970703125, ['z'] = 35.037223815918 }, - reward = math.random(100,1000), - nameofstore = "24/7. (Paleto Bay)", - lastrobbed = 0 - },]] - ["sandyshores_twentyfoursever"] = { - position = { ['x'] = 1961.24682617188, ['y'] = 3749.46069335938, ['z'] = 32.3437461853027 }, - reward = math.random(500,5000), - nameofstore = "24/7. (Sandy Shores)", - lastrobbed = 0 - }, - ["bar_one"] = { - position = { ['x'] = 1986.1240234375, ['y'] = 3053.8747558594, ['z'] = 47.215171813965 }, - reward = math.random(500,5000), - nameofstore = "Yellow Jack. (Sandy Shores)", - lastrobbed = 0 - }, - ["ocean_liquor"] = { - position = { ['x'] = -2959.33715820313, ['y'] = 388.214172363281, ['z'] = 14.0432071685791 }, - reward = math.random(1000,10000), - nameofstore = "Robs Liquor. (Great Ocean Higway)", - lastrobbed = 0 - }, - ["sanandreas_liquor"] = { - position = { ['x'] = -1219.85607910156, ['y'] = -916.276550292969, ['z'] = 11.3262157440186 }, - reward = math.random(1000,10000), - nameofstore = "Robs Liquor. (San andreas Avenue)", - lastrobbed = 0 - }, - ["grove_ltd"] = { - position = { ['x'] = -43.4035377502441, ['y'] = -1749.20922851563, ['z'] = 29.421012878418 }, - reward = math.random(1000,10000), - nameofstore = "LTD Gasoline. (Grove Street)", - lastrobbed = 0 - }, - ["mirror_ltd"] = { - position = { ['x'] = 1160.67578125, ['y'] = -314.400451660156, ['z'] = 69.2050552368164 }, - reward = math.random(1000,10000), - nameofstore = "LTD Gasoline. (Mirror Park Boulevard)", - lastrobbed = 0 - }, - ["littleseoul_twentyfourseven"] = { - position = { ['x'] = -709.17022705078, ['y'] = -904.21722412109, ['z'] = 19.215591430664 }, - reward = math.random(1000,10000), - nameofstore = "24/7. (Little Seoul)", - lastrobbed = 0 - } + --[["paleto_twentyfourseven"] = { + position = { ['x'] = 1736.32092285156, ['y'] = 6419.4970703125, ['z'] = 35.037223815918 }, + reward = math.random(100,1000), + nameofstore = "24/7. (Paleto Bay)", + lastrobbed = 0 + },]] + ["sandyshores_twentyfoursever"] = { + position = { ['x'] = 1961.24682617188, ['y'] = 3749.46069335938, ['z'] = 32.3437461853027 }, + reward = math.random(500,5000), + nameofstore = "24/7. (Sandy Shores)", + lastrobbed = 0 + }, + ["bar_one"] = { + position = { ['x'] = 1986.1240234375, ['y'] = 3053.8747558594, ['z'] = 47.215171813965 }, + reward = math.random(500,5000), + nameofstore = "Yellow Jack. (Sandy Shores)", + lastrobbed = 0 + }, + ["ocean_liquor"] = { + position = { ['x'] = -2959.33715820313, ['y'] = 388.214172363281, ['z'] = 14.0432071685791 }, + reward = math.random(1000,10000), + nameofstore = "Robs Liquor. (Great Ocean Higway)", + lastrobbed = 0 + }, + ["sanandreas_liquor"] = { + position = { ['x'] = -1219.85607910156, ['y'] = -916.276550292969, ['z'] = 11.3262157440186 }, + reward = math.random(1000,10000), + nameofstore = "Robs Liquor. (San andreas Avenue)", + lastrobbed = 0 + }, + ["grove_ltd"] = { + position = { ['x'] = -43.4035377502441, ['y'] = -1749.20922851563, ['z'] = 29.421012878418 }, + reward = math.random(1000,10000), + nameofstore = "LTD Gasoline. (Grove Street)", + lastrobbed = 0 + }, + ["mirror_ltd"] = { + position = { ['x'] = 1160.67578125, ['y'] = -314.400451660156, ['z'] = 69.2050552368164 }, + reward = math.random(1000,10000), + nameofstore = "LTD Gasoline. (Mirror Park Boulevard)", + lastrobbed = 0 + }, + ["littleseoul_twentyfourseven"] = { + position = { ['x'] = -709.17022705078, ['y'] = -904.21722412109, ['z'] = 19.215591430664 }, + reward = math.random(1000,10000), + nameofstore = "24/7. (Little Seoul)", + lastrobbed = 0 + } } diff --git a/locales/br.lua b/locales/br.lua index f6c50ecb..d058b945 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,23 +1,23 @@ Locales['br'] = { - ['robbery_cancelled'] = 'O roubo será cancelado, você não ganhará nada!', - ['robbery_successful'] = 'O roubo foi um sucesso. Você ganhou ~g~$', - ['shop_robbery'] = 'Loja roubavel', - ['press_to_rob'] = 'Pressione ~INPUT_CONTEXT~ para roubar ~b~', - ['robbery_of'] = 'Loja roubavel: ~r~', - ['seconds_remaining'] = '~w~ segundos restantes', - ['robbery_cancelled_at'] = '~r~ Roubo cancelado em: ~b~', - ['robbery_has_cancelled'] = '~r~ O assalto foi cancelado: ~b~', - ['already_robbed'] = 'Esta loja já foi roubada. Por favor, espere: ', - ['seconds'] = 'segundos.', - ['rob_in_prog'] = '~r~ Assalto em curso em: ~b~', - ['started_to_rob'] = 'Você começou a roubar ', - ['do_not_move'] = ', Não se afaste!', - ['alarm_triggered'] = 'O alarme foi disparado', - ['hold_pos'] = 'Segure por 5 minutos e o dinheiro é seu!', - ['robbery_complete'] = '~r~ Roubo completo.~s~ ~h~ Corre!', - ['robbery_complete_at'] = '~r~ Roubo completo em: ~b~', - ['min_two_police'] = 'Deve haver pelo menos ~b~2 policiais~s~ na cidade para roubar.', - ['robbery_already'] = '~r~Um assalto já está em andamento.', + ['robbery_cancelled'] = 'O roubo será cancelado, você não ganhará nada!', + ['robbery_successful'] = 'O roubo foi um sucesso. Você ganhou ~g~$', + ['shop_robbery'] = 'Loja roubavel', + ['press_to_rob'] = 'Pressione ~INPUT_CONTEXT~ para roubar ~b~', + ['robbery_of'] = 'Loja roubavel: ~r~', + ['seconds_remaining'] = '~w~ segundos restantes', + ['robbery_cancelled_at'] = '~r~ Roubo cancelado em: ~b~', + ['robbery_has_cancelled'] = '~r~ O assalto foi cancelado: ~b~', + ['already_robbed'] = 'Esta loja já foi roubada. Por favor, espere: ', + ['seconds'] = 'segundos.', + ['rob_in_prog'] = '~r~ Assalto em curso em: ~b~', + ['started_to_rob'] = 'Você começou a roubar ', + ['do_not_move'] = ', Não se afaste!', + ['alarm_triggered'] = 'O alarme foi disparado', + ['hold_pos'] = 'Segure por 5 minutos e o dinheiro é seu!', + ['robbery_complete'] = '~r~ Roubo completo.~s~ ~h~ Corre!', + ['robbery_complete_at'] = '~r~ Roubo completo em: ~b~', + ['min_two_police'] = 'Deve haver pelo menos ~b~2 policiais~s~ na cidade para roubar.', + ['robbery_already'] = '~r~Um assalto já está em andamento.', } diff --git a/locales/de.lua b/locales/de.lua index 900f6d53..867bf34a 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,23 +1,23 @@ Locales['de'] = { - ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', - ['robbery_successful'] = 'Raub erfolgreich du erbeutest ~g~$', - ['shop_robbery'] = 'Ladenraub', - ['press_to_rob'] = 'Drücke ~INPUT_CONTEXT~ zum ausrauben ~b~', - ['robbery_of'] = 'Ladenraub: ~r~', - ['seconds_remaining'] = '~w~ sekunden übrig', - ['robbery_cancelled_at'] = '~r~ Raub abgebrochen bei: ~b~', - ['robbery_has_cancelled'] = '~r~ Raub wurde abgebrochen: ~b~', - ['already_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte: ', - ['seconds'] = 'sekunden.', - ['rob_in_prog'] = '~r~ Raub im gange bei: ~b~', - ['started_to_rob'] = 'du hast einen Raub gestartet ', - ['do_not_move'] = ', laufe nicht weg!', - ['alarm_triggered'] = 'der Alarm wurde ausgelöst', - ['hold_pos'] = 'halte 5 Minuten lang durch, und die Beute gehört dir!', - ['robbery_complete'] = '~r~ Raub erfolgreich.~s~ ~h~ LAUF!', - ['robbery_complete_at'] = '~r~ Raub erfolgreich bei: ~b~', - ['min_two_police'] = 'es müssen mindestens ~b~2 Polizisten~s~ im Dienst sein um einen Raub starten zu können.', - ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', + ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', + ['robbery_successful'] = 'Raub erfolgreich du erbeutest ~g~$', + ['shop_robbery'] = 'Ladenraub', + ['press_to_rob'] = 'Drücke ~INPUT_CONTEXT~ zum ausrauben ~b~', + ['robbery_of'] = 'Ladenraub: ~r~', + ['seconds_remaining'] = '~w~ sekunden übrig', + ['robbery_cancelled_at'] = '~r~ Raub abgebrochen bei: ~b~', + ['robbery_has_cancelled'] = '~r~ Raub wurde abgebrochen: ~b~', + ['already_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte: ', + ['seconds'] = 'sekunden.', + ['rob_in_prog'] = '~r~ Raub im gange bei: ~b~', + ['started_to_rob'] = 'du hast einen Raub gestartet ', + ['do_not_move'] = ', laufe nicht weg!', + ['alarm_triggered'] = 'der Alarm wurde ausgelöst', + ['hold_pos'] = 'halte 5 Minuten lang durch, und die Beute gehört dir!', + ['robbery_complete'] = '~r~ Raub erfolgreich.~s~ ~h~ LAUF!', + ['robbery_complete_at'] = '~r~ Raub erfolgreich bei: ~b~', + ['min_two_police'] = 'es müssen mindestens ~b~2 Polizisten~s~ im Dienst sein um einen Raub starten zu können.', + ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', } diff --git a/locales/en.lua b/locales/en.lua index 6e6ce02d..80a51126 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,23 +1,23 @@ Locales['en'] = { - ['robbery_cancelled'] = 'the robbery will be cancelled, you will gain nothing!', - ['robbery_successful'] = 'successful robbery you have gained ~g~$', - ['shop_robbery'] = 'shop Robbery', - ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to rob ~b~', - ['robbery_of'] = 'store robbery: ~r~', - ['seconds_remaining'] = '~w~ seconds remaning', - ['robbery_cancelled_at'] = '~r~ Robbery cancelled at: ~b~', - ['robbery_has_cancelled'] = '~r~ robbery has been cancelled: ~b~', - ['already_robbed'] = 'this store has already been robbed. Please wait: ', - ['seconds'] = 'seconds.', - ['rob_in_prog'] = '~r~ robbery in progress at: ~b~', - ['started_to_rob'] = 'you started to rob ', - ['do_not_move'] = ', do not move away!', - ['alarm_triggered'] = 'the alarm has been triggered', - ['hold_pos'] = 'hold for 5 minutes and the money is yours!', - ['robbery_complete'] = '~r~ Robbery complete.~s~ ~h~ Run!', - ['robbery_complete_at'] = '~r~ Robbery complete at: ~b~', - ['min_two_police'] = 'there must be at least ~b~2 policemen~s~ in town to rob.', - ['robbery_already'] = '~r~A robbery is already in progress.', + ['robbery_cancelled'] = 'the robbery will be cancelled, you will gain nothing!', + ['robbery_successful'] = 'successful robbery you have gained ~g~$', + ['shop_robbery'] = 'shop Robbery', + ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to rob ~b~', + ['robbery_of'] = 'store robbery: ~r~', + ['seconds_remaining'] = '~w~ seconds remaning', + ['robbery_cancelled_at'] = '~r~ Robbery cancelled at: ~b~', + ['robbery_has_cancelled'] = '~r~ robbery has been cancelled: ~b~', + ['already_robbed'] = 'this store has already been robbed. Please wait: ', + ['seconds'] = 'seconds.', + ['rob_in_prog'] = '~r~ robbery in progress at: ~b~', + ['started_to_rob'] = 'you started to rob ', + ['do_not_move'] = ', do not move away!', + ['alarm_triggered'] = 'the alarm has been triggered', + ['hold_pos'] = 'hold for 5 minutes and the money is yours!', + ['robbery_complete'] = '~r~ Robbery complete.~s~ ~h~ Run!', + ['robbery_complete_at'] = '~r~ Robbery complete at: ~b~', + ['min_two_police'] = 'there must be at least ~b~2 policemen~s~ in town to rob.', + ['robbery_already'] = '~r~A robbery is already in progress.', } diff --git a/locales/fr.lua b/locales/fr.lua index a88233ec..85e6a024 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,23 +1,23 @@ Locales['fr'] = { - ['robbery_cancelled'] = 'le braquage vas être annulé, vous ne gagnerez rien!', - ['robbery_successful'] = 'braquage réussi vous avez gagné ~g~$', - ['shop_robbery'] = 'braquage magasin', - ['press_to_rob'] = 'appuyer sur ~INPUT_CONTEXT~ pour braquer ~b~', - ['robbery_of'] = 'braquage de magasin: ~r~', - ['seconds_remaining'] = '~w~ secondes restantes', - ['robbery_cancelled_at'] = '~r~ Braquage annulé à: ~b~', - ['robbery_has_cancelled'] = '~r~ le braquage à été annulé: ~b~', - ['already_robbed'] = 'ce magasin a déjà été braqué. Veuillez attendre: ', - ['seconds'] = 'secondes.', - ['rob_in_prog'] = '~r~ braquage en cours à: ~b~', - ['started_to_rob'] = 'vous avez commencé à braquer ', - ['do_not_move'] = ', ne vous éloignez pas!', - ['alarm_triggered'] = 'l\'alarme à été déclenché', - ['hold_pos'] = 'tenez la position pendant 5min et l\'argent est à vous!', - ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Fuie!', - ['robbery_complete_at'] = '~r~ Braquage terminé à: ~b~', - ['min_two_police'] = 'il faut minimum ~b~2 policiers~s~ en ville pour braquer.', - ['robbery_already'] = '~r~Un braquage est déjà en cours.', + ['robbery_cancelled'] = 'le braquage vas être annulé, vous ne gagnerez rien!', + ['robbery_successful'] = 'braquage réussi vous avez gagné ~g~$', + ['shop_robbery'] = 'braquage magasin', + ['press_to_rob'] = 'appuyer sur ~INPUT_CONTEXT~ pour braquer ~b~', + ['robbery_of'] = 'braquage de magasin: ~r~', + ['seconds_remaining'] = '~w~ secondes restantes', + ['robbery_cancelled_at'] = '~r~ Braquage annulé à: ~b~', + ['robbery_has_cancelled'] = '~r~ le braquage à été annulé: ~b~', + ['already_robbed'] = 'ce magasin a déjà été braqué. Veuillez attendre: ', + ['seconds'] = 'secondes.', + ['rob_in_prog'] = '~r~ braquage en cours à: ~b~', + ['started_to_rob'] = 'vous avez commencé à braquer ', + ['do_not_move'] = ', ne vous éloignez pas!', + ['alarm_triggered'] = 'l\'alarme à été déclenché', + ['hold_pos'] = 'tenez la position pendant 5min et l\'argent est à vous!', + ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Fuie!', + ['robbery_complete_at'] = '~r~ Braquage terminé à: ~b~', + ['min_two_police'] = 'il faut minimum ~b~2 policiers~s~ en ville pour braquer.', + ['robbery_already'] = '~r~Un braquage est déjà en cours.', } diff --git a/server/esx_holdup_sv.lua b/server/esx_holdup_sv.lua index 50205e24..8c5d1654 100644 --- a/server/esx_holdup_sv.lua +++ b/server/esx_holdup_sv.lua @@ -5,100 +5,100 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) function get3DDistance(x1, y1, z1, x2, y2, z2) - return math.sqrt(math.pow(x1 - x2, 2) + math.pow(y1 - y2, 2) + math.pow(z1 - z2, 2)) + return math.sqrt(math.pow(x1 - x2, 2) + math.pow(y1 - y2, 2) + math.pow(z1 - z2, 2)) end RegisterServerEvent('esx_holdup:toofar') AddEventHandler('esx_holdup:toofar', function(robb) - local source = source - local xPlayers = ESX.GetPlayers() - rob = false - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) - end - end - if(robbers[source])then - TriggerClientEvent('esx_holdup:toofarlocal', source) - robbers[source] = nil - TriggerClientEvent('esx:showNotification', source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) - end + local source = source + local xPlayers = ESX.GetPlayers() + rob = false + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + end + end + if(robbers[source])then + TriggerClientEvent('esx_holdup:toofarlocal', source) + robbers[source] = nil + TriggerClientEvent('esx:showNotification', source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) + end end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - local source = source - local xPlayer = ESX.GetPlayerFromId(source) - local xPlayers = ESX.GetPlayers() + local source = source + local xPlayer = ESX.GetPlayerFromId(source) + local xPlayers = ESX.GetPlayers() - if Stores[robb] then + if Stores[robb] then - local store = Stores[robb] + local store = Stores[robb] - if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then + if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (1800 - (os.time() - store.lastrobbed)) .. _U('seconds')) - return - end + TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (1800 - (os.time() - store.lastrobbed)) .. _U('seconds')) + return + end - local cops = 0 - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - cops = cops + 1 - end - end + local cops = 0 + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + cops = cops + 1 + end + end - if rob == false then + if rob == false then - if(cops > 1)then + if(cops > 1)then - rob = true - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore) - TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) - end - end + rob = true + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore) + TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) + end + end - TriggerClientEvent('esx:showNotification', source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) - TriggerClientEvent('esx:showNotification', source, _U('alarm_triggered')) - TriggerClientEvent('esx:showNotification', source, _U('hold_pos')) - TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) - Stores[robb].lastrobbed = os.time() - robbers[source] = robb - local savedSource = source - SetTimeout(300000, function() + TriggerClientEvent('esx:showNotification', source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) + TriggerClientEvent('esx:showNotification', source, _U('alarm_triggered')) + TriggerClientEvent('esx:showNotification', source, _U('hold_pos')) + TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) + Stores[robb].lastrobbed = os.time() + robbers[source] = robb + local savedSource = source + SetTimeout(300000, function() - if(robbers[savedSource])then + if(robbers[savedSource])then - rob = false - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) - if(xPlayer)then + rob = false + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) + if(xPlayer)then - xPlayer.addAccountMoney('black_money', store.reward) - local xPlayers = ESX.GetPlayers() - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) - end - end - end - end - end) - else - TriggerClientEvent('esx:showNotification', source, _U('min_two_police')) - end - else - TriggerClientEvent('esx:showNotification', source, _U('robbery_already')) - end - end + xPlayer.addAccountMoney('black_money', store.reward) + local xPlayers = ESX.GetPlayers() + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + end + end + end + end + end) + else + TriggerClientEvent('esx:showNotification', source, _U('min_two_police')) + end + else + TriggerClientEvent('esx:showNotification', source, _U('robbery_already')) + end + end end) From 8276cf15a9ede482f6efff9a752b958f70de4219 Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Thu, 2 Nov 2017 00:12:54 +0100 Subject: [PATCH 17/44] ESX file names + better config.lua + rob timer per shop With the help of AshdeuzoFR --- README.md | 4 +- __resource.lua | 7 +-- client/main.lua | 149 ++++++++++++++++++++++++++++++++++++++++++++++++ config.lua | 29 +++++++--- locales/br.lua | 7 ++- locales/de.lua | 7 ++- locales/en.lua | 7 ++- locales/fr.lua | 33 +++++------ server/main.lua | 108 +++++++++++++++++++++++++++++++++++ 9 files changed, 312 insertions(+), 39 deletions(-) create mode 100644 client/main.lua create mode 100644 server/main.lua diff --git a/README.md b/README.md index 631b0713..26da0c0b 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ FXserver ESX Hold Up [REQUIREMENTS] - * esx_policejob => https://github.com/FXServer-ESX/fxserver-esx_policejob + * esx_policejob => https://github.com/ESX-Org/esx_policejob [INSTALLATION] 1) CD in your resources/[esx] folder 2) Clone the repository ``` -git clone https://github.com/FXServer-ESX/fxserver_esx_holdup esx_holdup +git clone https://github.com/ESX-Org/esx_holdup esx_holdup ``` 3) Add this in your server.cfg : diff --git a/__resource.lua b/__resource.lua index c2697d45..cac35769 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,6 +1,5 @@ -version '1.0.0' +version '1.1.0' -dependency 'essentialmode' client_scripts { '@es_extended/locale.lua', @@ -9,7 +8,7 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'config.lua', - 'client/esx_holdup_cl.lua' + 'client/main.lua' } server_scripts { @@ -19,5 +18,5 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'config.lua', - 'server/esx_holdup_sv.lua' + 'server/main.lua' } diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..cff11a99 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,149 @@ +local holdingup = false +local store = "" +local blipRobbery = nil +ESX = nil + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function DisplayHelpText(str) + SetTextComponentFormat("STRING") + AddTextComponentString(str) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) +end + +function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) + SetTextFont(0) + SetTextProportional(0) + SetTextScale(scale, scale) + SetTextColour(r, g, b, a) + SetTextDropShadow(0, 0, 0, 0,255) + SetTextEdge(1, 0, 0, 0, 255) + SetTextDropShadow() + if(outline)then + SetTextOutline() + end + SetTextEntry("STRING") + AddTextComponentString(text) + DrawText(x - width/2, y - height/2 + 0.005) +end + +RegisterNetEvent('esx_holdup:currentlyrobbing') +AddEventHandler('esx_holdup:currentlyrobbing', function(robb) + holdingup = true + store = robb +end) + +RegisterNetEvent('esx_holdup:killblip') +AddEventHandler('esx_holdup:killblip', function() + RemoveBlip(blipRobbery) +end) + +RegisterNetEvent('esx_holdup:setblip') +AddEventHandler('esx_holdup:setblip', function(position) + blipRobbery = AddBlipForCoord(position.x, position.y, position.z) + SetBlipSprite(blipRobbery , 161) + SetBlipScale(blipRobbery , 2.0) + SetBlipColour(blipRobbery, 3) + PulseBlip(blipRobbery) +end) + +RegisterNetEvent('esx_holdup:toofarlocal') +AddEventHandler('esx_holdup:toofarlocal', function(robb) + holdingup = false + ESX.ShowNotification(_U('robbery_cancelled')) + robbingName = "" + incircle = false +end) + + +RegisterNetEvent('esx_holdup:robberycomplete') +AddEventHandler('esx_holdup:robberycomplete', function(robb) + holdingup = false + ESX.ShowNotification(_U('robbery_complete')) + store = "" + incircle = false +end) + + +RegisterNetEvent('esx_holdup:starttimer') +AddEventHandler('esx_holdup:starttimer', function(source) + timer = Stores[store].secondsRemaining + Citizen.CreateThread(function() + while timer > 0 do + Citizen.Wait(0) + Citizen.Wait(1000) + if(timer > 0)then + timer = timer - 1 + end + end + end) + Citizen.CreateThread(function() + while true do + Citizen.Wait(0) + if holdingup then + drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_of') .. timer .. _U('seconds_remaining'), 255, 255, 255, 255) + end + end + end) +end) + + +Citizen.CreateThread(function() + for k,v in pairs(Stores)do + local ve = v.position + + local blip = AddBlipForCoord(ve.x, ve.y, ve.z) + SetBlipSprite(blip, 156) + SetBlipScale(blip, 0.8) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('shop_robbery')) + EndTextCommandSetBlipName(blip) + end +end) +incircle = false + + +Citizen.CreateThread(function() + while true do + local pos = GetEntityCoords(GetPlayerPed(-1), true) + + for k,v in pairs(Stores)do + local pos2 = v.position + + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then + if not holdingup then + DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) + + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then + if (incircle == false) then + DisplayHelpText(_U('press_to_rob') .. v.nameofstore) + end + incircle = true + if IsControlJustReleased(1, 51) then + TriggerServerEvent('esx_holdup:rob', k) + end + elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then + incircle = false + end + end + end + end + + if holdingup then + + local pos2 = Stores[store].position + + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 13)then + TriggerServerEvent('esx_holdup:toofar', store) + end + end + + Citizen.Wait(0) + end +end) diff --git a/config.lua b/config.lua index 98332dd7..500f9a31 100644 --- a/config.lua +++ b/config.lua @@ -1,53 +1,66 @@ Config = {} 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,5000), + reward = math.random(500,2500), nameofstore = "24/7. (Sandy Shores)", + secondsRemaining = 200, -- seconds lastrobbed = 0 }, ["bar_one"] = { - position = { ['x'] = 1986.1240234375, ['y'] = 3053.8747558594, ['z'] = 47.215171813965 }, - reward = math.random(500,5000), + 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,10000), + 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(1000,10000), + 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(1000,10000), + 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(1000,10000), + 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(1000,10000), + reward = math.random(3000,8000), nameofstore = "24/7. (Little Seoul)", + secondsRemaining = 200, -- seconds lastrobbed = 0 } } diff --git a/locales/br.lua b/locales/br.lua index d058b945..96c38cdc 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -11,13 +11,14 @@ Locales['br'] = { ['already_robbed'] = 'Esta loja já foi roubada. Por favor, espere: ', ['seconds'] = 'segundos.', ['rob_in_prog'] = '~r~ Assalto em curso em: ~b~', - ['started_to_rob'] = 'Você começou a roubar ', - ['do_not_move'] = ', Não se afaste!', + ['started_to_rob'] = 'Você começou a roubar ~b~', + ['do_not_move'] = '~s~, Não se afaste!', ['alarm_triggered'] = 'O alarme foi disparado', ['hold_pos'] = 'Segure por 5 minutos e o dinheiro é seu!', ['robbery_complete'] = '~r~ Roubo completo.~s~ ~h~ Corre!', ['robbery_complete_at'] = '~r~ Roubo completo em: ~b~', - ['min_two_police'] = 'Deve haver pelo menos ~b~2 policiais~s~ na cidade para roubar.', + ['min_police'] = 'there must be at least ~b~', + ['in_city'] = '~s~ policemen in town to rob.', ['robbery_already'] = '~r~Um assalto já está em andamento.', } diff --git a/locales/de.lua b/locales/de.lua index 867bf34a..10d2faa4 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -11,13 +11,14 @@ Locales['de'] = { ['already_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte: ', ['seconds'] = 'sekunden.', ['rob_in_prog'] = '~r~ Raub im gange bei: ~b~', - ['started_to_rob'] = 'du hast einen Raub gestartet ', - ['do_not_move'] = ', laufe nicht weg!', + ['started_to_rob'] = 'du hast einen Raub gestartet ~b~', + ['do_not_move'] = '~s~, laufe nicht weg!', ['alarm_triggered'] = 'der Alarm wurde ausgelöst', ['hold_pos'] = 'halte 5 Minuten lang durch, und die Beute gehört dir!', ['robbery_complete'] = '~r~ Raub erfolgreich.~s~ ~h~ LAUF!', ['robbery_complete_at'] = '~r~ Raub erfolgreich bei: ~b~', - ['min_two_police'] = 'es müssen mindestens ~b~2 Polizisten~s~ im Dienst sein um einen Raub starten zu können.', + ['min_police'] = 'there must be at least ~b~', + ['in_city'] = '~s~ policemen in town to rob.', ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', } diff --git a/locales/en.lua b/locales/en.lua index 80a51126..cbf6cb25 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -11,13 +11,14 @@ Locales['en'] = { ['already_robbed'] = 'this store has already been robbed. Please wait: ', ['seconds'] = 'seconds.', ['rob_in_prog'] = '~r~ robbery in progress at: ~b~', - ['started_to_rob'] = 'you started to rob ', - ['do_not_move'] = ', do not move away!', + ['started_to_rob'] = 'you started to rob ~b~', + ['do_not_move'] = '~s~, do not move away!', ['alarm_triggered'] = 'the alarm has been triggered', ['hold_pos'] = 'hold for 5 minutes and the money is yours!', ['robbery_complete'] = '~r~ Robbery complete.~s~ ~h~ Run!', ['robbery_complete_at'] = '~r~ Robbery complete at: ~b~', - ['min_two_police'] = 'there must be at least ~b~2 policemen~s~ in town to rob.', + ['min_police'] = 'there must be at least ~b~', + ['in_city'] = '~s~ policemen in town to rob.', ['robbery_already'] = '~r~A robbery is already in progress.', } diff --git a/locales/fr.lua b/locales/fr.lua index 85e6a024..3bf3db32 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,23 +1,24 @@ Locales['fr'] = { - ['robbery_cancelled'] = 'le braquage vas être annulé, vous ne gagnerez rien!', - ['robbery_successful'] = 'braquage réussi vous avez gagné ~g~$', - ['shop_robbery'] = 'braquage magasin', - ['press_to_rob'] = 'appuyer sur ~INPUT_CONTEXT~ pour braquer ~b~', - ['robbery_of'] = 'braquage de magasin: ~r~', + ['robbery_cancelled'] = 'Le braquage va être annulé, vous ne gagnerez rien !', + ['robbery_successful'] = 'Braquage réussi, vous avez gagné ~g~$', + ['shop_robbery'] = 'Braquage magasin', + ['press_to_rob'] = 'Appuyez sur ~INPUT_CONTEXT~ pour braquer ~b~', + ['robbery_of'] = 'Braquage de magasin :\n ~r~', ['seconds_remaining'] = '~w~ secondes restantes', ['robbery_cancelled_at'] = '~r~ Braquage annulé à: ~b~', - ['robbery_has_cancelled'] = '~r~ le braquage à été annulé: ~b~', - ['already_robbed'] = 'ce magasin a déjà été braqué. Veuillez attendre: ', - ['seconds'] = 'secondes.', - ['rob_in_prog'] = '~r~ braquage en cours à: ~b~', - ['started_to_rob'] = 'vous avez commencé à braquer ', - ['do_not_move'] = ', ne vous éloignez pas!', - ['alarm_triggered'] = 'l\'alarme à été déclenché', - ['hold_pos'] = 'tenez la position pendant 5min et l\'argent est à vous!', - ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Fuie!', - ['robbery_complete_at'] = '~r~ Braquage terminé à: ~b~', - ['min_two_police'] = 'il faut minimum ~b~2 policiers~s~ en ville pour braquer.', + ['robbery_has_cancelled'] = '~r~ Le braquage à été annulé: ~b~', + ['already_robbed'] = 'Ce magasin a déjà été braqué. Attendez ~r~ ', + ['seconds'] = '~b~ secondes.', + ['rob_in_prog'] = '~r~ Braquage en cours à: ~b~', + ['started_to_rob'] = 'Vous avez commencé à braquer ~b~', + ['do_not_move'] = '~s~, ne vous éloignez pas !', + ['alarm_triggered'] = 'l\'alarme a été déclenchée', + ['hold_pos'] = 'Tenez la position et l\'argent sera à vous !', + ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Cours petite fille !', + ['robbery_complete_at'] = '~r~ Braquage terminé à : ~b~', + ['min_police'] = 'Il faut minimum ~b~', + ['in_city'] = '~s~ policiers en ville pour braquer.', ['robbery_already'] = '~r~Un braquage est déjà en cours.', } diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..9eb9be7b --- /dev/null +++ b/server/main.lua @@ -0,0 +1,108 @@ +local rob = false +local robbers = {} +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +function get3DDistance(x1, y1, z1, x2, y2, z2) + return math.sqrt(math.pow(x1 - x2, 2) + math.pow(y1 - y2, 2) + math.pow(z1 - z2, 2)) +end + +RegisterServerEvent('esx_holdup:toofar') +AddEventHandler('esx_holdup:toofar', function(robb) + local source = source + local xPlayers = ESX.GetPlayers() + rob = false + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + end + end + if(robbers[source])then + TriggerClientEvent('esx_holdup:toofarlocal', source) + robbers[source] = nil + TriggerClientEvent('esx:showNotification', source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) + end +end) + +RegisterServerEvent('esx_holdup:rob') +AddEventHandler('esx_holdup:rob', function(robb) + + local source = source + local xPlayer = ESX.GetPlayerFromId(source) + local xPlayers = ESX.GetPlayers() + + if Stores[robb] then + + local store = Stores[robb] + + if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then + + TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (Config.TimerBeforeNewRob - (os.time() - store.lastrobbed)) .. _U('seconds')) + return + end + + + local cops = 0 + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + cops = cops + 1 + end + end + + + if rob == false then + + if(cops >= Config.PoliceNumberRequired)then + + rob = true + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore) + TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) + end + end + + TriggerClientEvent('esx:showNotification', source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) + TriggerClientEvent('esx:showNotification', source, _U('alarm_triggered')) + TriggerClientEvent('esx:showNotification', source, _U('hold_pos')) + + TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) + TriggerClientEvent('esx_holdup:starttimer', source) + + + Stores[robb].lastrobbed = os.time() + robbers[source] = robb + local savedSource = source + SetTimeout(store.secondsRemaining*1000, function() + + if(robbers[savedSource])then + + rob = false + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) + if(xPlayer)then + + xPlayer.addAccountMoney('black_money', store.reward) + local xPlayers = ESX.GetPlayers() + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + end + end + end + end + end) + else + TriggerClientEvent('esx:showNotification', source, _U('min_police') .. Config.PoliceNumberRequired .. _U('in_city')) + end + else + TriggerClientEvent('esx:showNotification', source, _U('robbery_already')) + end + end +end) From c98a79f4fb5c9a52e2a71c398d0e644f2327a37a Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Thu, 2 Nov 2017 00:16:04 +0100 Subject: [PATCH 18/44] Old file names deletion --- client/esx_holdup_cl.lua | 142 --------------------------------------- server/esx_holdup_sv.lua | 104 ---------------------------- 2 files changed, 246 deletions(-) delete mode 100644 client/esx_holdup_cl.lua delete mode 100644 server/esx_holdup_sv.lua diff --git a/client/esx_holdup_cl.lua b/client/esx_holdup_cl.lua deleted file mode 100644 index 23e287a5..00000000 --- a/client/esx_holdup_cl.lua +++ /dev/null @@ -1,142 +0,0 @@ -local holdingup = false -local store = "" -local secondsRemaining = 0 -local blipRobbery = nil -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end -end) - -function DisplayHelpText(str) - SetTextComponentFormat("STRING") - AddTextComponentString(str) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) -end - -function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) - SetTextFont(0) - SetTextProportional(0) - SetTextScale(scale, scale) - SetTextColour(r, g, b, a) - SetTextDropShadow(0, 0, 0, 0,255) - SetTextEdge(1, 0, 0, 0, 255) - SetTextDropShadow() - if(outline)then - SetTextOutline() - end - SetTextEntry("STRING") - AddTextComponentString(text) - DrawText(x - width/2, y - height/2 + 0.005) -end - -RegisterNetEvent('esx_holdup:currentlyrobbing') -AddEventHandler('esx_holdup:currentlyrobbing', function(robb) - holdingup = true - store = robb - secondsRemaining = 300 -end) - -RegisterNetEvent('esx_holdup:killblip') -AddEventHandler('esx_holdup:killblip', function() - RemoveBlip(blipRobbery) -end) - -RegisterNetEvent('esx_holdup:setblip') -AddEventHandler('esx_holdup:setblip', function(position) - blipRobbery = AddBlipForCoord(position.x, position.y, position.z) - SetBlipSprite(blipRobbery , 161) - SetBlipScale(blipRobbery , 2.0) - SetBlipColour(blipRobbery, 3) - PulseBlip(blipRobbery) -end) - -RegisterNetEvent('esx_holdup:toofarlocal') -AddEventHandler('esx_holdup:toofarlocal', function(robb) - holdingup = false - ESX.ShowNotification(_U('robbery_cancelled')) - robbingName = "" - secondsRemaining = 0 - incircle = false -end) - - -RegisterNetEvent('esx_holdup:robberycomplete') -AddEventHandler('esx_holdup:robberycomplete', function(robb) - holdingup = false - ESX.ShowNotification(_U('robbery_cancelled') .. Stores[store].reward) - store = "" - secondsRemaining = 0 - incircle = false -end) - -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if holdingup then - Citizen.Wait(1000) - if(secondsRemaining > 0)then - secondsRemaining = secondsRemaining - 1 - end - end - end -end) - -Citizen.CreateThread(function() - for k,v in pairs(Stores)do - local ve = v.position - - local blip = AddBlipForCoord(ve.x, ve.y, ve.z) - SetBlipSprite(blip, 156) - SetBlipScale(blip, 0.8) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop_robbery')) - EndTextCommandSetBlipName(blip) - end -end) -incircle = false - -Citizen.CreateThread(function() - while true do - local pos = GetEntityCoords(GetPlayerPed(-1), true) - - for k,v in pairs(Stores)do - local pos2 = v.position - - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then - if not holdingup then - DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) - - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then - if (incircle == false) then - DisplayHelpText(_U('press_to_rob') .. v.nameofstore) - end - incircle = true - if IsControlJustReleased(1, 51) then - TriggerServerEvent('esx_holdup:rob', k) - end - elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then - incircle = false - end - end - end - end - - if holdingup then - - drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_of') .. secondsRemaining .. _U('seconds_remaining'), 255, 255, 255, 255) - - local pos2 = Stores[store].position - - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 7.5)then - TriggerServerEvent('esx_holdup:toofar', store) - end - end - - Citizen.Wait(0) - end -end) diff --git a/server/esx_holdup_sv.lua b/server/esx_holdup_sv.lua deleted file mode 100644 index 8c5d1654..00000000 --- a/server/esx_holdup_sv.lua +++ /dev/null @@ -1,104 +0,0 @@ -local rob = false -local robbers = {} -ESX = nil - -TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - -function get3DDistance(x1, y1, z1, x2, y2, z2) - return math.sqrt(math.pow(x1 - x2, 2) + math.pow(y1 - y2, 2) + math.pow(z1 - z2, 2)) -end - -RegisterServerEvent('esx_holdup:toofar') -AddEventHandler('esx_holdup:toofar', function(robb) - local source = source - local xPlayers = ESX.GetPlayers() - rob = false - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) - end - end - if(robbers[source])then - TriggerClientEvent('esx_holdup:toofarlocal', source) - robbers[source] = nil - TriggerClientEvent('esx:showNotification', source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) - end -end) - -RegisterServerEvent('esx_holdup:rob') -AddEventHandler('esx_holdup:rob', function(robb) - - local source = source - local xPlayer = ESX.GetPlayerFromId(source) - local xPlayers = ESX.GetPlayers() - - if Stores[robb] then - - local store = Stores[robb] - - if (os.time() - store.lastrobbed) < 600 and store.lastrobbed ~= 0 then - - TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (1800 - (os.time() - store.lastrobbed)) .. _U('seconds')) - return - end - - - local cops = 0 - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - cops = cops + 1 - end - end - - - if rob == false then - - if(cops > 1)then - - rob = true - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore) - TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) - end - end - - TriggerClientEvent('esx:showNotification', source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) - TriggerClientEvent('esx:showNotification', source, _U('alarm_triggered')) - TriggerClientEvent('esx:showNotification', source, _U('hold_pos')) - TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) - Stores[robb].lastrobbed = os.time() - robbers[source] = robb - local savedSource = source - SetTimeout(300000, function() - - if(robbers[savedSource])then - - rob = false - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) - if(xPlayer)then - - xPlayer.addAccountMoney('black_money', store.reward) - local xPlayers = ESX.GetPlayers() - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) - end - end - end - end - end) - else - TriggerClientEvent('esx:showNotification', source, _U('min_two_police')) - end - else - TriggerClientEvent('esx:showNotification', source, _U('robbery_already')) - end - end -end) From d41aa745a18b353ab65745ddf16a3cf007a61b88 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 02:01:57 +0100 Subject: [PATCH 19/44] Fix message pack Error --- server/main.lua | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/server/main.lua b/server/main.lua index 9eb9be7b..e864635a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -10,8 +10,8 @@ end RegisterServerEvent('esx_holdup:toofar') AddEventHandler('esx_holdup:toofar', function(robb) - local source = source - local xPlayers = ESX.GetPlayers() + local _source = _source + local xPlayer = ESX.GetPlayerFromId(_source) rob = false for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) @@ -20,18 +20,18 @@ AddEventHandler('esx_holdup:toofar', function(robb) TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end - if(robbers[source])then - TriggerClientEvent('esx_holdup:toofarlocal', source) - robbers[source] = nil - TriggerClientEvent('esx:showNotification', source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) + if(robbers[_source])then + TriggerClientEvent('esx_holdup:toofarlocal', _source) + robbers[_source] = nil + TriggerClientEvent('esx:showNotification', _source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) end end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - local source = source - local xPlayer = ESX.GetPlayerFromId(source) + local _source = _source + local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() if Stores[robb] then @@ -40,7 +40,7 @@ AddEventHandler('esx_holdup:rob', function(robb) if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', source, _U('already_robbed') .. (Config.TimerBeforeNewRob - (os.time() - store.lastrobbed)) .. _U('seconds')) + TriggerClientEvent('esx:showNotification', _source, _U('already_robbed') .. (Config.TimerBeforeNewRob - (os.time() - store.lastrobbed)) .. _U('seconds')) return end @@ -67,17 +67,17 @@ AddEventHandler('esx_holdup:rob', function(robb) end end - TriggerClientEvent('esx:showNotification', source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) - TriggerClientEvent('esx:showNotification', source, _U('alarm_triggered')) - TriggerClientEvent('esx:showNotification', source, _U('hold_pos')) + TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) + TriggerClientEvent('esx:showNotification', _source, _U('alarm_triggered')) + TriggerClientEvent('esx:showNotification', _source, _U('hold_pos')) - TriggerClientEvent('esx_holdup:currentlyrobbing', source, robb) - TriggerClientEvent('esx_holdup:starttimer', source) + TriggerClientEvent('esx_holdup:currentlyrobbing', _source, robb) + TriggerClientEvent('esx_holdup:starttimer', _source) Stores[robb].lastrobbed = os.time() - robbers[source] = robb - local savedSource = source + robbers[_source] = robb + local savedSource = _source SetTimeout(store.secondsRemaining*1000, function() if(robbers[savedSource])then @@ -99,10 +99,10 @@ AddEventHandler('esx_holdup:rob', function(robb) end end) else - TriggerClientEvent('esx:showNotification', source, _U('min_police') .. Config.PoliceNumberRequired .. _U('in_city')) + TriggerClientEvent('esx:showNotification', _source, _U('min_police') .. Config.PoliceNumberRequired .. _U('in_city')) end else - TriggerClientEvent('esx:showNotification', source, _U('robbery_already')) + TriggerClientEvent('esx:showNotification', _source, _U('robbery_already')) end end end) From 9911afa14b91f234262467ec822d5f28edee3c5b Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Mon, 26 Feb 2018 21:58:20 -0800 Subject: [PATCH 20/44] Update main.lua --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index e864635a..98275f9d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -10,7 +10,7 @@ end RegisterServerEvent('esx_holdup:toofar') AddEventHandler('esx_holdup:toofar', function(robb) - local _source = _source + local _source = source local xPlayer = ESX.GetPlayerFromId(_source) rob = false for i=1, #xPlayers, 1 do @@ -30,7 +30,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() From e743fc872d39fab4cd8c224a4e7a6e35352b292b Mon Sep 17 00:00:00 2001 From: Vanheden <33155577+Vanheden@users.noreply.github.com> Date: Wed, 7 Mar 2018 14:24:52 +0100 Subject: [PATCH 21/44] Create sv.lua --- locales/sv.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 locales/sv.lua diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..d0fa7cab --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,23 @@ +Locales['sv'] = { + + ['robbery_cancelled'] = 'rånet kommer att avbrytas, du får ingenting!', + ['robbery_successful'] = 'du lyckades råna och har nu fått ~g~$', + ['shop_robbery'] = 'Råna Affär', + ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att råna ~b~', + ['robbery_of'] = 'store robbery: ~r~', + ['seconds_remaining'] = '~w~ sekunder kvar', + ['robbery_cancelled_at'] = '~r~ Rånet avbryt: ~b~', + ['robbery_has_cancelled'] = '~r~ rånet har blivit avbrutet: ~b~', + ['already_robbed'] = 'denna affär har redan blivit råna, Vänta lite: ', + ['seconds'] = 'sekunder.', + ['rob_in_prog'] = '~r~ pågående rån vid: ~b~', + ['started_to_rob'] = 'du började att råna ', + ['do_not_move'] = ', Rör dig inte!', + ['alarm_triggered'] = 'larmet har utlösts', + ['hold_pos'] = 'stanna i 5 minuter och pengarna är din!', + ['robbery_complete'] = '~r~ Rånet avklarat.~s~ ~h~ Spring!', + ['robbery_complete_at'] = '~r~ Rånet har blivit avslutat och dom har fått pengar: ~b~', + ['min_two_police'] = 'det måste vara minst~b~2 poliser~s~ för att råna.', + ['robbery_already'] = '~r~Ett rån pågår redan.', + +} From e3fe0049e2f2d1a07e0909bdc47348ecb79869bf Mon Sep 17 00:00:00 2001 From: Vanheden <33155577+Vanheden@users.noreply.github.com> Date: Wed, 7 Mar 2018 14:25:17 +0100 Subject: [PATCH 22/44] Update __resource.lua --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index cac35769..51f93b04 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,6 +7,7 @@ client_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } @@ -17,6 +18,7 @@ server_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } From 8ec35a5b62703822e17aae6df5656c365ea15678 Mon Sep 17 00:00:00 2001 From: Laszlo Dindeleux Date: Wed, 7 Mar 2018 15:16:35 +0100 Subject: [PATCH 23/44] Fix loop limit error Resolves the "attempt to get length" error, which caused that the robbery didn't stop when being too far from the zone, and sending notification to police officers. Tested and working. --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 98275f9d..9129b1b1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -11,7 +11,7 @@ end RegisterServerEvent('esx_holdup:toofar') AddEventHandler('esx_holdup:toofar', function(robb) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayers = ESX.GetPlayers() rob = false for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) From 267023dc8a07bbd8c080eb03e32212bdafebcade Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Thu, 8 Mar 2018 08:19:48 -0800 Subject: [PATCH 24/44] Update __resource.lua --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 51f93b04..0b449434 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,4 +1,4 @@ -version '1.1.0' +version '1.0.1' client_scripts { From 95504fb185ce52a7dd08bb92ad972ba3ea9e79d1 Mon Sep 17 00:00:00 2001 From: Vanheden <33155577+Vanheden@users.noreply.github.com> Date: Mon, 12 Mar 2018 15:52:19 +0100 Subject: [PATCH 25/44] Fixed typo --- locales/sv.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/sv.lua b/locales/sv.lua index d0fa7cab..daee9488 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -6,7 +6,7 @@ Locales['sv'] = { ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att råna ~b~', ['robbery_of'] = 'store robbery: ~r~', ['seconds_remaining'] = '~w~ sekunder kvar', - ['robbery_cancelled_at'] = '~r~ Rånet avbryt: ~b~', + ['robbery_cancelled_at'] = '~r~ Rånet avbrutet: ~b~', ['robbery_has_cancelled'] = '~r~ rånet har blivit avbrutet: ~b~', ['already_robbed'] = 'denna affär har redan blivit råna, Vänta lite: ', ['seconds'] = 'sekunder.', From c6f6dd544b0e3b7097d4fa544a9065762532cce8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 24 Apr 2018 22:26:20 +0200 Subject: [PATCH 26/44] Improved manifest (fixes #13), formatted strings (todo) --- README.md | 41 +++++++--- __resource.lua | 37 +++++---- client/main.lua | 200 ++++++++++++++++++++++++++---------------------- locales/sv.lua | 33 ++++---- server/main.lua | 156 ++++++++++++++++++------------------- 5 files changed, 246 insertions(+), 221 deletions(-) diff --git a/README.md b/README.md index 26da0c0b..67ba2a02 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,39 @@ -# fxserver_esx_holdup -FXserver ESX Hold Up +# esx_holdup +### Requirements +- [esx_policejob](https://github.com/ESX-Org/esx_policejob) -[REQUIREMENTS] +## Download & Installation - * esx_policejob => https://github.com/ESX-Org/esx_policejob - -[INSTALLATION] - -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/ESX-Org/esx_holdup esx_holdup +fvm install --save --folder=esx esx-org/esx_holdup ``` -3) Add this in your server.cfg : +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_holdup [esx]/esx_holdup +``` + +### Manually +- Download https://github.com/ESX-Org/esx_holdup/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Add this to your `server.cfg`: ``` start esx_holdup ``` + +# Legal +### License +esx_holdup - rob stores + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 0b449434..35558977 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,24 +1,27 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Holdup' + version '1.0.1' - client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'config.lua', + 'client/main.lua' } server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'config.lua', + 'server/main.lua' } diff --git a/client/main.lua b/client/main.lua index cff11a99..c69eb41e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -3,147 +3,161 @@ local store = "" local blipRobbery = nil ESX = nil +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function DisplayHelpText(str) - SetTextComponentFormat("STRING") - AddTextComponentString(str) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + SetTextComponentFormat("STRING") + AddTextComponentString(str) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) end function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) - SetTextFont(0) - SetTextProportional(0) - SetTextScale(scale, scale) - SetTextColour(r, g, b, a) - SetTextDropShadow(0, 0, 0, 0,255) - SetTextEdge(1, 0, 0, 0, 255) - SetTextDropShadow() - if(outline)then - SetTextOutline() - end - SetTextEntry("STRING") - AddTextComponentString(text) - DrawText(x - width/2, y - height/2 + 0.005) + SetTextFont(0) + SetTextProportional(0) + SetTextScale(scale, scale) + SetTextColour(r, g, b, a) + SetTextDropShadow(0, 0, 0, 0,255) + SetTextEdge(1, 0, 0, 0, 255) + SetTextDropShadow() + if(outline)then + SetTextOutline() + end + SetTextEntry("STRING") + AddTextComponentString(text) + DrawText(x - width/2, y - height/2 + 0.005) end RegisterNetEvent('esx_holdup:currentlyrobbing') AddEventHandler('esx_holdup:currentlyrobbing', function(robb) - holdingup = true - store = robb + holdingup = true + store = robb end) RegisterNetEvent('esx_holdup:killblip') AddEventHandler('esx_holdup:killblip', function() - RemoveBlip(blipRobbery) + RemoveBlip(blipRobbery) end) RegisterNetEvent('esx_holdup:setblip') AddEventHandler('esx_holdup:setblip', function(position) - blipRobbery = AddBlipForCoord(position.x, position.y, position.z) - SetBlipSprite(blipRobbery , 161) - SetBlipScale(blipRobbery , 2.0) - SetBlipColour(blipRobbery, 3) - PulseBlip(blipRobbery) + blipRobbery = AddBlipForCoord(position.x, position.y, position.z) + SetBlipSprite(blipRobbery , 161) + SetBlipScale(blipRobbery , 2.0) + SetBlipColour(blipRobbery, 3) + PulseBlip(blipRobbery) end) RegisterNetEvent('esx_holdup:toofarlocal') AddEventHandler('esx_holdup:toofarlocal', function(robb) - holdingup = false - ESX.ShowNotification(_U('robbery_cancelled')) - robbingName = "" - incircle = false + holdingup = false + ESX.ShowNotification(_U('robbery_cancelled')) + robbingName = "" + incircle = false end) RegisterNetEvent('esx_holdup:robberycomplete') AddEventHandler('esx_holdup:robberycomplete', function(robb) - holdingup = false - ESX.ShowNotification(_U('robbery_complete')) - store = "" - incircle = false + holdingup = false + ESX.ShowNotification(_U('robbery_complete')) + store = "" + incircle = false end) RegisterNetEvent('esx_holdup:starttimer') AddEventHandler('esx_holdup:starttimer', function(source) - timer = Stores[store].secondsRemaining - Citizen.CreateThread(function() - while timer > 0 do - Citizen.Wait(0) - Citizen.Wait(1000) - if(timer > 0)then - timer = timer - 1 - end - end - end) - Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if holdingup then - drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_of') .. timer .. _U('seconds_remaining'), 255, 255, 255, 255) - end - end - end) + timer = Stores[store].secondsRemaining + Citizen.CreateThread(function() + while timer > 0 do + Citizen.Wait(0) + Citizen.Wait(1000) + if(timer > 0)then + timer = timer - 1 + end + end + end) + Citizen.CreateThread(function() + while true do + Citizen.Wait(0) + if holdingup then + drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_timer', timer), 255, 255, 255, 255) + elseif + Citizen.Wait(1000) + end + end + end) end) Citizen.CreateThread(function() - for k,v in pairs(Stores)do - local ve = v.position + for k,v in pairs(Stores)do + local ve = v.position - local blip = AddBlipForCoord(ve.x, ve.y, ve.z) - SetBlipSprite(blip, 156) - SetBlipScale(blip, 0.8) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop_robbery')) - EndTextCommandSetBlipName(blip) - end + local blip = AddBlipForCoord(ve.x, ve.y, ve.z) + SetBlipSprite(blip, 156) + SetBlipScale(blip, 0.8) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('shop_robbery')) + EndTextCommandSetBlipName(blip) + end end) incircle = false Citizen.CreateThread(function() - while true do - local pos = GetEntityCoords(GetPlayerPed(-1), true) + while true do + local pos = GetEntityCoords(GetPlayerPed(-1), true) - for k,v in pairs(Stores)do - local pos2 = v.position + for k,v in pairs(Stores)do + local pos2 = v.position - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then - if not holdingup then - DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then + if not holdingup then + DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then - if (incircle == false) then - DisplayHelpText(_U('press_to_rob') .. v.nameofstore) - end - incircle = true - if IsControlJustReleased(1, 51) then - TriggerServerEvent('esx_holdup:rob', k) - end - elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then - incircle = false - end - end - end - end + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then + if (incircle == false) then + DisplayHelpText(_U('press_to_rob') .. v.nameofstore) + end + incircle = true + if IsControlJustReleased(0, Keys['E']) then + TriggerServerEvent('esx_holdup:rob', k) + end + elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then + incircle = false + end + end + end + end - if holdingup then + if holdingup then - local pos2 = Stores[store].position + local pos2 = Stores[store].position - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 13)then - TriggerServerEvent('esx_holdup:toofar', store) - end - end + if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 13)then + TriggerServerEvent('esx_holdup:toofar', store) + end + end - Citizen.Wait(0) - end + Citizen.Wait(0) + end end) diff --git a/locales/sv.lua b/locales/sv.lua index daee9488..7e9fba1d 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,23 +1,16 @@ Locales['sv'] = { - - ['robbery_cancelled'] = 'rånet kommer att avbrytas, du får ingenting!', - ['robbery_successful'] = 'du lyckades råna och har nu fått ~g~$', - ['shop_robbery'] = 'Råna Affär', + ['robbery_cancelled'] = 'rånet har avbryts, spring nu!', + ['shop_robbery'] = 'råna butik', ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att råna ~b~', - ['robbery_of'] = 'store robbery: ~r~', - ['seconds_remaining'] = '~w~ sekunder kvar', - ['robbery_cancelled_at'] = '~r~ Rånet avbrutet: ~b~', - ['robbery_has_cancelled'] = '~r~ rånet har blivit avbrutet: ~b~', - ['already_robbed'] = 'denna affär har redan blivit råna, Vänta lite: ', - ['seconds'] = 'sekunder.', - ['rob_in_prog'] = '~r~ pågående rån vid: ~b~', - ['started_to_rob'] = 'du började att råna ', - ['do_not_move'] = ', Rör dig inte!', - ['alarm_triggered'] = 'larmet har utlösts', - ['hold_pos'] = 'stanna i 5 minuter och pengarna är din!', - ['robbery_complete'] = '~r~ Rånet avklarat.~s~ ~h~ Spring!', - ['robbery_complete_at'] = '~r~ Rånet har blivit avslutat och dom har fått pengar: ~b~', - ['min_two_police'] = 'det måste vara minst~b~2 poliser~s~ för att råna.', + ['robbery_timer'] = 'butiksrån: ~r~%s~s~ sekunder kvarstår', + ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrytits!', + ['recently_robbed'] = 'denna butik har nyligen rånats, du måste vänta ~y~%s~s~ sekunder!', + ['rob_in_prog'] = '~r~Det är ett pågående rån vid ~b~%s~s~', + ['started_to_rob'] = 'du började att råna ~y~%s~s~, gå inte för långt från butiken!', + ['alarm_triggered'] = '~o~Larmet har utlösts~s~', + ['hold_pos'] = 'vänta 5 minuter och pengarna är dina!', + ['robbery_complete'] = '~r~Rånet är avklarat~s~, förlora polisen!', + ['robbery_complete_at'] = '~r~Ett rån lyckades~s~ vid ~y~%s~s~', + ['min_police'] = 'det måste vara minst ~b~%s poliser~s~ inne för att du ska kunna ~o~råna butiker~s~.', ['robbery_already'] = '~r~Ett rån pågår redan.', - -} +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 9129b1b1..a1066cee 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,105 +4,101 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -function get3DDistance(x1, y1, z1, x2, y2, z2) - return math.sqrt(math.pow(x1 - x2, 2) + math.pow(y1 - y2, 2) + math.pow(z1 - z2, 2)) -end - RegisterServerEvent('esx_holdup:toofar') AddEventHandler('esx_holdup:toofar', function(robb) - local _source = source - local xPlayers = ESX.GetPlayers() - rob = false - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at') .. Stores[robb].nameofstore) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) - end - end - if(robbers[_source])then - TriggerClientEvent('esx_holdup:toofarlocal', _source) - robbers[_source] = nil - TriggerClientEvent('esx:showNotification', _source, _U('robbery_has_cancelled') .. Stores[robb].nameofstore) - end + local _source = source + local xPlayers = ESX.GetPlayers() + rob = false + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[robb].nameofstore)) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + end + end + if(robbers[_source])then + TriggerClientEvent('esx_holdup:toofarlocal', _source) + robbers[_source] = nil + TriggerClientEvent('esx:showNotification', _source, _U('robbery_cancelled_at', Stores[robb].nameofstore)) + end end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - local xPlayers = ESX.GetPlayers() + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayers = ESX.GetPlayers() - if Stores[robb] then + if Stores[robb] then - local store = Stores[robb] + local store = Stores[robb] - if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then + if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', _source, _U('already_robbed') .. (Config.TimerBeforeNewRob - (os.time() - store.lastrobbed)) .. _U('seconds')) - return - end + TriggerClientEvent('esx:showNotification', _source, _U('recently_robbed', Config.TimerBeforeNewRob - (os.time() - store.lastrobbed))) + return + end - local cops = 0 - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - cops = cops + 1 - end - end + local cops = 0 + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + cops = cops + 1 + end + end - if rob == false then + if rob == false then - if(cops >= Config.PoliceNumberRequired)then + if(cops >= Config.PoliceNumberRequired)then - rob = true - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog') .. store.nameofstore) - TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) - end - end + rob = true + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameofstore)) + TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) + end + end - TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob') .. store.nameofstore .. _U('do_not_move')) - TriggerClientEvent('esx:showNotification', _source, _U('alarm_triggered')) - TriggerClientEvent('esx:showNotification', _source, _U('hold_pos')) - - TriggerClientEvent('esx_holdup:currentlyrobbing', _source, robb) - TriggerClientEvent('esx_holdup:starttimer', _source) - - - Stores[robb].lastrobbed = os.time() - robbers[_source] = robb - local savedSource = _source - SetTimeout(store.secondsRemaining*1000, function() + TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameofstore)) + TriggerClientEvent('esx:showNotification', _source, _U('alarm_triggered')) + TriggerClientEvent('esx:showNotification', _source, _U('hold_pos')) + + TriggerClientEvent('esx_holdup:currentlyrobbing', _source, robb) + TriggerClientEvent('esx_holdup:starttimer', _source) + + + Stores[robb].lastrobbed = os.time() + robbers[_source] = robb + local savedSource = _source + SetTimeout(store.secondsRemaining * 1000, function() - if(robbers[savedSource])then + if(robbers[savedSource])then - rob = false - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) - if(xPlayer)then + rob = false + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) + if(xPlayer)then - xPlayer.addAccountMoney('black_money', store.reward) - local xPlayers = ESX.GetPlayers() - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at') .. store.nameofstore) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) - end - end - end - end - end) - else - TriggerClientEvent('esx:showNotification', _source, _U('min_police') .. Config.PoliceNumberRequired .. _U('in_city')) - end - else - TriggerClientEvent('esx:showNotification', _source, _U('robbery_already')) - end - end + xPlayer.addAccountMoney('black_money', store.reward) + local xPlayers = ESX.GetPlayers() + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameofstore)) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + end + end + end + end + end) + else + TriggerClientEvent('esx:showNotification', _source, _U('min_police', Config.PoliceNumberRequired)) + end + else + TriggerClientEvent('esx:showNotification', _source, _U('robbery_already')) + end + end end) From 1d0489b04348473353b7eb35bcbe5eed1f18cd54 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 25 Apr 2018 19:44:47 +0200 Subject: [PATCH 27/44] i18n updates --- client/main.lua | 10 +++++----- locales/de.lua | 35 +++++++++++++-------------------- locales/en.lua | 35 +++++++++++++-------------------- locales/fr.lua | 35 +++++++++++++-------------------- locales/sv.lua | 11 +++++------ server/main.lua | 51 +++++++++++++++++++++---------------------------- 6 files changed, 71 insertions(+), 106 deletions(-) diff --git a/client/main.lua b/client/main.lua index c69eb41e..a9e60aa5 100644 --- a/client/main.lua +++ b/client/main.lua @@ -65,7 +65,7 @@ AddEventHandler('esx_holdup:setblip', function(position) end) RegisterNetEvent('esx_holdup:toofarlocal') -AddEventHandler('esx_holdup:toofarlocal', function(robb) +AddEventHandler('esx_holdup:toofarlocal', function() holdingup = false ESX.ShowNotification(_U('robbery_cancelled')) robbingName = "" @@ -74,16 +74,16 @@ end) RegisterNetEvent('esx_holdup:robberycomplete') -AddEventHandler('esx_holdup:robberycomplete', function(robb) +AddEventHandler('esx_holdup:robberycomplete', function(award) holdingup = false - ESX.ShowNotification(_U('robbery_complete')) + ESX.ShowNotification(_U('robbery_complete', award)) store = "" incircle = false end) RegisterNetEvent('esx_holdup:starttimer') -AddEventHandler('esx_holdup:starttimer', function(source) +AddEventHandler('esx_holdup:starttimer', function() timer = Stores[store].secondsRemaining Citizen.CreateThread(function() while timer > 0 do @@ -136,7 +136,7 @@ Citizen.CreateThread(function() if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then if (incircle == false) then - DisplayHelpText(_U('press_to_rob') .. v.nameofstore) + DisplayHelpText(_U('press_to_rob', v.nameofstore)) end incircle = true if IsControlJustReleased(0, Keys['E']) then diff --git a/locales/de.lua b/locales/de.lua index 10d2faa4..3c94a9b7 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,24 +1,15 @@ Locales['de'] = { - - ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', - ['robbery_successful'] = 'Raub erfolgreich du erbeutest ~g~$', - ['shop_robbery'] = 'Ladenraub', - ['press_to_rob'] = 'Drücke ~INPUT_CONTEXT~ zum ausrauben ~b~', - ['robbery_of'] = 'Ladenraub: ~r~', - ['seconds_remaining'] = '~w~ sekunden übrig', - ['robbery_cancelled_at'] = '~r~ Raub abgebrochen bei: ~b~', - ['robbery_has_cancelled'] = '~r~ Raub wurde abgebrochen: ~b~', - ['already_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte: ', - ['seconds'] = 'sekunden.', - ['rob_in_prog'] = '~r~ Raub im gange bei: ~b~', - ['started_to_rob'] = 'du hast einen Raub gestartet ~b~', - ['do_not_move'] = '~s~, laufe nicht weg!', - ['alarm_triggered'] = 'der Alarm wurde ausgelöst', - ['hold_pos'] = 'halte 5 Minuten lang durch, und die Beute gehört dir!', - ['robbery_complete'] = '~r~ Raub erfolgreich.~s~ ~h~ LAUF!', - ['robbery_complete_at'] = '~r~ Raub erfolgreich bei: ~b~', - ['min_police'] = 'there must be at least ~b~', - ['in_city'] = '~s~ policemen in town to rob.', - ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', - + ['shop_robbery'] = 'ladenraub', + ['press_to_rob'] = 'drücke ~INPUT_CONTEXT~ ~o~zum ausrauben~s~ ~b~%s~s~', + ['robbery_timer'] = 'ladenraub: ~r~%s~s~ sekunden übrig!', + ['recently_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte ~y~%s~s~ sekunden!', + ['rob_in_prog'] = '~r~Raub im gange bei: ~b~%s~s~', + ['started_to_rob'] = 'du hast einen Raub gestartet ~y~%s~s~', + ['alarm_triggered'] = 'der Alarm wurde ausgelöst', + ['robbery_complete'] = '~r~Raub erfolgreich.~s~ Du ~o~hast gestohlen~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Raub erfolgreich bei: ~y~%s~s~', + ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', + ['robbery_cancelled_at'] = '~r~Raub abgebrochen bei: ~b~%s~s~', + ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', + ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', } diff --git a/locales/en.lua b/locales/en.lua index cbf6cb25..a8b1f3fc 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,24 +1,15 @@ Locales['en'] = { - - ['robbery_cancelled'] = 'the robbery will be cancelled, you will gain nothing!', - ['robbery_successful'] = 'successful robbery you have gained ~g~$', - ['shop_robbery'] = 'shop Robbery', - ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to rob ~b~', - ['robbery_of'] = 'store robbery: ~r~', - ['seconds_remaining'] = '~w~ seconds remaning', - ['robbery_cancelled_at'] = '~r~ Robbery cancelled at: ~b~', - ['robbery_has_cancelled'] = '~r~ robbery has been cancelled: ~b~', - ['already_robbed'] = 'this store has already been robbed. Please wait: ', - ['seconds'] = 'seconds.', - ['rob_in_prog'] = '~r~ robbery in progress at: ~b~', - ['started_to_rob'] = 'you started to rob ~b~', - ['do_not_move'] = '~s~, do not move away!', - ['alarm_triggered'] = 'the alarm has been triggered', - ['hold_pos'] = 'hold for 5 minutes and the money is yours!', - ['robbery_complete'] = '~r~ Robbery complete.~s~ ~h~ Run!', - ['robbery_complete_at'] = '~r~ Robbery complete at: ~b~', - ['min_police'] = 'there must be at least ~b~', - ['in_city'] = '~s~ policemen in town to rob.', - ['robbery_already'] = '~r~A robbery is already in progress.', - + ['shop_robbery'] = 'shop Robbery', + ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to ~o~rob~s~ ~b~%s~s~', + ['robbery_timer'] = 'store robbery: ~r~%s~s~ seconds remaning', + ['recently_robbed'] = 'this store was recently been robbed. Please wait ~y~%s~s~ seconds until you can rob again', + ['rob_in_prog'] = '~r~robbery in progress at ~b~%s~s~', + ['started_to_rob'] = 'you started to rob ~y~%s~s~', + ['alarm_triggered'] = 'the alarm has been triggered', + ['robbery_complete'] = '~r~The robbery has been successful~s~, you ~o~stole~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Robbery successful at ~y~%s~s~', + ['robbery_cancelled'] = 'the robbery has been cancelled!', + ['robbery_cancelled_at'] = '~r~The robbery at ~b~%s~s~ has been cancelled!', + ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', + ['robbery_already'] = '~r~A robbery is already in progress.', } diff --git a/locales/fr.lua b/locales/fr.lua index 3bf3db32..9adff5b9 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,24 +1,15 @@ Locales['fr'] = { - - ['robbery_cancelled'] = 'Le braquage va être annulé, vous ne gagnerez rien !', - ['robbery_successful'] = 'Braquage réussi, vous avez gagné ~g~$', - ['shop_robbery'] = 'Braquage magasin', - ['press_to_rob'] = 'Appuyez sur ~INPUT_CONTEXT~ pour braquer ~b~', - ['robbery_of'] = 'Braquage de magasin :\n ~r~', - ['seconds_remaining'] = '~w~ secondes restantes', - ['robbery_cancelled_at'] = '~r~ Braquage annulé à: ~b~', - ['robbery_has_cancelled'] = '~r~ Le braquage à été annulé: ~b~', - ['already_robbed'] = 'Ce magasin a déjà été braqué. Attendez ~r~ ', - ['seconds'] = '~b~ secondes.', - ['rob_in_prog'] = '~r~ Braquage en cours à: ~b~', - ['started_to_rob'] = 'Vous avez commencé à braquer ~b~', - ['do_not_move'] = '~s~, ne vous éloignez pas !', - ['alarm_triggered'] = 'l\'alarme a été déclenchée', - ['hold_pos'] = 'Tenez la position et l\'argent sera à vous !', - ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Cours petite fille !', - ['robbery_complete_at'] = '~r~ Braquage terminé à : ~b~', - ['min_police'] = 'Il faut minimum ~b~', - ['in_city'] = '~s~ policiers en ville pour braquer.', - ['robbery_already'] = '~r~Un braquage est déjà en cours.', - + ['shop_robbery'] = 'braquage magasin', + ['press_to_rob'] = 'appuyez sur ~INPUT_CONTEXT~ ~o~pour braquer~s~ ~b~%s~s~', + ['robbery_timer'] = 'braquage magasin: il reste ~r~%s~s~ secondes', + ['recently_robbed'] = 'ce magasin a déjà été braqué. Attendez ~r~%s~b~ secondes.', + ['rob_in_prog'] = '~r~Braquage en cours à: ~b~%s~s~', + ['started_to_rob'] = 'vous avez commencé à braquer ~b~%s~s~', + ['alarm_triggered'] = 'l\'alarme a été déclenchée', + ['robbery_complete'] = '~r~Braquage terminé~s~. Vous avez ~o~volé~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Braquage terminé à: ~b~%s~s~', + ['robbery_cancelled'] = 'le braquage va être annulé, vous ne gagnerez rien!', + ['robbery_cancelled_at'] = '~r~Braquage annulé à: ~b~%s~s~', + ['min_police'] = 'il faut minimum ~b~%s policiers~s~ en ville pour braquer.', + ['robbery_already'] = '~r~Un braquage est déjà en cours.', } diff --git a/locales/sv.lua b/locales/sv.lua index 7e9fba1d..2d0bc9cd 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,16 +1,15 @@ Locales['sv'] = { - ['robbery_cancelled'] = 'rånet har avbryts, spring nu!', - ['shop_robbery'] = 'råna butik', - ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att råna ~b~', + ['shop_robbery'] = 'butikrån', + ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att ~o~råna~s~ ~b~%s~s~', ['robbery_timer'] = 'butiksrån: ~r~%s~s~ sekunder kvarstår', - ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrytits!', ['recently_robbed'] = 'denna butik har nyligen rånats, du måste vänta ~y~%s~s~ sekunder!', ['rob_in_prog'] = '~r~Det är ett pågående rån vid ~b~%s~s~', ['started_to_rob'] = 'du började att råna ~y~%s~s~, gå inte för långt från butiken!', ['alarm_triggered'] = '~o~Larmet har utlösts~s~', - ['hold_pos'] = 'vänta 5 minuter och pengarna är dina!', - ['robbery_complete'] = '~r~Rånet är avklarat~s~, förlora polisen!', + ['robbery_complete'] = '~r~Rånet är avklarat~s~, du stal ~g~$%s~s~!', ['robbery_complete_at'] = '~r~Ett rån lyckades~s~ vid ~y~%s~s~', + ['robbery_cancelled'] = 'rånet har avbrutits!', + ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrutits!', ['min_police'] = 'det måste vara minst ~b~%s poliser~s~ inne för att du ska kunna ~o~råna butiker~s~.', ['robbery_already'] = '~r~Ett rån pågår redan.', } \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index a1066cee..ca6fb91d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -10,13 +10,14 @@ AddEventHandler('esx_holdup:toofar', function(robb) local xPlayers = ESX.GetPlayers() rob = false for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + + if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[robb].nameofstore)) TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end - if(robbers[_source])then + if robbers[_source] then TriggerClientEvent('esx_holdup:toofarlocal', _source) robbers[_source] = nil TriggerClientEvent('esx:showNotification', _source, _U('robbery_cancelled_at', Stores[robb].nameofstore)) @@ -25,70 +26,62 @@ end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() if Stores[robb] then - local store = Stores[robb] if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', _source, _U('recently_robbed', Config.TimerBeforeNewRob - (os.time() - store.lastrobbed))) return end - local cops = 0 for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then cops = cops + 1 end end - if rob == false then - - if(cops >= Config.PoliceNumberRequired)then - + if cops >= Config.PoliceNumberRequired then rob = true for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameofstore)) - TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameofstore)) + TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) end end TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameofstore)) TriggerClientEvent('esx:showNotification', _source, _U('alarm_triggered')) - TriggerClientEvent('esx:showNotification', _source, _U('hold_pos')) TriggerClientEvent('esx_holdup:currentlyrobbing', _source, robb) TriggerClientEvent('esx_holdup:starttimer', _source) - Stores[robb].lastrobbed = os.time() robbers[_source] = robb local savedSource = _source SetTimeout(store.secondsRemaining * 1000, function() - if(robbers[savedSource])then - + if robbers[savedSource] then rob = false - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) - if(xPlayer)then - - xPlayer.addAccountMoney('black_money', store.reward) + if xPlayer then + local award = store.reward + + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, reward) + xPlayer.addAccountMoney('black_money', reward) + local xPlayers = ESX.GetPlayers() for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameofstore)) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameofstore)) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end end From d2059ed13ece5c45a43e6b946d7ed7c3d015f9f1 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 25 Apr 2018 21:15:11 +0200 Subject: [PATCH 28/44] Fixed broken code --- client/main.lua | 2 +- server/main.lua | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index a9e60aa5..ed2b2c1b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -99,7 +99,7 @@ AddEventHandler('esx_holdup:starttimer', function() Citizen.Wait(0) if holdingup then drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_timer', timer), 255, 255, 255, 255) - elseif + else Citizen.Wait(1000) end end diff --git a/server/main.lua b/server/main.lua index ca6fb91d..6448f1ea 100644 --- a/server/main.lua +++ b/server/main.lua @@ -72,9 +72,8 @@ AddEventHandler('esx_holdup:rob', function(robb) rob = false if xPlayer then local award = store.reward - - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, reward) - xPlayer.addAccountMoney('black_money', reward) + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, award) + xPlayer.addAccountMoney('black_money', award) local xPlayers = ESX.GetPlayers() for i=1, #xPlayers, 1 do From f5a4a2c1de36c761f9346bbc706fca2eae503690 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 23:30:46 +0300 Subject: [PATCH 29/44] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index 35558977..1b1a869d 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', 'config.lua', @@ -20,6 +21,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', 'config.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..b33fdf26 --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,15 @@ +Locales['fi'] = { + ['shop_robbery'] = 'kaupan ryöstö', + ['press_to_rob'] = 'paina ~INPUT_CONTEXT~ ~o~ryöstääksesi~s~ kaupan ~b~%s~s~', + ['robbery_timer'] = 'kauppa ryöstö: ~r~%s~s~ sekunttia jäljellä', + ['recently_robbed'] = 'tämä kauppa ryöstettiin vasta. Odota ~y~%s~s~ sekunttia että voit ryöstää.', + ['rob_in_prog'] = '~r~ryöstö menossa kohteessa ~b~%s~s~', + ['started_to_rob'] = 'sinä aloitit ryöstään ~y~%s~s~', + ['alarm_triggered'] = 'hälyytys laukaistu!', + ['robbery_complete'] = '~r~Ryöstö onnistui~s~, sinä ~o~varastit~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Ryöstö ohitse kohteessa ~y~%s~s~', + ['robbery_cancelled'] = 'ryöstö keskeytyi!', + ['robbery_cancelled_at'] = '~r~Ryöstö kohteessa ~b~%s~s~ keskeytyi!', + ['min_police'] = 'kaupungissa pitää olla vähintää ~b~%s poliisia~s~ paikalla ryöstön aloitukseen.', + ['robbery_already'] = '~r~Ryöstö on jo menossa.', +} From e390a4565805b8fdb4575ef0ca8ffc3e9b5a90e2 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 22 Jun 2018 15:06:01 +0200 Subject: [PATCH 30/44] Fixed robbing without weapon #14 --- client/main.lua | 10 +++++++--- locales/br.lua | 3 +-- locales/de.lua | 1 + locales/en.lua | 1 + locales/fr.lua | 1 + locales/sv.lua | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index ed2b2c1b..e1c6e335 100644 --- a/client/main.lua +++ b/client/main.lua @@ -125,6 +125,7 @@ incircle = false Citizen.CreateThread(function() while true do + Citizen.Wait(1) local pos = GetEntityCoords(GetPlayerPed(-1), true) for k,v in pairs(Stores)do @@ -140,7 +141,11 @@ Citizen.CreateThread(function() end incircle = true if IsControlJustReleased(0, Keys['E']) then - TriggerServerEvent('esx_holdup:rob', k) + if IsPedArmed(GetPlayerPed(-1), 4) then + TriggerServerEvent('esx_holdup:rob', k) + else + ESX.ShowNotification(_U('no_threat')) + end end elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then incircle = false @@ -157,7 +162,6 @@ Citizen.CreateThread(function() TriggerServerEvent('esx_holdup:toofar', store) end end - - Citizen.Wait(0) end end) + \ No newline at end of file diff --git a/locales/br.lua b/locales/br.lua index 96c38cdc..6d2b2e2e 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,5 +1,4 @@ Locales['br'] = { - ['robbery_cancelled'] = 'O roubo será cancelado, você não ganhará nada!', ['robbery_successful'] = 'O roubo foi um sucesso. Você ganhou ~g~$', ['shop_robbery'] = 'Loja roubavel', @@ -20,5 +19,5 @@ Locales['br'] = { ['min_police'] = 'there must be at least ~b~', ['in_city'] = '~s~ policemen in town to rob.', ['robbery_already'] = '~r~Um assalto já está em andamento.', - + ['no_threat'] = 'you do not pose a threat to the store', } diff --git a/locales/de.lua b/locales/de.lua index 3c94a9b7..ffd9fe98 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -12,4 +12,5 @@ Locales['de'] = { ['robbery_cancelled_at'] = '~r~Raub abgebrochen bei: ~b~%s~s~', ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', + ['no_threat'] = 'you do not pose a threat to the store', } diff --git a/locales/en.lua b/locales/en.lua index a8b1f3fc..7d33c724 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -12,4 +12,5 @@ Locales['en'] = { ['robbery_cancelled_at'] = '~r~The robbery at ~b~%s~s~ has been cancelled!', ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', ['robbery_already'] = '~r~A robbery is already in progress.', + ['no_threat'] = 'you do not pose a threat to the store', } diff --git a/locales/fr.lua b/locales/fr.lua index 9adff5b9..5f3efced 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -12,4 +12,5 @@ Locales['fr'] = { ['robbery_cancelled_at'] = '~r~Braquage annulé à: ~b~%s~s~', ['min_police'] = 'il faut minimum ~b~%s policiers~s~ en ville pour braquer.', ['robbery_already'] = '~r~Un braquage est déjà en cours.', + ['no_threat'] = 'you do not pose a threat to the store', } diff --git a/locales/sv.lua b/locales/sv.lua index 2d0bc9cd..b04003c2 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -12,4 +12,5 @@ Locales['sv'] = { ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrutits!', ['min_police'] = 'det måste vara minst ~b~%s poliser~s~ inne för att du ska kunna ~o~råna butiker~s~.', ['robbery_already'] = '~r~Ett rån pågår redan.', + ['no_threat'] = 'du kan inte hota utan ett vapen', } \ No newline at end of file From a00b76e3b762e76f7711c2969c8d5a693e3abb79 Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 23:22:52 +0100 Subject: [PATCH 31/44] Polish Translation --- __resource.lua | 2 ++ locales/pl.lua | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index 1b1a869d..1669eb52 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } @@ -24,6 +25,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..1fea8ed6 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,16 @@ +Locales['en'] = { + ['shop_robbery'] = 'napad Na Sklep', + ['press_to_rob'] = 'Wciśnij ~INPUT_CONTEXT~ aby ~o~napaść~s~ na ~b~%s~s~', + ['robbery_timer'] = 'napad na sklep: ~r~%s~s~ sekund do końca', + ['recently_robbed'] = 'ten sklep niedawno został obrabowany. Proszę poczekać ~y~%s~s~ sekund przed kolejnym napadem', + ['rob_in_prog'] = '~r~napad w toku w ~b~%s~s~', + ['started_to_rob'] = 'rozpoczałeś/aś napad ~y~%s~s~', + ['alarm_triggered'] = 'alarm został włączony', + ['robbery_complete'] = '~r~Napad udany~s~, ~o~obrabowałeś/aś~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Napad udany w ~y~%s~s~', + ['robbery_cancelled'] = 'napad został anulowany!', + ['robbery_cancelled_at'] = '~r~Napad w ~b~%s~s~ został anulowany!', + ['min_police'] = 'minimalnie musi być ~b~%s policjantów~s~ w mieście aby obrabować.', + ['robbery_already'] = '~r~Napad jest już w toku.', + ['no_threat'] = 'nie tworzysz zagrożenia dla tego sklepu', +} From bd298d1680f9a8c20962b387daa49c7e095e4df2 Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 23:23:24 +0100 Subject: [PATCH 32/44] Update pl.lua quick fix --- locales/pl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pl.lua b/locales/pl.lua index 1fea8ed6..3ceaf197 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,4 +1,4 @@ -Locales['en'] = { +Locales['pl'] = { ['shop_robbery'] = 'napad Na Sklep', ['press_to_rob'] = 'Wciśnij ~INPUT_CONTEXT~ aby ~o~napaść~s~ na ~b~%s~s~', ['robbery_timer'] = 'napad na sklep: ~r~%s~s~ sekund do końca', From d1c5320059548bbf92d07a45dd42cb96ea94f33e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 29 Jul 2018 15:40:58 +0200 Subject: [PATCH 33/44] 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 From 2913e35009308cca35c21079896a4b107a1c547e Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:53:38 -0400 Subject: [PATCH 34/44] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 93c075e95879e5ccd478fcfc19d8db30f2401248 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Aug 2018 17:29:34 +0200 Subject: [PATCH 35/44] Minor changes, added futher configuration --- client/main.lua | 36 +++++++++++++++--------------------- config.lua | 21 ++++++++++++--------- locales/sv.lua | 2 +- server/main.lua | 8 +++++++- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/client/main.lua b/client/main.lua index e1c6e335..bfb8b0cd 100644 --- a/client/main.lua +++ b/client/main.lua @@ -22,12 +22,6 @@ Citizen.CreateThread(function() end end) -function DisplayHelpText(str) - SetTextComponentFormat("STRING") - AddTextComponentString(str) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) -end - function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) SetTextFont(0) SetTextProportional(0) @@ -36,9 +30,7 @@ function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) SetTextDropShadow(0, 0, 0, 0,255) SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() - if(outline)then - SetTextOutline() - end + if outline then SetTextOutline() end SetTextEntry("STRING") AddTextComponentString(text) DrawText(x - width/2, y - height/2 + 0.005) @@ -87,13 +79,14 @@ AddEventHandler('esx_holdup:starttimer', function() timer = Stores[store].secondsRemaining Citizen.CreateThread(function() while timer > 0 do - Citizen.Wait(0) + Citizen.Wait(1000) - if(timer > 0)then + if timer > 0 then timer = timer - 1 end end end) + Citizen.CreateThread(function() while true do Citizen.Wait(0) @@ -108,13 +101,14 @@ end) Citizen.CreateThread(function() - for k,v in pairs(Stores)do + for k,v in pairs(Stores) do local ve = v.position local blip = AddBlipForCoord(ve.x, ve.y, ve.z) SetBlipSprite(blip, 156) SetBlipScale(blip, 0.8) SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") AddTextComponentString(_U('shop_robbery')) EndTextCommandSetBlipName(blip) @@ -126,27 +120,29 @@ incircle = false Citizen.CreateThread(function() while true do Citizen.Wait(1) - local pos = GetEntityCoords(GetPlayerPed(-1), true) + local pos = GetEntityCoords(PlayerPedId(), true) for k,v in pairs(Stores)do local pos2 = v.position - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0)then + if Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0 then if not holdingup then DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then - if (incircle == false) then - DisplayHelpText(_U('press_to_rob', v.nameofstore)) + if Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0 then + if not incirle then + ESX.ShowHelpNotification(_U('press_to_rob', v.nameofstore)) end + incircle = true if IsControlJustReleased(0, Keys['E']) then - if IsPedArmed(GetPlayerPed(-1), 4) then + if IsPedArmed(PlayerPedId(), 4) then TriggerServerEvent('esx_holdup:rob', k) else ESX.ShowNotification(_U('no_threat')) end end + elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then incircle = false end @@ -157,11 +153,9 @@ Citizen.CreateThread(function() if holdingup then local pos2 = Stores[store].position - - if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 13)then + if Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > Config.MaxDistance then TriggerServerEvent('esx_holdup:toofar', store) end end end end) - \ No newline at end of file diff --git a/config.lua b/config.lua index 5e56242d..5b3934d5 100644 --- a/config.lua +++ b/config.lua @@ -4,65 +4,68 @@ Config.Locale = 'fr' Config.PoliceNumberRequired = 2 Config.TimerBeforeNewRob = 1800 -- seconds +Config.MaxDistance = 40 -- max distance from the robbary, going any longer away from it will to cancel the robbary +Config.GiveBlackMoney = true -- give black money? If disabled it will give cash instead. + Stores = { ["paleto_twentyfourseven"] = { - position = { ['x'] = 1736.32, ['y'] = 6419.47, ['z'] = 35.03 }, + 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 }, + 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 }, + 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 }, + 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 }, + 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 }, + 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 }, + 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 }, + 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 }, + position = { x = 1160.67, y = -314.40, z = 69.20 }, reward = math.random(3000, 15000), nameofstore = "LTD Gasoline. (Mirror Park Boulevard)", secondsRemaining = 200, -- seconds diff --git a/locales/sv.lua b/locales/sv.lua index b04003c2..26687951 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -6,7 +6,7 @@ Locales['sv'] = { ['rob_in_prog'] = '~r~Det är ett pågående rån vid ~b~%s~s~', ['started_to_rob'] = 'du började att råna ~y~%s~s~, gå inte för långt från butiken!', ['alarm_triggered'] = '~o~Larmet har utlösts~s~', - ['robbery_complete'] = '~r~Rånet är avklarat~s~, du stal ~g~$%s~s~!', + ['robbery_complete'] = '~r~Rånet är avklarat~s~, du stal ~r~%s SEK~s~!', ['robbery_complete_at'] = '~r~Ett rån lyckades~s~ vid ~y~%s~s~', ['robbery_cancelled'] = 'rånet har avbrutits!', ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrutits!', diff --git a/server/main.lua b/server/main.lua index 792edba7..38d88382 100644 --- a/server/main.lua +++ b/server/main.lua @@ -49,6 +49,7 @@ AddEventHandler('esx_holdup:rob', function(robb) if not rob then if cops >= Config.PoliceNumberRequired then rob = true + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) if xPlayer.job.name == 'police' then @@ -73,7 +74,12 @@ AddEventHandler('esx_holdup:rob', function(robb) if xPlayer then local award = store.reward TriggerClientEvent('esx_holdup:robberycomplete', savedSource, award) - xPlayer.addAccountMoney('black_money', award) + + if Config.GiveBlackMoney then + xPlayer.addAccountMoney('black_money', award) + else + xPlayer.addMoney(award) + end local xPlayers = ESX.GetPlayers() for i=1, #xPlayers, 1 do From 2035ed02f7ab0ebee75a5db3db66a264b5a1c84a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 14 Oct 2018 13:44:33 +0200 Subject: [PATCH 36/44] v1.1.0: Fixed #8, camelCase enforcing, check desc - Enforced 2 space indent on locale files - Removed incomplete br locale - Enforced camelCase - Improved translations - Code cleanup - Fixed #8 bug where timer didn't stop - Improved config file for markers - Final commit v1.1.0 --- README.md | 2 + __resource.lua | 4 +- client/main.lua | 108 ++++++++++++++++++++---------------------------- config.lua | 50 ++++++++++++---------- locales/br.lua | 23 ----------- locales/de.lua | 28 ++++++------- locales/en.lua | 28 ++++++------- locales/fi.lua | 1 + locales/fr.lua | 28 ++++++------- locales/pl.lua | 28 ++++++------- locales/sv.lua | 28 ++++++------- server/main.lua | 61 +++++++++++++-------------- 12 files changed, 178 insertions(+), 211 deletions(-) delete mode 100644 locales/br.lua diff --git a/README.md b/README.md index 67ba2a02..6e908cb8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # esx_holdup +This resource for ESX adds stores around the island for criminals to rob! + ### Requirements - [esx_policejob](https://github.com/ESX-Org/esx_policejob) diff --git a/__resource.lua b/__resource.lua index 1669eb52..ea830cab 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,12 +2,11 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Holdup' -version '1.0.1' +version '1.1.0' client_scripts { '@es_extended/locale.lua', 'locales/de.lua', - 'locales/br.lua', 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', @@ -20,7 +19,6 @@ client_scripts { server_scripts { '@es_extended/locale.lua', 'locales/de.lua', - 'locales/br.lua', 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', diff --git a/client/main.lua b/client/main.lua index bfb8b0cd..3ba23626 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,4 +1,4 @@ -local holdingup = false +local holdingUp = false local store = "" local blipRobbery = nil ESX = nil @@ -22,7 +22,7 @@ Citizen.CreateThread(function() end end) -function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) +function drawTxt(x,y, width, height, scale, text, r,g,b,a, outline) SetTextFont(0) SetTextProportional(0) SetTextScale(scale, scale) @@ -31,56 +31,53 @@ function drawTxt(x,y ,width,height,scale, text, r,g,b,a, outline) SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() if outline then SetTextOutline() end - SetTextEntry("STRING") - AddTextComponentString(text) - DrawText(x - width/2, y - height/2 + 0.005) + + BeginTextCommandDisplayText('STRING') + AddTextComponentSubstringPlayerName(text) + EndTextCommandDisplayText(x - width/2, y - height/2 + 0.005) end -RegisterNetEvent('esx_holdup:currentlyrobbing') -AddEventHandler('esx_holdup:currentlyrobbing', function(robb) - holdingup = true - store = robb +RegisterNetEvent('esx_holdup:currentlyRobbing') +AddEventHandler('esx_holdup:currentlyRobbing', function(currentStore) + holdingUp, store = true, currentStore end) -RegisterNetEvent('esx_holdup:killblip') -AddEventHandler('esx_holdup:killblip', function() +RegisterNetEvent('esx_holdup:killBlip') +AddEventHandler('esx_holdup:killBlip', function() RemoveBlip(blipRobbery) end) -RegisterNetEvent('esx_holdup:setblip') -AddEventHandler('esx_holdup:setblip', function(position) +RegisterNetEvent('esx_holdup:setBlip') +AddEventHandler('esx_holdup:setBlip', function(position) blipRobbery = AddBlipForCoord(position.x, position.y, position.z) - SetBlipSprite(blipRobbery , 161) - SetBlipScale(blipRobbery , 2.0) + + SetBlipSprite(blipRobbery, 161) + SetBlipScale(blipRobbery, 2.0) SetBlipColour(blipRobbery, 3) + PulseBlip(blipRobbery) end) -RegisterNetEvent('esx_holdup:toofarlocal') -AddEventHandler('esx_holdup:toofarlocal', function() - holdingup = false +RegisterNetEvent('esx_holdup:tooFar') +AddEventHandler('esx_holdup:tooFar', function() + holdingUp, store = false, '' ESX.ShowNotification(_U('robbery_cancelled')) - robbingName = "" - incircle = false end) - -RegisterNetEvent('esx_holdup:robberycomplete') -AddEventHandler('esx_holdup:robberycomplete', function(award) - holdingup = false +RegisterNetEvent('esx_holdup:robberyComplete') +AddEventHandler('esx_holdup:robberyComplete', function(award) + holdingUp, store = false, '' ESX.ShowNotification(_U('robbery_complete', award)) - store = "" - incircle = false end) +RegisterNetEvent('esx_holdup:startTimer') +AddEventHandler('esx_holdup:startTimer', function() + local timer = Stores[store].secondsRemaining -RegisterNetEvent('esx_holdup:starttimer') -AddEventHandler('esx_holdup:starttimer', function() - timer = Stores[store].secondsRemaining Citizen.CreateThread(function() - while timer > 0 do - + while timer > 0 and holdingUp do Citizen.Wait(1000) + if timer > 0 then timer = timer - 1 end @@ -88,23 +85,16 @@ AddEventHandler('esx_holdup:starttimer', function() end) Citizen.CreateThread(function() - while true do + while holdingUp do Citizen.Wait(0) - if holdingup then - drawTxt(0.66, 1.44, 1.0,1.0,0.4, _U('robbery_timer', timer), 255, 255, 255, 255) - else - Citizen.Wait(1000) - end + drawTxt(0.66, 1.44, 1.0, 1.0, 0.4, _U('robbery_timer', timer), 255, 255, 255, 255) end end) end) - Citizen.CreateThread(function() for k,v in pairs(Stores) do - local ve = v.position - - local blip = AddBlipForCoord(ve.x, ve.y, ve.z) + local blip = AddBlipForCoord(v.position.x, v.position.y, v.position.z) SetBlipSprite(blip, 156) SetBlipScale(blip, 0.8) SetBlipAsShortRange(blip, true) @@ -114,47 +104,39 @@ Citizen.CreateThread(function() EndTextCommandSetBlipName(blip) end end) -incircle = false - Citizen.CreateThread(function() while true do Citizen.Wait(1) - local pos = GetEntityCoords(PlayerPedId(), true) + local playerPos = GetEntityCoords(PlayerPedId(), true) - for k,v in pairs(Stores)do - local pos2 = v.position + for k,v in pairs(Stores) do + local storePos = v.position + local distance = Vdist(playerPos.x, playerPos.y, playerPos.z, storePos.x, storePos.y, storePos.z) - if Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 15.0 then - if not holdingup then - DrawMarker(1, v.position.x, v.position.y, v.position.z - 1, 0, 0, 0, 0, 0, 0, 1.0001, 1.0001, 1.5001, 1555, 0, 0,255, 0, 0, 0,0) + if distance < Config.Marker.DrawDistance then + if not holdingUp then + DrawMarker(Config.Marker.Type, storePos.x, storePos.y, storePos.z - 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, Config.Marker.a, false, false, 2, false, false, false, false) - if Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0 then - if not incirle then - ESX.ShowHelpNotification(_U('press_to_rob', v.nameofstore)) - end + if distance < 0.5 then + ESX.ShowHelpNotification(_U('press_to_rob', v.nameOfStore)) - incircle = true if IsControlJustReleased(0, Keys['E']) then if IsPedArmed(PlayerPedId(), 4) then - TriggerServerEvent('esx_holdup:rob', k) + TriggerServerEvent('esx_holdup:robberyStarted', k) else ESX.ShowNotification(_U('no_threat')) end end - - elseif(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > 1.0)then - incircle = false end end end end - if holdingup then - - local pos2 = Stores[store].position - if Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) > Config.MaxDistance then - TriggerServerEvent('esx_holdup:toofar', store) + if holdingUp then + local storePos = Stores[store].position + if Vdist(playerPos.x, playerPos.y, playerPos.z, storePos.x, storePos.y, storePos.z) > Config.MaxDistance then + TriggerServerEvent('esx_holdup:tooFar', store) end end end diff --git a/config.lua b/config.lua index 5b3934d5..1b2027a0 100644 --- a/config.lua +++ b/config.lua @@ -1,74 +1,80 @@ Config = {} Config.Locale = 'fr' -Config.PoliceNumberRequired = 2 -Config.TimerBeforeNewRob = 1800 -- seconds +Config.Marker = { + r = 250, g = 0, b = 0, a = 100, -- red color + x = 1.0, y = 1.0, z = 1.5, -- tiny, cylinder formed circle + DrawDistance = 15.0, Type = 1 -- default circle type, low draw distance due to indoors area +} -Config.MaxDistance = 40 -- max distance from the robbary, going any longer away from it will to cancel the robbary -Config.GiveBlackMoney = true -- give black money? If disabled it will give cash instead. +Config.PoliceNumberRequired = 2 +Config.TimerBeforeNewRob = 1800 -- The cooldown timer on a store after robbery was completed / canceled, in seconds + +Config.MaxDistance = 20 -- max distance from the robbary, going any longer away from it will to cancel the robbary +Config.GiveBlackMoney = true -- give black money? If disabled it will give cash instead Stores = { ["paleto_twentyfourseven"] = { position = { x = 1736.32, y = 6419.47, z = 35.03 }, reward = math.random(5000, 35000), - nameofstore = "24/7. (Paleto Bay)", + nameOfStore = "24/7. (Paleto Bay)", secondsRemaining = 350, -- seconds - lastrobbed = 0 + lastRobbed = 0 }, ["sandyshores_twentyfoursever"] = { position = { x = 1961.24, y = 3749.46, z = 32.34 }, reward = math.random(3000, 20000), - nameofstore = "24/7. (Sandy Shores)", + nameOfStore = "24/7. (Sandy Shores)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + lastRobbed = 0 }, ["littleseoul_twentyfourseven"] = { position = { x = -709.17, y = -904.21, z = 19.21 }, reward = math.random(3000, 20000), - nameofstore = "24/7. (Little Seoul)", + nameOfStore = "24/7. (Little Seoul)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + lastRobbed = 0 }, ["bar_one"] = { position = { x = 1990.57, y = 3044.95, z = 47.21 }, reward = math.random(5000, 35000), - nameofstore = "Yellow Jack. (Sandy Shores)", + nameOfStore = "Yellow Jack. (Sandy Shores)", secondsRemaining = 300, -- seconds - lastrobbed = 0 + 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)", + nameOfStore = "Robs Liquor. (Great Ocean Highway)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + 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)", + nameOfStore = "Robs Liquor. (El Rancho Blvd)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + 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)", + nameOfStore = "Robs Liquor. (San Andreas Avenue)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + lastRobbed = 0 }, ["grove_ltd"] = { position = { x = -43.40, y = -1749.20, z = 29.42 }, reward = math.random(3000, 15000), - nameofstore = "LTD Gasoline. (Grove Street)", + nameOfStore = "LTD Gasoline. (Grove Street)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + 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)", + nameOfStore = "LTD Gasoline. (Mirror Park Boulevard)", secondsRemaining = 200, -- seconds - lastrobbed = 0 + lastRobbed = 0 } } diff --git a/locales/br.lua b/locales/br.lua deleted file mode 100644 index 6d2b2e2e..00000000 --- a/locales/br.lua +++ /dev/null @@ -1,23 +0,0 @@ -Locales['br'] = { - ['robbery_cancelled'] = 'O roubo será cancelado, você não ganhará nada!', - ['robbery_successful'] = 'O roubo foi um sucesso. Você ganhou ~g~$', - ['shop_robbery'] = 'Loja roubavel', - ['press_to_rob'] = 'Pressione ~INPUT_CONTEXT~ para roubar ~b~', - ['robbery_of'] = 'Loja roubavel: ~r~', - ['seconds_remaining'] = '~w~ segundos restantes', - ['robbery_cancelled_at'] = '~r~ Roubo cancelado em: ~b~', - ['robbery_has_cancelled'] = '~r~ O assalto foi cancelado: ~b~', - ['already_robbed'] = 'Esta loja já foi roubada. Por favor, espere: ', - ['seconds'] = 'segundos.', - ['rob_in_prog'] = '~r~ Assalto em curso em: ~b~', - ['started_to_rob'] = 'Você começou a roubar ~b~', - ['do_not_move'] = '~s~, Não se afaste!', - ['alarm_triggered'] = 'O alarme foi disparado', - ['hold_pos'] = 'Segure por 5 minutos e o dinheiro é seu!', - ['robbery_complete'] = '~r~ Roubo completo.~s~ ~h~ Corre!', - ['robbery_complete_at'] = '~r~ Roubo completo em: ~b~', - ['min_police'] = 'there must be at least ~b~', - ['in_city'] = '~s~ policemen in town to rob.', - ['robbery_already'] = '~r~Um assalto já está em andamento.', - ['no_threat'] = 'you do not pose a threat to the store', -} diff --git a/locales/de.lua b/locales/de.lua index ffd9fe98..cf0ee184 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,16 +1,16 @@ Locales['de'] = { - ['shop_robbery'] = 'ladenraub', - ['press_to_rob'] = 'drücke ~INPUT_CONTEXT~ ~o~zum ausrauben~s~ ~b~%s~s~', - ['robbery_timer'] = 'ladenraub: ~r~%s~s~ sekunden übrig!', - ['recently_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte ~y~%s~s~ sekunden!', - ['rob_in_prog'] = '~r~Raub im gange bei: ~b~%s~s~', - ['started_to_rob'] = 'du hast einen Raub gestartet ~y~%s~s~', - ['alarm_triggered'] = 'der Alarm wurde ausgelöst', - ['robbery_complete'] = '~r~Raub erfolgreich.~s~ Du ~o~hast gestohlen~s~ ~g~$%s~s~', - ['robbery_complete_at'] = '~r~Raub erfolgreich bei: ~y~%s~s~', - ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', - ['robbery_cancelled_at'] = '~r~Raub abgebrochen bei: ~b~%s~s~', - ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', - ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', - ['no_threat'] = 'you do not pose a threat to the store', + ['shop_robbery'] = 'ladenraub', + ['press_to_rob'] = 'drücke ~INPUT_CONTEXT~ ~o~zum ausrauben~s~ ~b~%s~s~', + ['robbery_timer'] = 'ladenraub: ~r~%s~s~ sekunden übrig!', + ['recently_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte ~y~%s~s~ sekunden!', + ['rob_in_prog'] = '~r~Raub im gange bei: ~b~%s~s~', + ['started_to_rob'] = 'du hast einen Raub gestartet ~y~%s~s~', + ['alarm_triggered'] = 'der Alarm wurde ausgelöst', + ['robbery_complete'] = '~r~Raub erfolgreich.~s~ Du ~o~hast gestohlen~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Raub erfolgreich bei: ~y~%s~s~', + ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', + ['robbery_cancelled_at'] = '~r~Raub abgebrochen bei: ~b~%s~s~', + ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', + ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', + ['no_threat'] = 'you do not pose a threat to the store keeper', } diff --git a/locales/en.lua b/locales/en.lua index 7d33c724..7670c511 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,16 +1,16 @@ Locales['en'] = { - ['shop_robbery'] = 'shop Robbery', - ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to ~o~rob~s~ ~b~%s~s~', - ['robbery_timer'] = 'store robbery: ~r~%s~s~ seconds remaning', - ['recently_robbed'] = 'this store was recently been robbed. Please wait ~y~%s~s~ seconds until you can rob again', - ['rob_in_prog'] = '~r~robbery in progress at ~b~%s~s~', - ['started_to_rob'] = 'you started to rob ~y~%s~s~', - ['alarm_triggered'] = 'the alarm has been triggered', - ['robbery_complete'] = '~r~The robbery has been successful~s~, you ~o~stole~s~ ~g~$%s~s~', - ['robbery_complete_at'] = '~r~Robbery successful at ~y~%s~s~', - ['robbery_cancelled'] = 'the robbery has been cancelled!', - ['robbery_cancelled_at'] = '~r~The robbery at ~b~%s~s~ has been cancelled!', - ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', - ['robbery_already'] = '~r~A robbery is already in progress.', - ['no_threat'] = 'you do not pose a threat to the store', + ['shop_robbery'] = 'shop Robbery', + ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to ~o~rob~s~ ~b~%s~s~', + ['robbery_timer'] = 'store robbery: ~r~%s~s~ seconds remaning', + ['recently_robbed'] = 'this store was recently been robbed. Please wait ~y~%s~s~ seconds until you can rob again', + ['rob_in_prog'] = '~r~robbery in progress at ~b~%s~s~', + ['started_to_rob'] = 'you started to rob ~y~%s~s~', + ['alarm_triggered'] = 'the alarm has been triggered', + ['robbery_complete'] = '~r~The robbery has been successful~s~, you ~o~stole~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Robbery successful at ~y~%s~s~', + ['robbery_cancelled'] = 'the robbery has been cancelled!', + ['robbery_cancelled_at'] = '~r~The robbery at ~b~%s~s~ has been cancelled!', + ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', + ['robbery_already'] = '~r~A robbery is already in progress.', + ['no_threat'] = 'you do not pose a threat to the store keeper', } diff --git a/locales/fi.lua b/locales/fi.lua index b33fdf26..5bbe8b27 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -12,4 +12,5 @@ Locales['fi'] = { ['robbery_cancelled_at'] = '~r~Ryöstö kohteessa ~b~%s~s~ keskeytyi!', ['min_police'] = 'kaupungissa pitää olla vähintää ~b~%s poliisia~s~ paikalla ryöstön aloitukseen.', ['robbery_already'] = '~r~Ryöstö on jo menossa.', + ['no_threat'] = 'you do not pose a threat to the store keeper', } diff --git a/locales/fr.lua b/locales/fr.lua index 5f3efced..7c7b6f59 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,16 +1,16 @@ Locales['fr'] = { - ['shop_robbery'] = 'braquage magasin', - ['press_to_rob'] = 'appuyez sur ~INPUT_CONTEXT~ ~o~pour braquer~s~ ~b~%s~s~', - ['robbery_timer'] = 'braquage magasin: il reste ~r~%s~s~ secondes', - ['recently_robbed'] = 'ce magasin a déjà été braqué. Attendez ~r~%s~b~ secondes.', - ['rob_in_prog'] = '~r~Braquage en cours à: ~b~%s~s~', - ['started_to_rob'] = 'vous avez commencé à braquer ~b~%s~s~', - ['alarm_triggered'] = 'l\'alarme a été déclenchée', - ['robbery_complete'] = '~r~Braquage terminé~s~. Vous avez ~o~volé~s~ ~g~$%s~s~', - ['robbery_complete_at'] = '~r~Braquage terminé à: ~b~%s~s~', - ['robbery_cancelled'] = 'le braquage va être annulé, vous ne gagnerez rien!', - ['robbery_cancelled_at'] = '~r~Braquage annulé à: ~b~%s~s~', - ['min_police'] = 'il faut minimum ~b~%s policiers~s~ en ville pour braquer.', - ['robbery_already'] = '~r~Un braquage est déjà en cours.', - ['no_threat'] = 'you do not pose a threat to the store', + ['shop_robbery'] = 'braquage magasin', + ['press_to_rob'] = 'appuyez sur ~INPUT_CONTEXT~ ~o~pour braquer~s~ ~b~%s~s~', + ['robbery_timer'] = 'braquage magasin: il reste ~r~%s~s~ secondes', + ['recently_robbed'] = 'ce magasin a déjà été braqué. Attendez ~r~%s~b~ secondes.', + ['rob_in_prog'] = '~r~Braquage en cours à: ~b~%s~s~', + ['started_to_rob'] = 'vous avez commencé à braquer ~b~%s~s~', + ['alarm_triggered'] = 'l\'alarme a été déclenchée', + ['robbery_complete'] = '~r~Braquage terminé~s~. Vous avez ~o~volé~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Braquage terminé à: ~b~%s~s~', + ['robbery_cancelled'] = 'le braquage va être annulé, vous ne gagnerez rien!', + ['robbery_cancelled_at'] = '~r~Braquage annulé à: ~b~%s~s~', + ['min_police'] = 'il faut minimum ~b~%s policiers~s~ en ville pour braquer.', + ['robbery_already'] = '~r~Un braquage est déjà en cours.', + ['no_threat'] = 'you do not pose a threat to the store keeper', } diff --git a/locales/pl.lua b/locales/pl.lua index 3ceaf197..84c6d3d2 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,16 +1,16 @@ Locales['pl'] = { - ['shop_robbery'] = 'napad Na Sklep', - ['press_to_rob'] = 'Wciśnij ~INPUT_CONTEXT~ aby ~o~napaść~s~ na ~b~%s~s~', - ['robbery_timer'] = 'napad na sklep: ~r~%s~s~ sekund do końca', - ['recently_robbed'] = 'ten sklep niedawno został obrabowany. Proszę poczekać ~y~%s~s~ sekund przed kolejnym napadem', - ['rob_in_prog'] = '~r~napad w toku w ~b~%s~s~', - ['started_to_rob'] = 'rozpoczałeś/aś napad ~y~%s~s~', - ['alarm_triggered'] = 'alarm został włączony', - ['robbery_complete'] = '~r~Napad udany~s~, ~o~obrabowałeś/aś~s~ ~g~$%s~s~', - ['robbery_complete_at'] = '~r~Napad udany w ~y~%s~s~', - ['robbery_cancelled'] = 'napad został anulowany!', - ['robbery_cancelled_at'] = '~r~Napad w ~b~%s~s~ został anulowany!', - ['min_police'] = 'minimalnie musi być ~b~%s policjantów~s~ w mieście aby obrabować.', - ['robbery_already'] = '~r~Napad jest już w toku.', - ['no_threat'] = 'nie tworzysz zagrożenia dla tego sklepu', + ['shop_robbery'] = 'napad Na Sklep', + ['press_to_rob'] = 'Wciśnij ~INPUT_CONTEXT~ aby ~o~napaść~s~ na ~b~%s~s~', + ['robbery_timer'] = 'napad na sklep: ~r~%s~s~ sekund do końca', + ['recently_robbed'] = 'ten sklep niedawno został obrabowany. Proszę poczekać ~y~%s~s~ sekund przed kolejnym napadem', + ['rob_in_prog'] = '~r~napad w toku w ~b~%s~s~', + ['started_to_rob'] = 'rozpoczałeś/aś napad ~y~%s~s~', + ['alarm_triggered'] = 'alarm został włączony', + ['robbery_complete'] = '~r~Napad udany~s~, ~o~obrabowałeś/aś~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Napad udany w ~y~%s~s~', + ['robbery_cancelled'] = 'napad został anulowany!', + ['robbery_cancelled_at'] = '~r~Napad w ~b~%s~s~ został anulowany!', + ['min_police'] = 'minimalnie musi być ~b~%s policjantów~s~ w mieście aby obrabować.', + ['robbery_already'] = '~r~Napad jest już w toku.', + ['no_threat'] = 'nie tworzysz zagrożenia dla tego sklepu', } diff --git a/locales/sv.lua b/locales/sv.lua index 26687951..d1fb6eee 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,16 +1,16 @@ Locales['sv'] = { - ['shop_robbery'] = 'butikrån', - ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att ~o~råna~s~ ~b~%s~s~', - ['robbery_timer'] = 'butiksrån: ~r~%s~s~ sekunder kvarstår', - ['recently_robbed'] = 'denna butik har nyligen rånats, du måste vänta ~y~%s~s~ sekunder!', - ['rob_in_prog'] = '~r~Det är ett pågående rån vid ~b~%s~s~', - ['started_to_rob'] = 'du började att råna ~y~%s~s~, gå inte för långt från butiken!', - ['alarm_triggered'] = '~o~Larmet har utlösts~s~', - ['robbery_complete'] = '~r~Rånet är avklarat~s~, du stal ~r~%s SEK~s~!', - ['robbery_complete_at'] = '~r~Ett rån lyckades~s~ vid ~y~%s~s~', - ['robbery_cancelled'] = 'rånet har avbrutits!', - ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrutits!', - ['min_police'] = 'det måste vara minst ~b~%s poliser~s~ inne för att du ska kunna ~o~råna butiker~s~.', - ['robbery_already'] = '~r~Ett rån pågår redan.', - ['no_threat'] = 'du kan inte hota utan ett vapen', + ['shop_robbery'] = 'butikrån', + ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att ~o~råna~s~ ~b~%s~s~', + ['robbery_timer'] = 'butiksrån: ~r~%s~s~ sekunder kvarstår', + ['recently_robbed'] = 'denna butik har nyligen rånats, du måste vänta ~y~%s~s~ sekunder!', + ['rob_in_prog'] = '~r~Det är ett pågående rån vid ~b~%s~s~', + ['started_to_rob'] = 'du började att råna ~y~%s~s~, gå inte för långt från butiken!', + ['alarm_triggered'] = '~o~Larmet har utlösts~s~', + ['robbery_complete'] = '~r~Rånet är avklarat~s~, du stal ~r~%s SEK~s~!', + ['robbery_complete_at'] = '~r~Ett rån lyckades~s~ vid ~y~%s~s~', + ['robbery_cancelled'] = 'rånet avbröts!', + ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ avbröts!', + ['min_police'] = 'det måste vara minst ~b~%s poliser~s~ inne för att du ska kunna ~o~råna butiker~s~.', + ['robbery_already'] = '~r~Ett rån pågår redan.', + ['no_threat'] = 'du kan inte hota utan ett vapen', } \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 38d88382..9d8f91c9 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,37 +4,39 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -RegisterServerEvent('esx_holdup:toofar') -AddEventHandler('esx_holdup:toofar', function(robb) +RegisterServerEvent('esx_holdup:tooFar') +AddEventHandler('esx_holdup:tooFar', function(currentStore) local _source = source local xPlayers = ESX.GetPlayers() rob = false + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[robb].nameofstore)) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[currentStore].nameOfStore)) + TriggerClientEvent('esx_holdup:killBlip', xPlayers[i]) end end + if robbers[_source] then - TriggerClientEvent('esx_holdup:toofarlocal', _source) + TriggerClientEvent('esx_holdup:tooFar', _source) robbers[_source] = nil - TriggerClientEvent('esx:showNotification', _source, _U('robbery_cancelled_at', Stores[robb].nameofstore)) + TriggerClientEvent('esx:showNotification', _source, _U('robbery_cancelled_at', Stores[currentStore].nameOfStore)) end end) -RegisterServerEvent('esx_holdup:rob') -AddEventHandler('esx_holdup:rob', function(robb) +RegisterServerEvent('esx_holdup:robberyStarted') +AddEventHandler('esx_holdup:robberyStarted', function(currentStore) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() - if Stores[robb] then - local store = Stores[robb] + if Stores[currentStore] then + local store = Stores[currentStore] - if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', _source, _U('recently_robbed', Config.TimerBeforeNewRob - (os.time() - store.lastrobbed))) + if (os.time() - store.lastRobbed) < Config.TimerBeforeNewRob and store.lastRobbed ~= 0 then + TriggerClientEvent('esx:showNotification', _source, _U('recently_robbed', Config.TimerBeforeNewRob - (os.time() - store.lastRobbed))) return end @@ -53,40 +55,39 @@ AddEventHandler('esx_holdup:rob', function(robb) for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameofstore)) - TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameOfStore)) + TriggerClientEvent('esx_holdup:setBlip', xPlayers[i], Stores[currentStore].position) end end - TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameofstore)) + TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameOfStore)) TriggerClientEvent('esx:showNotification', _source, _U('alarm_triggered')) - TriggerClientEvent('esx_holdup:currentlyrobbing', _source, robb) - TriggerClientEvent('esx_holdup:starttimer', _source) + TriggerClientEvent('esx_holdup:currentlyRobbing', _source, currentStore) + TriggerClientEvent('esx_holdup:startTimer', _source) - Stores[robb].lastrobbed = os.time() - robbers[_source] = robb - local savedSource = _source - SetTimeout(store.secondsRemaining * 1000, function() + Stores[currentStore].lastRobbed = os.time() + robbers[_source] = currentStore - if robbers[savedSource] then + SetTimeout(store.secondsRemaining * 1000, function() + if robbers[_source] then rob = false if xPlayer then - local award = store.reward - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, award) + TriggerClientEvent('esx_holdup:robberyComplete', _source, store.reward) if Config.GiveBlackMoney then - xPlayer.addAccountMoney('black_money', award) + xPlayer.addAccountMoney('black_money', store.reward) else - xPlayer.addMoney(award) + xPlayer.addMoney(store.reward) end - local xPlayers = ESX.GetPlayers() + local xPlayers, xPlayer = ESX.GetPlayers(), nil for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameofstore)) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameOfStore)) + TriggerClientEvent('esx_holdup:killBlip', xPlayers[i]) end end end From 2800fa5d8fc2e97d0f931bca643df8feced23da9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 15 Mar 2019 13:11:02 +0100 Subject: [PATCH 37/44] Enforced 2 space indent --- locales/fi.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locales/fi.lua b/locales/fi.lua index 5bbe8b27..27a967ea 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,16 +1,16 @@ Locales['fi'] = { - ['shop_robbery'] = 'kaupan ryöstö', - ['press_to_rob'] = 'paina ~INPUT_CONTEXT~ ~o~ryöstääksesi~s~ kaupan ~b~%s~s~', - ['robbery_timer'] = 'kauppa ryöstö: ~r~%s~s~ sekunttia jäljellä', - ['recently_robbed'] = 'tämä kauppa ryöstettiin vasta. Odota ~y~%s~s~ sekunttia että voit ryöstää.', - ['rob_in_prog'] = '~r~ryöstö menossa kohteessa ~b~%s~s~', - ['started_to_rob'] = 'sinä aloitit ryöstään ~y~%s~s~', - ['alarm_triggered'] = 'hälyytys laukaistu!', - ['robbery_complete'] = '~r~Ryöstö onnistui~s~, sinä ~o~varastit~s~ ~g~$%s~s~', - ['robbery_complete_at'] = '~r~Ryöstö ohitse kohteessa ~y~%s~s~', - ['robbery_cancelled'] = 'ryöstö keskeytyi!', - ['robbery_cancelled_at'] = '~r~Ryöstö kohteessa ~b~%s~s~ keskeytyi!', - ['min_police'] = 'kaupungissa pitää olla vähintää ~b~%s poliisia~s~ paikalla ryöstön aloitukseen.', - ['robbery_already'] = '~r~Ryöstö on jo menossa.', - ['no_threat'] = 'you do not pose a threat to the store keeper', + ['shop_robbery'] = 'kaupan ryöstö', + ['press_to_rob'] = 'paina ~INPUT_CONTEXT~ ~o~ryöstääksesi~s~ kaupan ~b~%s~s~', + ['robbery_timer'] = 'kauppa ryöstö: ~r~%s~s~ sekunttia jäljellä', + ['recently_robbed'] = 'tämä kauppa ryöstettiin vasta. Odota ~y~%s~s~ sekunttia että voit ryöstää.', + ['rob_in_prog'] = '~r~ryöstö menossa kohteessa ~b~%s~s~', + ['started_to_rob'] = 'sinä aloitit ryöstään ~y~%s~s~', + ['alarm_triggered'] = 'hälyytys laukaistu!', + ['robbery_complete'] = '~r~Ryöstö onnistui~s~, sinä ~o~varastit~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Ryöstö ohitse kohteessa ~y~%s~s~', + ['robbery_cancelled'] = 'ryöstö keskeytyi!', + ['robbery_cancelled_at'] = '~r~Ryöstö kohteessa ~b~%s~s~ keskeytyi!', + ['min_police'] = 'kaupungissa pitää olla vähintää ~b~%s poliisia~s~ paikalla ryöstön aloitukseen.', + ['robbery_already'] = '~r~Ryöstö on jo menossa.', + ['no_threat'] = 'you do not pose a threat to the store keeper', } From a18fa50463ce9402595360bf5268969b94b56926 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 20 May 2019 23:06:03 +0200 Subject: [PATCH 38/44] Proper hud natives --- client/main.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 3ba23626..51595b65 100644 --- a/client/main.lua +++ b/client/main.lua @@ -24,10 +24,9 @@ end) function drawTxt(x,y, width, height, scale, text, r,g,b,a, outline) SetTextFont(0) - SetTextProportional(0) SetTextScale(scale, scale) SetTextColour(r, g, b, a) - SetTextDropShadow(0, 0, 0, 0,255) + SetTextDropshadow(0, 0, 0, 0,255) SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() if outline then SetTextOutline() end From bb1c90f50dcd69d4bf6b1fd863576e3bc0816982 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 31 May 2019 12:41:20 +0200 Subject: [PATCH 39/44] Unused text native --- client/main.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 51595b65..896659a4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -27,7 +27,6 @@ function drawTxt(x,y, width, height, scale, text, r,g,b,a, outline) SetTextScale(scale, scale) SetTextColour(r, g, b, a) SetTextDropshadow(0, 0, 0, 0,255) - SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() if outline then SetTextOutline() end From e962b1daae1e053795ce67dbf07dd99f9ba9a1dd Mon Sep 17 00:00:00 2001 From: userMacieG Date: Sun, 13 Oct 2019 19:20:40 +0200 Subject: [PATCH 40/44] Update pl.lua --- locales/pl.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locales/pl.lua b/locales/pl.lua index 84c6d3d2..2004680d 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,16 +1,16 @@ Locales['pl'] = { - ['shop_robbery'] = 'napad Na Sklep', - ['press_to_rob'] = 'Wciśnij ~INPUT_CONTEXT~ aby ~o~napaść~s~ na ~b~%s~s~', - ['robbery_timer'] = 'napad na sklep: ~r~%s~s~ sekund do końca', - ['recently_robbed'] = 'ten sklep niedawno został obrabowany. Proszę poczekać ~y~%s~s~ sekund przed kolejnym napadem', - ['rob_in_prog'] = '~r~napad w toku w ~b~%s~s~', - ['started_to_rob'] = 'rozpoczałeś/aś napad ~y~%s~s~', - ['alarm_triggered'] = 'alarm został włączony', - ['robbery_complete'] = '~r~Napad udany~s~, ~o~obrabowałeś/aś~s~ ~g~$%s~s~', - ['robbery_complete_at'] = '~r~Napad udany w ~y~%s~s~', - ['robbery_cancelled'] = 'napad został anulowany!', - ['robbery_cancelled_at'] = '~r~Napad w ~b~%s~s~ został anulowany!', - ['min_police'] = 'minimalnie musi być ~b~%s policjantów~s~ w mieście aby obrabować.', - ['robbery_already'] = '~r~Napad jest już w toku.', - ['no_threat'] = 'nie tworzysz zagrożenia dla tego sklepu', + ['shop_robbery'] = 'napad na sklep', + ['press_to_rob'] = 'naciśnij ~INPUT_CONTEXT~ aby rozpocząc ~o~napad~s~ na ~b~%s~s~', + ['robbery_timer'] = 'napad na sklep: ~r~%s~s~ sekund do końca', + ['recently_robbed'] = 'ten sklep niedawno został obrabowany. Proszę poczekać ~y~%s~s~ sekund przed kolejnym napadem', + ['rob_in_prog'] = '~r~napad w toku w ~b~%s~s~', + ['started_to_rob'] = 'rozpoczałeś/aś napad ~y~%s~s~', + ['alarm_triggered'] = 'alarm został włączony', + ['robbery_complete'] = '~r~Napad udany~s~, ~o~obrabowałeś/aś~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Napad udany w ~y~%s~s~', + ['robbery_cancelled'] = 'napad został anulowany!', + ['robbery_cancelled_at'] = '~r~Napad w ~b~%s~s~ został anulowany!', + ['min_police'] = 'minimalnie musi być ~b~%s policjantów~s~ w mieście aby obrabować.', + ['robbery_already'] = '~r~Napad jest już w toku.', + ['no_threat'] = 'nie stwarzasz zagrożenia dla tego sklepu', } From 2634d0356e4406c8505f4f1345ddbefece8b4f2f Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sat, 4 Jan 2020 13:06:51 +0100 Subject: [PATCH 41/44] Removed keys table --- client/main.lua | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/client/main.lua b/client/main.lua index 896659a4..600255d2 100644 --- a/client/main.lua +++ b/client/main.lua @@ -3,18 +3,6 @@ local store = "" local blipRobbery = nil ESX = nil -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - Citizen.CreateThread(function() while ESX == nil do TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -119,7 +107,7 @@ Citizen.CreateThread(function() if distance < 0.5 then ESX.ShowHelpNotification(_U('press_to_rob', v.nameOfStore)) - if IsControlJustReleased(0, Keys['E']) then + if IsControlJustReleased(0, 38) then if IsPedArmed(PlayerPedId(), 4) then TriggerServerEvent('esx_holdup:robberyStarted', k) else From 7b0a4c25093ccd1c31ef3818159596c2096c15dd Mon Sep 17 00:00:00 2001 From: BackrndSource Date: Sun, 19 Jan 2020 16:04:49 +0100 Subject: [PATCH 42/44] Spanish Translation (#21) * Create es.lua * Update __resource.lua --- __resource.lua | 2 ++ locales/es.lua | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 locales/es.lua diff --git a/__resource.lua b/__resource.lua index ea830cab..72fc260d 100644 --- a/__resource.lua +++ b/__resource.lua @@ -8,6 +8,7 @@ client_scripts { '@es_extended/locale.lua', 'locales/de.lua', 'locales/en.lua', + 'locales/es.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', @@ -20,6 +21,7 @@ server_scripts { '@es_extended/locale.lua', 'locales/de.lua', 'locales/en.lua', + 'locales/es.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..a742876a --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,16 @@ +Locales['es'] = { + ['shop_robbery'] = 'atraco a tienda', + ['press_to_rob'] = 'pulsa ~INPUT_CONTEXT~ para ~o~robar~s~ ~b~%s~s~', + ['robbery_timer'] = 'atraco: ~r~%s~s~ segundos restantes', + ['recently_robbed'] = 'esta tienda fue robada recientemente. Espera ~y~%s~s~ antes de poder robarla de nuevo', + ['rob_in_prog'] = '~r~Robo en proceso en ~b~%s~s~', + ['started_to_rob'] = 'has empezado a robar en ~y~%s~s~', + ['alarm_triggered'] = 'la alarma ha sido activada!', + ['robbery_complete'] = '~r~El robo salió bien~s~, has ~o~robado~s~ ~g~%s€~s~', + ['robbery_complete_at'] = '~r~Robo finalizado en ~y~%s~s~', + ['robbery_cancelled'] = 'el ~o~robo~s~ ha sido cancelado!', + ['robbery_cancelled_at'] = '~r~El robo en ~b~%s~s~ ha sido cancelado!', + ['min_police'] = 'se necesitan ~b~%s policias~s~ activos para poder robar.', + ['robbery_already'] = '~r~Ya hay un robo en progreso.', + ['no_threat'] = 'sin pistola el encargado de la tienda no te tiene miedo...', +} From 5e24910a43ebdcb3520cb5ec03be131d03550b61 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:59:02 +0100 Subject: [PATCH 43/44] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (83%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 83% rename from __resource.lua rename to fxmanifest.lua index 72fc260d..4ce6f7f6 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Holdup' From 85d898ce754b6a526e4e8167362ab08214963d2a Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:41:21 +0000 Subject: [PATCH 44/44] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 1b2027a0..ff2ab602 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.Marker = { r = 250, g = 0, b = 0, a = 100, -- red color