diff --git a/server-data/resources/[bpt_addons]/bpt_ammujob/config.lua b/server-data/resources/[bpt_addons]/bpt_ammujob/config.lua index a6b3b9ed6..4c5434faa 100644 --- a/server-data/resources/[bpt_addons]/bpt_ammujob/config.lua +++ b/server-data/resources/[bpt_addons]/bpt_ammujob/config.lua @@ -7,29 +7,29 @@ Config.Locale = "en" Config.OxInventory = ESX.GetConfig().OxInventory Config.AuthorizedVehicles = { - { model = "rumpo", label = "Rumpo" }, + { model = "rumpo", label = "Rumpo" }, } Config.Zones = { - VehicleSpawner = { - Pos = { x = 821.340637, y = -2146.417480, z = 28.706909 }, - Size = { x = 1.0, y = 1.0, z = 1.0 }, - Color = { r = 145, g = 30, b = 30 }, - Type = 36, - Rotate = true, - }, + VehicleSpawner = { + Pos = { x = 821.340637, y = -2146.417480, z = 28.706909 }, + Size = { x = 1.0, y = 1.0, z = 1.0 }, + Color = { r = 145, g = 30, b = 30 }, + Type = 36, + Rotate = true, + }, - VehicleSpawnPoint = { - Pos = { x = 822.540649, y = -2134.575928, z = 29.279907 }, - Size = { x = 1.5, y = 1.5, z = 1.0 }, - Type = -1, - Rotate = false, - Heading = 225.0, - }, + VehicleSpawnPoint = { + Pos = { x = 822.540649, y = -2134.575928, z = 29.279907 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = -1, + Rotate = false, + Heading = 225.0, + }, - VehicleDeleter = { - Pos = { x = 822.540649, y = -2134.575928, z = 28.279907 }, + VehicleDeleter = { + Pos = { x = 822.540649, y = -2134.575928, z = 28.279907 }, Size = { x = 3.0, y = 3.0, z = 0.25 }, Color = { r = 255, g = 0, b = 0 }, Type = 1, diff --git a/server-data/resources/[bpt_addons]/bpt_ammujob/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_ammujob/fxmanifest.lua index 90d342f3c..50649ee53 100644 --- a/server-data/resources/[bpt_addons]/bpt_ammujob/fxmanifest.lua +++ b/server-data/resources/[bpt_addons]/bpt_ammujob/fxmanifest.lua @@ -9,17 +9,17 @@ version("1.0.0") shared_script("@es_extended/imports.lua") client_scripts({ - "@es_extended/locale.lua", - "locales/*.lua", - "config.lua", - "client/main.lua", + "@es_extended/locale.lua", + "locales/*.lua", + "config.lua", + "client/main.lua", }) server_scripts({ - "@es_extended/locale.lua", - "locales/*.lua", - "config.lua", - "server/main.lua", + "@es_extended/locale.lua", + "locales/*.lua", + "config.lua", + "server/main.lua", }) -dependency("es_extended") \ No newline at end of file +dependency("es_extended") diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua index 65ae4f1ae..88d48256a 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua @@ -1,13 +1,70 @@ local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, - ["F9"] = 56, ["F10"] = 57, ["~"] = 243, ["-"] = 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 + ["ESC"] = 322, + ["F1"] = 288, + ["F2"] = 289, + ["F3"] = 170, + ["F5"] = 166, + ["F6"] = 167, + ["F7"] = 168, + ["F8"] = 169, + ["F9"] = 56, + ["F10"] = 57, + ["~"] = 243, + ["-"] = 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, } local labels = {} @@ -16,46 +73,40 @@ local job = "" local grade = 0 ESX = exports["es_extended"]:getSharedObject() -CreateThread( - function() - while ESX.GetPlayerData().job == nil do - Wait(10) - end +CreateThread(function() + while ESX.GetPlayerData().job == nil do + Wait(10) + end - job = ESX.GetPlayerData().job.name - grade = ESX.GetPlayerData().job.grade + job = ESX.GetPlayerData().job.name + grade = ESX.GetPlayerData().job.grade - ESX.TriggerServerCallback("bpt_crafting:getItemNames", - function(info) - labels = info - end - ) + ESX.TriggerServerCallback("bpt_crafting:getItemNames", function(info) + labels = info + end) - for _, v in ipairs(Config.Workbenches) do - if v.blip then - local blip = AddBlipForCoord(v.coords) + for _, v in ipairs(Config.Workbenches) do + if v.blip then + local blip = AddBlipForCoord(v.coords) - SetBlipScale(blip, 0.8) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - EndTextCommandSetBlipName(blip) + SetBlipScale(blip, 0.8) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + EndTextCommandSetBlipName(blip) end end - end -) + end) RegisterNetEvent("esx:setJob") -AddEventHandler("esx:setJob", - function(j) - job = j.name - grade = j.grade - end -) +AddEventHandler("esx:setJob", function(j) + job = j.name + grade = j.grade +end) function isNearWorkbench() - local ped = PlayerPedId() - local coords = GetEntityCoords(ped) - local near = false + local ped = PlayerPedId() + local coords = GetEntityCoords(ped) + local near = false for _, v in ipairs(Config.Workbenches) do local dst = #(coords - v.coords) @@ -71,160 +122,136 @@ function isNearWorkbench() end end -CreateThread( - function() - while true do - Wait(1000) - if craftingQueue[1] ~= nil then - if not Config.CraftingStopWithDistance or (Config.CraftingStopWithDistance and isNearWorkbench()) then - craftingQueue[1].time = craftingQueue[1].time - 1 - - SendNUIMessage( - { - type = "addqueue", - item = craftingQueue[1].item, - time = craftingQueue[1].time, - id = craftingQueue[1].id - } - ) - - if craftingQueue[1].time == 0 then - TriggerServerEvent("bpt_crafting:itemCrafted", craftingQueue[1].item, craftingQueue[1].count) - table.remove(craftingQueue, 1) - end +CreateThread(function() + while true do + Wait(1000) + if craftingQueue[1] ~= nil then + if not Config.CraftingStopWithDistance or (Config.CraftingStopWithDistance and isNearWorkbench()) then + craftingQueue[1].time = craftingQueue[1].time - 1 + + SendNUIMessage({ + type = "addqueue", + item = craftingQueue[1].item, + time = craftingQueue[1].time, + id = craftingQueue[1].id, + }) + + if craftingQueue[1].time == 0 then + TriggerServerEvent("bpt_crafting:itemCrafted", craftingQueue[1].item, craftingQueue[1].count) + table.remove(craftingQueue, 1) end end end end -) +end) function openWorkbench(val) - ESX.TriggerServerCallback( - "bpt_crafting:getXP", - function(xp) - SetNuiFocus(true, true) - TriggerScreenblurFadeIn(1000) - - local inv = {} - for _, v in ipairs(ESX.GetPlayerData().inventory) do - inv[v.name] = v.count - end + ESX.TriggerServerCallback("bpt_crafting:getXP", function(xp) + SetNuiFocus(true, true) + TriggerScreenblurFadeIn(1000) + + local inv = {} + for _, v in ipairs(ESX.GetPlayerData().inventory) do + inv[v.name] = v.count + end - local recipes = {} + local recipes = {} - if #val.recipes > 0 then - for _, g in ipairs(val.recipes) do - recipes[g] = Config.Recipes[g] + if #val.recipes > 0 then + for _, g in ipairs(val.recipes) do + recipes[g] = Config.Recipes[g] end else recipes = Config.Recipes end - SendNUIMessage( - { - type = "open", - recipes = recipes, - names = labels, - level = xp, - inventory = inv, - job = job, - grade = grade, - hidecraft = Config.HideWhenCantCraft, - categories = Config.Categories - } - ) - end - ) -end + SendNUIMessage({ + type = "open", + recipes = recipes, + names = labels, + level = xp, + inventory = inv, + job = job, + grade = grade, + hidecraft = Config.HideWhenCantCraft, + categories = Config.Categories, + }) + end) + end -CreateThread( - function() + CreateThread(function() while true do - Wait(1) - local ped = PlayerPedId() - local coords = GetEntityCoords(ped) + Wait(1) + local ped = PlayerPedId() + local coords = GetEntityCoords(ped) for _, v in ipairs(Config.Workbenches) do local dst = #(coords - v.coords) if dst < 10 then - DrawText3D(v.coords[1], v.coords[2], v.coords[3] - 0.8, _U('workbench_hologram')) + DrawText3D(v.coords[1], v.coords[2], v.coords[3] - 0.8, _U("workbench_hologram")) end if dst < 2 then if IsControlJustReleased(0, Keys["E"]) then local open = false for _, g in ipairs(v.jobs) do if g == job then - open = true + open = true end end if open or #v.jobs == 0 then openWorkbench(v) else - SendTextMessage(_U('wrong_job')) + SendTextMessage(_U("wrong_job")) end end end end end - end -) + end) RegisterNetEvent("bpt_crafting:craftStart") -AddEventHandler("bpt_crafting:craftStart", - function(item, _) - local id = math.random(000, 999) - table.insert(craftingQueue, {time = Config.Recipes[item].Time, item = item, count = 1, id = id}) - - SendNUIMessage( - { - type = "crafting", - item = item - } - ) - - SendNUIMessage( - { - type = "addqueue", - item = item, - time = Config.Recipes[item].Time, - id = id - } - ) - end -) +AddEventHandler("bpt_crafting:craftStart", function(item, _) + local id = math.random(000, 999) + table.insert(craftingQueue, { time = Config.Recipes[item].Time, item = item, count = 1, id = id }) + + SendNUIMessage({ + type = "crafting", + item = item, + }) + + SendNUIMessage({ + type = "addqueue", + item = item, + time = Config.Recipes[item].Time, + id = id, + }) +end) RegisterNetEvent("bpt_crafting:sendMessage") -AddEventHandler( - "bpt_crafting:sendMessage", - function(msg) - SendTextMessage(msg) - end -) +AddEventHandler("bpt_crafting:sendMessage", function(msg) + SendTextMessage(msg) +end) -RegisterNUICallback("close", - function() - TriggerScreenblurFadeOut(1000) - SetNuiFocus(false, false) - end -) +RegisterNUICallback("close", function() + TriggerScreenblurFadeOut(1000) + SetNuiFocus(false, false) +end) -RegisterNUICallback("craft", - function(data) - local item = data["item"] - TriggerServerEvent("bpt_crafting:craft", item, false) - end -) +RegisterNUICallback("craft", function(data) + local item = data["item"] + TriggerServerEvent("bpt_crafting:craft", item, false) +end) function SendTextMessage(msg) - exports['mythic_notify']:SendAlert('inform', msg) + exports["mythic_notify"]:SendAlert("inform", msg) end function DrawText3D(x, y, z, text) - local onScreen, _x, _y = World3dToScreen2d(x, y, z) - local px, py, pz = table.unpack(GetGameplayCamCoord()) - local dist = GetDistanceBetweenCoords(px, py, pz, x, y, z, 1) - local scale = ((1 / dist) * 2) * (1 / GetGameplayCamFov()) * 100 + local onScreen, _x, _y = World3dToScreen2d(x, y, z) + local px, py, pz = table.unpack(GetGameplayCamCoord()) + local dist = GetDistanceBetweenCoords(px, py, pz, x, y, z, 1) + local scale = ((1 / dist) * 2) * (1 / GetGameplayCamFov()) * 100 if onScreen then SetTextColour(255, 255, 255, 255) @@ -241,4 +268,4 @@ function DrawText3D(x, y, z, text) AddTextComponentString(text) EndTextCommandDisplayText(_x, _y) end -end \ No newline at end of file +end diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua index ff1a73bf7..629e1656a 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua @@ -4,55 +4,55 @@ Config = { ExperiancePerCraft = 5, -- The amount of experiance added per craft (100 Experiance is 1 level) HideWhenCantCraft = false, -- Instead of lowering the opacity it hides the item that is not craftable due to low level or wrong job - Categories = { - ["medical"] = { - Label = "Ospedale", - Image = "bandage", - Jobs = { "ambulance" }, - }, - ["import"] = { - Label = "Import", - Image = "Import", - Jobs = { "import" }, - }, - ["mechanic"] = { - Label = "Meccanico", - Image = "Mechanic", - Jobs = { "mechanic" }, - }, - ["ammu"] = { - Label = "Armeria", - Image = "ammu", - Jobs = { "ammu" }, - }, - ["unicorn"] = { - Label = "Unicorn", - Image = "unicorn", - Jobs = { "unicorn" }, - }, - ["dustman"] = { - Label = "Dustman", - Image = "dustman", - Jobs = { "dustman" }, - }, - ["ballas"] = { - Label = "Ballas", - Image = "ballas", - Jobs = { "ballas" }, - }, - ["baker"] = { - Label = "Baker", - Image = "baker", - Jobs = { "baker" }, - }, - ["fisherman"] = { - Label = "fisherman", - Image = "fisherman", - Jobs = { "fisherman" }, - }, - }, + Categories = { + ["medical"] = { + Label = "Ospedale", + Image = "bandage", + Jobs = { "ambulance" }, + }, + ["import"] = { + Label = "Import", + Image = "Import", + Jobs = { "import" }, + }, + ["mechanic"] = { + Label = "Meccanico", + Image = "Mechanic", + Jobs = { "mechanic" }, + }, + ["ammu"] = { + Label = "Armeria", + Image = "ammu", + Jobs = { "ammu" }, + }, + ["unicorn"] = { + Label = "Unicorn", + Image = "unicorn", + Jobs = { "unicorn" }, + }, + ["dustman"] = { + Label = "Dustman", + Image = "dustman", + Jobs = { "dustman" }, + }, + ["ballas"] = { + Label = "Ballas", + Image = "ballas", + Jobs = { "ballas" }, + }, + ["baker"] = { + Label = "Baker", + Image = "baker", + Jobs = { "baker" }, + }, + ["fisherman"] = { + Label = "fisherman", + Image = "fisherman", + Jobs = { "fisherman" }, + }, + }, - PermanentItems = { -- Items that dont get removed when crafting + PermanentItems = { -- Items that dont get removed when crafting ["wrench"] = true, }, @@ -118,225 +118,226 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th }, }, -['paper'] = { - Level = 0, - Category = 'dustman', - isGun = false, - Jobs = {'dustman'}, - JobGrades = {}, - Amount = 6, - SuccessRate = 100, - requireBlueprint = false, - Time = 30, +["paper"] = { + Level = 0, + Category = "dustman", + isGun = false, + Jobs = { "dustman" }, + JobGrades = {}, + Amount = 6, + SuccessRate = 100, + requireBlueprint = false, + Time = 30, Ingredients = { - ['newspaper'] = 1, - ['trash_burgershot'] = 1 - } + ["newspaper"] = 1, + ["trash_burgershot"] = 1, + }, }, -['hammer'] = { - Level = 0, - Category = 'import', - isGun = false, - Jobs = {'import'}, - JobGrades = {}, - Amount = 4, - SuccessRate = 100, - requireBlueprint = false, - Time = 60, +["hammer"] = { + Level = 0, + Category = "import", + isGun = false, + Jobs = { "import" }, + JobGrades = {}, + Amount = 4, + SuccessRate = 100, + requireBlueprint = false, + Time = 60, Ingredients = { - ['iron'] = 4, - ['wood'] = 1 - } + ["iron"] = 4, + ["wood"] = 1, + }, }, -['fixkit'] = { - Level = 0, - Category = 'mechanic', - isGun = false, - Jobs = {'mechanic'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 60, +["fixkit"] = { + Level = 0, + Category = "mechanic", + isGun = false, + Jobs = { "mechanic" }, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 60, Ingredients = { - ['ironsheet'] = 2, - ['hammer'] = 1 - } + ["ironsheet"] = 2, + ["hammer"] = 1, + }, }, -['almondmilk'] = { - Level = 0, - Category = 'unicorn', - isGun = false, - Jobs = {'unicorn'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 60, +["almondmilk"] = { + Level = 0, + Category = "unicorn", + isGun = false, + Jobs = { "unicorn" }, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 60, Ingredients = { - ['ice'] = 2, - ['almonds'] = 5, - ['water'] = 1 - } + ["ice"] = 2, + ["almonds"] = 5, + ["water"] = 1, + }, }, -['slicedchips'] = { - Level = 0, - Category = 'unicorn', - isGun = false, - Jobs = {'unicorn'}, - JobGrades = {}, - Amount = 5, - SuccessRate = 100, - requireBlueprint = false, - Time = 10, +["slicedchips"] = { + Level = 0, + Category = "unicorn", + isGun = false, + Jobs = { "unicorn" }, + JobGrades = {}, + Amount = 5, + SuccessRate = 100, + requireBlueprint = false, + Time = 10, Ingredients = { - ['potato'] = 1, - ['water'] = 1 - } + ["potato"] = 1, + ["water"] = 1, + }, }, -['iron'] = { - Level = 0, - Category = 'import', - isGun = false, - Jobs = {'import'}, - JobGrades = {}, - Amount = 3, - SuccessRate = 100, - requireBlueprint = false, - Time = 10, +["iron"] = { + Level = 0, + Category = "import", + isGun = false, + Jobs = { "import" }, + JobGrades = {}, + Amount = 3, + SuccessRate = 100, + requireBlueprint = false, + Time = 10, Ingredients = { - ['hammer'] = 1, - ['ironsheet'] = 10 - } + ["hammer"] = 1, + ["ironsheet"] = 10, + }, }, -['cigarette_paper'] = { - Level = 0, - Category = 'ballas', - isGun = false, - Jobs = {'ballas'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 10, +["cigarette_paper"] = { + Level = 0, + Category = "ballas", + isGun = false, + Jobs = { "ballas" }, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 10, Ingredients = { - ['recycled_paper'] = 1 - } + ["recycled_paper"] = 1, + }, }, -['WEAPON_APPISTOL'] = { - Level = 10, - Category = 'ammu', - isGun = false, - Jobs = {'ammu'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 180, +["WEAPON_APPISTOL"] = { + Level = 10, + Category = "ammu", + isGun = false, + Jobs = { "ammu" }, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 180, Ingredients = { - ['copper'] = 1, - ['iron'] = 1, - ['wood'] = 1 - } + ["copper"] = 1, + ["iron"] = 1, + ["wood"] = 1, + }, }, -['ammo-sniper'] = { - Level = 10, - Category = 'ammu', - isGun = false, - Jobs = {'ammu'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 30, +["ammo-sniper"] = { + Level = 10, + Category = "ammu", + isGun = false, + Jobs = { "ammu" }, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 30, Ingredients = { - ['copper'] = 1, - ['iron'] = 1, - ['gunpowder'] = 1, - ['gold'] = 1 - } + ["copper"] = 1, + ["iron"] = 1, + ["gunpowder"] = 1, + ["gold"] = 1, + }, }, -['bread'] = { - Level = 0, - Category = 'baker', - isGun = false, - Jobs = {'baker'}, - JobGrades = {}, - Amount = 5, - SuccessRate = 100, - requireBlueprint = false, - Time = 200, +["bread"] = { + Level = 0, + Category = "baker", + isGun = false, + Jobs = { "baker" }, + JobGrades = {}, + Amount = 5, + SuccessRate = 100, + requireBlueprint = false, + Time = 200, Ingredients = { - ['flour'] = 1 - } + ["flour"] = 1, + }, }, -['flour'] = { - Level = 0, - Category = 'baker', - isGun = false, - Jobs = {'baker'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 120, +["flour"] = { + Level = 0, + Category = "baker", + isGun = false, + Jobs = { "baker" }, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 120, Ingredients = { - ['grain'] = 10 - } + ["grain"] = 10, + }, }, -['bread_deer'] = { - Level = 0, - Category = 'unicorn', - isGun = false, - Jobs = {'unicorn'}, - JobGrades = {}, - Amount = 3, - SuccessRate = 100, - requireBlueprint = false, - Time = 120, +["bread_deer"] = { + Level = 0, + Category = "unicorn", + isGun = false, + Jobs = { "unicorn" }, + JobGrades = {}, + Amount = 3, + SuccessRate = 100, + requireBlueprint = false, + Time = 120, Ingredients = { - ['deer_meat'] = 1, - ['bread'] = 3 - } + ["deer_meat"] = 1, + ["bread"] = 3, + }, }, -['salmon_fillet'] = { +["salmon_fillet"] = { Level = 0, - Category = 'fisherman', + Category = "fisherman", isGun = false, - Jobs = {'fisherman'}, + Jobs = { "fisherman" }, JobGrades = {}, Amount = 2, SuccessRate = 100, requireBlueprint = false, Time = 60, - Ingredients = { - ['salmon'] = 1 - } - }, + Ingredients = { + ["salmon"] = 1, + }, +}, }, Workbenches = { -- Every workbench location, leave {} for jobs if you want everybody to access - {coords = vector3(1020.936279, -2404.628662, 30.122314), jobs = {'import'}, blip = false, recipes = {'cottonforbandages','iron','hammer'}, radius = 1.0}, - {coords = vector3(311.314301, -565.213196, 43.282104), jobs = {'ambulance'}, blip = false, recipes = {'bandage'}, radius = 1.0}, - {coords = vector3(-323.551636, -129.626373, 39.002197), jobs = {'mechanic'}, blip = false, recipes = {'fixkit'}, radius = 1.0}, - {coords = vector3(809.090088, -2172.923096, 29.616821), jobs = {'ammu'}, blip = false, recipes = {'WEAPON_APPISTOL','ammo-sniper'}, radius = 1.0}, - {coords = vector3(129.217590, -1283.802246, 29.263062), jobs = {'unicorn'}, blip = false, recipes = {'almondmilk','slicedchips','bread_deer'}, radius = 1.0}, - {coords = vector3(-416.993408, -1683.468140, 19.018311), jobs = {'dustman'}, blip = false, recipes = {'ironsheet','recycled_paper','paper'}, radius = 1.0}, - {coords = vector3(83.156044, -1960.259277, 18.041016), jobs = {'ballas'}, blip = false, recipes = {'cigarette_paper'}, radius = 1.0}, - {coords = vector3(2342.202148, 3144.817627, 48.202148), jobs = {'baker'}, blip = false, recipes = {'flour', 'bread'}, radius = 1.0}, - {coords = vector3(-316.549438, -2781.217529, 4.982422), jobs = {'fisherman'}, blip = false, recipes = {'salmon_fillet'}, radius = 1.0}, -}} +{ coords = vector3(1020.936279, -2404.628662, 30.122314), jobs = { "import" }, blip = false, recipes = { "cottonforbandages", "iron", "hammer" }, radius = 1.0 }, +{ coords = vector3(311.314301, -565.213196, 43.282104), jobs = { "ambulance" }, blip = false, recipes = { "bandage" }, radius = 1.0 }, +{ coords = vector3(-323.551636, -129.626373, 39.002197), jobs = { "mechanic" }, blip = false, recipes = { "fixkit" }, radius = 1.0 }, +{ coords = vector3(809.090088, -2172.923096, 29.616821), jobs = { "ammu" }, blip = false, recipes = { "WEAPON_APPISTOL", "ammo-sniper" }, radius = 1.0 }, +{ coords = vector3(129.217590, -1283.802246, 29.263062), jobs = { "unicorn" }, blip = false, recipes = { "almondmilk", "slicedchips", "bread_deer" }, radius = 1.0 }, +{ coords = vector3(-416.993408, -1683.468140, 19.018311), jobs = { "dustman" }, blip = false, recipes = { "ironsheet", "recycled_paper", "paper" }, radius = 1.0 }, +{ coords = vector3(83.156044, -1960.259277, 18.041016), jobs = { "ballas" }, blip = false, recipes = { "cigarette_paper" }, radius = 1.0 }, +{ coords = vector3(2342.202148, 3144.817627, 48.202148), jobs = { "baker" }, blip = false, recipes = { "flour", "bread" }, radius = 1.0 }, +{ coords = vector3(-316.549438, -2781.217529, 4.982422), jobs = { "fisherman" }, blip = false, recipes = { "salmon_fillet" }, radius = 1.0 }, +}, +} -Config.Locale = 'en' \ No newline at end of file +Config.Locale = "en" diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/locales/en.lua b/server-data/resources/[bpt_addons]/bpt_crafting/locales/en.lua index a73e2388f..e28a2a881 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/locales/en.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/locales/en.lua @@ -1,9 +1,9 @@ Locales["en"] = { - ["not_enough_ingredients"] = "You don't have enough ingredients", - ["you_cant_hold_item"] = "You can't create the product", - ["item_crafted"] = "Item crafted!", - ["wrong_job"] = "You cannot open this workbench", - ["workbench_hologram"] = "[~b~E~w~] Work station", - ["inv_limit_exceed"] = "Inventory limit exceeded! Remove something before you lose more merchandise", - ["crafting_failed"] = "You were unable to create the item!", -} \ No newline at end of file + ["not_enough_ingredients"] = "You don't have enough ingredients", + ["you_cant_hold_item"] = "You can't create the product", + ["item_crafted"] = "Item crafted!", + ["wrong_job"] = "You cannot open this workbench", + ["workbench_hologram"] = "[~b~E~w~] Work station", + ["inv_limit_exceed"] = "Inventory limit exceeded! Remove something before you lose more merchandise", + ["crafting_failed"] = "You were unable to create the item!", +} diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/locales/it.lua b/server-data/resources/[bpt_addons]/bpt_crafting/locales/it.lua index 244f3cdc5..18c6fd904 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/locales/it.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/locales/it.lua @@ -1,9 +1,9 @@ Locales["it"] = { - ["not_enough_ingredients"] = "Non hai abbastanza ingredienti", - ["you_cant_hold_item"] = "Non puoi creare il prodotto", - ["item_crafted"] = "Articolo realizzato!", - ["wrong_job"] = "Non puoi aprire questo banco di lavoro", - ["workbench_hologram"] = "[~b~E~w~] banco da lavoro", - ["inv_limit_exceed"] = "Limite inventario superato! Rimuovi qualcosa prima di perdere altra merce", - ["crafting_failed"] = "Non sei riuscito a creare l'oggetto!", -} \ No newline at end of file + ["not_enough_ingredients"] = "Non hai abbastanza ingredienti", + ["you_cant_hold_item"] = "Non puoi creare il prodotto", + ["item_crafted"] = "Articolo realizzato!", + ["wrong_job"] = "Non puoi aprire questo banco di lavoro", + ["workbench_hologram"] = "[~b~E~w~] banco da lavoro", + ["inv_limit_exceed"] = "Limite inventario superato! Rimuovi qualcosa prima di perdere altra merce", + ["crafting_failed"] = "Non sei riuscito a creare l'oggetto!", +} diff --git a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua index 2831137b2..fe4beacba 100644 --- a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua +++ b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua @@ -20,4 +20,4 @@ client_scripts({ "scripts/peds_config.lua", -- Invincible peds that appear on the island, ie merryweather "scripts/main_peds.lua", -- Don't touch this "scripts/static_emitters.lua", -- Disables annoying 'cheering' SFXs from Arena Wars location near North Yankton / Cayo Perico -}) \ No newline at end of file +}) diff --git a/server-data/resources/[ox]/ox_inventory/data/shops.lua b/server-data/resources/[ox]/ox_inventory/data/shops.lua index 82e5b535c..b49993379 100644 --- a/server-data/resources/[ox]/ox_inventory/data/shops.lua +++ b/server-data/resources/[ox]/ox_inventory/data/shops.lua @@ -67,7 +67,8 @@ return { blip = { id = 59, colour = 69, scale = 0.8 }, inventory = { - { name = 'backpack', price = 800 } + { name = 'backpack', price = 800 }, + { name = 'wallet', price = 300 } }, locations = { vec3(-1131.481323, -1635.652710, 4.359009) }, targets = {