diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a4b90dbd..df7562bd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,20 +1,20 @@ -name: CI +name: Lint on: [push, pull_request] jobs: lint: - name: Lint Lua Scripts + name: Lint Resource runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - name: Lint - uses: Sub-Zero-Interactive/fivem-lua-lint-action@v1.1 + uses: iLLeniumStudios/fivem-lua-lint-action@v2 with: capture: "junit.xml" - args: "-t --formatter JUnit --no-max-comment-line-length" - extra_libs: "+esx_legacy" - - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + args: "-t --formatter JUnit" + - name: Generate Lint Report + if: always() + uses: mikepenz/action-junit-report@v3 with: report_paths: "**/junit.xml" - fail_on_failure: 0 \ No newline at end of file + check_name: Linting Report + fail_on_failure: false diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql index ae6c1840..21937885 100644 --- a/[SQL]/legacy.sql +++ b/[SQL]/legacy.sql @@ -112,6 +112,19 @@ CREATE TABLE `cardealer_vehicles` ( -- -------------------------------------------------------- +-- +-- Table structure for table `multicharacter_slots` +-- + +CREATE TABLE `multicharacter_slots` ( + `identifier` VARCHAR(60) NOT NULL, + `slots` INT(11) NOT NULL, + PRIMARY KEY (`identifier`) USING BTREE, + INDEX `slots` (`slots`) USING BTREE +) ENGINE=InnoDB; + +-- -------------------------------------------------------- + -- -- Table structure for table `datastore` -- @@ -317,6 +330,10 @@ CREATE TABLE `licenses` ( -- INSERT INTO `licenses` (`type`, `label`) VALUES +('dmv', 'Driving Permit'), +('drive', 'Drivers License'), +('drive_bike', 'Motorcycle License'), +('drive_truck', 'Commercial Drivers License'), ('weed_processing', 'Weed Processing License'); -- -------------------------------------------------------- @@ -501,6 +518,7 @@ CREATE TABLE `users` ( `status` longtext DEFAULT NULL, `is_dead` tinyint(1) DEFAULT 0, `id` int(11) NOT NULL, + `disabled` TINYINT(1) NULL DEFAULT '0', `last_property` varchar(255) DEFAULT NULL ) ENGINE=InnoDB; @@ -831,67 +849,6 @@ CREATE TABLE `vehicle_sold` ( `date` varchar(50) NOT NULL ) ENGINE=InnoDB; --- -------------------------------------------------------- - --- --- Table structure for table `weashops` --- - -CREATE TABLE `weashops` ( - `id` int(11) NOT NULL, - `zone` varchar(255) NOT NULL, - `item` varchar(255) NOT NULL, - `price` int(11) NOT NULL -) ENGINE=InnoDB; - --- --- Dumping data for table `weashops` --- - -INSERT INTO `weashops` (`id`, `zone`, `item`, `price`) VALUES -(1, 'GunShop', 'WEAPON_PISTOL', 300), -(2, 'BlackWeashop', 'WEAPON_PISTOL', 500), -(3, 'GunShop', 'WEAPON_FLASHLIGHT', 60), -(4, 'BlackWeashop', 'WEAPON_FLASHLIGHT', 70), -(5, 'GunShop', 'WEAPON_MACHETE', 90), -(6, 'BlackWeashop', 'WEAPON_MACHETE', 110), -(7, 'GunShop', 'WEAPON_NIGHTSTICK', 150), -(8, 'BlackWeashop', 'WEAPON_NIGHTSTICK', 150), -(9, 'GunShop', 'WEAPON_BAT', 100), -(10, 'BlackWeashop', 'WEAPON_BAT', 100), -(11, 'GunShop', 'WEAPON_STUNGUN', 50), -(12, 'BlackWeashop', 'WEAPON_STUNGUN', 50), -(13, 'GunShop', 'WEAPON_MICROSMG', 1400), -(14, 'BlackWeashop', 'WEAPON_MICROSMG', 1700), -(15, 'GunShop', 'WEAPON_PUMPSHOTGUN', 3400), -(16, 'BlackWeashop', 'WEAPON_PUMPSHOTGUN', 3500), -(17, 'GunShop', 'WEAPON_ASSAULTRIFLE', 10000), -(18, 'BlackWeashop', 'WEAPON_ASSAULTRIFLE', 11000), -(19, 'GunShop', 'WEAPON_SPECIALCARBINE', 15000), -(20, 'BlackWeashop', 'WEAPON_SPECIALCARBINE', 16500), -(21, 'GunShop', 'WEAPON_SNIPERRIFLE', 22000), -(22, 'BlackWeashop', 'WEAPON_SNIPERRIFLE', 24000), -(23, 'GunShop', 'WEAPON_FIREWORK', 18000), -(24, 'BlackWeashop', 'WEAPON_FIREWORK', 20000), -(25, 'GunShop', 'WEAPON_GRENADE', 500), -(26, 'BlackWeashop', 'WEAPON_GRENADE', 650), -(27, 'GunShop', 'WEAPON_BZGAS', 200), -(28, 'BlackWeashop', 'WEAPON_BZGAS', 350), -(29, 'GunShop', 'WEAPON_FIREEXTINGUISHER', 100), -(30, 'BlackWeashop', 'WEAPON_FIREEXTINGUISHER', 100), -(31, 'GunShop', 'WEAPON_BALL', 50), -(32, 'BlackWeashop', 'WEAPON_BALL', 50), -(33, 'GunShop', 'WEAPON_SMOKEGRENADE', 100), -(34, 'BlackWeashop', 'WEAPON_SMOKEGRENADE', 100), -(35, 'BlackWeashop', 'WEAPON_APPISTOL', 1100), -(36, 'BlackWeashop', 'WEAPON_CARBINERIFLE', 12000), -(37, 'BlackWeashop', 'WEAPON_HEAVYSNIPER', 30000), -(38, 'BlackWeashop', 'WEAPON_MINIGUN', 45000), -(39, 'BlackWeashop', 'WEAPON_RAILGUN', 50000), -(40, 'BlackWeashop', 'WEAPON_STICKYBOMB', 500); - --- -------------------------------------------------------- - -- -- Table structure for table `whitelist` -- @@ -1046,12 +1003,6 @@ ALTER TABLE `vehicle_categories` ALTER TABLE `vehicle_sold` ADD PRIMARY KEY (`plate`); --- --- Indexes for table `weashops` --- -ALTER TABLE `weashops` - ADD PRIMARY KEY (`id`); - -- -- Indexes for table `whitelist` -- @@ -1130,12 +1081,6 @@ ALTER TABLE `user_licenses` ALTER TABLE `user_parkings` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `weashops` --- -ALTER TABLE `weashops` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=41; - -- -- ESX Phone -- diff --git a/[esx]/es_extended/client/functions.lua b/[esx]/es_extended/client/functions.lua index 25a5facf..7f7113e2 100644 --- a/[esx]/es_extended/client/functions.lua +++ b/[esx]/es_extended/client/functions.lua @@ -77,12 +77,30 @@ function ESX.SetPlayerData(key, val) end end -function ESX.ShowNotification(msg) - BeginTextCommandThefeedPost('STRING') - AddTextComponentSubstringPlayerName(msg) - EndTextCommandThefeedPostTicker(0,1) +function ESX.Progressbar(message,length, Options) + exports["esx_progressbar"]:Progressbar(message,length, Options) end + +function ESX.ShowNotification(message, type, length) + if Config.NativeNotify then + BeginTextCommandThefeedPost('STRING') + AddTextComponentSubstringPlayerName(message) + EndTextCommandThefeedPostTicker(0,1) + else + exports["esx_notify"]:Notify(type, length, message) + end +end + +function ESX.TextUI(message, type) + exports["esx_textui"]:TextUI(message, type) +end + +function ESX.HideUI() + exports["esx_textui"]:HideUI() +end + + function ESX.ShowAdvancedNotification(sender, subject, msg, textureDict, iconType, flash, saveToBrief, hudColorIndex) if saveToBrief == nil then saveToBrief = true end AddTextEntry('esxAdvancedNotification', msg) @@ -573,6 +591,19 @@ function ESX.Game.GetVehicleProperties(vehicle) if DoesEntityExist(vehicle) then local colorPrimary, colorSecondary = GetVehicleColours(vehicle) local pearlescentColor, wheelColor = GetVehicleExtraColours(vehicle) + local hasCustomPrimaryColor = GetIsVehiclePrimaryColourCustom(vehicle) + local customPrimaryColor = nil + if hasCustomPrimaryColor then + local r, g, b = GetVehicleCustomPrimaryColour(vehicle) + customPrimaryColor = { r, g, b } + end + + local hasCustomSecondaryColor = GetIsVehicleSecondaryColourCustom(vehicle) + local customSecondaryColor = nil + if hasCustomSecondaryColor then + local r, g, b = GetVehicleCustomSecondaryColour(vehicle) + customSecondaryColor = { r, g, b } + end local extras = {} for extraId=0, 12 do @@ -582,9 +613,45 @@ function ESX.Game.GetVehicleProperties(vehicle) end end + local doorsBroken, windowsBroken, tyreBurst = {}, {}, {} + local numWheels = tostring(GetVehicleNumberOfWheels(vehicle)) + + local TyresIndex = { -- Wheel index list according to the number of vehicle wheels. + ['2'] = {0, 4}, -- Bike and cycle. + ['3'] = {0, 1, 4, 5}, -- Vehicle with 3 wheels (get for wheels because some 3 wheels vehicles have 2 wheels on front and one rear or the reverse). + ['4'] = {0, 1, 4, 5}, -- Vehicle with 4 wheels. + ['6'] = {0, 1, 2, 3, 4, 5}, -- Vehicle with 6 wheels. + } + + for tyre,idx in pairs(TyresIndex[numWheels]) do + if IsVehicleTyreBurst(vehicle, idx, false) then + tyreBurst[tostring(idx)] = true + else + tyreBurst[tostring(idx)] = false + end + end + + for windowId = 0, 7 do -- 13 + if not IsVehicleWindowIntact(vehicle, windowId) then + windowsBroken[tostring(windowId)] = true + else + windowsBroken[tostring(windowId)] = false + end + end + + for doorsId = 0, GetNumberOfVehicleDoors(vehicle) do + if IsVehicleDoorDamaged(vehicle, doorsId) then + doorsBroken[tostring(doorsId)] = true + else + doorsBroken[tostring(doorsId)] = false + end + end + return { model = GetEntityModel(vehicle), - + doorsBroken = doorsBroken, + windowsBroken = windowsBroken, + tyreBurst = tyreBurst, plate = ESX.Math.Trim(GetVehicleNumberPlateText(vehicle)), plateIndex = GetVehicleNumberPlateTextIndex(vehicle), @@ -596,6 +663,8 @@ function ESX.Game.GetVehicleProperties(vehicle) dirtLevel = ESX.Math.Round(GetVehicleDirtLevel(vehicle), 1), color1 = colorPrimary, color2 = colorSecondary, + customPrimaryColor = customPrimaryColor, + customSecondaryColor = customSecondaryColor, pearlescentColor = pearlescentColor, wheelColor = wheelColor, @@ -662,8 +731,9 @@ function ESX.Game.GetVehicleProperties(vehicle) modAerials = GetVehicleMod(vehicle, 43), modTrimB = GetVehicleMod(vehicle, 44), modTank = GetVehicleMod(vehicle, 45), - modWindows = GetVehicleMod(vehicle, 46), - modLivery = GetVehicleLivery(vehicle) + modDoorR = GetVehicleMod(vehicle, 47), + modLivery = GetVehicleLivery(vehicle), + modLightbar = GetVehicleMod(vehicle, 49), } else return @@ -683,6 +753,8 @@ function ESX.Game.SetVehicleProperties(vehicle, props) if props.tankHealth then SetVehiclePetrolTankHealth(vehicle, props.tankHealth + 0.0) end if props.fuelLevel then SetVehicleFuelLevel(vehicle, props.fuelLevel + 0.0) end if props.dirtLevel then SetVehicleDirtLevel(vehicle, props.dirtLevel + 0.0) end + if props.customPrimaryColor then SetVehicleCustomPrimaryColour(vehicle, props.customPrimaryColor[1], props.customPrimaryColor[2], props.customPrimaryColor[3]) end + if props.customSecondaryColor then SetVehicleCustomSecondaryColour(vehicle, props.customSecondaryColor[1], props.customSecondaryColor[2], props.customSecondaryColor[3]) end if props.color1 then SetVehicleColours(vehicle, props.color1, colorSecondary) end if props.color2 then SetVehicleColours(vehicle, props.color1 or colorPrimary, props.color2) end if props.pearlescentColor then SetVehicleExtraColours(vehicle, props.pearlescentColor, wheelColor) end @@ -756,9 +828,26 @@ function ESX.Game.SetVehicleProperties(vehicle, props) if props.modWindows then SetVehicleMod(vehicle, 46, props.modWindows, false) end if props.modLivery then - SetVehicleMod(vehicle, 48, props.modLivery, false) SetVehicleLivery(vehicle, props.modLivery) end + + if props.windowsBroken then + for k, v in pairs(props.windowsBroken) do + if v then SmashVehicleWindow(vehicle, tonumber(k)) end + end + end + + if props.doorsBroken then + for k, v in pairs(props.doorsBroken) do + if v then SetVehicleDoorBroken(vehicle, tonumber(k), true) end + end + end + + if props.tyreBurst then + for k, v in pairs(props.tyreBurst) do + if v then SetVehicleTyreBurst(vehicle, tonumber(k), true, 1000.0) end + end + end end end @@ -1042,8 +1131,8 @@ AddEventHandler('esx:serverCallback', function(requestId, ...) end) RegisterNetEvent('esx:showNotification') -AddEventHandler('esx:showNotification', function(msg) - ESX.ShowNotification(msg) +AddEventHandler('esx:showNotification', function(msg, type, length) + ESX.ShowNotification(msg, type, length) end) RegisterNetEvent('esx:showAdvancedNotification') diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua index 2897991f..2861d4ef 100644 --- a/[esx]/es_extended/client/main.lua +++ b/[esx]/es_extended/client/main.lua @@ -55,6 +55,10 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin) NetworkSetFriendlyFireOption(true) end + if Config.DisableHealthRegen then + SetPlayerHealthRechargeMultiplier(PlayerId(), 0.0) + end + if Config.EnableHud then for k,v in ipairs(ESX.PlayerData.accounts) do local accountTpl = '
 {{money}}
' @@ -300,7 +304,7 @@ if not Config.OxInventory then RegisterNetEvent('esx:createMissingPickups') AddEventHandler('esx:createMissingPickups', function(missingPickups) for pickupId, pickup in pairs(missingPickups) do - TriggerEvent('esx:createPickup', pickupId, pickup.label, pickup.coords, pickup.type, pickup.name, pickup.components, pickup.tintIndex) + TriggerEvent('esx:createPickup', pickupId, pickup.label, pickup.coords - vector3(0,0, 1.0), pickup.type, pickup.name, pickup.components, pickup.tintIndex) end end) end @@ -389,36 +393,32 @@ end function StartServerSyncLoops() if not Config.OxInventory then - -- keep track of ammo - CreateThread(function() - local currentWeapon = {timer=0} - while ESX.PlayerLoaded do - local sleep = 500 + -- keep track of ammo - if currentWeapon.timer == sleep then - local ammoCount = GetAmmoInPedWeapon(ESX.PlayerData.ped, currentWeapon.hash) - TriggerServerEvent('esx:updateWeaponAmmo', currentWeapon.name, ammoCount) - currentWeapon.timer = 0 - elseif currentWeapon.timer > sleep then - currentWeapon.timer = currentWeapon.timer - sleep - end - - if IsPedArmed(ESX.PlayerData.ped, 4) then - sleep = 0 - if IsPedShooting(ESX.PlayerData.ped) then - local _,weaponHash = GetCurrentPedWeapon(ESX.PlayerData.ped, true) - local weapon = ESX.GetWeaponFromHash(weaponHash) - - if weapon then - currentWeapon.name = weapon.name - currentWeapon.hash = weaponHash - currentWeapon.timer = 100 * sleep - end + CreateThread(function() + local currentWeapon = {Ammo = 0} + while ESX.PlayerLoaded do + local sleep = 300 + if GetSelectedPedWeapon(ESX.PlayerData.ped) ~= -1569615261 then + sleep = 0 + local _,weaponHash = GetCurrentPedWeapon(ESX.PlayerData.ped, true) + local weapon = ESX.GetWeaponFromHash(weaponHash) + if weapon then + local ammoCount = GetAmmoInPedWeapon(ESX.PlayerData.ped, weaponHash) + if weapon.name ~= currentWeapon.name then + currentWeapon.Ammo = ammoCount + currentWeapon.name = weapon.name + else + if ammoCount ~= currentWeapon.Ammo then + currentWeapon.Ammo = ammoCount + TriggerServerEvent('esx:updateWeaponAmmo', weapon.name, ammoCount) + end + end + end + end + Wait(sleep) end - end - Wait(sleep) - end - end) + end) end -- sync current player coords with server diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua index 6d9f4203..60378868 100644 --- a/[esx]/es_extended/config.lua +++ b/[esx]/es_extended/config.lua @@ -17,6 +17,10 @@ Config.EnableDebug = false -- Use Debug options? Config.EnableDefaultInventory = true -- Display the default Inventory ( F2 ) Config.EnableWantedLevel = false -- Use Normal GTA wanted Level? Config.EnablePVP = true -- Allow Player to player combat +Config.NativeNotify = false -- true = old esx notification +Config.DisableHealthRegen = true -Config.Multichar = false -- Enable support for esx_multicharacter +Config.Multichar = true -- Enable support for esx_multicharacter Config.Identity = true -- Select a characters identity data before they have loaded in (this happens by default with multichar) +Config.DistanceGive = 4.0 -- Max distance when giving items, weapons etc. +Config.OnDuty = true -- Default state of the on duty system diff --git a/[esx]/es_extended/fxmanifest.lua b/[esx]/es_extended/fxmanifest.lua index be327f6f..7774e187 100644 --- a/[esx]/es_extended/fxmanifest.lua +++ b/[esx]/es_extended/fxmanifest.lua @@ -4,8 +4,8 @@ game 'gta5' description 'ES Extended' -version '1.5.0' lua54 'yes' +version '1.7.0' shared_scripts { 'locale.lua', diff --git a/[esx]/es_extended/locales/en.lua b/[esx]/es_extended/locales/en.lua index 4420bd79..761babde 100644 --- a/[esx]/es_extended/locales/en.lua +++ b/[esx]/es_extended/locales/en.lua @@ -54,6 +54,7 @@ Locales['en'] = { ['in_vehicle'] = 'Cannot Perform Action, Player is in a vehicle', -- Commands + ['command_bring'] = 'Bring player to you', ['command_car'] = 'Spawn a vehicle', ['command_car_car'] = 'Vehicle model or hash', ['command_cardel'] = 'Remove vehicles in proximity', @@ -62,6 +63,8 @@ Locales['en'] = { ['command_clearall'] = 'Clear chat Text for all players', ['command_clearinventory'] = 'Remove All items from the Players Inventory', ['command_clearloadout'] = 'Remove All weapons from the Players Loadout', + ['command_freeze'] = 'Freeze a player', + ['command_unfreeze'] = 'Unfreeze a player', ['command_giveaccountmoney'] = 'Give Money to a specified Account', ['command_giveaccountmoney_account'] = 'Account to add to', ['command_giveaccountmoney_amount'] = 'Amount to add', @@ -78,6 +81,8 @@ Locales['en'] = { ['command_giveweaponcomponent_invalid'] = 'Invalid weapon component', ['command_giveweaponcomponent_hasalready'] = 'Player already has this weapon component', ['command_giveweaponcomponent_missingweapon'] = 'Player does not have this weapon', + ['command_goto'] = 'Teleport yourself to a player', + ['command_kill'] = 'Kill a player', ['command_save'] = 'Force Save a player`s Data', ['command_saveall'] = 'Force Save all player data', ['command_setaccountmoney'] = 'Set the money within a specified account', @@ -343,4 +348,8 @@ Locales['en'] = { ['tint_lspd'] = 'blue skin', ['tint_orange'] = 'orange skin', ['tint_platinum'] = 'platinum skin', + + -- Duty related + ['stopped_duty'] = 'You\'ve stopped your duty.', + ['started_duty'] = 'You\'ve started your duty.', } diff --git a/[esx]/es_extended/locales/fr.lua b/[esx]/es_extended/locales/fr.lua index 38565b1e..5cf46d2c 100644 --- a/[esx]/es_extended/locales/fr.lua +++ b/[esx]/es_extended/locales/fr.lua @@ -222,4 +222,8 @@ Locales['fr'] = { ['tint_lspd'] = 'skin bleu', ['tint_orange'] = 'skin orange', ['tint_platinum'] = 'skin platine', + + -- Duty related + ['stopped_duty'] = 'Vous êtes maintenant hors-service.', + ['started_duty'] = 'Vous êtes maintenant en-service.', } diff --git a/[esx]/es_extended/locales/hu.lua b/[esx]/es_extended/locales/hu.lua new file mode 100644 index 00000000..9b699cd1 --- /dev/null +++ b/[esx]/es_extended/locales/hu.lua @@ -0,0 +1,350 @@ +Locales["hu"] = { + -- Inventory + ["inventory"] = "Inventory ( Súly %s / %s )", + ["use"] = "Használ", + ["give"] = "Átad", + ["remove"] = "Eldob", + ["return"] = "Visszatérés", + ["give_to"] = "Adni valakinek", + ["amount"] = "Mennyiség", + ["giveammo"] = "Lőszer adás", + ["amountammo"] = "Lőszer mennyiség", + ["noammo"] = "Nincsen több lövedéked!", + ["gave_item"] = "Átadtál: ~y~%sx~s~ ~b~%s~s~ neki: ~y~%s~s~", + ["received_item"] = "Kaptál: ~y~%sx~s~ ~b~%s~s~ töle: ~b~%s~s~", + ["gave_weapon"] = "Átadtál: ~b~%s~s~ neki: ~y~%s~s~", + ["gave_weapon_ammo"] = "Átadtál ~o~%sx %s~s~ ~b~%s~s~ neki: ~y~%s~s~", + ["gave_weapon_withammo"] = "Átadtál ~b~%s~s~ ~o~%sx %s~s~ neki: ~y~%s~s~", + ["gave_weapon_hasalready"] = "~y~%s~s~ már rendelkezik ~y~%s~s~", + ["gave_weapon_noweapon"] = "~y~%s~s~ nincsen ilyen fegyere", + ["received_weapon"] = "Kaptál: ~b~%s~s~ töle: ~b~%s~s~", + ["received_weapon_ammo"] = "Kaptál ~o~%sx %s~s~ ~b~%s~s~ töle: ~b~%s~s~", + ["received_weapon_withammo"] = "Kaptál ~b~%s~s~ ~o~%sx %s~s~ töle: ~b~%s~s~", + ["received_weapon_hasalready"] = "~b~%s~s~ megpróbálta átadni a következöt: ~y~%s~s~, nem már van rendelkezel egy ilyennel", + ["received_weapon_noweapon"] = "~b~%s~s~ átakart adni ~y~%s~s~, de nincsen ilyen fegyvered", + ["gave_account_money"] = "Átadtál: ~g~$%s~s~ (%s) neki: ~y~%s~s~", + ["received_account_money"] = "Kaptál: ~g~$%s~s~ (%s) töle: ~b~%s~s~", + ["amount_invalid"] = "Érvénytelen mennyiség", + ["players_nearby"] = "Nincsen játékos a közeledben", + ["ex_inv_lim"] = "Nincsen elég szabad helyed ~y~%s~s~", + ["imp_invalid_quantity"] = "Érvénytelen mennyiség", + ["imp_invalid_amount"] = "Érvénytelen összeg", + ["threw_standard"] = "Kidobtál: ~y~%sx~s~ ~b~%s~s~", + ["threw_account"] = "Kidobtál: ~g~$%s~s~ ~b~%s~s~", + ["threw_weapon"] = "Kidobtál: ~b~%s~s~", + ["threw_weapon_ammo"] = "Kidobtál: ~b~%s~s~ ~o~%sx %s~s~", + ["threw_weapon_already"] = "Van már ilyen fegyvered", + ["threw_cannot_pickup"] = "Nincsen elég szabad helyed", + ["threw_pickup_prompt"] = "~y~E~s~ hogy felvedd", + + -- Key mapping + ["keymap_showinventory"] = "Leltár mutatása", + + -- Salary related + ["received_salary"] = "Megkaptad a fizetésed: ~g~$%s~s~", + ["received_help"] = "Megkaptad a segélyt: ~g~$%s~s~", + ["company_nomoney"] = "Nem kaptál fizetést, mert a frakciónak nincs elég pénze!", + ["received_paycheck"] = "Fizetésed érkezett!", + ["bank"] = "maze Bank", + ["account_bank"] = "bank", + ["account_black_money"] = "Piszkos pénz", + ["account_money"] = "Készpénz", + + ["act_imp"] = "Érvénytelen mennyiség", + ["in_vehicle"] = "Nem tudod átadni, mivel benne ül a jármüben", + + -- Commands + ["command_car"] = "Jármű lehívása", + ["command_car_car"] = "Jármű név vagy hash", + ["command_cardel"] = "Közeli járművek törlése", + ["command_cardel_radius"] = "Megadott radiusban lévő járművek törlése", + ["command_clear"] = "Chat ürítése", + ["command_clearall"] = "Chat ürítése minden játékosnál", + ["command_clearinventory"] = "Minden tárgy törlése a játékos inventoryból", + ["command_clearloadout"] = "Minden fegyver elvétele a játékostól", + ["command_giveaccountmoney"] = "Pénz adás a megadott típusban", + ["command_giveaccountmoney_account"] = "Típus", + ["command_giveaccountmoney_amount"] = "Mennyiség", + ["command_giveaccountmoney_invalid"] = "Megadott típus hibás", + ["command_giveitem"] = "Tárgy adás a játékosnak", + ["command_giveitem_item"] = "Tárgy neve", + ["command_giveitem_count"] = "Mennyiség", + ["command_giveweapon"] = "Fegyver adás játékosnak", + ["command_giveweapon_weapon"] = "Fegyver neve", + ["command_giveweapon_ammo"] = "Lőszer mennyiség", + ["command_giveweapon_hasalready"] = "Játékosnak már van ilyen fegyvere", + ["command_giveweaponcomponent"] = "Fegyver kiegészítő adás a játékosnak", + ["command_giveweaponcomponent_component"] = "Kiegészítő neve", + ["command_giveweaponcomponent_invalid"] = "Érvénytelen fegyver kiegészítő", + ["command_giveweaponcomponent_hasalready"] = "Játékosnak már van ilyen fegyver kiegészítője", + ["command_giveweaponcomponent_missingweapon"] = "Játékosnak nincs ilyen fegyvere", + ["command_save"] = "Játékos adatainak mentése", + ["command_saveall"] = "Összes játékos adatainak mentése", + ["command_setaccountmoney"] = "Játékos pénzének beállítása megadott típusban", + ["command_setaccountmoney_amount"] = "Mennyiség", + ["command_setcoords"] = "Teleportálás megadott kordinátára", + ["command_setcoords_x"] = "X érték", + ["command_setcoords_y"] = "Y érték", + ["command_setcoords_z"] = "Z érték", + ["command_setjob"] = "Játékos munkájának beállítása", + ["command_setjob_job"] = "Munka neve", + ["command_setjob_grade"] = "Rang", + ["command_setjob_invalid"] = "Munka név vagy rang érvénytelen", + ["command_setgroup"] = "Játékos jogosultsági csoportjának beállítása", + ["command_setgroup_group"] = "Csoport neve", + ["commanderror_argumentmismatch"] = "Érvénytelen argumentumszám (%s megadva, %s szükséges)", + ["commanderror_argumentmismatch_number"] = "Érvénytelen argumentum #%s adat típus (szöveg megadva, szám szükséges)", + ["commanderror_invaliditem"] = "Érvénytelen tárgy", + ["commanderror_invalidweapon"] = "Érvénytelen fegyver", + ["commanderror_console"] = "Parancs nem használható konzolból", + ["commanderror_invalidcommand"] = "Érvénytelen parancs - /%s", + ["commanderror_invalidplayerid"] = "Megadott játékos nem online.", + ["commandgeneric_playerid"] = "Játékos Szerver Id", + + -- Locale settings + ["locale_digit_grouping_symbol"] = ",", + ["locale_currency"] = "$%s", + + -- Weapons + + -- Melee + ["weapon_dagger"] = "Dagger", + ["weapon_bat"] = "Bat", + ["weapon_battleaxe"] = "Battle Axe", + ["weapon_bottle"] = "Bottle", + ["weapon_crowbar"] = "Crowbar", + ["weapon_flashlight"] = "Flashlight", + ["weapon_golfclub"] = "Golf Club", + ["weapon_hammer"] = "Hammer", + ["weapon_hatchet"] = "Hatchet", + ["weapon_knife"] = "Knife", + ["weapon_knuckle"] = "Knuckledusters", + ["weapon_machete"] = "Machete", + ["weapon_nightstick"] = "Nightstick", + ["weapon_wrench"] = "Pipe Wrench", + ["weapon_poolcue"] = "Pool Cue", + ["weapon_stone_hatchet"] = "Stone Hatchet", + ["weapon_switchblade"] = "Switchblade", + + -- Handguns + ["weapon_appistol"] = "AP Pistol", + ["weapon_ceramicpistol"] = "Ceramic Pistol", + ["weapon_combatpistol"] = "Combat Pistol", + ["weapon_doubleaction"] = "Double-Action Revolver", + ["weapon_navyrevolver"] = "Navy Revolver", + ["weapon_flaregun"] = "Flaregun", + ["weapon_gadgetpistol"] = "Gadget Pistol", + ["weapon_heavypistol"] = "Heavy Pistol", + ["weapon_revolver"] = "Heavy Revolver", + ["weapon_revolver_mk2"] = "Heavy Revolver MK2", + ["weapon_marksmanpistol"] = "Marksman Pistol", + ["weapon_pistol"] = "Pistol", + ["weapon_pistol_mk2"] = "Pistol MK2", + ["weapon_pistol50"] = "Pistol .50", + ["weapon_snspistol"] = "SNS Pistol", + ["weapon_snspistol_mk2"] = "SNS Pistol MK2", + ["weapon_stungun"] = "Taser", + ["weapon_raypistol"] = "Up-N-Atomizer", + ["weapon_vintagepistol"] = "Vintage Pistol", + + -- Shotguns + ["weapon_assaultshotgun"] = "Assault Shotgun", + ["weapon_autoshotgun"] = "Auto Shotgun", + ["weapon_bullpupshotgun"] = "Bullpup Shotgun", + ["weapon_combatshotgun"] = "Combat Shotgun", + ["weapon_dbshotgun"] = "Double Barrel Shotgun", + ["weapon_heavyshotgun"] = "Heavy Shotgun", + ["weapon_musket"] = "Musket", + ["weapon_pumpshotgun"] = "Pump Shotgun", + ["weapon_pumpshotgun_mk2"] = "Pump Shotgun MK2", + ["weapon_sawnoffshotgun"] = "Sawed Off Shotgun", + + -- SMG & LMG + ["weapon_assaultsmg"] = "Assault SMG", + ["weapon_combatmg"] = "Combat MG", + ["weapon_combatmg_mk2"] = "Combat MG MK2", + ["weapon_combatpdw"] = "Combat PDW", + ["weapon_gusenberg"] = "Gusenberg Sweeper", + ["weapon_machinepistol"] = "Machine Pistol", + ["weapon_mg"] = "MG", + ["weapon_microsmg"] = "Micro SMG", + ["weapon_minismg"] = "Mini SMG", + ["weapon_smg"] = "SMG", + ["weapon_smg_mk2"] = "SMG MK2", + ["weapon_raycarbine"] = "Unholy Hellbringer", + + -- Rifles + ["weapon_advancedrifle"] = "Advanced Rifle", + ["weapon_assaultrifle"] = "Assault Rifle", + ["weapon_assaultrifle_mk2"] = "Assault Rifle MK2", + ["weapon_bullpuprifle"] = "Bullpup Rifle", + ["weapon_bullpuprifle_mk2"] = "Bullpup Rifle MK2", + ["weapon_carbinerifle"] = "Carbine Rifle", + ["weapon_carbinerifle_mk2"] = "Carbine Rifle MK2", + ["weapon_compactrifle"] = "Compact Rifle", + ["weapon_militaryrifle"] = "Military Rifle", + ["weapon_specialcarbine"] = "Special Carbine", + ["weapon_specialcarbine_mk2"] = "Special Carbine MK2", + + -- Sniper + ["weapon_heavysniper"] = "Heavy Sniper", + ["weapon_heavysniper_mk2"] = "Heavy Sniper MK2", + ["weapon_marksmanrifle"] = "Marksman Rifle", + ["weapon_marksmanrifle_mk2"] = "Marksman Rifle MK2", + ["weapon_sniperrifle"] = "Sniper Rifle", + + -- Heavy / Launchers + ["weapon_compactlauncher"] = "Compact Launcher", + ["weapon_firework"] = "Firework Launcher", + ["weapon_grenadelauncher"] = "Grenade Launcher", + ["weapon_hominglauncher"] = "Homing Launcher", + ["weapon_minigun"] = "Minigun", + ["weapon_railgun"] = "Railgun", + ["weapon_rpg"] = "Rocket Launcher", + ["weapon_rayminigun"] = "Widowmaker", + + -- Thrown + ["weapon_ball"] = "Baseball", + ["weapon_bzgas"] = "BZ Gas", + ["weapon_flare"] = "Flare", + ["weapon_grenade"] = "Grenade", + ["weapon_petrolcan"] = "Jerrycan", + ["weapon_hazardcan"] = "Hazardous Jerrycan", + ["weapon_molotov"] = "Molotov Cocktail", + ["weapon_proxmine"] = "Proximity Mine", + ["weapon_pipebomb"] = "Pipe Bomb", + ["weapon_snowball"] = "Snowball", + ["weapon_stickybomb"] = "Sticky Bomb", + ["weapon_smokegrenade"] = "Tear Gas", + + -- Special + ["weapon_fireextinguisher"] = "Fire Extinguisher", + ["weapon_digiscanner"] = "Digital Scanner", + ["weapon_garbagebag"] = "Garbage Bag", + ["weapon_handcuffs"] = "Handcuffs", + ["gadget_nightvision"] = "Night Vision", + ["gadget_parachute"] = "parachute", + + -- Weapon Components + ["component_knuckle_base"] = "base Model", + ["component_knuckle_pimp"] = "the Pimp", + ["component_knuckle_ballas"] = "the Ballas", + ["component_knuckle_dollar"] = "the Hustler", + ["component_knuckle_diamond"] = "the Rock", + ["component_knuckle_hate"] = "the Hater", + ["component_knuckle_love"] = "the Lover", + ["component_knuckle_player"] = "the Player", + ["component_knuckle_king"] = "the King", + ["component_knuckle_vagos"] = "the Vagos", + + ["component_luxary_finish"] = "luxary Weapon Finish", + + ["component_handle_default"] = "default Handle", + ["component_handle_vip"] = "vIP Handle", + ["component_handle_bodyguard"] = "bodyguard Handle", + + ["component_vip_finish"] = "vIP Finish", + ["component_bodyguard_finish"] = "bodyguard Finish", + + ["component_camo_finish"] = "digital Camo", + ["component_camo_finish2"] = "brushstroke Camo", + ["component_camo_finish3"] = "woodland Camo", + ["component_camo_finish4"] = "skull Camo", + ["component_camo_finish5"] = "sessanta Nove Camo", + ["component_camo_finish6"] = "perseus Camo", + ["component_camo_finish7"] = "leopard Camo", + ["component_camo_finish8"] = "zebra Camo", + ["component_camo_finish9"] = "geometric Camo", + ["component_camo_finish10"] = "boom Camo", + ["component_camo_finish11"] = "patriotic Camo", + + ["component_camo_slide_finish"] = "digital Slide Camo", + ["component_camo_slide_finish2"] = "brushstroke Slide Camo", + ["component_camo_slide_finish3"] = "woodland Slide Camo", + ["component_camo_slide_finish4"] = "skull Slide Camo", + ["component_camo_slide_finish5"] = "sessanta Nove Slide Camo", + ["component_camo_slide_finish6"] = "perseus Slide Camo", + ["component_camo_slide_finish7"] = "leopard Slide Camo", + ["component_camo_slide_finish8"] = "zebra Slide Camo", + ["component_camo_slide_finish9"] = "geometric Slide Camo", + ["component_camo_slide_finish10"] = "boom Slide Camo", + ["component_camo_slide_finish11"] = "patriotic Slide Camo", + + ["component_clip_default"] = "default Magazine", + ["component_clip_extended"] = "extended Magazine", + ["component_clip_drum"] = "drum Magazine", + ["component_clip_box"] = "box Magazine", + + ["component_scope_holo"] = "holographic Scope", + ["component_scope_small"] = "small Scope", + ["component_scope_medium"] = "medium Scope", + ["component_scope_large"] = "large Scope", + ["component_scope"] = "mounted Scope", + ["component_scope_advanced"] = "advanced Scope", + ["component_ironsights"] = "ironsights", + + ["component_suppressor"] = "suppressor", + ["component_compensator"] = "compensator", + + ["component_muzzle_flat"] = "flat Muzzle Brake", + ["component_muzzle_tactical"] = "tactical Muzzle Brake", + ["component_muzzle_fat"] = "fat-End Muzzle Brake", + ["component_muzzle_precision"] = "precision Muzzle Brake", + ["component_muzzle_heavy"] = "heavy Duty Muzzle Brake", + ["component_muzzle_slanted"] = "slanted Muzzle Brake", + ["component_muzzle_split"] = "split-End Muzzle Brake", + ["component_muzzle_squared"] = "squared Muzzle Brake", + + ["component_flashlight"] = "flashlight", + ["component_grip"] = "grip", + + ["component_barrel_default"] = "default Barrel", + ["component_barrel_heavy"] = "heavy Barrel", + + ["component_ammo_tracer"] = "tracer Ammo", + ["component_ammo_incendiary"] = "incendiary Ammo", + ["component_ammo_hollowpoint"] = "hollowpoint Ammo", + ["component_ammo_fmj"] = "fMJ Ammo", + ["component_ammo_armor"] = "armor Piercing Ammo", + ["component_ammo_explosive"] = "armor Piercing Incendiary Ammo", + + ["component_shells_default"] = "default Shells", + ["component_shells_incendiary"] = "dragons Breath Shells", + ["component_shells_armor"] = "steel Buckshot Shells", + ["component_shells_hollowpoint"] = "flechette Shells", + ["component_shells_explosive"] = "explosive Slug Shells", + + -- Weapon Ammo + ["ammo_rounds"] = "round(s)", + ["ammo_shells"] = "shell(s)", + ["ammo_charge"] = "charge", + ["ammo_petrol"] = "gallons of fuel", + ["ammo_firework"] = "firework(s)", + ["ammo_rockets"] = "rocket(s)", + ["ammo_grenadelauncher"] = "grenade(s)", + ["ammo_grenade"] = "grenade(s)", + ["ammo_stickybomb"] = "bomb(s)", + ["ammo_pipebomb"] = "bomb(s)", + ["ammo_smokebomb"] = "bomb(s)", + ["ammo_molotov"] = "cocktail(s)", + ["ammo_proxmine"] = "mine(s)", + ["ammo_bzgas"] = "can(s)", + ["ammo_ball"] = "ball(s)", + ["ammo_snowball"] = "snowball(s)", + ["ammo_flare"] = "flare(s)", + ["ammo_flaregun"] = "flare(s)", + + -- Weapon Tints + ["tint_default"] = "default skin", + ["tint_green"] = "green skin", + ["tint_gold"] = "gold skin", + ["tint_pink"] = "pink skin", + ["tint_army"] = "army skin", + ["tint_lspd"] = "blue skin", + ["tint_orange"] = "orange skin", + ["tint_platinum"] = "platinum skin", + + -- Duty related + ["stopped_duty"] = "Leadtad a szolgálatot.", + ["started_duty"] = "Szolgálatba álltál.", +} diff --git a/[esx]/es_extended/locales/sv.lua b/[esx]/es_extended/locales/sv.lua index 8de56f35..16233213 100644 --- a/[esx]/es_extended/locales/sv.lua +++ b/[esx]/es_extended/locales/sv.lua @@ -1,207 +1,328 @@ Locales['sv'] = { -- Inventory - ['inventory'] = 'mitt förråd %s / %s', - ['use'] = 'använd', - ['give'] = 'ge', - ['remove'] = 'kasta', - ['return'] = 'gå tillbaka', - ['give_to'] = 'ge till', - ['amount'] = 'antal', - ['giveammo'] = 'ge ammunition', - ['amountammo'] = 'mängd ammunition', - ['noammo'] = 'du har inte tillräckligt med ammunition!', - ['gave_item'] = 'du gav ~y~%sx~s~ ~b~%s~s~ till ~y~%s~s~', - ['received_item'] = 'du tog emot ~y~%sx~s~ ~b~%s~s~ från ~b~%s~s~', - ['gave_weapon'] = 'du gav ~b~%s~s~ till ~y~%s~s~', - ['gave_weapon_ammo'] = 'du gav ~o~%sx %s~s~ för ~b~%s~s~ till ~y~%s~s~', - ['gave_weapon_withammo'] = 'du gav ~b~%s~s~ med ~o~%sx %s~s~ till ~y~%s~s~', + ['inventory'] = 'Förråd ( Vikt %s / %s )', + ['use'] = 'Använd', + ['give'] = 'Ge', + ['remove'] = 'Kasta', + ['return'] = 'Gå tillbaka', + ['give_to'] = 'Ge till', + ['amount'] = 'Antal', + ['giveammo'] = 'Ge ammunition', + ['amountammo'] = 'Mängd ammunition', + ['noammo'] = 'Inte tillräckligt med ammunition!', + ['gave_item'] = 'Ge ~y~%sx~s~ ~b~%s~s~ till ~y~%s~s~', + ['received_item'] = 'Fick ~y~%sx~s~ ~b~%s~s~ från ~b~%s~s~', + ['gave_weapon'] = 'Ge ~b~%s~s~ till ~y~%s~s~', + ['gave_weapon_ammo'] = 'Ge ~o~%sx %s~s~ för ~b~%s~s~ till ~y~%s~s~', + ['gave_weapon_withammo'] = 'Ge ~b~%s~s~ med ~o~%sx %s~s~ till ~y~%s~s~', ['gave_weapon_hasalready'] = '~y~%s~s~ har redan en ~y~%s~s~', ['gave_weapon_noweapon'] = '~y~%s~s~ har inte det vapnet', - ['received_weapon'] = 'du tog emot ~b~%s~s~ från ~b~%s~s~', - ['received_weapon_ammo'] = 'du tog emot ~o~%sx %s~s~ för ~b~%s~s~ från ~b~%s~s~', - ['received_weapon_withammo'] = 'du tog emot ~b~%s~s~ med ~o~%sx %s~s~ från ~b~%s~s~', - ['received_weapon_hasalready'] = '~b~%s~s~ försökte ge dig en ~y~%s~s~, men det vapnet har du redan', - ['received_weapon_noweapon'] = '~b~%s~s~ försökte ge dig ammunition för ett ~y~%s~s~, men du har inget sådant vapen', - ['gave_account_money'] = 'du gav ~g~%s SEK~s~ (%s) till ~y~%s~s~', - ['received_account_money'] = 'du tog emot ~g~%s SEK~s~ (%s) från ~b~%s~s~', - ['amount_invalid'] = 'ogiltig mängd', - ['players_nearby'] = 'det finns inga spelare nära', - ['ex_inv_lim'] = 'åtgärd inte möjligt, översteg förråd gräns för ~y~%s~s~', - ['imp_invalid_quantity'] = 'åtgärd omöjlig, ogiltig mängd', - ['imp_invalid_amount'] = 'åtgärd omöjlig, ogiltig belopp', - ['threw_standard'] = 'du kastade ~y~%sx~s~ ~b~%s~s~', - ['threw_account'] = 'du kastade ~g~%s SEK~s~ ~b~%s~s~', - ['threw_weapon'] = 'du kastade ~b~%s~s~', - ['threw_weapon_ammo'] = 'du kastade ~b~%s~s~ med ~o~%sx %s~s~', - ['threw_weapon_already'] = 'du har redan ett sådant vapen på dig', - ['threw_cannot_pickup'] = 'du kan inte plocka upp det på grund av att det kommer ej få plats i ditt förråd!', - ['threw_pickup_prompt'] = 'tryck ~y~E~s~ för att plocka upp', + ['received_weapon'] = 'Mottog ~b~%s~s~ från ~b~%s~s~', + ['received_weapon_ammo'] = 'Fick ~o~%sx %s~s~ för din ~b~%s~s~ från ~b~%s~s~', + ['received_weapon_withammo'] = 'Mottog ~b~%s~s~ med ~o~%sx %s~s~ från ~b~%s~s~', + ['received_weapon_hasalready'] = '~b~%s~s~ har försökt ge dig en ~y~%s~s~, men du har redan det här vapnet', + ['received_weapon_noweapon'] = '~b~%s~s~ har försökt ge dig ammunition för en ~y~%s~s~, men du har inte det här vapnet', + ['gave_account_money'] = 'Ge ~g~$%s~s~ (%s) till ~y~%s~s~', + ['received_account_money'] = 'Mottog ~g~$%s~s~ (%s) från ~b~%s~s~', + ['amount_invalid'] = 'Ogiltig mängd', + ['players_nearby'] = 'Inga spelare i närheten', + ['ex_inv_lim'] = 'Kan inte utföra åtgärden, överstiger maxvikten ~y~%s~s~', + ['imp_invalid_quantity'] = 'Det går inte att utföra åtgärden, mängden är ogiltig', + ['imp_invalid_amount'] = 'Det går inte att utföra åtgärden, mängden är ogiltigt', + ['threw_standard'] = 'Kastade ~y~%sx~s~ ~b~%s~s~', + ['threw_account'] = 'Kastade ~g~$%s~s~ ~b~%s~s~', + ['threw_weapon'] = 'Kastade ~b~%s~s~', + ['threw_weapon_ammo'] = 'Kastade ~b~%s~s~ med ~o~%sx %s~s~', + ['threw_weapon_already'] = 'Du har redan det här vapnet', + ['threw_cannot_pickup'] = 'Förrådet är fullt, kan inte plocka upp!', + ['threw_pickup_prompt'] = 'Tryck ~y~E~s~ för att plocka upp', -- Key mapping - ['keymap_showinventory'] = 'öppna inventory', + ['keymap_showinventory'] = 'Visa förrådet', -- Salary related - ['received_salary'] = 'du har mottagit din lön på ~g~%s SEK~s~', - ['received_help'] = 'du har mottagit bidrag på ~g~%s SEK~s~', + ['received_salary'] = 'Du har fått lön: ~g~$%s~s~', + ['received_help'] = 'Du har fått bidrag: ~g~$%s~s~', ['company_nomoney'] = 'företaget du är anställt hos har inte råd att betala ut din lön', - ['received_paycheck'] = 'mottagit lön', - ['bank'] = 'bank', - ['account_bank'] = 'bank', - ['account_black_money'] = 'svarta pengar', - ['account_money'] = 'kontakter', + ['received_paycheck'] = 'Mottagit lön', + ['bank'] = 'Bank', + ['account_bank'] = 'Bank', + ['account_black_money'] = 'Svarta pengar', + ['account_money'] = 'Kontanter', - ['act_imp'] = 'åtgärd omöjlig', - ['in_vehicle'] = 'du kan inte ge saker till en som sitter i ett fordon!', + ['act_imp'] = 'Kan inte utföra åtgärd', + ['in_vehicle'] = 'Kan inte utföra åtgärd, spelaren är i ett fordon', -- Commands - ['command_car'] = 'spawna ett fordon', - ['command_car_car'] = 'namn på fordon eller hash', - ['command_cardel'] = 'radera fordon i närheten', - ['command_cardel_radius'] = 'valfri, radera alla fordon inom den angivna radien', - ['command_clear'] = 'töm chatten', - ['command_clearall'] = 'töm chatten för alla spelare', - ['command_clearinventory'] = 'töm en spelares inventory', - ['command_clearloadout'] = 'töm en spelares loadout', - ['command_giveaccountmoney'] = 'ge pengar för ett konto', - ['command_giveaccountmoney_account'] = 'giltigt kontonamn', - ['command_giveaccountmoney_amount'] = 'mängd att ge', - ['command_giveaccountmoney_invalid'] = 'kontonamnet är ej giltigt', - ['command_giveitem'] = 'ge ett item till en spelare', - ['command_giveitem_item'] = 'itemnamn', - ['command_giveitem_count'] = 'mängd av itemet', - ['command_giveweapon'] = 'ge ett vapen till en spelare', - ['command_giveweapon_weapon'] = 'vapennamn', - ['command_giveweapon_ammo'] = 'hur mycket ammo att ge', - ['command_giveweapon_hasalready'] = 'spelaren har redan ett sådant vapen', - ['command_giveweaponcomponent'] = 'ge vapen komponent', - ['command_giveweaponcomponent_component'] = 'vapenkomponent', - ['command_giveweaponcomponent_invalid'] = 'det vapenkomponentet är ej giltigt', - ['command_giveweaponcomponent_hasalready'] = 'spelaren har redan det vapenkomponent', - ['command_giveweaponcomponent_missingweapon'] = 'spelaren har ej det vapnet', - ['command_save'] = 'spara en spelare i databas', - ['command_saveall'] = 'spara alla spelare i databas', - ['command_setaccountmoney'] = 'bestäm ny balans på ett spelarkonto', - ['command_setaccountmoney_amount'] = 'ny balans', - ['command_setcoords'] = 'teleportera till koordinater', - ['command_setcoords_x'] = 'x axel', - ['command_setcoords_y'] = 'y axel', - ['command_setcoords_z'] = 'z axel', - ['command_setjob'] = 'välj jobb för en spelare', - ['command_setjob_job'] = 'jobbnamn', - ['command_setjob_grade'] = 'jobbnivå', - ['command_setjob_invalid'] = 'jobbet, nivån eller båda är ej giltiga', - ['command_setgroup'] = 'välj grupp åt en spelare', - ['command_setgroup_group'] = 'gruppnamn', - ['commanderror_argumentmismatch'] = 'argumentstorlek mismatch (gav %s, ville ha %s)', - ['commanderror_argumentmismatch_number'] = 'argument #%s typ mismatch (gav string, ville ha number)', - ['commanderror_invaliditem'] = 'ej giltigt item', - ['commanderror_invalidweapon'] = 'ej giltigt vapen', - ['commanderror_console'] = 'detta kommando kan ej executas i konsol', - ['commanderror_invalidcommand'] = '/%s är inte ett giltigt kommando!', - ['commanderror_invalidplayerid'] = 'det finns ingen spelare som matchar det angivna server id', - ['commandgeneric_playerid'] = 'spelarid', + ['command_car'] = 'Spawna ett fordon', + ['command_car_car'] = 'Fordonsmodell eller hash', + ['command_cardel'] = 'Ta bort fordon i närheten', + ['command_cardel_radius'] = 'Tar bort alla fordon inom angiven radie', + ['command_clear'] = 'Rensa chatttext', + ['command_clearall'] = 'Rensa chatttext för alla spelare', + ['command_clearinventory'] = 'Ta bort alla föremål från spelarens förråd', + ['command_clearloadout'] = 'Ta bort alla vapen från spelarens förråd', + ['command_giveaccountmoney'] = 'Ge pengar till ett specifikt konto', + ['command_giveaccountmoney_account'] = 'Konto att lägga till i', + ['command_giveaccountmoney_amount'] = 'Belopp att lägga till', + ['command_giveaccountmoney_invalid'] = 'Kontonamn ogiltigt', + ['command_giveitem'] = 'Ge spelaren ett föremål', + ['command_giveitem_item'] = 'Föremålsnamn', + ['command_giveitem_count'] = 'Mängd', + ['command_giveweapon'] = 'Ge spelaren ett vapen', + ['command_giveweapon_weapon'] = 'Vapennamn', + ['command_giveweapon_ammo'] = 'Ammunitionsmängd', + ['command_giveweapon_hasalready'] = 'Spelaren har redan det här vapnet', + ['command_giveweaponcomponent'] = 'Ge en vapenkomponent till spelaren', + ['command_giveweaponcomponent_component'] = 'Vapenkomponentnamn', + ['command_giveweaponcomponent_invalid'] = 'Ogiltig vapenkomponent', + ['command_giveweaponcomponent_hasalready'] = 'Spelaren har redan denna vapenkomponent', + ['command_giveweaponcomponent_missingweapon'] = 'Spelaren har inte det här vapnet', + ['command_save'] = 'Tvångspara en spelares data', + ['command_saveall'] = 'Tvångspara allas spelardata', + ['command_setaccountmoney'] = 'Ställ in pengarna på ett angivet konto', + ['command_setaccountmoney_amount'] = 'Ny Summa', + ['command_setcoords'] = 'Teleportera till specificerade koordinater', + ['command_setcoords_x'] = 'X-värde', + ['command_setcoords_y'] = 'Y-värde', + ['command_setcoords_z'] = 'Z-värde', + ['command_setjob'] = 'Ställ in en spelares jobb', + ['command_setjob_job'] = 'Jobbnamn', + ['command_setjob_grade'] = 'Jobbnivå', + ['command_setjob_invalid'] = 'jobbet, nivån eller båda är ogiltiga', + ['command_setgroup'] = 'Ställ in en spelares behörighetsgrupp', + ['command_setgroup_group'] = 'Gruppens namn', + ['commanderror_argumentmismatch'] = 'Ogiltigt antal argument (godkänt %s, önskat %s)', + ['commanderror_argumentmismatch_number'] = 'Ogiltigt argument #%s datatyp (godkänd sträng, önskat nummer)', + ['commanderror_invaliditem'] = 'Ogiltig artikel', + ['commanderror_invalidweapon'] = 'Ogiltigt vapen', + ['commanderror_console'] = 'Kommandot kan inte köras från konsolen', + ['commanderror_invalidcommand'] = 'Ogiltigt kommando - /%s', + ['commanderror_invalidplayerid'] = 'Angiven spelare är inte online', + ['commandgeneric_playerid'] = 'Spelarens server-id', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', ['locale_currency'] = '%s SEK', -- Weapons - ['weapon_knife'] = 'kniv', - ['weapon_nightstick'] = 'batong', - ['weapon_hammer'] = 'hammare', - ['weapon_bat'] = 'slagträ', - ['weapon_golfclub'] = 'golf club', - ['weapon_crowbar'] = 'kofot', - ['weapon_pistol'] = 'pistol', - ['weapon_combatpistol'] = 'combat pistol', - ['weapon_appistol'] = 'ap pistol', - ['weapon_pistol50'] = 'pistol .50', - ['weapon_microsmg'] = 'micro smg', - ['weapon_smg'] = 'smg', - ['weapon_assaultsmg'] = 'assault smg', - ['weapon_assaultrifle'] = 'assault rifle', - ['weapon_carbinerifle'] = 'carbine rifle', - ['weapon_advancedrifle'] = 'advanced rifle', - ['weapon_mg'] = 'mg', - ['weapon_combatmg'] = 'combat mg', - ['weapon_pumpshotgun'] = 'pump shotgun', - ['weapon_sawnoffshotgun'] = 'sawed off shotgun', - ['weapon_assaultshotgun'] = 'assault shotgun', - ['weapon_bullpupshotgun'] = 'bullpup shotgun', - ['weapon_stungun'] = 'elchockpistol', - ['weapon_sniperrifle'] = 'prickskyttegevär', - ['weapon_heavysniper'] = 'tung prickskytt', - ['weapon_grenadelauncher'] = 'granatkastare', - ['weapon_rpg'] = 'raketgevär', - ['weapon_minigun'] = 'minigun', - ['weapon_grenade'] = 'granat', - ['weapon_stickybomb'] = 'klibbig bomb', - ['weapon_smokegrenade'] = 'rökgranat', - ['weapon_bzgas'] = 'bz gas', - ['weapon_molotov'] = 'molotov cocktail', - ['weapon_fireextinguisher'] = 'brandsläckare', - ['weapon_petrolcan'] = 'bensindunk', - ['weapon_ball'] = 'boll', - ['weapon_snspistol'] = 'sns pistol', - ['weapon_bottle'] = 'flaska', - ['weapon_gusenberg'] = 'gusenberg sweeper', - ['weapon_specialcarbine'] = 'special carbine', - ['weapon_heavypistol'] = 'heavy pistol', - ['weapon_bullpuprifle'] = 'bullpup rifle', - ['weapon_dagger'] = 'dolk', - ['weapon_vintagepistol'] = 'vintage pistol', - ['weapon_firework'] = 'fyrverkeriraket', - ['weapon_musket'] = 'musköt', - ['weapon_heavyshotgun'] = 'heavy shotgun', - ['weapon_marksmanrifle'] = 'marksman rifle', - ['weapon_hominglauncher'] = 'homing launcher', - ['weapon_proxmine'] = 'proximity mine', - ['weapon_snowball'] = 'snöboll', - ['weapon_flaregun'] = 'signalpistol', - ['weapon_combatpdw'] = 'combat pdw', - ['weapon_marksmanpistol'] = 'marksman pistol', - ['weapon_knuckle'] = 'knogjärn', - ['weapon_hatchet'] = 'yxa', - ['weapon_railgun'] = 'railgun', - ['weapon_machete'] = 'machete', - ['weapon_machinepistol'] = 'machine pistol', - ['weapon_switchblade'] = 'switchblade', - ['weapon_revolver'] = 'heavy revolver', - ['weapon_dbshotgun'] = 'double barrel shotgun', - ['weapon_compactrifle'] = 'compact rifle', - ['weapon_autoshotgun'] = 'auto shotgun', - ['weapon_battleaxe'] = 'stridsyxa', - ['weapon_compactlauncher'] = 'compact launcher', - ['weapon_minismg'] = 'mini smg', - ['weapon_pipebomb'] = 'pipe bomb', - ['weapon_poolcue'] = 'biljardkö', - ['weapon_wrench'] = 'skiftnyckel', - ['weapon_flashlight'] = 'ficklampa', - ['gadget_parachute'] = 'fallskärm', - ['weapon_flare'] = 'blossa', - ['weapon_doubleaction'] = 'double-Action Revolver', + + -- Melee + ['weapon_dagger'] = 'Dolk', + ['weapon_bat'] = 'Slagträ', + ['weapon_battleaxe'] = 'Stridsyxa', + ['weapon_bottle'] = 'Flaska', + ['weapon_crowbar'] = 'Kofot', + ['weapon_flashlight'] = 'Ficklampa', + ['weapon_golfclub'] = 'Golfklubba', + ['weapon_hammer'] = 'Hammare', + ['weapon_hatchet'] = 'Yxa', + ['weapon_knife'] = 'Kniv', + ['weapon_knuckle'] = 'Knogjärn', + ['weapon_machete'] = 'Machete', + ['weapon_nightstick'] = 'Batong', + ['weapon_wrench'] = 'Rörtång', + ['weapon_poolcue'] = 'Biljardkö', + ['weapon_stone_hatchet'] = 'Stenyxa', + ['weapon_switchblade'] = 'Fällkniv', + + -- Handguns + ['weapon_appistol'] = 'AP Pistol', + ['weapon_ceramicpistol'] = 'Ceramic Pistol', + ['weapon_combatpistol'] = 'Combat Pistol', + ['weapon_doubleaction'] = 'Double-Action Revolver', + ['weapon_navyrevolver'] = 'Navy Revolver', + ['weapon_flaregun'] = 'Flaregun', + ['weapon_gadgetpistol'] = 'Gadget Pistol', + ['weapon_heavypistol'] = 'Heavy Pistol', + ['weapon_revolver'] = 'Heavy Revolver', + ['weapon_revolver_mk2'] = 'Heavy Revolver MK2', + ['weapon_marksmanpistol'] = 'Marksman Pistol', + ['weapon_pistol'] = 'Pistol', + ['weapon_pistol_mk2'] = 'Pistol MK2', + ['weapon_pistol50'] = 'Pistol .50', + ['weapon_snspistol'] = 'SNS Pistol', + ['weapon_snspistol_mk2'] = 'SNS Pistol MK2', + ['weapon_stungun'] = 'Taser', + ['weapon_raypistol'] = 'Up-N-Atomizer', + ['weapon_vintagepistol'] = 'Vintage Pistol', + + -- Shotguns + ['weapon_assaultshotgun'] = 'Assault Shotgun', + ['weapon_autoshotgun'] = 'Auto Shotgun', + ['weapon_bullpupshotgun'] = 'Bullpup Shotgun', + ['weapon_combatshotgun'] = 'Combat Shotgun', + ['weapon_dbshotgun'] = 'Double Barrel Shotgun', + ['weapon_heavyshotgun'] = 'Heavy Shotgun', + ['weapon_musket'] = 'Musket', + ['weapon_pumpshotgun'] = 'Pump Shotgun', + ['weapon_pumpshotgun_mk2'] = 'Pump Shotgun MK2', + ['weapon_sawnoffshotgun'] = 'Sawed Off Shotgun', + + -- SMG & LMG + ['weapon_assaultsmg'] = 'Assault SMG', + ['weapon_combatmg'] = 'Combat MG', + ['weapon_combatmg_mk2'] = 'Combat MG MK2', + ['weapon_combatpdw'] = 'Combat PDW', + ['weapon_gusenberg'] = 'Gusenberg Sweeper', + ['weapon_machinepistol'] = 'Machine Pistol', + ['weapon_mg'] = 'MG', + ['weapon_microsmg'] = 'Micro SMG', + ['weapon_minismg'] = 'Mini SMG', + ['weapon_smg'] = 'SMG', + ['weapon_smg_mk2'] = 'SMG MK2', + ['weapon_raycarbine'] = 'Unholy Hellbringer', + + -- Rifles + ['weapon_advancedrifle'] = 'Advanced Rifle', + ['weapon_assaultrifle'] = 'Assault Rifle', + ['weapon_assaultrifle_mk2'] = 'Assault Rifle MK2', + ['weapon_bullpuprifle'] = 'Bullpup Rifle', + ['weapon_bullpuprifle_mk2'] = 'Bullpup Rifle MK2', + ['weapon_carbinerifle'] = 'Carbine Rifle', + ['weapon_carbinerifle_mk2'] = 'Carbine Rifle MK2', + ['weapon_compactrifle'] = 'Compact Rifle', + ['weapon_militaryrifle'] = 'Military Rifle', + ['weapon_specialcarbine'] = 'Special Carbine', + ['weapon_specialcarbine_mk2'] = 'Special Carbine MK2', + + -- Sniper + ['weapon_heavysniper'] = 'Heavy Sniper', + ['weapon_heavysniper_mk2'] = 'Heavy Sniper MK2', + ['weapon_marksmanrifle'] = 'Marksman Rifle', + ['weapon_marksmanrifle_mk2'] = 'Marksman Rifle MK2', + ['weapon_sniperrifle'] = 'Sniper Rifle', + + -- Heavy / Launchers + ['weapon_compactlauncher'] = 'Compact Launcher', + ['weapon_firework'] = 'Firework Launcher', + ['weapon_grenadelauncher'] = 'Grenade Launcher', + ['weapon_hominglauncher'] = 'Homing Launcher', + ['weapon_minigun'] = 'Minigun', + ['weapon_railgun'] = 'Railgun', + ['weapon_rpg'] = 'Rocket Launcher', + ['weapon_rayminigun'] = 'Widowmaker', + + -- Thrown + ['weapon_ball'] = 'Baseball', + ['weapon_bzgas'] = 'BZ Gas', + ['weapon_flare'] = 'Flare', + ['weapon_grenade'] = 'Grenade', + ['weapon_petrolcan'] = 'Jerrycan', + ['weapon_hazardcan'] = 'Hazardous Jerrycan', + ['weapon_molotov'] = 'Molotov Cocktail', + ['weapon_proxmine'] = 'Proximity Mine', + ['weapon_pipebomb'] = 'Pipe Bomb', + ['weapon_snowball'] = 'Snowball', + ['weapon_stickybomb'] = 'Sticky Bomb', + ['weapon_smokegrenade'] = 'Tear Gas', + + -- Special + ['weapon_fireextinguisher'] = 'Fire Extinguisher', + ['weapon_digiscanner'] = 'Digital Scanner', + ['weapon_garbagebag'] = 'Garbage Bag', + ['weapon_handcuffs'] = 'Handcuffs', + ['gadget_nightvision'] = 'Night Vision', + ['gadget_parachute'] = 'parachute', -- Weapon Components - ['component_clip_default'] = 'standard magg', - ['component_clip_extended'] = 'förlängd magg', - ['component_clip_drum'] = 'trummagasin', - ['component_clip_box'] = 'lådmagasin', - ['component_flashlight'] = 'ficklampa', - ['component_scope'] = 'sikte', - ['component_scope_advanced'] = 'advancerat sikte', - ['component_suppressor'] = 'ljuddämpare', - ['component_grip'] = 'handtag', - ['component_luxary_finish'] = 'lyxvapen behandling', + ['component_knuckle_base'] = 'base Model', + ['component_knuckle_pimp'] = 'the Pimp', + ['component_knuckle_ballas'] = 'the Ballas', + ['component_knuckle_dollar'] = 'the Hustler', + ['component_knuckle_diamond'] = 'the Rock', + ['component_knuckle_hate'] = 'the Hater', + ['component_knuckle_love'] = 'the Lover', + ['component_knuckle_player'] = 'the Player', + ['component_knuckle_king'] = 'the King', + ['component_knuckle_vagos'] = 'the Vagos', + + ['component_luxary_finish'] = 'luxary Weapon Finish', + + ['component_handle_default'] = 'default Handle', + ['component_handle_vip'] = 'vIP Handle', + ['component_handle_bodyguard'] = 'bodyguard Handle', + + ['component_vip_finish'] = 'vIP Finish', + ['component_bodyguard_finish'] = 'bodyguard Finish', + + ['component_camo_finish'] = 'digital Camo', + ['component_camo_finish2'] = 'brushstroke Camo', + ['component_camo_finish3'] = 'woodland Camo', + ['component_camo_finish4'] = 'skull Camo', + ['component_camo_finish5'] = 'sessanta Nove Camo', + ['component_camo_finish6'] = 'perseus Camo', + ['component_camo_finish7'] = 'leopard Camo', + ['component_camo_finish8'] = 'zebra Camo', + ['component_camo_finish9'] = 'geometric Camo', + ['component_camo_finish10'] = 'boom Camo', + ['component_camo_finish11'] = 'patriotic Camo', + + ['component_camo_slide_finish'] = 'digital Slide Camo', + ['component_camo_slide_finish2'] = 'brushstroke Slide Camo', + ['component_camo_slide_finish3'] = 'woodland Slide Camo', + ['component_camo_slide_finish4'] = 'skull Slide Camo', + ['component_camo_slide_finish5'] = 'sessanta Nove Slide Camo', + ['component_camo_slide_finish6'] = 'perseus Slide Camo', + ['component_camo_slide_finish7'] = 'leopard Slide Camo', + ['component_camo_slide_finish8'] = 'zebra Slide Camo', + ['component_camo_slide_finish9'] = 'geometric Slide Camo', + ['component_camo_slide_finish10'] = 'boom Slide Camo', + ['component_camo_slide_finish11'] = 'patriotic Slide Camo', + + ['component_clip_default'] = 'default Magazine', + ['component_clip_extended'] = 'extended Magazine', + ['component_clip_drum'] = 'drum Magazine', + ['component_clip_box'] = 'box Magazine', + + ['component_scope_holo'] = 'holographic Scope', + ['component_scope_small'] = 'small Scope', + ['component_scope_medium'] = 'medium Scope', + ['component_scope_large'] = 'large Scope', + ['component_scope'] = 'mounted Scope', + ['component_scope_advanced'] = 'advanced Scope', + ['component_ironsights'] = 'ironsights', + + ['component_suppressor'] = 'suppressor', + ['component_compensator'] = 'compensator', + + ['component_muzzle_flat'] = 'flat Muzzle Brake', + ['component_muzzle_tactical'] = 'tactical Muzzle Brake', + ['component_muzzle_fat'] = 'fat-End Muzzle Brake', + ['component_muzzle_precision'] = 'precision Muzzle Brake', + ['component_muzzle_heavy'] = 'heavy Duty Muzzle Brake', + ['component_muzzle_slanted'] = 'slanted Muzzle Brake', + ['component_muzzle_split'] = 'split-End Muzzle Brake', + ['component_muzzle_squared'] = 'squared Muzzle Brake', + + ['component_flashlight'] = 'flashlight', + ['component_grip'] = 'grip', + + ['component_barrel_default'] = 'default Barrel', + ['component_barrel_heavy'] = 'heavy Barrel', + + ['component_ammo_tracer'] = 'tracer Ammo', + ['component_ammo_incendiary'] = 'incendiary Ammo', + ['component_ammo_hollowpoint'] = 'hollowpoint Ammo', + ['component_ammo_fmj'] = 'fMJ Ammo', + ['component_ammo_armor'] = 'armor Piercing Ammo', + ['component_ammo_explosive'] = 'armor Piercing Incendiary Ammo', + + ['component_shells_default'] = 'default Shells', + ['component_shells_incendiary'] = 'dragons Breath Shells', + ['component_shells_armor'] = 'steel Buckshot Shells', + ['component_shells_hollowpoint'] = 'flechette Shells', + ['component_shells_explosive'] = 'explosive Slug Shells', -- Weapon Ammo ['ammo_rounds'] = 'ammunition', ['ammo_shells'] = 'hagel', ['ammo_charge'] = 'laddning', - ['ammo_petrol'] = 'liter bensin', - ['ammo_firework'] = 'fyrverkeri', - ['ammo_rockets'] = 'raket', - ['ammo_grenadelauncher'] = 'granat(er)', - ['ammo_grenade'] = 'granat(er)', + ['ammo_petrol'] = 'bensin', + ['ammo_firework'] = 'fyrverkeri(er)', + ['ammo_rockets'] = 'raket(er)', + ['ammo_grenadelauncher'] = 'grenat(er)', + ['ammo_grenade'] = 'grenat(er)', ['ammo_stickybomb'] = 'bomb(er)', ['ammo_pipebomb'] = 'bomb(er)', ['ammo_smokebomb'] = 'bomb(er)', @@ -214,12 +335,12 @@ Locales['sv'] = { ['ammo_flaregun'] = 'lysraket(er)', -- Weapon Tints - ['tint_default'] = 'standardutseende', - ['tint_green'] = 'grönskinn', - ['tint_gold'] = 'guldskinn', - ['tint_pink'] = 'råsaskinn', - ['tint_army'] = 'arméskinn', - ['tint_lspd'] = 'blåskinn', - ['tint_orange'] = 'orangeskinn', - ['tint_platinum'] = 'platinaskinn', -} + ['tint_default'] = 'Standard färg', + ['tint_green'] = 'Grön färg', + ['tint_gold'] = 'Guld färg', + ['tint_pink'] = 'Rosa färg', + ['tint_army'] = 'Armé färg', + ['tint_lspd'] = 'Blå färg', + ['tint_orange'] = 'Orange färg', + ['tint_platinum'] = 'Platina färg', +} \ No newline at end of file diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua index 1243c6d1..cd91f799 100644 --- a/[esx]/es_extended/server/classes/player.lua +++ b/[esx]/es_extended/server/classes/player.lua @@ -356,6 +356,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end end + function self.setDuty(bool) + self.job.onDuty = bool + self.triggerEvent('esx:setJob', self.job) + end + function self.setJob(job, grade) grade = tostring(grade) local lastJob = json.decode(json.encode(self.job)) @@ -371,6 +376,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.job.grade_name = gradeObject.name self.job.grade_label = gradeObject.label self.job.grade_salary = gradeObject.salary + self.job.onDuty = Config.OnDuty if gradeObject.skin_male then self.job.skin_male = json.decode(gradeObject.skin_male) @@ -445,9 +451,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, local loadoutNum, weapon = self.getWeapon(weaponName) if weapon then - if ammoCount < weapon.ammo then - weapon.ammo = ammoCount - end + weapon.ammo = ammoCount end end diff --git a/[esx]/es_extended/server/commands.lua b/[esx]/es_extended/server/commands.lua index a6e9becf..66240596 100644 --- a/[esx]/es_extended/server/commands.lua +++ b/[esx]/es_extended/server/commands.lua @@ -153,18 +153,18 @@ ESX.RegisterCommand('group', {"user", "admin"}, function(xPlayer, args, showErro end, true) ESX.RegisterCommand('job', {"user", "admin"}, function(xPlayer, args, showError) -print(xPlayer.getName()..", You are currently: ^5".. xPlayer.getJob().name.. "^0 - ^5".. xPlayer.getJob().grade_label .. "^0") + print(xPlayer.getName()..", You are currently: ^5".. xPlayer.getJob().name.. "^0 - ^5".. xPlayer.getJob().grade_label .. "^0") end, true) ESX.RegisterCommand('info', {"user", "admin"}, function(xPlayer, args, showError) local job = xPlayer.getJob().name local jobgrade = xPlayer.getJob().grade_name print("^2ID : ^5"..xPlayer.source.." ^0| ^2Name:^5"..xPlayer.getName().." ^0 | ^2Group:^5"..xPlayer.getGroup().."^0 | ^2Job:^5".. job.."^0") - end, true) +end, true) ESX.RegisterCommand('coords', "admin", function(xPlayer, args, showError) local coords = GetEntityCoords(GetPlayerPed(xPlayer.source), false) - local heading = GetEntityHeading(GetPlayerPed(xPlayer.source)) + local heading = GetEntityHeading(GetPlayerPed(xPlayer.source)) print("Coords - Vector3: ^5".. vector3(coords.x,coords.y,coords.z).. "^0") print("Coords - Vector4: ^5".. vector4(coords.x, coords.y, coords.z, heading) .. "^0") end, true) @@ -176,35 +176,35 @@ ESX.RegisterCommand('tpm', "admin", function(xPlayer, args, showError) end, true) ESX.RegisterCommand('goto', "admin", function(xPlayer, args, showError) - local targetCoords = args.playerId.getCoords() - xPlayer.setCoords(targetCoords) -end, true, {help = _U('goto'), validate = true, arguments = { + local targetCoords = args.playerId.getCoords() + xPlayer.setCoords(targetCoords) +end, true, {help = _U('command_goto'), validate = true, arguments = { {name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} }}) ESX.RegisterCommand('bring', "admin", function(xPlayer, args, showError) - local playerCoords = xPlayer.getCoords() - args.playerId.setCoords(playerCoords) -end, true, {help = _U('bring'), validate = true, arguments = { + local playerCoords = xPlayer.getCoords() + args.playerId.setCoords(playerCoords) +end, true, {help = _U('command_bring'), validate = true, arguments = { {name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} }}) ESX.RegisterCommand('kill', "admin", function(xPlayer, args, showError) args.playerId.triggerEvent("esx:killPlayer") -end, true, {help = _U('kill'), validate = true, arguments = { -{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} +end, true, {help = _U('command_kill'), validate = true, arguments = { + {name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} }}) ESX.RegisterCommand('freeze', "admin", function(xPlayer, args, showError) args.playerId.triggerEvent('esx:freezePlayer', "freeze") -end, true, {help = _U('kill'), validate = true, arguments = { -{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} +end, true, {help = _U('command_freeze'), validate = true, arguments = { + {name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} }}) ESX.RegisterCommand('unfreeze', "admin", function(xPlayer, args, showError) args.playerId.triggerEvent('esx:freezePlayer', "unfreeze") -end, true, {help = _U('kill'), validate = true, arguments = { -{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} +end, true, {help = _U('command_unfreeze'), validate = true, arguments = { + {name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'} }}) ESX.RegisterCommand("noclip", 'admin', function(xPlayer, args, showError) @@ -212,10 +212,9 @@ ESX.RegisterCommand("noclip", 'admin', function(xPlayer, args, showError) end, false) ESX.RegisterCommand('players', "admin", function(xPlayer, args, showError) - local xAll = ESX.GetPlayers() - print("^5"..#xAll.." ^2online player(s)^0") - for i=1, #xAll, 1 do - local xPlayer = ESX.GetPlayerFromId(xAll[i]) + local xPlayers = ESX.GetExtendedPlayers() -- Returns all xPlayers + print("^5"..#xPlayers.." ^2online player(s)^0") + for _, xPlayer in pairs(xPlayers) do print("^1[ ^2ID : ^5"..xPlayer.source.." ^0| ^2Name : ^5"..xPlayer.getName().." ^0 | ^2Group : ^5"..xPlayer.getGroup().." ^0 | ^2Identifier : ^5".. xPlayer.identifier .."^1]^0\n") end end, true) diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua index 552e3d4b..29a702bc 100644 --- a/[esx]/es_extended/server/common.lua +++ b/[esx]/es_extended/server/common.lua @@ -80,7 +80,7 @@ MySQL.ready(function() for _, v in pairs(Jobs) do if ESX.Table.SizeOf(v.grades) == 0 then Jobs[v.name] = nil - print(('[^3WARNING^7] Ignoring job ^5"%s"^0due to no job grades found'):format(v.name)) + print(('[^3WARNING^7] Ignoring job ^5"%s"^0 due to no job grades found'):format(v.name)) end end @@ -93,6 +93,7 @@ MySQL.ready(function() grade = 0, label = 'Unemployed', salary = 200, + onDuty = false, skin_male = {}, skin_female = {} } diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua index 37584df5..45714a7a 100644 --- a/[esx]/es_extended/server/main.lua +++ b/[esx]/es_extended/server/main.lua @@ -156,6 +156,7 @@ function loadESXPlayer(identifier, playerId, isNew) userData.job.grade_name = gradeObject.name userData.job.grade_label = gradeObject.label userData.job.grade_salary = gradeObject.salary + userData.job.onDuty = Config.OnDuty userData.job.skin_male = {} userData.job.skin_female = {} @@ -360,6 +361,11 @@ if not Config.OxInventory then local playerId = source local sourceXPlayer = ESX.GetPlayerFromId(playerId) local targetXPlayer = ESX.GetPlayerFromId(target) + local distance = #(GetEntityCoords(GetPlayerPed(playerId)) - GetEntityCoords(GetPlayerPed(target))) + if not sourceXPlayer then return end + if not targetXPlayer then print("Cheating: " .. GetPlayerName(playerId)) return end + if distance > Config.DistanceGive then print("Cheating: " .. GetPlayerName(playerId)) return end + if type == 'item_standard' then local sourceItem = sourceXPlayer.getInventoryItem(itemName) @@ -390,12 +396,20 @@ if not Config.OxInventory then elseif type == 'item_weapon' then if sourceXPlayer.hasWeapon(itemName) then local weaponLabel = ESX.GetWeaponLabel(itemName) - if not targetXPlayer.hasWeapon(itemName) then local _, weapon = sourceXPlayer.getWeapon(itemName) local _, weaponObject = ESX.GetWeapon(itemName) itemCount = weapon.ammo - + local weaponComponents = ESX.Table.Clone(weapon.components) + local weaponTint = weapon.tintIndex + if weaponTint then + targetXPlayer.setWeaponTint(itemName, weaponTint) + end + if weaponComponents then + for k, v in pairs(weaponComponents) do + targetXPlayer.addWeaponComponent(itemName, v) + end + end sourceXPlayer.removeWeapon(itemName) targetXPlayer.addWeapon(itemName, itemCount) @@ -600,3 +614,18 @@ AddEventHandler('txAdmin:events:scheduledRestart', function(eventData) end) end end) + +RegisterNetEvent('esx:setDuty') +AddEventHandler('esx:setDuty', function(bool) + local xPlayer = ESX.GetPlayerFromId(source) + if xPlayer.job.onDuty == bool then return end + + if bool then + xPlayer.setDuty(true) + xPlayer.triggerEvent('esx:showNotification', _U('started_duty')) + else + xPlayer.setDuty(false) + xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty')) + end + TriggerClientEvent('esx:setJob', xPlayer.source, xPlayer.job) +end) diff --git a/[esx]/es_extended/server/paycheck.lua b/[esx]/es_extended/server/paycheck.lua index bd6ec910..2116cba1 100644 --- a/[esx]/es_extended/server/paycheck.lua +++ b/[esx]/es_extended/server/paycheck.lua @@ -5,13 +5,14 @@ function StartPayCheck() local xPlayers = ESX.GetExtendedPlayers() for _, xPlayer in pairs(xPlayers) do local job = xPlayer.job.grade_name + local onDuty = xPlayer.job.onDuty local salary = xPlayer.job.grade_salary if salary > 0 then if job == 'unemployed' then -- unemployed xPlayer.addAccountMoney('bank', salary) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_help', salary), 'CHAR_BANK_MAZE', 9) - elseif Config.EnableSocietyPayouts then -- possibly a society + elseif Config.EnableSocietyPayouts and onDuty then -- possibly a society TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society) if society ~= nil then -- verified society TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function (account) @@ -29,7 +30,7 @@ function StartPayCheck() TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) end end) - else -- generic job + elseif onDuty then -- generic job xPlayer.addAccountMoney('bank', salary) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) end diff --git a/[esx]/es_extended/version.json b/[esx]/es_extended/version.json index 9f3db69d..8883c3fc 100644 --- a/[esx]/es_extended/version.json +++ b/[esx]/es_extended/version.json @@ -1,5 +1,5 @@ { "version": "legacy", - "commit" : "1.4.2", - "changelog": "\n- Updated `Car` Command. Fixed some vulnerabilities. Fix SQL. Updated Commands." + "commit" : "1.7.0", + "changelog": "\n- Add ESX Mulitcharacter" } diff --git a/[esx]/esx_identity/client/main.lua b/[esx]/esx_identity/client/main.lua index 4a2df13c..00729385 100644 --- a/[esx]/esx_identity/client/main.lua +++ b/[esx]/esx_identity/client/main.lua @@ -32,6 +32,7 @@ if not Config.UseDeferrals then type = "enableui", enable = state }) + if state == false then ClearTimecycleModifier() end end RegisterNetEvent('esx_identity:showRegisterIdentity') @@ -40,9 +41,12 @@ if not Config.UseDeferrals then if not ESX.PlayerData.dead then EnableGui(true) + SetTimecycleModifier("hud_def_blur") + SetTimecycleModifierStrength(1) end end) + RegisterNUICallback('register', function(data, cb) ESX.TriggerServerCallback('esx_identity:registerIdentity', function(callback) if callback then @@ -50,7 +54,7 @@ if not Config.UseDeferrals then EnableGui(false) if not ESX.GetConfig().Multichar then TriggerEvent('esx_skin:playerRegistered') end else - ESX.ShowNotification(_U('registration_error')) + ESX.ShowNotification(_U('registration_error'), "error",5000) end end, data) end) diff --git a/[esx]/esx_identity/config.lua b/[esx]/esx_identity/config.lua index 524e8b4a..a46575be 100644 --- a/[esx]/esx_identity/config.lua +++ b/[esx]/esx_identity/config.lua @@ -10,8 +10,8 @@ Config.UseDeferrals = false -- EXPERIMENTAL Character Registration Method. -- These values are for the second input validation in server/main.lua Config.MaxNameLength = 20 -Config.MinHeight = 45 -Config.MaxHeight = 96 +Config.MinHeight = 120 +Config.MaxHeight = 220 Config.LowestYear = 1900 Config.HighestYear = 2021 diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua index 863c708e..e34396d2 100644 --- a/[esx]/esx_identity/fxmanifest.lua +++ b/[esx]/esx_identity/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Identity' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx]/esx_identity/html/css/style.css b/[esx]/esx_identity/html/css/style.css index eaa2535e..0821863f 100644 --- a/[esx]/esx_identity/html/css/style.css +++ b/[esx]/esx_identity/html/css/style.css @@ -1,8 +1,11 @@ + + + body { font-family: sans-serif; overflow: hidden; display: none; - color: #000000; + background: linear-gradient(135deg, rgba(33, 47, 63, 1) 51%, hsla(214, 33%, 22%, 1) 100%); } .dialog { @@ -12,28 +15,41 @@ body { margin-left: auto; margin-right: auto; top : 30.0%; - padding: 10px; + padding: 20px; left : 50%; /* à 50%/50% du parent référent */ transform : translate(-50%); /* décalage de 50% de sa propre taille */ - background-color: #B7B7B7; - border-radius : 4px; - box-shadow: 0px 0px 50px 0px #000; - border-left:5px solid #000; - border:1px inset; + background-color: #152029; + border-radius : 10px; + box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d; + border:none; margin:5px; margin-bottom:20px; - color: #000000; + color: #ffffff; +} + +.aa { + font-family: "Gill Sans", sans-serif; + font-size: 22px; + text-align: center; + padding: 5px; + margin-bottom: 20px; } input { + margin-bottom: 15px; + border: none; + border-bottom: 2px solid #58636c; width: 100%; + outline: none; padding: 10px; + padding-left:0; + color: #ffffff; text-align:left; - color: #000000; + background-color: #152029; } ::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ - color: black; + color: rgba(84,97,105,255); opacity: 1; /* Firefox */ } @@ -46,42 +62,48 @@ input { .radio-toolbar label { display: inline-block; margin-top: 5px; - background-color: #ddd; + background-color: rgba(15,15,15,0.9); padding: 10px 20px; font-family: sans-serif, Arial; font-size: 16px; - color: #000000; - border: 2px solid #444; - border-radius: 4px; + color: #FFFFFF; + border: none; + border-radius: 5px; width: 36%; } .radio-toolbar input[type="radio"]:checked + label { width: 36%; - background-color:#3399FF; - border-color: #0033FF; - color: #000000; + background-color:rgba(15,15,15,0.9); + border: none; + border-bottom: 1px solid #93a3b6; + border-radius: 5px; + color: #ffffff; } .radio-toolbar input[type="radio"]:focus + label { - border: 2px solid #444; - width: 36%; - color: #000000; + background-color:rgba(15,15,15,0.9); + border: none; + border-bottom: 1px solid #93a3b6; + border-radius: 5px; + color: #ffffff; } .radio-toolbar label:hover { - background-color: #dfd; + background-color: rgba(28, 24, 24, 0.931); width: 36%; - color: #000000; + color: #ffffff; } button { display: block; - margin-top: 5px; - padding: 10px; - background-color: #373737; - border: 2px solid #444; + margin-top: 35px; + /*padding: 10px;*/ + background-color: #4569c6; + outline: none; + border: 2px double rgba(40, 40, 40, 0.9); color: #FFFFFF; + height: 30px; width: 100%; } @@ -90,8 +112,8 @@ h1 { margin-top: 5px; margin-right: 5px; padding: 10px; - background-color: #506be6; - color: #000000; + background-color: rgba(15,15,15,0.9); + color: #ffffff; width: 93%; text-align: center; } @@ -106,8 +128,8 @@ h1 { } .bubble { - background: #3399FF; - color: black; + background: rgba(15,15,15,0.9); + color: #ffffff; padding: 4px 12px; position: absolute; border-radius: 4px; @@ -115,13 +137,14 @@ h1 { transform: translateX(-50%); } + .bubble::after { content: ""; position: absolute; width: 2px; height: 2px; - background: #3399FF; + background: rgba(15,15,15,0.9); color: black; top: -1px; left: 50%; -} \ No newline at end of file +} diff --git a/[esx]/esx_identity/html/index.html b/[esx]/esx_identity/html/index.html index 182d344a..d3cd00de 100644 --- a/[esx]/esx_identity/html/index.html +++ b/[esx]/esx_identity/html/index.html @@ -8,11 +8,17 @@
- +
IDENTITY
+
-
-
-
+
First Name
+
+
Last Name
+
+
Date of Birth (MM/DD/YYYY)
+
+
Height
+
@@ -22,13 +28,13 @@
-
+ + -
If the submit button doesn't work, please ensure that you've entered the fields correctly.
+
If the submit button doesn't work, please ensure that you've entered the fields correctly.
+ + + + + +
+
+

Loading

+
+ + + +
+ + + + \ No newline at end of file diff --git a/[esx]/esx_loadingscreen/js/index.js b/[esx]/esx_loadingscreen/js/index.js new file mode 100644 index 00000000..955be242 --- /dev/null +++ b/[esx]/esx_loadingscreen/js/index.js @@ -0,0 +1,22 @@ +// Copyright (c) Jérémie N'gadi +// +// All rights reserved. +// +// Even if 'All rights reserved' is very clear : +// +// You shall not use any piece of this software in a commercial product / service +// You shall not resell this software +// You shall not provide any facility to install this particular software in a commercial product / service +// If you redistribute this software, you must link to ORIGINAL repository at https://github.com/esx-framework/esx-reborn +// This copyright should appear in every part of the project code + +$(document).ready(function(){ + const introTag = document.getElementById('esx_intro'); + const loopTag = document.getElementById('esx_loop'); + + introTag.onended = (event) => { + introTag.style.display = "none"; + loopTag.loop = true; // true + loopTag.play() + }; +}) diff --git a/[esx]/esx_loadingscreen/vid/esx_intro.mp4 b/[esx]/esx_loadingscreen/vid/esx_intro.mp4 new file mode 100644 index 00000000..57d0d729 Binary files /dev/null and b/[esx]/esx_loadingscreen/vid/esx_intro.mp4 differ diff --git a/[esx]/esx_loadingscreen/vid/esx_intro.webm b/[esx]/esx_loadingscreen/vid/esx_intro.webm new file mode 100644 index 00000000..2c2a9f87 Binary files /dev/null and b/[esx]/esx_loadingscreen/vid/esx_intro.webm differ diff --git a/[esx]/esx_loadingscreen/vid/esx_loop.mp4 b/[esx]/esx_loadingscreen/vid/esx_loop.mp4 new file mode 100644 index 00000000..23fd976f Binary files /dev/null and b/[esx]/esx_loadingscreen/vid/esx_loop.mp4 differ diff --git a/[esx]/esx_loadingscreen/vid/esx_loop.webm b/[esx]/esx_loadingscreen/vid/esx_loop.webm new file mode 100644 index 00000000..98cac420 Binary files /dev/null and b/[esx]/esx_loadingscreen/vid/esx_loop.webm differ diff --git a/[esx]/esx_menu_default/fxmanifest.lua b/[esx]/esx_menu_default/fxmanifest.lua index 5c4f7676..db235cb9 100644 --- a/[esx]/esx_menu_default/fxmanifest.lua +++ b/[esx]/esx_menu_default/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Default' -version '1.5.0' +version '1.7.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx]/esx_menu_default/html/css/app.css b/[esx]/esx_menu_default/html/css/app.css index b03e1e9b..4214d78c 100644 --- a/[esx]/esx_menu_default/html/css/app.css +++ b/[esx]/esx_menu_default/html/css/app.css @@ -1,96 +1,112 @@ -@font-face { - font-family: bankgothic; - src: url('../fonts/bankgothic.ttf'); -} +@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@500;600&display=swap'); -@font-face { - font-family: pcdown; - src: url('../fonts/pdown.ttf'); -} +::-webkit-scrollbar { + display: none; + } .menu { - font-family: 'PT Sans Narrow', sans-serif; - font-size: 22px; - min-width: 400px; + font-family: 'Poppins', sans-serif; + min-width: 350px; color: #fff; - box-shadow: 0px 0px 50px 0px #000; position: absolute; + padding: auto; + background: rgba(33, 33, 33, 0.0); + text-allign: center; +} + +.head { + display: block; + text-align: center; + overflow: hidden; + padding-bottom: 3px; + text-allign: center; + margin-bottom: 5px; + white-space: nowrap; + background: rgba(10, 10, 10, 0.9); +} + +.menu .head { + text-allign: center; + height: 28px; + color: #ffffff; + font-weight: 700; + font-size: 20px; +} + +.menu .menu-items { + max-height: 450px; + overflow-y: auto; + font-weight: 550; +} + +.menu-items { + margin-bottom: 2px; +} + +.menu .menu-items .menu-item { + display: block; + padding: 7px; + font-size: 13px; + height: 16px; + text-indent: 5px; + margin-top: 5px; + background: rgba(40, 40, 40, 0.8); + color: rgb(202, 202, 202); + border-radius: 5px; + margin-bottom: 6px; +} + +.menu .menu-items .menu-item.selected { + background: rgba(31, 31, 31, 0.525); + border: 1px solid rgba(55, 55, 55, 0.9); + background: rgba(20, 20, 20, 0.9); + color: rgba(243, 243, 243); + letter-spacing: 0.2px; + font-weight: 500; } .menu.align-left { - left: 40; + left: 0; top: 50%; - transform: translate(0, -50%); } .menu.align-top-left { left: 40; - top: 40; + top: 0; } .menu.align-top { left: 50%; - top: 40; - transform: translate(-50%, 0); + top: 0; } .menu.align-top-right { right: 10; - top: 40; + top: 0; } .menu.align-right { - right: 40; + right: 0; top: 50%; - transform: translate(0, -50%); } .menu.align-bottom-right { right: 40; - bottom: 40; + bottom: 0; } .menu.align-bottom { left: 50%; - bottom: 40; - transform: translate(-50%, 0); + bottom: 0; + transform: translate(0, -50%); } .menu.align-bottom-left { left: 40; - bottom: 40; + bottom: 0; } .menu.align-center { - left: 50%; + left: 50%; top: 50%; - transform: translate(-50%, -50%); -} - -.menu .head { - background-color: #4682B4; - text-align: center; - height: 40px; - line-height: 40px; -} - -.menu .menu-items { - max-height: 600px; - overflow-y: auto; -} - -.menu .menu-items .menu-item { - height: 40px; - display: block; - background-color: rgba(40, 40, 40, 1); - line-height: 32px; - color: #ffffff; - padding: 2px; - text-align: center; -} - -.menu .menu-items .menu-item.selected { - background-color: rgba(20, 20, 20, 1); - border-top: 2px solid #e76767; - border-bottom: 2px solid #e76767; -} +} \ No newline at end of file diff --git a/[esx]/esx_menu_dialog/fxmanifest.lua b/[esx]/esx_menu_dialog/fxmanifest.lua index e6d7ad49..fafc52fb 100644 --- a/[esx]/esx_menu_dialog/fxmanifest.lua +++ b/[esx]/esx_menu_dialog/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Dialog' -version '1.5.0' +version '1.7.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx]/esx_menu_dialog/html/css/app.css b/[esx]/esx_menu_dialog/html/css/app.css index accb9864..db52551b 100644 --- a/[esx]/esx_menu_dialog/html/css/app.css +++ b/[esx]/esx_menu_dialog/html/css/app.css @@ -1,16 +1,9 @@ -@font-face { - font-family: bankgothic; - src: url('../fonts/bankgothic.ttf'); -} -@font-face { - font-family: pcdown; - src: url('../fonts/pdown.ttf'); -} +@import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap'); #controls { - font-family: 'IBM Plex Sans', sans-serif; - font-size: 5em; + font-family: montserrat; + font-size: 3em; color: #FFF; position: absolute; bottom: 40; @@ -22,30 +15,38 @@ } .dialog { - font-family: 'PT Sans Narrow', sans-serif; - background-color: rgba(40, 40, 40, 1); - color: #fff; + font-family: montserrat; + background: rgba(33, 33, 33, 0.8); + color: #fff; position: absolute; + border-top-left-radius: 5px; + border-top-right-radius: 5px; overflow: hidden; top: 50%; left: 50%; - width: 640px; - height: 124px; + width: 600px; + height: 152px; transform: translate(-50%, -50%); } +.head { + display: flex; + flex-basis: 100%; + align-items: center; + color: #fff; +} + .dialog.big { height: 200px; } .dialog .head { - background-color: #4682B4; + background: rgba(25, 25, 25, 0.9); text-align: center; height: 40px; - font-size: 22px; } -.dialog .head span:before { +.dialog .head span::before { content: ""; display: inline-block; height: 100%; @@ -53,39 +54,79 @@ } .dialog input[type="text"] { - width: 100%; - height: 42px; - color: #fff; - font-size: 20px; - background-color: rgba(20, 20, 20, 1); - border-bottom: 2px solid #e76767; + width: 60%; + height: 32px; + outline: 0; + background: none; + text-align: center; + margin-top: 26px; + margin-left: 125px; + font-size: large; + transition: all 0.2s ease-in-out; + color: white; + border: 0.5px solid #ffffff3b; + border-radius: 0px; +} + +.dialog input[type="text"]:active, .dialog input[type="text"]:hover { + color: white; } .dialog textarea { width: 100%; - height: 138px; - color: #fff; - font-size: 20px; - background-color: rgba(20, 20, 20, 1); - border-bottom: 2px solid #e76767; + height: 128px; } .dialog button[name="submit"] { - width: 75%; - color: #fff; - height: 42px; - font-size: 22px; - border: 0px solid #e76767; - border-right: 1px solid #e76767; - background-color: rgba(40, 40, 40, 1) + width: 17.6%; + height: 32px; + margin-left: 160px; + font-weight: 300; + color: rgb(37, 34, 53); + border-radius: 10px; + text-transform: uppercase; + background: rgb(50, 79, 208); + outline: 0; + border: none; + transition: all 0.2s ease-in-out; +} + +.dialog button { + z-index: 9999; + transform: translate(-0%, 50%); } .dialog button[name="cancel"] { - width: 25%; - color: rgb(236, 75, 75); - height: 42px; - font-size: 20px; - border: 0px solid #e76767; - border-left: 1px solid #e76767; - background-color: rgba(40, 40, 40, 1) + width: 17.6%; + height: 32px; + margin-left: 60px; + border: none; + text-transform: uppercase; + font-weight: 200; + border-radius: 10px; + color: rgb(53, 34, 34); + outline: 0; + background: #c74545; + transition: all 0.2s ease-in-out; +} + +.dialog button[name="cancel"]:hover { + letter-spacing: 1px; + color: #ffffff; + width: 17.6%; +} + +.dialog button[name="submit"]:hover { + letter-spacing: 1px; + color: white; + width: 17.6%; +} + +.head::before, +.head::after { + content: ""; + flex-grow: 1; + background: #00e1ff; + height: 2px; + margin: 0px 3px; } diff --git a/[esx]/esx_menu_list/fxmanifest.lua b/[esx]/esx_menu_list/fxmanifest.lua index fdcae6a2..191ac24b 100644 --- a/[esx]/esx_menu_list/fxmanifest.lua +++ b/[esx]/esx_menu_list/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu List' -version '1.5.0' +version '1.7.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx]/esx_menu_list/html/css/app.css b/[esx]/esx_menu_list/html/css/app.css index 75ce8066..fc2f712f 100644 --- a/[esx]/esx_menu_list/html/css/app.css +++ b/[esx]/esx_menu_list/html/css/app.css @@ -12,9 +12,8 @@ font-family: bankgothic; position: absolute; left: 50%; - top: 50%; + top: 40%; transform: translate(-50%, -50%); - box-shadow: 0px 0px 50px 0px #000; overflow-y: auto; max-height: 90%; } @@ -24,29 +23,34 @@ } .menu>table { - border: 1px transparent; - border-spacing: 0; + border-collapse: separate; + border-spacing: 0 5px; min-width: 400px; - background-color: #FFF; + background: rgba(33, 33, 33, 0.0); } .menu>table>thead { - background-color: #506be6; + background: rgba(10, 10, 10, 0.9); text-align: center; - height: 40px; - line-height: 40px; + height: 20px; + line-height: 20px; + margin-bottom: 20px; color: #fff; } .menu td { + text-align: center; padding: 8px; + margin: 20px; } .menu tbody tr:nth-child(even) { - background: #CCC + color: #fff; + background: rgba(40, 40, 40, 0.8); } .menu tbody tr:nth-child(odd) { - background: #FFF + color: #fff; + background: rgba(40, 40, 40, 0.8); } \ No newline at end of file diff --git a/[esx]/esx_multicharacter/LICENSE.md b/[esx]/esx_multicharacter/LICENSE.md new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/[esx]/esx_multicharacter/LICENSE.md @@ -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. + + + Copyright (C) + + 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: + + Copyright (C) + 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 +. diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua new file mode 100644 index 00000000..0a3595a3 --- /dev/null +++ b/[esx]/esx_multicharacter/client/main.lua @@ -0,0 +1,335 @@ +ESX = exports['es_extended']:getSharedObject() +if ESX.GetConfig().Multichar then + + Citizen.CreateThread(function() + while not ESX.PlayerLoaded do + Citizen.Wait(0) + if NetworkIsPlayerActive(PlayerId()) then + exports.spawnmanager:setAutoSpawn(false) + DoScreenFadeOut(0) + while not GetResourceState('esx_menu_default') == 'started' do + Citizen.Wait(0) + end + TriggerEvent("esx_multicharacter:SetupCharacters") + break + end + end + end) + + local canRelog, cam, spawned = true, nil, nil + local Characters = {} + + RegisterNetEvent('esx_multicharacter:SetupCharacters') + AddEventHandler('esx_multicharacter:SetupCharacters', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} + spawned = false + cam = CreateCam("DEFAULT_SCRIPTED_CAMERA", true) + local playerPed = PlayerPedId() + SetEntityCoords(playerPed, Config.Spawn.x, Config.Spawn.y, Config.Spawn.z, true, false, false, false) + SetEntityHeading(playerPed, Config.Spawn.w) + local offset = GetOffsetFromEntityInWorldCoords(playerPed, 0, 1.7, 0.4) + DoScreenFadeOut(0) + SetCamActive(cam, true) + RenderScriptCams(true, false, 1, true, true) + SetCamCoord(cam, offset.x, offset.y, offset.z) + PointCamAtCoord(cam, Config.Spawn.x, Config.Spawn.y, Config.Spawn.z + 1.3) + ESX.UI.Menu.CloseAll() + ESX.UI.HUD.SetDisplay(0.0) + StartLoop() + ShutdownLoadingScreen() + ShutdownLoadingScreenNui() + TriggerEvent('esx:loadingScreenOff') + Citizen.Wait(200) + TriggerServerEvent("esx_multicharacter:SetupCharacters") + end) + + StartLoop = function() + hidePlayers = true + MumbleSetVolumeOverride(PlayerId(), 0.0) + Citizen.CreateThread(function() + local keys = {18, 27, 172, 173, 174, 175, 176, 177, 187, 188, 191, 201, 108, 109} + while hidePlayers do + DisableAllControlActions(0) + for i = 1, #keys do + EnableControlAction(0, keys[i], true) + end + SetEntityVisible(PlayerPedId(), 0, 0) + SetLocalPlayerVisibleLocally(1) + SetPlayerInvincible(PlayerId(), 1) + ThefeedHideThisFrame() + HideHudComponentThisFrame(11) + HideHudComponentThisFrame(12) + HideHudComponentThisFrame(21) + HideHudAndRadarThisFrame() + Citizen.Wait(0) + local vehicles = GetGamePool('CVehicle') + for i = 1, #vehicles do + SetEntityLocallyInvisible(vehicles[i]) + end + end + local playerId, playerPed = PlayerId(), PlayerPedId() + MumbleSetVolumeOverride(playerId, -1.0) + SetEntityVisible(playerPed, 1, 0) + SetPlayerInvincible(playerId, 0) + FreezeEntityPosition(playerPed, false) + Citizen.Wait(10000) + canRelog = true + end) + Citizen.CreateThread(function() + local playerPool = {} + while hidePlayers do + local players = GetActivePlayers() + for i = 1, #players do + local player = players[i] + if player ~= PlayerId() and not playerPool[player] then + playerPool[player] = true + NetworkConcealPlayer(player, true, true) + end + end + Citizen.Wait(500) + end + for k in pairs(playerPool) do + NetworkConcealPlayer(k, false, false) + end + end) + end + + SetupCharacter = function(index) + if spawned == false then + exports.spawnmanager:spawnPlayer({ + x = Config.Spawn.x, + y = Config.Spawn.y, + z = Config.Spawn.z, + heading = Config.Spawn.w, + model = Characters[index].model or GetHashKey("mp_m_freemode_01"), + skipFade = true + }, function() + canRelog = false + if Characters[index] then + local skin = Characters[index].skin or Config.Default + if not Characters[index].model then + if Characters[index].sex == _('female') then skin.sex = 1 else skin.sex = 0 end + end + TriggerEvent('skinchanger:loadSkin', skin) + end + DoScreenFadeIn(400) + end) + repeat Citizen.Wait(200) until not IsScreenFadedOut() + + elseif Characters[index] and Characters[index].skin then + if Characters[spawned] and Characters[spawned].model then + RequestModel(Characters[index].model) + while not HasModelLoaded(Characters[index].model) do + RequestModel(Characters[index].model) + Citizen.Wait(0) + end + SetPlayerModel(PlayerId(), Characters[index].model) + SetModelAsNoLongerNeeded(Characters[index].model) + end + TriggerEvent('skinchanger:loadSkin', Characters[index].skin) + end + spawned = index + local playerPed = PlayerPedId() + FreezeEntityPosition(PlayerPedId(), true) + SetPedAoBlobRendering(playerPed, true) + SetEntityAlpha(playerPed, 255) + SendNUIMessage({ + action = "openui", + character = Characters[spawned] + }) + end + + RegisterNetEvent('esx_multicharacter:SetupUI') + AddEventHandler('esx_multicharacter:SetupUI', function(data, slots) + DoScreenFadeOut(0) + Characters = data + slots = slots + local elements = {} + local Character = next(Characters) + exports.spawnmanager:forceRespawn() + + if Character == nil then + SendNUIMessage({ + action = "closeui" + }) + exports.spawnmanager:spawnPlayer({ + x = Config.Spawn.x, + y = Config.Spawn.y, + z = Config.Spawn.z, + heading = Config.Spawn.w, + model = GetHashKey("mp_m_freemode_01"), + skipFade = true + }, function() + canRelog = false + DoScreenFadeIn(400) + Citizen.Wait(400) + local playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, false) + SetEntityAlpha(playerPed, 0) + TriggerServerEvent('esx_multicharacter:CharacterChosen', 1, true) + TriggerEvent('esx_identity:showRegisterIdentity') + end) + else + for k,v in pairs(Characters) do + if not v.model and v.skin then + if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = GetHashKey("mp_m_freemode_01") else v.model = GetHashKey("mp_m_freemode_01") end + end + if spawned == false then SetupCharacter(Character) end + local label = v.firstname..' '..v.lastname + if Characters[k].disabled then + elements[#elements+1] = {label = label, value = v.id} + else + elements[#elements+1] = {label = label, value = v.id} + end + end + if #elements < slots then + elements[#elements+1] = {label = _('create_char'), value = (#elements+1), new = true} + end + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'selectchar', { + title = _('select_char'), + align = 'top-left', + elements = elements + }, function(data, menu) + local elements = {} + if not data.current.new then + if not Characters[data.current.value].disabled then + elements[1] = {label = _('char_play'), action = 'play', value = data.current.value} + else + elements[1] = {label = _('char_disabled'), value = data.current.value} + end + if Config.CanDelete then elements[2] = {label = _('char_delete'), action = 'delete', value = data.current.value} end + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'choosechar', { + title = _('select_char'), + align = 'top-left', + elements = elements + }, function(data, menu) + if data.current.action == 'play' then + ESX.UI.Menu.CloseAll() + SendNUIMessage({ + action = "closeui" + }) + TriggerServerEvent('esx_multicharacter:CharacterChosen', data.current.value, false) + elseif data.current.action == 'delete' then + local elements2 = {} + elements2[1] = {label = _('cancel')} + elements2[2] = {label = _('confirm'), value = data.current.value} + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'deletechar', { + title = _('delete_label', Characters[data.current.value].firstname, Characters[data.current.value].lastname), + align = 'center', + elements = elements2 + }, function(data, menu) + if data.current.value then + TriggerServerEvent('esx_multicharacter:DeleteCharacter', data.current.value) + spawned = false + ESX.UI.Menu.CloseAll() + else + menu.close() + end + end, function(data, menu) + menu.close() + end) + end + end, function(data, menu) + menu.close() + end) + else + ESX.UI.Menu.CloseAll() + local GetSlot = function() + for i = 1, slots do + if not Characters[i] then + return i + end + end + end + local slot = GetSlot() + TriggerServerEvent('esx_multicharacter:CharacterChosen', slot, true) + TriggerEvent('esx_identity:showRegisterIdentity') + end + end, function(data, menu) + menu.refresh() + end, function(data, menu) + if data.current.new then + local playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, false) + SetEntityAlpha(playerPed, 0) + SendNUIMessage({ + action = "closeui" + }) + else + SetupCharacter(data.current.value) + local playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, true) + ResetEntityAlpha(playerPed) + end + end) + end + end) + + RegisterNetEvent('esx:playerLoaded') + AddEventHandler('esx:playerLoaded', function(playerData, isNew, skin) + local spawn = playerData.coords or Config.Spawn + if isNew or not skin or #skin == 1 then + local finished = false + local sex = skin.sex or 0 + if sex == 0 then model = GetHashKey("mp_m_freemode_01") else model = GetHashKey("mp_m_freemode_01") end + RequestModel(model) + while not HasModelLoaded(model) do + RequestModel(model) + Citizen.Wait(0) + end + SetPlayerModel(PlayerId(), model) + SetModelAsNoLongerNeeded(model) + skin = Config.Default + skin.sex = sex + TriggerEvent('skinchanger:loadSkin', skin, function() + playerPed = PlayerPedId() + SetPedAoBlobRendering(playerPed, true) + ResetEntityAlpha(playerPed) + TriggerEvent('esx_skin:openSaveableMenu', function() + finished = true end, function() finished = true + end) + end) + repeat Citizen.Wait(200) until finished + end + DoScreenFadeOut(100) + + SetCamActive(cam, false) + RenderScriptCams(false, false, 0, true, true) + cam = nil + local playerPed = PlayerPedId() + FreezeEntityPosition(playerPed, true) + SetEntityCoordsNoOffset(playerPed, spawn.x, spawn.y, spawn.z, false, false, false, true) + SetEntityHeading(playerPed, spawn.heading) + if not isNew then TriggerEvent('skinchanger:loadSkin', skin or Characters[spawned].skin) end + Citizen.Wait(400) + DoScreenFadeIn(400) + repeat Citizen.Wait(200) until not IsScreenFadedOut() + TriggerServerEvent('esx:onPlayerSpawn') + TriggerEvent('esx:onPlayerSpawn') + TriggerEvent('playerSpawned') + TriggerEvent('esx:restoreLoadout') + Characters, hidePlayers = {}, false + end) + + RegisterNetEvent('esx:onPlayerLogout') + AddEventHandler('esx:onPlayerLogout', function() + DoScreenFadeOut(0) + spawned = false + TriggerEvent("esx_multicharacter:SetupCharacters") + TriggerEvent('esx_skin:resetFirstSpawn') + end) + + if Config.Relog then + RegisterCommand('relog', function(source, args, rawCommand) + if canRelog == true then + canRelog = false + TriggerServerEvent('esx_multicharacter:relog') + ESX.SetTimeout(10000, function() + canRelog = true + end) + end + end) + end + +end diff --git a/[esx]/esx_multicharacter/config.lua b/[esx]/esx_multicharacter/config.lua new file mode 100644 index 00000000..078a9c4b --- /dev/null +++ b/[esx]/esx_multicharacter/config.lua @@ -0,0 +1,129 @@ +Config = {} +Config.Locale = 'en' + +-- Allows players to delete their characters +Config.CanDelete = true + +if IsDuplicityVersion() then + -- This is the default number of slots for EVERY player + -- If you want to manage extra slots for specific players you can do it by using '/setslots' and '/remslots' commands + Config.Slots = 4 + -------------------- + + -- Text to prepend to each character (char#:identifier) - keep it short + Config.Prefix = 'char' + -------------------- + + -- Default identifier to store for characters - this should always match es_extended (recommended: license) + Config.Identifier = 'license' + +else + -- Sets the location for the character selection scene + -- To set the spawn location for new characters, modify the default value in the users SQL table + Config.Spawn = vector4(-113.7, 565.3, 195.2, 0) + -------------------- + + -- Do not use unless you are prepared to adjust your resources to correctly reset data + -- Information: https://github.com/thelindat/esx_multicharacter#relogging + Config.Relog = true + -------------------- + + -- Default appearance for new characters + Config.Default = { + mom = 21, + dad = 0, + face_md_weight = 50, + skin_md_weight = 50, + nose_1 = 0, + nose_2 = 0, + nose_3 = 0, + nose_4 = 0, + nose_5 = 0, + nose_6 = 0, + cheeks_1 = 0, + cheeks_2 = 0, + cheeks_3 = 0, + lip_thickness = 0, + jaw_1 = 0, + jaw_2 = 0, + chin_1 = 0, + chin_2 = 0, + chin_13 = 0, + chin_4 = 0, + neck_thickness = 0, + hair_1 = 0, + hair_2 = 0, + hair_color_1 = 0, + hair_color_2 = 0, + tshirt_1 = 0, + tshirt_2 = 0, + torso_1 = 0, + torso_2 = 0, + decals_1 = 0, + decals_2 = 0, + arms = 0, + arms_2 = 0, + pants_1 = 0, + pants_2 = 0, + shoes_1 = 0, + shoes_2 = 0, + mask_1 = 0, + mask_2 = 0, + bproof_1 = 0, + bproof_2 = 0, + chain_1 = 0, + chain_2 = 0, + helmet_1 = -1, + helmet_2 = 0, + glasses_1 = 0, + glasses_2 = 0, + watches_1 = -1, + watches_2 = 0, + bracelets_1 = -1, + bracelets_2 = 0, + bags_1 = 0, + bags_2 = 0, + eye_color = 0, + eye_squint = 0, + eyebrows_2 = 0, + eyebrows_1 = 0, + eyebrows_3 = 0, + eyebrows_4 = 0, + eyebrows_5 = 0, + eyebrows_6 = 0, + makeup_1 = 0, + makeup_2 = 0, + makeup_3 = 0, + makeup_4 = 0, + lipstick_1 = 0, + lipstick_2 = 0, + lipstick_3 = 0, + lipstick_4 = 0, + ears_1 = -1, + ears_2 = 0, + chest_1 = 0, + chest_2 = 0, + chest_3 = 0, + bodyb_1 = -1, + bodyb_2 = 0, + bodyb_3 = -1, + bodyb_4 = 0, + age_1 = 0, + age_2 = 0, + blemishes_1 = 0, + blemishes_2 = 0, + blush_1 = 0, + blush_2 = 0, + blush_3 = 0, + complexion_1 = 0, + complexion_2 = 0, + sun_1 = 0, + sun_2 = 0, + moles_1 = 0, + moles_2 = 0, + beard_1 = 0, + beard_2 = 0, + beard_3 = 0, + beard_4 = 0 + } +end \ No newline at end of file diff --git a/[esx]/esx_multicharacter/esx_multicharacter.sql b/[esx]/esx_multicharacter/esx_multicharacter.sql new file mode 100644 index 00000000..f19f7610 --- /dev/null +++ b/[esx]/esx_multicharacter/esx_multicharacter.sql @@ -0,0 +1,9 @@ +CREATE TABLE `multicharacter_slots` ( + `identifier` VARCHAR(60) NOT NULL, + `slots` INT(11) NOT NULL, + PRIMARY KEY (`identifier`) USING BTREE, + INDEX `slots` (`slots`) USING BTREE +) ENGINE=InnoDB; + +ALTER TABLE `users` ADD COLUMN + `disabled` TINYINT(1) NULL DEFAULT '0'; diff --git a/[esx]/esx_multicharacter/fxmanifest.lua b/[esx]/esx_multicharacter/fxmanifest.lua new file mode 100644 index 00000000..cb441eab --- /dev/null +++ b/[esx]/esx_multicharacter/fxmanifest.lua @@ -0,0 +1,39 @@ +fx_version 'cerulean' +game 'gta5' +description 'Official Multicharacter System For ESX Legacy' +version '1.7.0' +lua54 'yes' + +dependencies { + 'es_extended', + 'esx_menu_default', + 'esx_identity', + 'esx_skin' +} + +shared_scripts { + '@es_extended/locale.lua', + 'locales/*.lua', + 'config.lua' +} + +server_scripts { + '@es_extended/imports.lua', + '@oxmysql/lib/MySQL.lua', + 'server/*.lua', +} + +client_scripts { + 'client/*.lua' +} + +ui_page { + 'html/ui.html', +} + +files { + 'html/ui.html', + 'html/css/main.css', + 'html/js/app.js', + 'html/locales/*.js', +} diff --git a/[esx]/esx_multicharacter/html/css/main.css b/[esx]/esx_multicharacter/html/css/main.css new file mode 100644 index 00000000..15fb9bc5 --- /dev/null +++ b/[esx]/esx_multicharacter/html/css/main.css @@ -0,0 +1,70 @@ +@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@300;600&display=swap'); +* { + margin: 0; + padding: 0; + user-select: none; + color: rgb(255, 255, 255); + font-weight: 300; + font-size: 1.6vh; + font-family: Calibri, "Helvetica", san-serif; +} + +html { + overflow: hidden; +} + +p { + margin: 0 !important; +} + +body { + background: transparent; +} + +.main-container { + display:none; + position: absolute; + top: 50%; + right: 25; + transform: translate(0, -50%); + background: rgba(0,0,0,0.7); +} + +.header { + position: absolute; + top: 5%; + left: 50%; + transform: translate(-50%); + font-size: 1.1rem; +} + +.footer { + position: absolute; + bottom: 5%; + left: 50%; + transform: translate(-50%); + font-size: 1.1rem; +} + +.character-box { + display: flex; + right: 0; + flex-direction: column; + justify-content: center; + align-items: center; + text-align: center; + line-height: 1.4rem; + height: calc(100vh - 6rem); + width: 20rem; + padding: 1rem; + border: 1px rgba(12,12,12,200) solid; + box-shadow: 0px 0px 4px 1px rgba(12,12,12,20); +} + +h1 { + font-family: 'Raleway', sans-serif; + padding-top: 2rem; + display: block; + font-size: 1.3rem; + font-weight: 600; +} diff --git a/[esx]/esx_multicharacter/html/js/app.js b/[esx]/esx_multicharacter/html/js/app.js new file mode 100644 index 00000000..22b5c92c --- /dev/null +++ b/[esx]/esx_multicharacter/html/js/app.js @@ -0,0 +1,35 @@ +var money = Intl.NumberFormat('en-US', { + style: 'currency', + currency: 'USD', + minimumFractionDigits: 0 +}); + +(() => { + Kashacter = {}; + + Kashacter.ShowUI = function(data) { + $('body').css({"display":"block"}); + $('.main-container').css({"display":"block"}); + $('[data-charid=1]').html('

' + `${translate.name} ` + '

' + data.firstname +' '+ data.lastname +'

' + `${translate.job} ` + '

'+ data.job +' '+ data.job_grade +'

' + `${translate.money} ` + '

'+ money.format(data.money) +'

' + `${translate.bank} ` + '

'+ money.format(data.bank) +'

' + `${translate.dob} ` + '

'+ data.dateofbirth +'

' + `${translate.gender} ` + '

'+ data.sex +'

').attr("data-ischar", "true"); + }; + + Kashacter.CloseUI = function() { + $('body').css({"display":"none"}); + $('.main-container').css({"display":"none"}); + $('[data-charid=1]').html('

'); + }; + + window.onload = function(e) { + window.addEventListener('message', function(event) { + switch(event.data.action) { + case 'openui': + Kashacter.ShowUI(event.data.character); + break; + case 'closeui': + Kashacter.CloseUI(); + break; + } + }) + } + +})(); diff --git a/[esx]/esx_multicharacter/html/locales/cs.js b/[esx]/esx_multicharacter/html/locales/cs.js new file mode 100644 index 00000000..cc84dedc --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/cs.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Jméno"; +translate.job = "Práce"; +translate.bank = "Banka"; +translate.money = "Peníze"; +translate.gender = "Pohlaví"; +translate.dob = "Datum narození"; diff --git a/[esx]/esx_multicharacter/html/locales/de.js b/[esx]/esx_multicharacter/html/locales/de.js new file mode 100644 index 00000000..efd17188 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/de.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Name"; +translate.job = "Beruf"; +translate.bank = "Bankguthaben"; +translate.money = "Bargeld"; +translate.gender = "Geschlecht"; +translate.dob = "Geburtsdatum"; diff --git a/[esx]/esx_multicharacter/html/locales/en.js b/[esx]/esx_multicharacter/html/locales/en.js new file mode 100644 index 00000000..125dd3f0 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/en.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Name"; +translate.job = "Job"; +translate.bank = "Bank"; +translate.money = "Cash"; +translate.gender = "Gender"; +translate.dob = "Date of birth"; diff --git a/[esx]/esx_multicharacter/html/locales/fr.js b/[esx]/esx_multicharacter/html/locales/fr.js new file mode 100644 index 00000000..597a217d --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/fr.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Nom"; +translate.job = "Métier"; +translate.bank = "Banque"; +translate.money = "Argent"; +translate.gender = "Sexe"; +translate.dob = "Date de naissance"; diff --git a/[esx]/esx_multicharacter/html/locales/hu.js b/[esx]/esx_multicharacter/html/locales/hu.js new file mode 100644 index 00000000..c23e7af1 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/hu.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = 'Név'; +translate.job = 'Munka'; +translate.bank = 'Bank'; +translate.money = 'Készpénz'; +translate.gender = 'Nem'; +translate.dob = 'Születési idő'; diff --git a/[esx]/esx_multicharacter/html/locales/pl.js b/[esx]/esx_multicharacter/html/locales/pl.js new file mode 100644 index 00000000..07b27356 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/pl.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "imię"; +translate.job = "Zajęcie"; +translate.bank = "Bank"; +translate.money = "Gotówka"; +translate.gender = "Seks"; +translate.dob = "Data urodzenia"; diff --git a/[esx]/esx_multicharacter/html/locales/pt.js b/[esx]/esx_multicharacter/html/locales/pt.js new file mode 100644 index 00000000..c8eca4f8 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/pt.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Nome"; +translate.job = "Trabalho"; +translate.bank = "Banco"; +translate.money = "Dinheiro"; +translate.gender = "Género"; +translate.dob = "Data de Nascimento"; diff --git a/[esx]/esx_multicharacter/html/locales/tr.js b/[esx]/esx_multicharacter/html/locales/tr.js new file mode 100644 index 00000000..ab820732 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/tr.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "İsim"; +translate.job = "Meslek"; +translate.bank = "Banka"; +translate.money = "Nakit"; +translate.gender = "Cinsiyet"; +translate.dob = "Doğum Tarihi"; diff --git a/[esx]/esx_multicharacter/html/ui.html b/[esx]/esx_multicharacter/html/ui.html new file mode 100644 index 00000000..7b59ac89 --- /dev/null +++ b/[esx]/esx_multicharacter/html/ui.html @@ -0,0 +1,24 @@ + + + + + + + + + + +
+
ESX Legacy
+
+

+
+
+
Multicharacter
+
+
+ + + + + \ No newline at end of file diff --git a/[esx]/esx_multicharacter/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua new file mode 100644 index 00000000..d309e309 --- /dev/null +++ b/[esx]/esx_multicharacter/locales/cs.lua @@ -0,0 +1,25 @@ +Locales['cs'] = { + ['male'] = "Muž", + ['female'] = "Žena", + ['delete_label'] = "Vymazat %s %s?", + ['select_char'] = "Zvolit Postavu", + ['create_char'] = "Vytvořit Novou Postavu", + ['char_play'] = "Hrát za postavu", + ['char_disabled'] = "Tato postava je zakázána!", + ['char_delete'] = "Vymazat postavu", + ['cancel'] = "Zrušit", + ['confirm'] = "Potvrdit", + ['command_setslots'] = "Nastavit slot pro hráče v multicharacteru", + ['command_remslots'] = "Odebrat slot pro hráče v multicharacteru", + ['command_enablechar'] = "Povolit zovlený slot hráči", + ['command_disablechar'] = "Zakázat zvolený slot pro hračé", + ['command_charslot'] = "Číslo slotu", + ['command_identifier'] = "Identifier hráče", + ['command_slots'] = "# ze slotu", + ['slotsadd'] = "Přidal slot %s hráči %s", + ['slotsedit'] = "Nastavil si slot %s hráči %s", + ['slotsrem'] = "Odebral si slot %s", + ['charenabled'] = "Povolol si postavu #%s z %s", + ['chardisabled'] = "Zakázal si postavu #%s z %s", + ['charnotfound'] = "Postava #%s z %s nebyla nalezena/neexistuje", +} diff --git a/[esx]/esx_multicharacter/locales/de.lua b/[esx]/esx_multicharacter/locales/de.lua new file mode 100644 index 00000000..654971af --- /dev/null +++ b/[esx]/esx_multicharacter/locales/de.lua @@ -0,0 +1,11 @@ +Locales['de'] = { + ['male'] = "Männlich", + ['female'] = "Weiblich", + ['delete_label'] = "Lösche %s %s?", + ['select_char'] = "Charakter auswählen", + ['create_char'] = "Neuen Charakter erstellen", + ['char_play'] = "Diesen Charakter spielen", + ['char_delete'] = "Diesen Charakter löschen", + ['cancel'] = "Abbrechen", + ['confirm'] = "Bestätigen", +} diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua new file mode 100644 index 00000000..2acccb10 --- /dev/null +++ b/[esx]/esx_multicharacter/locales/en.lua @@ -0,0 +1,25 @@ +Locales["en"] = { + ["male"] = "Male", + ["female"] = "Female", + ["delete_label"] = "Delete %s %s?", + ["select_char"] = "Select Character", + ["create_char"] = "Create new character", + ["char_play"] = "Play this character", + ["char_disabled"] = "This character is disabled", + ["char_delete"] = "Delete this character", + ["cancel"] = "Cancel", + ["confirm"] = "Confirm", + ["command_setslots"] = "Set multicharacter slots number of a player", + ["command_remslots"] = "Remove multicharacter slots number of a player", + ["command_enablechar"] = "Enable a given character of a player", + ["command_disablechar"] = "Disable a given character of a player", + ["command_charslot"] = "Slot number of the character", + ["command_identifier"] = "Player identifier", + ["command_slots"] = "# of slots", + ["slotsadd"] = "You added %s slots to %s", + ["slotsedit"] = "You set %s slots to %s", + ["slotsrem"] = "You removed slots to %s", + ["charenabled"] = "You enabled character #%s of %s", + ["chardisabled"] = "You disabled character #%s of %s", + ["charnotfound"] = "Character #%s of %s doesn't exist", +} diff --git a/[esx]/esx_multicharacter/locales/hu.lua b/[esx]/esx_multicharacter/locales/hu.lua new file mode 100644 index 00000000..28a6ae68 --- /dev/null +++ b/[esx]/esx_multicharacter/locales/hu.lua @@ -0,0 +1,25 @@ +Locales["hu"] = { + ["male"] = "Férfi", + ["female"] = "Nő", + ["delete_label"] = "Törlés %s %s?", + ["select_char"] = "Karakter kiválasztása", + ["create_char"] = "Új karakter létrehozása", + ["char_play"] = "Karakter kiválasztása", + ["char_disabled"] = "Karakter le van tiltva", + ["char_delete"] = "Karakter törlése", + ["cancel"] = "Mégsem", + ["confirm"] = "Megerősítés", + ["command_setslots"] = "Játékos karakter slotok számának beállítása", + ["command_remslots"] = "Játékos karakter slotok számának eltávolítása", + ["command_enablechar"] = "Játékos karakterének engedélyezése", + ["command_disablechar"] = "Játékos karakterének tiltása", + ["command_charslot"] = "Karakter slotok számának beállítása", + ["command_identifier"] = "Játékos identifier", + ["command_slots"] = "# slotok", + ["slotsadd"] = "Adtál %s slotokat, neki %s", + ["slotsedit"] = "Beállítottad %s slotokat, neki %s", + ["slotsrem"] = "Eltávolítottad a következő slotokat: %s", + ["charenabled"] = "Karakter engedélyezve #%s-ból/ből %s", + ["chardisabled"] = "Karakter letiltva #%s-ból/ből %s", + ["charnotfound"] = "Karakter #%s-ból/ből %s nem létezik", +} diff --git a/[esx]/esx_multicharacter/locales/it.lua b/[esx]/esx_multicharacter/locales/it.lua new file mode 100644 index 00000000..1f2333e5 --- /dev/null +++ b/[esx]/esx_multicharacter/locales/it.lua @@ -0,0 +1,25 @@ +Locales['it'] = { + ['male'] = "Maschio", + ['female'] = "Femmina", + ['delete_label'] = "Cancella %s %s?", + ['select_char'] = "Seleziona Personaggio", + ['create_char'] = "Crea un nuovo personaggio", + ['char_play'] = "Gioca questo personaggio", + ['char_disabled'] = "Questo personaggio è disabilitato", + ['char_delete'] = "Cancella questo personaggio", + ['cancel'] = "Annulla", + ['confirm'] = "Conferma", + ['command_setslots'] = "Imposta il numero di slot di personaggi di un giocatore", + ['command_remslots'] = "Rimuovi il numero di slot di personaggi di un giocatore", + ['command_enablechar'] = "Abilita un personaggio di un giocatore", + ['command_disablechar'] = "Disabilita un personaggio di un giocatore", + ['command_charslot'] = "Numero dello slot del personaggio", + ['command_identifier'] = "Identifier del giocatore", + ['command_slots'] = "# di slot", + ['slotsadd'] = "Hai aggiunto %s slot a %s", + ['slotsedit'] = "Hai impostato %s slot a %s", + ['slotsrem'] = "Hai rimosso gli slot a %s", + ['charenabled'] = "Hai abilitato il %s° personaggio di %s", + ['chardisabled'] = "Hai disabilitato il %s° personaggio di %s", + ['charnotfound'] = "Il personaggio %s di %s non esiste", +} diff --git a/[esx]/esx_multicharacter/locales/pt.lua b/[esx]/esx_multicharacter/locales/pt.lua new file mode 100644 index 00000000..7b1f86e5 --- /dev/null +++ b/[esx]/esx_multicharacter/locales/pt.lua @@ -0,0 +1,25 @@ +Locales['pt'] = { + ['male'] = "Masculino", + ['female'] = "Feminino", + ['delete_label'] = "Excluir %s %s?", + ['select_char'] = "Selecionar personagem", + ['create_char'] = "Criar novo personagem", + ['char_play'] = "Selecionar", + ['char_disabled'] = "Este personagem está desabilitado", + ['char_delete'] = "Excluir este personagem", + ['cancel'] = "Cancelar", + ['confirm'] = "Confirmar", + ['command_setslots'] = "Definir o número de slots de vários personagens de um jogador", + ['command_remslots'] = "Remover o número de slots de vários personagens de um jogador", + ['command_enablechar'] = "Habilitar um determinado personagem de um jogador", + ['command_disablechar'] = "Desabilitar um determinado personagem de um jogador", + ['command_charslot'] = "Número do slot do personagem", + ['command_identifier'] = "Identificador do jogador", + ['command_slots'] = "# de slots", + ['slotsadd'] = "Você adcionou %s slots para %s", + ['slotsedit'] = "Você definiu %s slots para %s", + ['slotsrem'] = "Você removeu slots de %s", + ['charenabled'] = "Você ativou o personagem #%s de %s", + ['chardisabled'] = "Você desativou o personagem #%s de %s", + ['charnotfound'] = "Personagem #%s de %s não existe", +} diff --git a/[esx]/esx_multicharacter/locales/tr.lua b/[esx]/esx_multicharacter/locales/tr.lua new file mode 100644 index 00000000..8a3aa060 --- /dev/null +++ b/[esx]/esx_multicharacter/locales/tr.lua @@ -0,0 +1,11 @@ +Locales['tr'] = { + ['male'] = "Erkek", + ['female'] = "Kadın", + ['delete_label'] = "Sil %s %s?", + ['select_char'] = "Karakter Seç", + ['create_char'] = "Yeni Karakter Oluştur", + ['char_play'] = "Bu Karakterle Oyna", + ['char_delete'] = "Bu Karakteri Sil", + ['cancel'] = "İptal", + ['confirm'] = "Onayla", +} diff --git a/[esx]/esx_multicharacter/readme.md b/[esx]/esx_multicharacter/readme.md new file mode 100644 index 00000000..f5879edc --- /dev/null +++ b/[esx]/esx_multicharacter/readme.md @@ -0,0 +1,59 @@ + +# Preview + +![image](https://user-images.githubusercontent.com/65407488/126976325-17cc3241-bb9e-451f-a6ed-610a8ef52fa5.png) + +## Installation + +- Modify your ESX config with `Config.Multichar = true` +- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry + - The resource will attempt to set columns automatically + +### Relogging + +- Do not enable this setting if you do not intend to properly set up relog support +- Requires the latest update for ESX Status (prevents multiple status ticks from running) +- Add the following events to resources that require support for relogging, or +- Add them to [@es_extended/imports.lua](https://github.com/esx-framework/esx-legacy/blob/main/[esx]/es_extended/imports.lua) (and use the imports in your resources) + +```lua +RegisterNetEvent('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + +RegisterNetEvent('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} +end) +``` + +### Notes + +- Characters are stored in the users table as `char#:license` - if you need to use a different identifier then you need to modify ESX itself +- Character deletion does not require manual entries for the tables to remove +- As characters are stored with unique identifiers, there is no excessive queries being executed + +### Kashacters + +- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter) +- Most of the code has been entirely rewritten +- KASH has given permission for this resource to use his code and the addition of a license +- The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however + +## Notice + +Copyright © 2022 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH + +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 . diff --git a/[esx]/esx_multicharacter/server/commands.lua b/[esx]/esx_multicharacter/server/commands.lua new file mode 100644 index 00000000..3cfa98d5 --- /dev/null +++ b/[esx]/esx_multicharacter/server/commands.lua @@ -0,0 +1,79 @@ +ESX.RegisterCommand('setslots', 'admin', function(xPlayer, args, showError) + local slots = MySQL.scalar('SELECT `slots` FROM `multicharacter_slots` WHERE identifier = ?', { + args.identifier + }) + + if slots == nil then + MySQL.update('INSERT INTO `multicharacter_slots` (`identifier`, `slots`) VALUES (?, ?)', { + args.identifier, + args.slots + }) + xPlayer.triggerEvent('esx:showNotification', _U('slotsadd', args.slots, args.identifier)) + else + MySQL.update('UPDATE `multicharacter_slots` SET `slots` = ? WHERE `identifier` = ?', { + args.slots, + args.identifier + }) + xPlayer.triggerEvent('esx:showNotification', _U('slotsedit', args.slots, args.identifier)) + end +end, true, {help = _U('command_setslots'), validate = true, arguments = { + {name = 'identifier', help = _U('command_identifier'), type = 'string'}, + {name = 'slots', help = _U('command_slots'), type = 'number'} +}}) + +ESX.RegisterCommand('remslots', 'admin', function(xPlayer, args, showError) + local slots = MySQL.scalar('SELECT `slots` FROM `multicharacter_slots` WHERE identifier = ?', { + args.identifier + }) + + if slots ~= nil then + MySQL.update('DELETE FROM `multicharacter_slots` WHERE `identifier` = ?', { + args.identifier + }) + xPlayer.triggerEvent('esx:showNotification', _U('slotsrem', args.identifier)) + end +end, true, {help = _U('command_remslots'), validate = true, arguments = { + {name = 'identifier', help = _U('command_identifier'), type = 'string'} +}}) + +ESX.RegisterCommand('enablechar', 'admin', function(xPlayer, args, showError) + + local selectedCharacter = 'char'..args.charslot..':'..args.identifier; + + MySQL.update('UPDATE `users` SET `disabled` = 0 WHERE identifier = ?', { + selectedCharacter + }, function(result) + if result > 0 then + xPlayer.triggerEvent('esx:showNotification', _U('charenabled', args.charslot, args.identifier)) + else + xPlayer.triggerEvent('esx:showNotification', _U('charnotfound', args.charslot, args.identifier)) + end + end) + +end, true, {help = _U('command_enablechar'), validate = true, arguments = { + {name = 'identifier', help = _U('command_identifier'), type = 'string'}, + {name = 'charslot', help = _U('command_charslot'), type = 'number'} +}}) + +ESX.RegisterCommand('disablechar', 'admin', function(xPlayer, args, showError) + + local selectedCharacter = 'char'..args.charslot..':'..args.identifier; + + MySQL.update('UPDATE `users` SET `disabled` = 1 WHERE identifier = ?', { + selectedCharacter + }, function(result) + if result > 0 then + xPlayer.triggerEvent('esx:showNotification', _U('chardisabled', args.charslot, args.identifier)) + else + xPlayer.triggerEvent('esx:showNotification', _U('charnotfound', args.charslot, args.identifier)) + end + end) + +end, true, {help = _U('command_disablechar'), validate = true, arguments = { + {name = 'identifier', help = _U('command_identifier'), type = 'string'}, + {name = 'charslot', help = _U('command_charslot'), type = 'number'} +}}) + +RegisterCommand('forcelog', function(source, args, rawCommand) + TriggerEvent('esx:playerLogout', source) +end, true) diff --git a/[esx]/esx_multicharacter/server/main.lua b/[esx]/esx_multicharacter/server/main.lua new file mode 100644 index 00000000..ff0e4448 --- /dev/null +++ b/[esx]/esx_multicharacter/server/main.lua @@ -0,0 +1,221 @@ +if not ESX then + error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0') +elseif ESX.GetConfig().Multichar == true then + local DATABASE do + local connectionString = GetConvar('mysql_connection_string', ''); + if connectionString == '' then + error(connectionString..'\n^1Unable to start Multicharacter - unable to determine database from mysql_connection_string^0', 0) + elseif connectionString:find('mysql://') then + connectionString = connectionString:sub(9, -1) + DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '') + else + connectionString = {string.strsplit(';', connectionString)} + for i = 1, #connectionString do + local v = connectionString[i] + if v:match('database') then + DATABASE = v:sub(10, #v) + end + end + end + end + + local DB_TABLES = {users = 'identifier'} + local FETCH = nil + local SLOTS = Config.Slots or 4 + local PREFIX = Config.Prefix or 'char' + local PRIMARY_IDENTIFIER = ESX.GetConfig().Identifier or GetConvar('sv_lan', '') == 'true' and 'ip' or Config.Identifier + + local function GetIdentifier(source) + local identifier = PRIMARY_IDENTIFIER..':' + for _, v in pairs(GetPlayerIdentifiers(source)) do + if string.match(v, identifier) then + identifier = string.gsub(v, identifier, '') + return identifier + end + end + end + + if next(ESX.Players) then + local players = table.clone(ESX.Players) + table.wipe(ESX.Players) + for _, v in pairs(players) do + ESX.Players[GetIdentifier(v.source)] = true + end + else ESX.Players = {} end + + local function SetupCharacters(source) + while not FETCH do Citizen.Wait(100) end + local identifier = GetIdentifier(source) + ESX.Players[identifier] = true + + local slots = MySQL.scalar.await('SELECT slots FROM multicharacter_slots WHERE identifier = ?', { identifier }) or SLOTS + identifier = PREFIX..'%:'..identifier + + local result = MySQL.query.await(FETCH, {identifier, slots}) + local characters + + if result then + local characterCount = #result + characters = table.create(0, characterCount) + + for i = 1, characterCount, 1 do + local v = result[i] + local job, grade = v.job or 'unemployed', tostring(v.job_grade) + + if ESX.Jobs[job] and ESX.Jobs[job].grades[grade] then + if job ~= 'unemployed' then grade = ESX.Jobs[job].grades[grade].label else grade = '' end + job = ESX.Jobs[job].label + end + + local accounts = json.decode(v.accounts) + local id = tonumber(string.sub(v.identifier, #PREFIX+1, string.find(v.identifier, ':')-1)) + + characters[id] = { + id = id, + bank = accounts.bank, + money = accounts.money, + job = job, + job_grade = grade, + firstname = v.firstname, + lastname = v.lastname, + dateofbirth = v.dateofbirth, + skin = v.skin and json.decode(v.skin) or {}, + disabled = v.disabled, + sex = v.sex == 'm' and _('male') or _('female') + } + end + end + + TriggerClientEvent('esx_multicharacter:SetupUI', source, characters, slots) + end + + AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals) + deferrals.defer() + local identifier = GetIdentifier(source) + + if identifier then + if ESX.Players[identifier] then + deferrals.done(('A player is already connected to the server with this identifier.\nYour identifier: %s:%s'):format(PRIMARY_IDENTIFIER, identifier)) + else + deferrals.done() + end + else + deferrals.done(('Unable to retrieve player identifier.\nIdentifier type: %s'):format(PRIMARY_IDENTIFIER)) + end + end) + + local function DeleteCharacter(source, charid) + local identifier = ('%s%s:%s'):format(PREFIX, charid, GetIdentifier(source)) + local query = 'DELETE FROM %s WHERE %s = ?' + local queries = {} + local count = 0 + + for table, column in pairs(DB_TABLES) do + count += 1 + queries[count] = {query = query:format(table, column), values = {identifier}} + end + + MySQL.transaction(queries, function(result) + if result then + print(('[^2INFO^7] Player [%s] %s has deleted a character (%s)'):format(GetPlayerName(source), source, identifier)) + Citizen.Wait(50) + SetupCharacters(source) + else + error('\n^1Transaction failed while trying to delete '..identifier..'^0') + end + end) + end + + MySQL.ready(function() + local length = 42 + #PREFIX + local DB_COLUMNS = MySQL.query.await(('SELECT TABLE_NAME, COLUMN_NAME, CHARACTER_MAXIMUM_LENGTH FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = "%s" AND DATA_TYPE = "varchar" AND COLUMN_NAME IN (?)'):format(DATABASE, length), { + {'identifier', 'owner'} + }) + + if DB_COLUMNS then + local columns = {} + local count = 0 + + for i = 1, #DB_COLUMNS do + local v = DB_COLUMNS[i] + + if v?.CHARACTER_MAXIMUM_LENGTH ~= length then + count += 1 + columns[v.TABLE_NAME] = v.COLUMN_NAME + end + end + + if next(columns) then + local query = 'ALTER TABLE `%s` MODIFY COLUMN `%s` VARCHAR(%s)' + local queries = table.create(count, 0) + + for k, v in pairs(columns) do + queries[#queries+1] = {query = query:format(k, v, length)} + end + + if MySQL.transaction.await(queries) then + print(('[^2INFO^7] Updated ^5%s^7 columns to use VARCHAR(%s)'):format(count, length)) + else + print(('[^2INFO^7] Unable to update ^5%s^7 columns to use VARCHAR(%s)'):format(count, length)) + end + end + + ESX.Jobs = {} + + local function GetJobs() + if ESX.GetJobs then + return ESX.GetJobs() + end + return exports.es_extended:getSharedObject().Jobs + end + + repeat + ESX.Jobs = GetJobs() + Citizen.Wait(50) + until next(ESX.Jobs) + + FETCH = 'SELECT identifier, accounts, job, job_grade, firstname, lastname, dateofbirth, sex, skin, disabled FROM users WHERE identifier LIKE ? LIMIT ?' + end + end) + + RegisterNetEvent('esx_multicharacter:SetupCharacters', function() + SetupCharacters(source) + end) + + local awaitingRegistration = {} + + RegisterNetEvent('esx_multicharacter:CharacterChosen', function(charid, isNew) + if type(charid) == 'number' and string.len(charid) <= 2 and type(isNew) == 'boolean' then + if isNew then + awaitingRegistration[source] = charid + else + TriggerEvent('esx:onPlayerJoined', source, PREFIX..charid) + ESX.Players[GetIdentifier(source)] = true + end + end + end) + + AddEventHandler('esx_identity:completedRegistration', function(source, data) + TriggerEvent('esx:onPlayerJoined', source, PREFIX..awaitingRegistration[source], data) + awaitingRegistration[source] = nil + ESX.Players[GetIdentifier(source)] = true + end) + + AddEventHandler('playerDropped', function(reason) + awaitingRegistration[source] = nil + ESX.Players[GetIdentifier(source)] = nil + end) + + RegisterNetEvent('esx_multicharacter:DeleteCharacter', function(charid) + if Config.CanDelete and type(charid) == 'number' and string.len(charid) <= 2 then + DeleteCharacter(source, charid) + end + end) + + RegisterNetEvent('esx_multicharacter:relog', function() + TriggerEvent('esx:playerLogout', source) + end) + + else + assert(nil, '^3WARNING: Multicharacter is disabled - please check your ESX configuration^0') + end diff --git a/[esx]/esx_notify/Notify.lua b/[esx]/esx_notify/Notify.lua new file mode 100644 index 00000000..27c7956e --- /dev/null +++ b/[esx]/esx_notify/Notify.lua @@ -0,0 +1,11 @@ +local function Notify(type, length, message) + SendNuiMessage(json.encode({ + type = type or "info", + length = length or 3000, + message = message or "ESX-Notify" + })) +end + +exports('Notify', Notify) +RegisterNetEvent("ESX:Notify", Notify) + diff --git a/[esx]/esx_notify/fxmanifest.lua b/[esx]/esx_notify/fxmanifest.lua new file mode 100644 index 00000000..cbf467ef --- /dev/null +++ b/[esx]/esx_notify/fxmanifest.lua @@ -0,0 +1,15 @@ +fx_version 'adamant' +game 'gta5' +author 'ESX-Framework' +description 'ESX Notification' + +client_scripts { 'Notify.lua' } + +ui_page 'nui/index.html' + +files { + 'nui/index.html', + 'nui/js/*.js', + 'nui/css/*.css', + 'nui/img/*.png', +} diff --git a/[esx]/esx_notify/nui/css/style.css b/[esx]/esx_notify/nui/css/style.css new file mode 100644 index 00000000..4b24467e --- /dev/null +++ b/[esx]/esx_notify/nui/css/style.css @@ -0,0 +1,14 @@ +:root { + --color: white; + --bgColor: #212121; +} + +* { + padding: 0; + margin: 0; +} + +body { + color: var(--color); + font-family: sans-serif; +} \ No newline at end of file diff --git a/[esx]/esx_notify/nui/index.html b/[esx]/esx_notify/nui/index.html new file mode 100644 index 00000000..1fd3c86c --- /dev/null +++ b/[esx]/esx_notify/nui/index.html @@ -0,0 +1,96 @@ + + + + + + + + + +
+
+ +

+
+
+
+
+ +

+
+
+
+
+ +

+
+
+ + + + diff --git a/[esx]/esx_notify/nui/js/script.js b/[esx]/esx_notify/nui/js/script.js new file mode 100644 index 00000000..5122b5a1 --- /dev/null +++ b/[esx]/esx_notify/nui/js/script.js @@ -0,0 +1,26 @@ +const w = window +const doc = document + +$(function () { + w.addEventListener('message', function(e) { + $(".text").text(e.data.message) + if (e.data.type === "info") { + doc.getElementById("notifyInfo").style.display = "block"; + Timeout() + } else if (e.data.type === "error") { + doc.getElementById("notifyError").style.display = "block"; + Timeout() + } else if (e.data.type === "success") { + doc.getElementById("notifySuccess").style.display = "block"; + Timeout() + } + + function Timeout() { + setTimeout(function () { + doc.getElementById("notifyInfo").style.display = "none"; + doc.getElementById("notifyError").style.display = "none"; + doc.getElementById("notifySuccess").style.display = "none"; + }, e.data.length) + } + }) +}) diff --git a/[esx]/esx_notify/readme.md b/[esx]/esx_notify/readme.md new file mode 100644 index 00000000..18ed3765 --- /dev/null +++ b/[esx]/esx_notify/readme.md @@ -0,0 +1,13 @@ +## How to change style and time + +* ESX.ShowNotification("Text Here", "error", 3000) -- Error Notification +* ESX.ShowNotification("Text Here", "success", 3000) -- Success Notification +* ESX.ShowNotification("Text Here", "info", 3000) -- Info + +* By doing ESX.ShowNotification("Text Here") it will be default/info + +# Exports +* exports["esx_notify"]:Notify("info", 3000, "Text Here") + +# Events +* TriggerEvent("ESX:Notify", "info", 3000, "Text Here") diff --git a/[esx]/esx_progressbar/Progress.lua b/[esx]/esx_progressbar/Progress.lua new file mode 100644 index 00000000..01e7d52f --- /dev/null +++ b/[esx]/esx_progressbar/Progress.lua @@ -0,0 +1,21 @@ +local function Progressbar(message,length,Options) + if Options.animation then + if Options.animation.type == "anim" then + ESX.Streaming.RequestAnimDict(Options.animation.dict, function() + TaskPlayAnim(ESX.PlayerData.ped, Options.animation.dict, Options.animation.lib, 1.0, 1.0, length, 1, 1.0, false,false,false) + end) + end + end + if Options.FreezePlayer then FreezeEntityPosition(PlayerPedId(),Options.FreezePlayer) end + SendNuiMessage(json.encode({ + type = "Progressbar", + length = length or 3000, + message = message or "ESX-Framework" + })) + Wait(length) + if Options.FreezePlayer then FreezeEntityPosition(PlayerPedId(),not Options.FreezePlayer) end + if Options.onFinish then Options.onFinish() end +end + +exports('Progressbar', Progressbar) + diff --git a/[esx]/esx_progressbar/fxmanifest.lua b/[esx]/esx_progressbar/fxmanifest.lua new file mode 100644 index 00000000..8df232aa --- /dev/null +++ b/[esx]/esx_progressbar/fxmanifest.lua @@ -0,0 +1,15 @@ +fx_version 'adamant' +game 'gta5' +author 'ESX-Framework' +description 'ESX Progressbar' + +client_scripts { 'Progress.lua' } +shared_script '@es_extended/imports.lua' +ui_page 'nui/index.html' + +files { + 'nui/index.html', + 'nui/js/*.js', + 'nui/css/*.css', + 'nui/img/*.png', +} diff --git a/[esx]/esx_progressbar/nui/css/style.css b/[esx]/esx_progressbar/nui/css/style.css new file mode 100644 index 00000000..4b24467e --- /dev/null +++ b/[esx]/esx_progressbar/nui/css/style.css @@ -0,0 +1,14 @@ +:root { + --color: white; + --bgColor: #212121; +} + +* { + padding: 0; + margin: 0; +} + +body { + color: var(--color); + font-family: sans-serif; +} \ No newline at end of file diff --git a/[esx]/esx_progressbar/nui/index.html b/[esx]/esx_progressbar/nui/index.html new file mode 100644 index 00000000..a2e2c2be --- /dev/null +++ b/[esx]/esx_progressbar/nui/index.html @@ -0,0 +1,88 @@ + + + + + + + + + +
+
+ +

+
+
+
+ + + + diff --git a/[esx]/esx_progressbar/nui/js/script.js b/[esx]/esx_progressbar/nui/js/script.js new file mode 100644 index 00000000..9ffa5e71 --- /dev/null +++ b/[esx]/esx_progressbar/nui/js/script.js @@ -0,0 +1,33 @@ +const w = window +const doc = document + +$(function () { + w.addEventListener('message', function(e) { + $(".text").text(e.data.message) + if (e.data.type === "Progressbar") { + doc.getElementById("notifyInfo").style.display = "block"; + const start = new Date(); + const maxTime = e.data.length + const timeoutValue = Math.floor(maxTime/100); + animUpdate(); + + function updateProg(prc) { + $("#progline").css("width", prc + "%"); + } + + function animUpdate() { + const now = new Date(); + const timeoutDiff = now.getTime() - start.getTime(); + const prc = Math.round((timeoutDiff/maxTime)*100); + if (prc <= 100) { + updateProg(prc); + setTimeout(animUpdate, timeoutValue); + } else { + doc.getElementById('notifyInfo').style.display = "none"; + } + } + } else { + doc.getElementById("notifyInfo").style.display = "none" + } + }) +}) diff --git a/[esx]/esx_progressbar/readme.md b/[esx]/esx_progressbar/readme.md new file mode 100644 index 00000000..3fb80e92 --- /dev/null +++ b/[esx]/esx_progressbar/readme.md @@ -0,0 +1,12 @@ +## Use + + * ESX Function +```lua + ESX.Progressbar("test", 25000,{FreezePlayer = false, animation ={type = "anim",dict = "mini@prostitutes@sexlow_veh", lib ="low_car_sex_to_prop_p2_player" }, onFinish = function() + +``` + +* Export +```lua + exports["esx_progressbar"]:Progressbar("test", 25000,{FreezePlayer = false, animation ={type = "anim",dict = "mini@prostitutes@sexlow_veh", lib ="low_car_sex_to_prop_p2_player" }, onFinish = function() + ``` diff --git a/[esx]/esx_skin/fxmanifest.lua b/[esx]/esx_skin/fxmanifest.lua index b3b9270a..b279b675 100644 --- a/[esx]/esx_skin/fxmanifest.lua +++ b/[esx]/esx_skin/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Skin' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx]/esx_skin/locales/hu.lua b/[esx]/esx_skin/locales/hu.lua new file mode 100644 index 00000000..ba52b09e --- /dev/null +++ b/[esx]/esx_skin/locales/hu.lua @@ -0,0 +1,6 @@ +Locales["hu"] = { + ["skin_menu"] = "Kinézet Menü", + ["use_rotate_view"] = "Használd ~INPUT_FRONTEND_LS~ vagy ~INPUT_CHARACTER_WHEEL~ gombokat a forgatáshoz", + ["skin"] = "kinézet változtatása", + ["saveskin"] = "kinézet mentése fájlba", +} diff --git a/[esx]/esx_skin/locales/sv.lua b/[esx]/esx_skin/locales/sv.lua index 02ddd5f0..b728903a 100644 --- a/[esx]/esx_skin/locales/sv.lua +++ b/[esx]/esx_skin/locales/sv.lua @@ -1,6 +1,6 @@ Locales['sv'] = { - ['skin_menu'] = 'skin meny', - ['use_rotate_view'] = 'använd ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ och ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ för att rotera.', - ['skin'] = 'ändra skin', - ['saveskin'] = 'spara skin till fil', + ['skin_menu'] = 'Skin meny', + ['use_rotate_view'] = 'Använd ~INPUT_FRONTEND_LS~ och ~INPUT_CHARACTER_WHEEL~ för att rotera vyn.', + ['skin'] = 'Ändra skin', + ['saveskin'] = 'Spara skin till en fil', } diff --git a/[esx]/esx_textui/TextUI.lua b/[esx]/esx_textui/TextUI.lua new file mode 100644 index 00000000..5753cd74 --- /dev/null +++ b/[esx]/esx_textui/TextUI.lua @@ -0,0 +1,18 @@ +local function TextUI(message, type) + SendNUIMessage({ + action = 'show', + message = message or 'ESX-TextUI', + type = type or 'info' + }) +end + +local function HideUI() + SendNUIMessage({ + action = 'hide' + }) +end + +exports('TextUI', TextUI) +exports('HideUI', HideUI) +RegisterNetEvent('ESX:TextUI', TextUI) +RegisterNetEvent('ESX:HideUI', HideUI) \ No newline at end of file diff --git a/[esx]/esx_textui/fxmanifest.lua b/[esx]/esx_textui/fxmanifest.lua new file mode 100644 index 00000000..d852702d --- /dev/null +++ b/[esx]/esx_textui/fxmanifest.lua @@ -0,0 +1,14 @@ +fx_version 'adamant' +game 'gta5' +author 'ESX-Framework' +description 'ESX TextUI' + +client_scripts { 'TextUI.lua' } +shared_script '@es_extended/imports.lua' +ui_page 'nui/index.html' + +files { + 'nui/index.html', + 'nui/js/*.js', + 'nui/css/*.css' +} diff --git a/[esx]/esx_textui/nui/css/style.css b/[esx]/esx_textui/nui/css/style.css new file mode 100644 index 00000000..61d24738 --- /dev/null +++ b/[esx]/esx_textui/nui/css/style.css @@ -0,0 +1,14 @@ +:root { + --color: white; + --bgColor: #212121; +} + +* { + padding: 0; + margin: 0; +} + +body { + color: var(--color); + font-family: sans-serif; +} \ No newline at end of file diff --git a/[esx]/esx_textui/nui/index.html b/[esx]/esx_textui/nui/index.html new file mode 100644 index 00000000..b1f1e739 --- /dev/null +++ b/[esx]/esx_textui/nui/index.html @@ -0,0 +1,94 @@ + + + + + + + + + + +
+
+ +

+
+
+
+
+ +

+
+
+
+
+ +

+
+
+ + + + \ No newline at end of file diff --git a/[esx]/esx_textui/nui/js/script.js b/[esx]/esx_textui/nui/js/script.js new file mode 100644 index 00000000..8778d408 --- /dev/null +++ b/[esx]/esx_textui/nui/js/script.js @@ -0,0 +1,21 @@ +const w = window +const doc = document + +$(function () { + w.addEventListener('message', function(e) { + $(".text").text(e.data.message) + if (e.data.action === "show") { + if (e.data.type === "info") { + doc.getElementById("notifyInfo").style.display = "block"; + } else if (e.data.type === "error") { + doc.getElementById("notifyError").style.display = "block"; + } else if (e.data.type === "success") { + doc.getElementById("notifySuccess").style.display = "block"; + } + } else if (e.data.action === "hide") { + doc.getElementById("notifyInfo").style.display = "none"; + doc.getElementById("notifyError").style.display = "none"; + doc.getElementById("notifySuccess").style.display = "none"; + } + }) +}) \ No newline at end of file diff --git a/[esx]/skinchanger/locales/hu.lua b/[esx]/skinchanger/locales/hu.lua new file mode 100644 index 00000000..52238094 --- /dev/null +++ b/[esx]/skinchanger/locales/hu.lua @@ -0,0 +1,100 @@ +Locales["hu"] = { + ["sex"] = "Nem", + ["mom"] = "Anyja arca", + ["dad"] = "Apja arca", + ["resemblance"] = "Hasonlóság", + ["skin_tone"] = "Bőrszín", + ["nose_1"] = "Orr szélessége", + ["nose_2"] = "Orr magassága", + ["nose_3"] = "Orrcsúcs hossza", + ["nose_4"] = "Orrcsont magassága", + ["nose_5"] = "Orrcsúcs leengedése", + ["nose_6"] = "Orrcsong csavar", + ["cheeks_1"] = "Arccsont magassága", + ["cheeks_2"] = "Arccsont szélessége", + ["cheeks_3"] = "Arccsont szélessége 2", + ["lip_fullness"] = "Ajak teltsége", + ["jaw_bone_width"] = "Allcsont szélessége", + ["jaw_bone_length"] = "Állcsong hossza", + ["chin_height"] = "Áll magassága", + ["chin_length"] = "Áll hossza", + ["chin_width"] = "Áll szélessége", + ["chin_hole"] = "Álllyuk mérete", + ["neck_thickness"] = "Nyak vastagsága", + ["wrinkles"] = "Ráncok", + ["wrinkle_thickness"] = "Ráncok erőssége", + ["beard_type"] = "Szakáll típusa", + ["beard_size"] = "Szakáll nagysága", + ["beard_color_1"] = "Szakáll színe 1", + ["beard_color_2"] = "Szakáll színe 2", + ["hair_1"] = "Haj 1", + ["hair_2"] = "Haj 2", + ["hair_color_1"] = "Haj színe 1", + ["hair_color_2"] = "Haj színe 2", + ["eye_color"] = "Szem szine", + ["eye_squint"] = "Szem hunyorgás", + ["eyebrow_type"] = "Szem típusa", + ["eyebrow_size"] = "Szem nagysága", + ["eyebrow_color_1"] = "Szem színe 1", + ["eyebrow_color_2"] = "Szem színe 2", + ["eyebrow_depth"] = "Szemöldökmélysége", + ["eyebrow_height"] = "Szemöldökmagassága", + ["makeup_type"] = "Smink tipusa", + ["makeup_thickness"] = "Smink erössége", + ["makeup_color_1"] = "Smink színe 1", + ["makeup_color_2"] = "Smink színe 2", + ["lipstick_type"] = "Rúzs típusa", + ["lipstick_thickness"] = "Rúzs erőssége", + ["lipstick_color_1"] = "Rúzs színe 1", + ["lipstick_color_2"] = "Rúzs színe 2", + ["ear_accessories"] = "Fülbevaló", + ["ear_accessories_color"] = "Fülbevaló színe", + ["tshirt_1"] = "Póló 1", + ["tshirt_2"] = "Póló 2", + ["torso_1"] = "Felsö 1", + ["torso_2"] = "Felsö 2", + ["decals_1"] = "Matrica 1", + ["decals_2"] = "Matrica 2", + ["arms"] = "Kezek", + ["arms_2"] = "Kezek 2", + ["pants_1"] = "Nadrág 1", + ["pants_2"] = "Nadrág 2", + ["shoes_1"] = "Cipö 1", + ["shoes_2"] = "Cipö 2", + ["mask_1"] = "Maszk 1", + ["mask_2"] = "Maszk 2", + ["bproof_1"] = "Golyóállómellény 1", + ["bproof_2"] = "Golyóállómellény 2", + ["chain_1"] = "Lánc 1", + ["chain_2"] = "Lánc 2", + ["helmet_1"] = "Sisak 1", + ["helmet_2"] = "Sisak 2", + ["watches_1"] = "Óra 1", + ["watches_2"] = "Óra 2", + ["bracelets_1"] = "Karkötö 1", + ["bracelets_2"] = "Karkötö 2", + ["glasses_1"] = "Szemüveg 1", + ["glasses_2"] = "Szemüveg 2", + ["bag"] = "Táska", + ["bag_color"] = "Táska szine", + ["blemishes"] = "Foltok", + ["blemishes_size"] = "Foltok erőssége", + ["ageing"] = "Öregedés", + ["ageing_1"] = "Öregedés erőssége", + ["blush"] = "Bőrpír", + ["blush_1"] = "Bőrpír erőssége", + ["blush_color"] = "Bőrpír színe", + ["complexion"] = "Arcszín", + ["complexion_1"] = "Arcszín erőssége", + ["sun"] = "Nap", + ["sun_1"] = "Nap erőssége", + ["freckles"] = "Szeplők", + ["freckles_1"] = "Szeplők erőssége", + ["chest_hair"] = "Mellszőr", + ["chest_hair_1"] = "Mellszőr erőssége", + ["chest_color"] = "Mellszőr színe", + ["bodyb"] = "Bőrhibák", + ["bodyb_size"] = "Bőrhibák erőssége", + ["bodyb_extra"] = "Foltos testhatás", + ["bodyb_extra_thickness"] = "Foltos testhatás vastagsága", +} diff --git a/[esx]/skinchanger/locales/pl.lua b/[esx]/skinchanger/locales/pl.lua index bb6a8089..350d0c1d 100644 --- a/[esx]/skinchanger/locales/pl.lua +++ b/[esx]/skinchanger/locales/pl.lua @@ -1,5 +1,26 @@ Locales['pl'] = { - ['sex'] = 'płec', + ['sex'] = 'płeć', + ['mom'] = 'twarz matki', + ['dad'] = 'twarz ojca', + ['resemblance'] = 'podobieństwo', + ['skin_tone'] = 'kolor skóry', + ['nose_1'] = 'szerokość nosa', + ['nose_2'] = 'nose peak height', + ['nose_3'] = 'wysokość szczytu nosa', + ['nose_4'] = 'wysokość kości nosa', + ['nose_5'] = 'obniżenie szczytu nosa', + ['nose_6'] = 'skręcenie kości nosa', + ['cheeks_1'] = 'wysokość kości policzkowych', + ['cheeks_2'] = 'szerokość kości policzkowych', + ['cheeks_3'] = 'szerokość policzków', + ['lip_fullness'] = 'pełne usta', + ['jaw_bone_width'] = 'szerokość kości szczęki', + ['jaw_bone_length'] = 'długość kości szczęki', + ['chin_height'] = 'wysokość podbródka', + ['chin_length'] = 'długość podbródka', + ['chin_width'] = 'szerokość podbródka', + ['chin_hole'] = 'rozmiar dziury w podbródku', + ['neck_thickness'] = 'grubość szyi', ['face'] = 'twarz', ['skin'] = 'skóra', ['wrinkles'] = 'zmarszczki', @@ -10,13 +31,16 @@ Locales['pl'] = { ['beard_color_2'] = 'kolor brody 2', ['hair_1'] = 'włosy 1', ['hair_2'] = 'włosy 2', - ['hair_color_1'] = 'wolor włosów 1', - ['hair_color_2'] = 'wolor włosów 2', - ['eye_color'] = 'eye color', + ['hair_color_1'] = 'kolor włosów 1', + ['hair_color_2'] = 'kolor włosów 2', + ['eye_color'] = 'kolor oczu', + ['eye_squint'] = 'zmrużenie oczu', ['eyebrow_type'] = 'styl brwi', ['eyebrow_size'] = 'wielkość brwi', - ['eyebrow_color_1'] = 'wolor brwi 1', - ['eyebrow_color_2'] = 'wolor brwi 2', + ['eyebrow_color_1'] = 'kolor brwi 1', + ['eyebrow_color_2'] = 'kolor brwi 2', + ['eyebrow_depth'] = 'głębokość brwi', + ['eyebrow_height'] = 'wysokość brwi', ['makeup_type'] = 'styl makijażu', ['makeup_thickness'] = 'grubość makijażu', ['makeup_color_1'] = 'kolor makijażu 1', @@ -25,8 +49,8 @@ Locales['pl'] = { ['lipstick_thickness'] = 'grubość szminki', ['lipstick_color_1'] = 'kolor szminki 1', ['lipstick_color_2'] = 'kolor szminki 2', - ['ear_accessories'] = 'akcesoria do usz', - ['ear_accessories_color'] = 'kolor akcesorii do usz', + ['ear_accessories'] = 'akcesoria do uszu', + ['ear_accessories_color'] = 'kolor akcesorii do uszu', ['tshirt_1'] = 'koszulka 1', ['tshirt_2'] = 'koszulka 2', ['torso_1'] = 'tułów 1', @@ -47,30 +71,32 @@ Locales['pl'] = { ['chain_2'] = 'łańcuch 2', ['helmet_1'] = 'hełm 1', ['helmet_2'] = 'hełm 2', - ['watches_1'] = 'watches 1', - ['watches_2'] = 'watches 2', - ['bracelets_1'] = 'bracelets 1', - ['bracelets_2'] = 'bracelets 2', + ['watches_1'] = 'zegarek 1', + ['watches_2'] = 'zegarek 2', + ['bracelets_1'] = 'bransoletka 1', + ['bracelets_2'] = 'bransoletka 2', ['glasses_1'] = 'okulary 1', ['glasses_2'] = 'okulary 2', ['bag'] = 'torba', ['bag_color'] = 'kolor torby', - ['blemishes'] = 'blemishes', - ['blemishes_size']= 'blemishes thickness', - ['ageing'] = 'ageing', - ['ageing_1'] = 'ageing thickness', - ['blush'] = 'blush', - ['blush_1'] = 'blush thickness', - ['blush_color'] = 'blush color', - ['complexion'] = 'complexion', - ['complexion_1'] = 'complexion thickness', - ['sun'] = 'sun', - ['sun_1'] = 'sun thickness', - ['freckles'] = 'freckles', - ['freckles_1'] = 'freckles thickness', - ['chest_hair'] = 'chest hair', - ['chest_hair_1'] = 'chest hair thickness', - ['chest_color'] = 'chest hair color', - ['bodyb'] = 'body blemishes', - ['bodyb_size'] = 'body blemishes thickness', + ['blemishes'] = 'skazy', + ['blemishes_size']= 'wielkość skaz', + ['ageing'] = 'starzenie', + ['ageing_1'] = 'wielkość starzenia', + ['blush'] = 'rumieńce', + ['blush_1'] = 'grubość rumieni', + ['blush_color'] = 'kolor rumieni', + ['complexion'] = 'cera', + ['complexion_1'] = 'rodzaj cery', + ['sun'] = 'opalenie', + ['sun_1'] = 'wielkość opalenia', + ['freckles'] = 'piegi', + ['freckles_1'] = 'rodzaj piegów', + ['chest_hair'] = 'włosy na klacie', + ['chest_hair_1'] = 'ilość włosów na klacie', + ['chest_color'] = 'kolor włosów na klacie', + ['bodyb'] = 'skazy ciała', + ['bodyb_size'] = 'rodzaj skaz ciała', + ['bodyb_extra'] = 'efekt skaz ciała', + ['bodyb_extra_thickness'] = 'wielkość skaz ciała', } diff --git a/[esx]/skinchanger/locales/sv.lua b/[esx]/skinchanger/locales/sv.lua index 9ca5aab3..651e47d2 100644 --- a/[esx]/skinchanger/locales/sv.lua +++ b/[esx]/skinchanger/locales/sv.lua @@ -1,76 +1,100 @@ Locales['sv'] = { - ['sex'] = 'kön', - ['face'] = 'ansikte', - ['skin'] = 'hud', - ['wrinkles'] = 'rynkor', - ['wrinkle_thickness'] = 'rynk tjocklek', - ['beard_type'] = 'skäggtyp', - ['beard_size'] = 'skäggstorlek', - ['beard_color_1'] = 'skägg färg 1', - ['beard_color_2'] = 'skägg färg 2', - ['hair_1'] = 'hår 1', - ['hair_2'] = 'hår 2', - ['hair_color_1'] = 'hårfärg 1', - ['hair_color_2'] = 'hårfärg 2', - ['eye_color'] = 'eye color', - ['eyebrow_type'] = 'ögonbryn typ', - ['eyebrow_size'] = 'ögonbryn storlek', - ['eyebrow_color_1'] = 'ögonbryn färg 1', - ['eyebrow_color_2'] = 'ögonbryn färg 2', - ['makeup_type'] = 'smink typ', - ['makeup_thickness'] = 'smink tjocklek', - ['makeup_color_1'] = 'smink färg 1', - ['makeup_color_2'] = 'smink färg 2', - ['lipstick_type'] = 'läppstiftstyp', - ['lipstick_thickness'] = 'läppstjocklek', - ['lipstick_color_1'] = 'läppstift färg 1', - ['lipstick_color_2'] = 'läppstift färg 2', - ['ear_accessories'] = 'öron tillbehör', - ['ear_accessories_color'] = 'öron tillbehörs färg', - ['tshirt_1'] = 't-shirt 1', - ['tshirt_2'] = 't-shirt 2', - ['torso_1'] = 'kropp 1', - ['torso_2'] = 'kropp 2', - ['decals_1'] = 'dekaler 1', - ['decals_2'] = 'dekaler 2', - ['arms'] = 'armar', - ['arms_2'] = 'armar 2', - ['pants_1'] = 'byxor 1', - ['pants_2'] = 'byxor 2', - ['shoes_1'] = 'skor 1', - ['shoes_2'] = 'skor 2', - ['mask_1'] = 'mask 1', - ['mask_2'] = 'mask 2', - ['bproof_1'] = 'skottsäker väst 1', - ['bproof_2'] = 'skottsäker väst 2', - ['chain_1'] = 'kedja 1', + ['sex'] = 'Kön', + ['mom'] = 'Mammas ansikte', + ['dad'] = 'Pappas ansikte', + ['resemblance'] = 'Likhet', + ['skin_tone'] = 'Hudton', + ['nose_1'] = 'Näsvidd', + ['nose_2'] = 'Nästoppshöjd', + ['nose_3'] = 'Nästoppslängd', + ['nose_4'] = 'Näsbenshöjd', + ['nose_5'] = 'Nästoppssänkning', + ['nose_6'] = 'Näsbensvridning', + ['cheeks_1'] = 'Kindbens höjd', + ['cheeks_2'] = 'Kindbens bredd', + ['cheeks_3'] = 'Kinder bredd', + ['lip_fullness'] = 'Läppfullhet', + ['jaw_bone_width'] = 'Käkbensbredd', + ['jaw_bone_length'] = 'Käkbenslängd', + ['chin_height'] = 'Hakhöjd', + ['chin_length'] = 'Haklängd', + ['chin_width'] = 'Hakbredd', + ['chin_hole'] = 'Hakhålsstorlek', + ['neck_thickness'] = 'Halstjocklek', + ['wrinkles'] = 'Rynkor', + ['wrinkle_thickness'] = 'Rynktjocklek', + ['beard_type'] = 'Skägg typ', + ['beard_size'] = 'Skäggstorlek', + ['beard_color_1'] = 'Skäggfärg 1', + ['beard_color_2'] = 'Skäggfärg 2', + ['hair_1'] = 'Hår 1', + ['hair_2'] = 'Hår 2', + ['hair_color_1'] = 'Hårfärg 1', + ['hair_color_2'] = 'Hårfärg 1', + ['eye_color'] = 'Ögonfärg', + ['eye_squint'] = 'Ögonkisning', + ['eyebrow_type'] = 'Ögonbrynstyp', + ['eyebrow_size'] = 'Storlek på ögonbrynen', + ['eyebrow_color_1'] = 'Ögonbrynsfärg 1', + ['eyebrow_color_2'] = 'Ögonbrynsfärg 2', + ['eyebrow_depth'] = 'Ögonbryns djup', + ['eyebrow_height'] = 'Ögonbrynshöjd', + ['makeup_type'] = 'Typ av smink', + ['makeup_thickness'] = 'Sminktjocklek', + ['makeup_color_1'] = 'Sminkfärg 1', + ['makeup_color_2'] = 'Sminkfärg 2', + ['lipstick_type'] = 'Läppstiftstyp', + ['lipstick_thickness'] = 'Läppstift tjocklek', + ['lipstick_color_1'] = 'Läppstiftsfärg 1', + ['lipstick_color_2'] = 'Läppstiftsfärg 2', + ['ear_accessories'] = 'Örontillbehör', + ['ear_accessories_color'] = 'Örontillbehör färg', + ['tshirt_1'] = 'T-Shirt 1', + ['tshirt_2'] = 'T-Shirt 2', + ['torso_1'] = 'Kropp 1', + ['torso_2'] = 'Kropp 2', + ['decals_1'] = 'Dekaler 1', + ['decals_2'] = 'Dekaler 2', + ['arms'] = 'Armar', + ['arms_2'] = 'Armar 2', + ['pants_1'] = 'Byxor 1', + ['pants_2'] = 'Byxor 2', + ['shoes_1'] = 'Skor 1', + ['shoes_2'] = 'Skor 2', + ['mask_1'] = 'Mask 1', + ['mask_2'] = 'Mask 2', + ['bproof_1'] = 'Skottsäker väst 1', + ['bproof_2'] = 'Skottsäker väst 2', + ['chain_1'] = 'Kedja 1', ['chain_2'] = 'kedja 2', - ['helmet_1'] = 'hjälm 1', - ['helmet_2'] = 'hjälm 2', - ['watches_1'] = 'watches 1', - ['watches_2'] = 'watches 2', - ['bracelets_1'] = 'bracelets 1', - ['bracelets_2'] = 'bracelets 2', - ['glasses_1'] = 'glasögon 1', - ['glasses_2'] = 'glasögon 2', - ['bag'] = 'väska', - ['bag_color'] = 'väska färg', - ['blemishes'] = 'blemishes', - ['blemishes_size']= 'blemishes thickness', - ['ageing'] = 'ageing', - ['ageing_1'] = 'ageing thickness', - ['blush'] = 'blush', - ['blush_1'] = 'blush thickness', - ['blush_color'] = 'blush color', - ['complexion'] = 'complexion', - ['complexion_1'] = 'complexion thickness', - ['sun'] = 'sun', - ['sun_1'] = 'sun thickness', - ['freckles'] = 'freckles', - ['freckles_1'] = 'freckles thickness', - ['chest_hair'] = 'chest hair', - ['chest_hair_1'] = 'chest hair thickness', - ['chest_color'] = 'chest hair color', - ['bodyb'] = 'body blemishes', - ['bodyb_size'] = 'body blemishes thickness', -} + ['helmet_1'] = 'Hjälm 1', + ['helmet_2'] = 'Hjälm 2', + ['watches_1'] = 'Klockor 1', + ['watches_2'] = 'Klockor 2', + ['bracelets_1'] = 'Armband 1', + ['bracelets_2'] = 'Armband 2', + ['glasses_1'] = 'Glasögon 1', + ['glasses_2'] = 'Glasögon 2', + ['bag'] = 'Väska', + ['bag_color'] = 'Väsk färg', + ['blemishes'] = 'Fläckar', + ['blemishes_size'] = 'Fläckar tjocklek', + ['ageing'] = 'Åldrande', + ['ageing_1'] = 'Åldrande tjocklek', + ['blush'] = 'Rouge', + ['blush_1'] = 'Rouge tjocklek', + ['blush_color'] = 'Rouge färg', + ['complexion'] = 'Hy', + ['complexion_1'] = 'Hy tjocklek', + ['sun'] = 'Sol', + ['sun_1'] = 'Soltjocklek', + ['freckles'] = 'Fräknar', + ['freckles_1'] = 'Fräknar tjocklek', + ['chest_hair'] = 'Brösthår', + ['chest_hair_1'] = 'Brösthårets tjocklek', + ['chest_color'] = 'Hårfärg på bröstet', + ['bodyb'] = 'Kroppsfläckar', + ['bodyb_size'] = 'Kroppsfläckar tjocklek', + ['bodyb_extra'] = 'Fläckar kroppseffekt', + ['bodyb_extra_thickness'] = 'Fläckar kroppseffekt tjocklek', +} \ No newline at end of file diff --git a/[esx_addons]/esx_accessories/fxmanifest.lua b/[esx_addons]/esx_accessories/fxmanifest.lua index c89087a0..1ebdb318 100644 --- a/[esx_addons]/esx_accessories/fxmanifest.lua +++ b/[esx_addons]/esx_accessories/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Accessories' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_accessories/locales/nl.lua b/[esx_addons]/esx_accessories/locales/nl.lua new file mode 100644 index 00000000..4567594a --- /dev/null +++ b/[esx_addons]/esx_accessories/locales/nl.lua @@ -0,0 +1,19 @@ +Locales ['nl'] = { + ['valid_purchase'] = 'kopen?', + ['yes'] = 'ja ($%s)', + ['no'] = 'nee', + ['helmet'] = 'Helm / Hoed', + ['glasses'] = 'Brillen', + ['mask'] = 'Masker', + ['ears'] = 'Oor accessories', + ['shop'] = '%s Winkel', + ['set_unset'] = 'Doe aan / doe uit', + ['not_enough_money'] = 'Je hebt niet genoeg geld', + ['press_access'] = 'Druk op ~INPUT_CONTEXT~ om het menu te openen', + ['accessories_blip'] = 'Accessories', + ['no_ears'] = 'Je hebt geen oor accessories', + ['no_glasses'] = 'je hebt geen brillen', + ['no_helmet'] = 'je hebt geen helm', + ['no_mask'] = 'je hebt geen masker', + ['you_paid'] = 'je betaalde ~g~$%s~s~', +} diff --git a/[esx_addons]/esx_accessories/locales/sv.lua b/[esx_addons]/esx_accessories/locales/sv.lua index 7d033564..8286624a 100644 --- a/[esx_addons]/esx_accessories/locales/sv.lua +++ b/[esx_addons]/esx_accessories/locales/sv.lua @@ -1,19 +1,19 @@ Locales ['sv'] = { - ['valid_purchase'] = 'bekräfta köp?', - ['yes'] = 'ja (%s SEK)', - ['no'] = 'nej', - ['helmet'] = 'hjälm / hat', - ['glasses'] = 'glasögon', - ['mask'] = 'ansiktsmask', - ['ears'] = 'örontillbehör', + ['valid_purchase'] = 'Bekräfta köp?', + ['yes'] = 'Ja (%s SEK)', + ['no'] = 'Nej', + ['helmet'] = 'Hjälm / hatt', + ['glasses'] = 'Glasögon', + ['mask'] = 'Mask', + ['ears'] = 'Öron tillbehör', ['shop'] = '%s affär', - ['set_unset'] = 'ta på / av', - ['not_enough_money'] = 'du har inte råd!', - ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', - ['accessories_blip'] = 'extrautröstning', - ['no_ears'] = 'du har inga öron tillbehör', - ['no_glasses'] = 'du har inga glasögon', - ['no_helmet'] = 'du har ingen hjälm', - ['no_mask'] = 'du har inte någon mask', - ['you_paid'] = 'du har betalat ~g~%s SEK~s~', -} + ['set_unset'] = 'Ta på / av', + ['not_enough_money'] = 'Du har inte tillräckligt med pengar', + ['press_access'] = 'Tryck ~INPUT_CONTEXT~ för att komma åt menyn', + ['accessories_blip'] = 'Tillbehör', + ['no_ears'] = 'Du har inga örontillbehör', + ['no_glasses'] = 'Du har inga glasögon', + ['no_helmet'] = 'Du har ingen hjälm', + ['no_mask'] = 'Du har ingen mask', + ['you_paid'] = 'Du betalade ~g~%s SEK~s~', +} \ No newline at end of file diff --git a/[esx_addons]/esx_addonaccount/fxmanifest.lua b/[esx_addons]/esx_addonaccount/fxmanifest.lua index 6c528153..8619e78c 100644 --- a/[esx_addons]/esx_addonaccount/fxmanifest.lua +++ b/[esx_addons]/esx_addonaccount/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Addon Account' -version '1.5.0' +version '1.7.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_addoninventory/fxmanifest.lua b/[esx_addons]/esx_addoninventory/fxmanifest.lua index bfc1a4d7..b8a211c5 100644 --- a/[esx_addons]/esx_addoninventory/fxmanifest.lua +++ b/[esx_addons]/esx_addoninventory/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Addon Inventory' -version '1.5.0' +version '1.7.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_ambulancejob/client/job.lua b/[esx_addons]/esx_ambulancejob/client/job.lua index 005e1730..155a1e88 100644 --- a/[esx_addons]/esx_ambulancejob/client/job.lua +++ b/[esx_addons]/esx_ambulancejob/client/job.lua @@ -3,6 +3,13 @@ local HasAlreadyEnteredMarker, LastHospital, LastPart, LastPartNum local isBusy, deadPlayers, deadPlayerBlips, isOnDuty = false, {}, {}, false isInShopMenu = false +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + + function OpenAmbulanceActionsMenu() local elements = {{label = _U('cloakroom'), value = 'cloakroom'}} diff --git a/[esx_addons]/esx_ambulancejob/client/main.lua b/[esx_addons]/esx_ambulancejob/client/main.lua index b99c8f12..0ed99442 100644 --- a/[esx_addons]/esx_ambulancejob/client/main.lua +++ b/[esx_addons]/esx_ambulancejob/client/main.lua @@ -290,26 +290,36 @@ function StartDeathTimer() end) end +function GetClosestRespawnPoint() + local PlyCoords = GetEntityCoords(PlayerPedId()) + local ClosestDist, ClosestHospital, ClosestCoord = 10000, {}, nil + + for k,v in pairs(Config.RespawnPoints) do + local Distance = #(PlyCoords - vector3(v.coords.x, v.coords.y, v.coords.z)) + if Distance <= ClosestDist then + ClosestDist = Distance + ClosestHospital = v + ClosestCoord = vector3(v.coords.x, v.coords.y, v.coords.z) + end + end + + return ClosestCoord, ClosestHospital +end + function RemoveItemsAfterRPDeath() TriggerServerEvent('esx_ambulancejob:setDeathStatus', false) CreateThread(function() - DoScreenFadeOut(800) - - while not IsScreenFadedOut() do - Wait(0) - end - ESX.TriggerServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function() - local formattedCoords = { - x = Config.RespawnPoint.coords.x, - y = Config.RespawnPoint.coords.y, - z = Config.RespawnPoint.coords.z - } - + local RespawnCoords, ClosestHospital = GetClosestRespawnPoint() + ESX.SetPlayerData('loadout', {}) - RespawnPed(PlayerPedId(), formattedCoords, Config.RespawnPoint.heading) + DoScreenFadeOut(800) + RespawnPed(PlayerPedId(), RespawnCoords, ClosestHospital.heading) + while not IsScreenFadedOut() do + Wait(0) + end AnimpostfxStop('DeathFailOut') DoScreenFadeIn(800) end) diff --git a/[esx_addons]/esx_ambulancejob/client/vehicle.lua b/[esx_addons]/esx_ambulancejob/client/vehicle.lua index 6a51d64a..0da56abd 100644 --- a/[esx_addons]/esx_ambulancejob/client/vehicle.lua +++ b/[esx_addons]/esx_ambulancejob/client/vehicle.lua @@ -13,7 +13,7 @@ function OpenVehicleSpawnerMenu(type, hospital, part, partNum) }}, function(data, menu) if data.current.action == 'buy_vehicle' then local shopElements = {} - local authorizedVehicles = Config.AuthorizedVehicles[type][ESX.PlayerData.job.grade_name] + local authorizedVehicles = Config.AuthorizedVehicles[type][ESX.PlayerData.job.grade_name] local shopCoords = Config.Hospitals[hospital][part][partNum].InsideShop if #authorizedVehicles > 0 then diff --git a/[esx_addons]/esx_ambulancejob/config.lua b/[esx_addons]/esx_ambulancejob/config.lua index 7bd36288..7f49c7e4 100644 --- a/[esx_addons]/esx_ambulancejob/config.lua +++ b/[esx_addons]/esx_ambulancejob/config.lua @@ -24,8 +24,9 @@ Config.EarlyRespawnFine = false Config.EarlyRespawnFineAmount = 5000 Config.OxInventory = ESX.GetConfig().OxInventory - -Config.RespawnPoint = {coords = vector3(341.0, -1397.3, 32.5), heading = 48.5} +Config.RespawnPoints = { + {coords = vector3(341.0, -1397.3, 32.5), heading = 48.5} +} Config.Hospitals = { diff --git a/[esx_addons]/esx_ambulancejob/fxmanifest.lua b/[esx_addons]/esx_ambulancejob/fxmanifest.lua index a0715a40..424e5f52 100644 --- a/[esx_addons]/esx_ambulancejob/fxmanifest.lua +++ b/[esx_addons]/esx_ambulancejob/fxmanifest.lua @@ -4,43 +4,22 @@ game 'gta5' description 'ESX Ambulance Job' -version '1.5.0' +version '1.7.0' + +shared_scripts { + '@es_extended/imports.lua', + '@es_extended/locale.lua', + 'locales/*.lua', + 'config.lua' +} -shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/de.lua', - 'locales/cs.lua', - 'locales/nl.lua', - 'locales/tr.lua', - 'locales/hu.lua', - 'config.lua', 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/cs.lua', - 'locales/nl.lua', - 'locales/tr.lua', - 'locales/hu.lua', - 'config.lua', 'client/main.lua', 'client/job.lua', 'client/vehicle.lua', diff --git a/[esx_addons]/esx_ambulancejob/locales/br.lua b/[esx_addons]/esx_ambulancejob/locales/br.lua index 58284626..33b78249 100644 --- a/[esx_addons]/esx_ambulancejob/locales/br.lua +++ b/[esx_addons]/esx_ambulancejob/locales/br.lua @@ -5,8 +5,8 @@ Locales['br'] = { ['ems_clothes_ems'] = 'entrar como socorrista', -- Vehicles ['ambulance'] = 'ambulancia', - ['helicopter_prompt'] = 'pressione ~INPUT_CONTEXT~ para acessar a ~y~Helicopter Actions~s~.', - ['garage_prompt'] = 'pressione ~INPUT_CONTEXT~ para entra no ~y~Vehicle Actions~s~.', + ['helicopter_prompt'] = 'pressione ~INPUT_CONTEXT~ para acessar a Helicopter Actions.', + ['garage_prompt'] = 'pressione ~INPUT_CONTEXT~ para entra no Vehicle Actions.', ['garage_title'] = 'ações do veiculo', ['garage_stored'] = 'guardado', ['garage_notstored'] = 'não foi guardado', @@ -24,26 +24,26 @@ Locales['br'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'loja de veículos', ['vehicleshop_confirm'] = 'você quer comprar este veículo?', - ['vehicleshop_bought'] = 'você comprou ~y~%s~s~ para ~g~$%s~s~', + ['vehicleshop_bought'] = 'você comprou %s para $%s', ['vehicleshop_money'] = 'você não pode pagar esse veículo', - ['vehicleshop_awaiting_model'] = 'o veículo está atualmente ~g~DOWNLOADING & LOADING~s~, por favor aguarde', + ['vehicleshop_awaiting_model'] = 'o veículo está atualmente DOWNLOADING & LOADING, por favor aguarde', ['confirm_no'] = 'não', ['confirm_yes'] = 'sim', -- Action Menu ['revive_inprogress'] = 'reanimação em andamento', - ['revive_complete'] = 'você ressuscitou ~y~%s~s~', - ['revive_complete_award'] = 'você ressuscitou ~y~%s~s~, ~g~$%s~s~', + ['revive_complete'] = 'você ressuscitou %s', + ['revive_complete_award'] = 'você ressuscitou %s, $%s', ['revive_fail_offline'] = 'esse cidadão não está mais na cidade', ['heal_inprogress'] = 'você está curando!', - ['heal_complete'] = 'você curou ~y~%s~s~', + ['heal_complete'] = 'você curou %s', ['no_players'] = 'nenhum cidadão nas proximidades', ['player_not_unconscious'] = 'não está inconsciente', ['player_not_conscious'] = 'esse cidadão não está consciente!', -- Boss Menu ['boss_actions'] = 'menu administração', -- Misc - ['invalid_amount'] = '~r~Quantidade inválida', - ['actions_prompt'] = 'aperte ~INPUT_CONTEXT~ para entra ~y~Ambulance Actions~s~.', + ['invalid_amount'] = ' dade inválida', + ['actions_prompt'] = 'aperte ~INPUT_CONTEXT~ para entra Ambulance Actions.', ['deposit_amount'] = 'quantidade inválida para deposito', ['money_withdraw'] = 'quantidade a ser retirada', ['fast_travel'] = 'aperte ~INPUT_CONTEXT~ para mover-se rapidamente.', @@ -64,12 +64,12 @@ Locales['br'] = { -- Phone ['alert_ambulance'] = 'alerta socorrista', -- Death - ['respawn_available_in'] = 'você irar reviver em ~b~%s minutos %s segundos~s~', - ['respawn_bleedout_in'] = 'você vai sangrar ~b~%s minutos %s segundos~s~\n', - ['respawn_bleedout_prompt'] = 'aguarde [~b~E~s~] para reviver', - ['respawn_bleedout_fine'] = 'aguarde [~b~E~s~] para reviver por ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'você precisa pagar ~r~$%s~s~ para reviver', - ['distress_send'] = 'pressione [~b~G~s~] enviar sinal de socorro', + ['respawn_available_in'] = 'você irar reviver em %s minutos %s segundos', + ['respawn_bleedout_in'] = 'você vai sangrar %s minutos %s segundos\n', + ['respawn_bleedout_prompt'] = 'aguarde [ E] para reviver', + ['respawn_bleedout_fine'] = 'aguarde [ E] para reviver por $%s', + ['respawn_bleedout_fine_msg'] = 'você precisa pagar para reviver', + ['distress_send'] = 'pressione [~bs~] enviar sinal de socorro', ['distress_sent'] = 'sinal de socorro foi enviado para as unidades disponíveis!', -- Revive @@ -77,8 +77,8 @@ Locales['br'] = { -- Item ['used_medikit'] = 'você usou 1x Seringa', ['used_bandage'] = 'você usou 1x Vendagem', - ['not_enough_medikit'] = 'você não tem ~b~Seringa~s~.', - ['not_enough_bandage'] = 'você não tem ~b~Vendagem~s~.', + ['not_enough_medikit'] = 'você não tem Seringa.', + ['not_enough_bandage'] = 'você não tem Vendagem.', ['healed'] = 'você foi tratado.', -- Blips ['blip_hospital'] = 'hospital', diff --git a/[esx_addons]/esx_ambulancejob/locales/cs.lua b/[esx_addons]/esx_ambulancejob/locales/cs.lua index 4462052b..077474b3 100644 --- a/[esx_addons]/esx_ambulancejob/locales/cs.lua +++ b/[esx_addons]/esx_ambulancejob/locales/cs.lua @@ -5,8 +5,8 @@ Locales['cs'] = { ['ems_clothes_ems'] = 'zdravotnické oblečení', -- Vehicles ['ambulance'] = 'ambulance', - ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Helicopter Actions~s~.', - ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Vehicle Actions~s~.', + ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the Helicopter Actions.', + ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the Vehicle Actions.', ['garage_title'] = 'vehicle Actions', ['garage_stored'] = 'stored', ['garage_notstored'] = 'not in garage', @@ -24,32 +24,32 @@ Locales['cs'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'vehicle Shop', ['vehicleshop_confirm'] = 'do you want to buy this vehicle?', - ['vehicleshop_bought'] = 'you have bought ~y~%s~s~ for ~g~$%s~s~', + ['vehicleshop_bought'] = 'you have bought %s for $%s', ['vehicleshop_money'] = 'you cannot afford that vehicle', - ['vehicleshop_awaiting_model'] = 'the vehicle is currently ~g~DOWNLOADING & LOADING~s~ please wait', + ['vehicleshop_awaiting_model'] = 'the vehicle is currently DOWNLOADING & LOADING please wait', ['confirm_no'] = 'no', ['confirm_yes'] = 'yes', -- Action Menu ['revive_inprogress'] = 'probíhá oživení!', - ['revive_complete'] = 'oživili jste ~y~%s~s~', - ['revive_complete_award'] = 'oživili jste ~y~%s~s~ a dostali jste ~g~$%s~s~!', + ['revive_complete'] = 'oživili jste %s', + ['revive_complete_award'] = 'oživili jste %s a dostali jste $%s!', ['revive_fail_offline'] = 'that player is no longer online', ['heal_inprogress'] = 'uzdravujete!', - ['heal_complete'] = 'uzdravili jste ~y~%s~s~', + ['heal_complete'] = 'uzdravili jste %s', ['no_players'] = 'v okolí není žádný hráč!', ['player_not_unconscious'] = 'hráč není v bezvědomí!', ['player_not_conscious'] = 'hráč je v bezvědomí!', -- Boss Menu ['boss_actions'] = 'akce šéfa', -- Misc - ['invalid_amount'] = '~r~neplatná částka', - ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the ~y~Ambulance Actions~s~.', + ['invalid_amount'] = ' ná částka', + ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the Ambulance Actions.', ['deposit_amount'] = 'částka vkladu', ['money_withdraw'] = 'částka výběru', ['fast_travel'] = 'stiskněte ~INPUT_CONTEXT~ k rychlému odcestování.', ['open_pharmacy'] = 'stiskněte ~INPUT_CONTEXT~ k otevření lékárny.', ['pharmacy_menu_title'] = 'lékárna', - ['pharmacy_take'] = 'vzít ~y~%s~s~', + ['pharmacy_take'] = 'vzít %s', ['medikit'] = 'lékarnička', ['bandage'] = 'obvaz', ['max_item'] = 'již nesete dostatek věcí.', @@ -64,20 +64,20 @@ Locales['cs'] = { -- Phone ['alert_ambulance'] = 'zdravotnický poplach', -- Death - ['respawn_available_in'] = 'oživení dostupné za ~b~%s minut a %s sekund~s~\n', - ['respawn_bleedout_in'] = 'vykrvácíte za ~b~%s minut a %s sekund~s~\n', - ['respawn_bleedout_prompt'] = 'držte [~b~E~s~] pro respawn.', - ['respawn_now_fine'] = 'držte [~b~E~s~] pro oživení za ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'zaplatili jste ~r~$%s~s~ za respawn.', - ['distress_send'] = 'stiskněte [~b~G~s~] pro vyslání tísňového signálu', + ['respawn_available_in'] = 'oživení dostupné za %s minut a %s sekund\n', + ['respawn_bleedout_in'] = 'vykrvácíte za %s minut a %s sekund\n', + ['respawn_bleedout_prompt'] = 'držte [ E] pro respawn.', + ['respawn_now_fine'] = 'držte [ E] pro oživení za $%s', + ['respawn_bleedout_fine_msg'] = 'zaplatili jste za respawn.', + ['distress_send'] = 'stiskněte [~bs~] pro vyslání tísňového signálu', ['distress_sent'] = 'tísňový signál byl vyslán dostupným jednotkám!', -- Revive ['revive_help'] = 'oživit hráče', -- Item - ['used_medikit'] = 'použili jste ~y~1x~s~ lékarničku', - ['used_bandage'] = 'použili jste ~y~1x~s~ obvaz', - ['not_enough_medikit'] = 'nemáte ~b~medikit~s~.', - ['not_enough_bandage'] = 'nemáte~b~bandage~s~.', + ['used_medikit'] = 'použili jste 1x lékarničku', + ['used_bandage'] = 'použili jste 1x obvaz', + ['not_enough_medikit'] = 'nemáte medikit.', + ['not_enough_bandage'] = 'nemáte bandage.', ['healed'] = 'byli jste ošetřeni.', -- Blips ['blip_hospital'] = 'nemocnice', diff --git a/[esx_addons]/esx_ambulancejob/locales/de.lua b/[esx_addons]/esx_ambulancejob/locales/de.lua index efa572cf..78378bb3 100644 --- a/[esx_addons]/esx_ambulancejob/locales/de.lua +++ b/[esx_addons]/esx_ambulancejob/locales/de.lua @@ -5,8 +5,8 @@ Locales['de'] = { ['ems_clothes_ems'] = 'Uniform', -- Vehicles ['ambulance'] = 'Rettungsdienst', - ['helicopter_prompt'] = 'Drücke ~INPUT_CONTEXT~ um auf das ~y~Helikopter-Menü~s~ zuzugreifen.', - ['garage_prompt'] = 'Drücke ~INPUT_CONTEXT~ um auf das ~y~Fahrzeug-Menü~s~ zuzugreifen.', + ['helicopter_prompt'] = 'Drücke ~INPUT_CONTEXT~ um auf das Helikopter-Menüzugreifen.', + ['garage_prompt'] = 'Drücke ~INPUT_CONTEXT~ um auf das Fahrzeug-Menüzugreifen.', ['garage_title'] = 'Fahrzeugmenü', ['garage_stored'] = 'gelagert', ['garage_notstored'] = 'nicht in der Garage', @@ -24,26 +24,26 @@ Locales['de'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'Fahrzeug-Shop', ['vehicleshop_confirm'] = 'Du möchstest dieses Fahrzeug kaufen?', - ['vehicleshop_bought'] = 'Du hast dir einen ~y~%s~s~ für ~g~$%s~s~ gekauft!', + ['vehicleshop_bought'] = 'Du hast dir einen %sr $%s geft!', ['vehicleshop_money'] = 'Du kannst dir dieses Fahrzeug nicht leisten!', - ['vehicleshop_awaiting_model'] = 'Dieses Fahrzeug ~g~LÄDT~s~ bitte warte', + ['vehicleshop_awaiting_model'] = 'Dieses Fahrzeug LÄDTtte warte', ['confirm_no'] = 'Nein', ['confirm_yes'] = 'Ja', -- Action Menu ['revive_inprogress'] = 'Eine Wiederbelebung findet statt!', - ['revive_complete'] = 'Du hast ~y~%s~s~ wiederbelebt', - ['revive_complete_award'] = 'Du hast ~y~%s~s~ wiederbelebt und dabei ~g~$%s~s~ erhalten!', + ['revive_complete'] = 'Du hast %sederbelebt', + ['revive_complete_award'] = 'Du hast %sederbelebt und dabei $%s erten!', ['revive_fail_offline'] = 'Dieser Spieler ist nicht länger online', ['heal_inprogress'] = 'Du heilst!', - ['heal_complete'] = 'yDu hast ~y~%s~s~ geheilt!', + ['heal_complete'] = 'yDu hast %sheilt!', ['no_players'] = 'Keine Spieler in der Nähe', ['player_not_unconscious'] = 'Diese Spieler ist nicht bewusstlos!', ['player_not_conscious'] = 'Dieser Spieler ist nicht bei Bewusstsein!', -- Boss Menu ['boss_actions'] = 'Chef-Aktionen', -- Misc - ['invalid_amount'] = '~r~Ungültige Menge', - ['actions_prompt'] = 'Drücke ~INPUT_CONTEXT~ um das ~y~Rettungsdienst-Menü~s~ zu öffnen.', + ['invalid_amount'] = ' ige Menge', + ['actions_prompt'] = 'Drücke ~INPUT_CONTEXT~ um das Rettungsdienst-Menü öffnen.', ['deposit_amount'] = 'Menge deponieren', ['money_withdraw'] = 'Menge abheben', ['fast_travel'] = 'Drücke ~INPUT_CONTEXT~ zu schnellreisen.', @@ -63,20 +63,20 @@ Locales['de'] = { -- Phone ['alert_ambulance'] = 'Rettungsdienst alarmieren', -- Death - ['respawn_available_in'] = 'Respawn in ~b~%s Minuten %s Sekunden~s~ verfügbar', - ['respawn_bleedout_in'] = 'Du wirst in ~b~%s Minuten %s Sekunden~s~ ausbluten\n', - ['respawn_bleedout_prompt'] = 'Drücke [~b~E~s~] um zu respawnen', - ['respawn_bleedout_fine'] = 'Drücke [~b~E~s~] um für ~g~$%s~s~ zu respawnen', - ['respawn_bleedout_fine_msg'] = 'Du hast ~r~$%s~s~ bezahlt, um zu respawnen.', - ['distress_send'] = 'Drücke [~b~G~s~] um ein Notsignal zu senden', + ['respawn_available_in'] = 'Respawn in %s Minuten %s Sekundenrfügbar', + ['respawn_bleedout_in'] = 'Du wirst in %s Minuten %s Sekundensbluten\n', + ['respawn_bleedout_prompt'] = 'Drücke [ Em zu respawnen', + ['respawn_bleedout_fine'] = 'Drücke [ Em für $%s zuspawnen', + ['respawn_bleedout_fine_msg'] = 'Du hast bezahlt, um zu respawnen.', + ['distress_send'] = 'Drücke [~bs~] um ein Notsignal zu senden', ['distress_sent'] = 'Notsignal wurde an den Rettungsdienst übermittelt!', -- Revive ['revive_help'] = 'Belebe einen Spieler wieder', -- Item - ['used_medikit'] = 'Du hast ~y~ein~s~ Medikit verwendet', - ['used_bandage'] = 'Du hast ~y~einen~s~ Verband verwendet', - ['not_enough_medikit'] = 'Du hast keine ~b~Medikits~s~.', - ['not_enough_bandage'] = 'Du hast keine ~b~Verbände~s~.', + ['used_medikit'] = 'Du hast eindikit verwendet', + ['used_bandage'] = 'Du hast einenrband verwendet', + ['not_enough_medikit'] = 'Du hast keine Medikits', + ['not_enough_bandage'] = 'Du hast keine Verbände', ['healed'] = 'Du wurdest behandelt.', -- Blips ['blip_hospital'] = 'Krankenhaus', diff --git a/[esx_addons]/esx_ambulancejob/locales/en.lua b/[esx_addons]/esx_ambulancejob/locales/en.lua index 80540568..97d55cfd 100644 --- a/[esx_addons]/esx_ambulancejob/locales/en.lua +++ b/[esx_addons]/esx_ambulancejob/locales/en.lua @@ -1,85 +1,85 @@ Locales['en'] = { -- Cloakroom - ['cloakroom'] = 'locker Room', - ['ems_clothes_civil'] = 'civilian Clothes', + ['cloakroom'] = 'Locker Room', + ['ems_clothes_civil'] = 'Civilian Clothes', ['ems_clothes_ems'] = 'EMS Clothes', -- Vehicles - ['ambulance'] = 'ambulance', - ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Helicopter Actions~s~.', - ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Vehicle Actions~s~.', - ['garage_title'] = 'vehicle Actions', - ['garage_stored'] = 'stored', - ['garage_notstored'] = 'not in garage', - ['garage_storing'] = 'we\'re attempting to remove the vehicle, make sure no players are around it.', - ['garage_has_stored'] = 'the vehicle has been stored in your garage', - ['garage_has_notstored'] = 'no nearby owned vehicles were found', - ['garage_notavailable'] = 'your vehicle is not stored in the garage.', - ['garage_blocked'] = 'there\'s no available spawn points!', - ['garage_empty'] = 'you dont have any vehicles in your garage.', - ['garage_released'] = 'your vehicle has been released from the garage.', - ['garage_store_nearby'] = 'there is no nearby vehicles.', - ['garage_storeditem'] = 'open garage', - ['garage_storeitem'] = 'store vehicle in garage', - ['garage_buyitem'] = 'vehicle shop', + ['ambulance'] = 'Ambulance', + ['helicopter_prompt'] = 'Press ~INPUT_CONTEXT~ to access the Helicopter Actions.', + ['garage_prompt'] = 'Press ~INPUT_CONTEXT~ to access the Vehicle Actions.', + ['garage_title'] = 'Vehicle Actions', + ['garage_stored'] = 'Stored', + ['garage_notstored'] = 'Not in garage', + ['garage_storing'] = 'We\'re attempting to remove the vehicle, make sure no players are around it.', + ['garage_has_stored'] = 'The vehicle has been stored in your garage', + ['garage_has_notstored'] = 'No nearby owned vehicles were found', + ['garage_notavailable'] = 'Your vehicle is not stored in the garage.', + ['garage_blocked'] = 'There\'s no available spawn points!', + ['garage_empty'] = 'You dont have any vehicles in your garage.', + ['garage_released'] = 'Your vehicle has been released from the garage.', + ['garage_store_nearby'] = 'There is no nearby vehicles.', + ['garage_storeditem'] = 'Open garage', + ['garage_storeitem'] = 'Store vehicle in garage', + ['garage_buyitem'] = 'Vehicle shop', ['shop_item'] = '$%s', - ['vehicleshop_title'] = 'vehicle Shop', - ['vehicleshop_confirm'] = 'do you want to buy this vehicle?', - ['vehicleshop_bought'] = 'you have bought ~y~%s~s~ for ~g~$%s~s~', - ['vehicleshop_money'] = 'you cannot afford that vehicle', - ['vehicleshop_awaiting_model'] = 'the vehicle is currently ~g~DOWNLOADING & LOADING~s~ please wait', - ['confirm_no'] = 'no', - ['confirm_yes'] = 'yes', + ['vehicleshop_title'] = 'Yehicle Shop', + ['vehicleshop_confirm'] = 'Yo you want to buy this vehicle?', + ['vehicleshop_bought'] = 'You have bought %s for $%s', + ['vehicleshop_money'] = 'You cannot afford that vehicle', + ['vehicleshop_awaiting_model'] = 'The vehicle is currently DOWNLOADING & LOADING please wait', + ['confirm_no'] = 'No', + ['confirm_yes'] = 'Yes', -- Action Menu - ['revive_inprogress'] = 'a revive is in progress!', - ['revive_complete'] = 'you have revived ~y~%s~s~', - ['revive_complete_award'] = 'you have revived ~y~%s~s~ and earned ~g~$%s~s~!', - ['revive_fail_offline'] = 'that player is no longer online', - ['heal_inprogress'] = 'you are healing!', - ['heal_complete'] = 'you have healed ~y~%s~s~', - ['no_players'] = 'no players nearby', - ['player_not_unconscious'] = 'that player is not unconscious!', - ['player_not_conscious'] = 'that player is not conscious!', + ['revive_inprogress'] = 'A revive is in progress!', + ['revive_complete'] = 'You have revived %s', + ['revive_complete_award'] = 'You have revived %s and earned $%s!', + ['revive_fail_offline'] = 'That player is no longer online', + ['heal_inprogress'] = 'You are healing!', + ['heal_complete'] = 'You have healed %s', + ['no_players'] = 'No players nearby', + ['player_not_unconscious'] = 'That player is not unconscious!', + ['player_not_conscious'] = 'That player is not conscious!', -- Boss Menu - ['boss_actions'] = 'boss Actions', + ['boss_actions'] = 'Boss Actions', -- Misc - ['invalid_amount'] = '~r~Invalid amount', - ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the ~y~Ambulance Actions~s~.', - ['deposit_amount'] = 'deposit Amount', - ['money_withdraw'] = 'amount withdrawn', + ['invalid_amount'] = 'Invalid amount', + ['actions_prompt'] = 'Press ~INPUT_CONTEXT~ access the Ambulance Actions.', + ['deposit_amount'] = 'Deposit Amount', + ['money_withdraw'] = 'Amount withdrawn', ['fast_travel'] = 'press ~INPUT_CONTEXT~ to fast travel.', - ['open_pharmacy'] = 'press ~INPUT_CONTEXT~ to open the pharmacy.', - ['pharmacy_menu_title'] = 'pharmacy', - ['pharmacy_take'] = 'take %s', - ['medikit'] = 'medikit', - ['bandage'] = 'bandage', + ['open_pharmacy'] = 'Press ~INPUT_CONTEXT~ to open the pharmacy.', + ['pharmacy_menu_title'] = 'Pharmacy', + ['pharmacy_take'] = 'Take %s', + ['medikit'] = 'Medikit', + ['bandage'] = 'Bandage', ['max_item'] = 'You are already carrying enough.', -- F6 Menu ['ems_menu'] = 'EMS Menu', - ['ems_menu_title'] = 'ambulance - EMS Menu', - ['ems_menu_revive'] = 'revive Player', - ['ems_menu_putincar'] = 'put in Vehicle', - ['ems_menu_small'] = 'heal small wounds', - ['ems_menu_big'] = 'treat serious injuries', - ['ems_menu_search'] = 'patient not found', + ['ems_menu_title'] = 'Ambulance - EMS Menu', + ['ems_menu_revive'] = 'Revive Player', + ['ems_menu_putincar'] = 'Put in Vehicle', + ['ems_menu_small'] = 'Heal small wounds', + ['ems_menu_big'] = 'Treat serious injuries', + ['ems_menu_search'] = 'Patient not found', -- Phone - ['alert_ambulance'] = 'alert Ambulance', + ['alert_ambulance'] = 'Alert Ambulance', -- Death - ['respawn_available_in'] = 'respawn available in ~b~%s minutes %s seconds~s~', - ['respawn_bleedout_in'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n', - ['respawn_bleedout_prompt'] = 'hold [~b~E~s~] to respawn', - ['respawn_bleedout_fine'] = 'hold [~b~E~s~] to respawn for ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'you paid ~r~$%s~s~ to respawn.', - ['distress_send'] = 'press [~b~G~s~] to send distress signal', - ['distress_sent'] = 'distress signal has been sent to available units!', + ['respawn_available_in'] = 'Respawn available in %s minutes %s seconds', + ['respawn_bleedout_in'] = 'You will bleed out in %s minutes %s seconds\n', + ['respawn_bleedout_prompt'] = 'Hold [E] to respawn', + ['respawn_bleedout_fine'] = 'Hold [E] to respawn for $%s', + ['respawn_bleedout_fine_msg'] = 'You paid $%s to respawn.', + ['distress_send'] = 'Press [~b~[E]o send distress signal', + ['distress_sent'] = 'Distress signal has been sent to available units!', -- Revive ['revive_help'] = 'revive a player', -- Item - ['used_medikit'] = 'You have used ~y~1x~s~ medikit', - ['used_bandage'] = 'You have used ~y~1x~s~ bandage', - ['not_enough_medikit'] = 'You do not have ~b~medikit~s~.', - ['not_enough_bandage'] = 'You do not have ~b~bandage~s~.', - ['healed'] = 'you have been treated.', + ['used_medikit'] = 'You have used 1x medikit', + ['used_bandage'] = 'You have used 1x bandage', + ['not_enough_medikit'] = 'You do not have medikit.', + ['not_enough_bandage'] = 'You do not have bandage.', + ['healed'] = 'You have been treated.', -- Blips - ['blip_hospital'] = 'hospital', - ['blip_dead'] = 'unconscious player', + ['blip_hospital'] = 'Hospital', + ['blip_dead'] = 'Unconscious player', } diff --git a/[esx_addons]/esx_ambulancejob/locales/es.lua b/[esx_addons]/esx_ambulancejob/locales/es.lua index fc947ade..98bddd62 100644 --- a/[esx_addons]/esx_ambulancejob/locales/es.lua +++ b/[esx_addons]/esx_ambulancejob/locales/es.lua @@ -7,8 +7,8 @@ Locales['es'] = { ['ems_clothes_ems'] = 'Equipo de ambulancia', -- Vehicles ['ambulance'] = 'Ambulancia', - ['helicopter_prompt'] = 'Presiona ~INPUT_CONTEXT~ para acceder al ~y~Acciones de helicópteros~s~.', - ['garage_prompt'] = 'Presiona ~INPUT_CONTEXT~ para acceder al ~y~Acciones de vehículos~s~.', + ['helicopter_prompt'] = 'Presiona ~INPUT_CONTEXT~ para acceder al Acciones de helicópteros.', + ['garage_prompt'] = 'Presiona ~INPUT_CONTEXT~ para acceder al Acciones de vehículos.', ['garage_title'] = 'Acciones de vehículos', ['garage_stored'] = 'Almacenado', ['garage_notstored'] = 'No en el garaje', @@ -26,26 +26,26 @@ Locales['es'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'Tienda de vehículos', ['vehicleshop_confirm'] = '¿Quieres comprar este vehículo?', - ['vehicleshop_bought'] = 'Usted ha comprado ~y~%s~s~ para ~g~$%s~s~', + ['vehicleshop_bought'] = 'Usted ha comprado %s para $%s', ['vehicleshop_money'] = 'No puedes pagar ese vehículo', - ['vehicleshop_awaiting_model'] = 'El vehículo está actualmente ~g~DESCARGANDO & CARGANDO~s~ por favor espere.', + ['vehicleshop_awaiting_model'] = 'El vehículo está actualmente DESCARGANDO & CARGANDO por favor espere.', ['confirm_no'] = 'No', ['confirm_yes'] = 'Si', -- Action Menu ['revive_inprogress'] = 'Reanimación en curso', - ['revive_complete'] = 'Has sido reanimado ~y~%s~s~', - ['revive_complete_award'] = 'Has sido reanimado ~y~%s~s~, ~g~$%s~s~', + ['revive_complete'] = 'Has sido reanimado %s', + ['revive_complete_award'] = 'Has sido reanimado %s, $%s', ['revive_fail_offline'] = 'Ese jugador ya no está en línea', ['heal_inprogress'] = '!Te estas curando!', - ['heal_complete'] = 'Te has curado ~y~%s~s~', + ['heal_complete'] = 'Te has curado %s', ['no_players'] = 'Ningún jugador cerca', ['player_not_unconscious'] = 'n\'Estás inconsciente', ['player_not_conscious'] = '¡Ese jugador no está consciente!', -- Boss Menu ['boss_actions'] = 'Acciones del jefe', -- Misc - ['invalid_amount'] = '~r~Cantidad no válida', - ['actions_prompt'] = 'Presiona ~INPUT_CONTEXT~ acceder al ~y~Acciones de ambulancia~s~.', + ['invalid_amount'] = ' ad no válida', + ['actions_prompt'] = 'Presiona ~INPUT_CONTEXT~ acceder al Acciones de ambulancia.', ['deposit_amount'] = 'Cantidad de fianza depositada', ['money_withdraw'] = 'Cantidad de fianza retirada', ['fast_travel'] = 'Presiona ~INPUT_CONTEXT~ para viajar rápido.', @@ -66,21 +66,21 @@ Locales['es'] = { -- Phone ['alert_ambulance'] = 'Alerta de ambulancia', -- Death - ['respawn_available_in'] = 'Reaparición disponible en ~b~%s minutes %s seconds~s~', - ['respawn_bleedout_in'] = 'te desangrarás en ~b~%s minutes %s seconds~s~\n', - ['respawn_bleedout_prompt'] = 'Mantén [~b~E~s~] reaparecer', - ['respawn_bleedout_fine'] = 'Mantén [~b~E~s~] para reaparecer ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'Tu pagaste ~r~$%s~s~ para reaparecer.', - ['distress_send'] = 'Presiona [~b~G~s~] para enviar señal de socorro', + ['respawn_available_in'] = 'Reaparición disponible en %s minutes %s seconds', + ['respawn_bleedout_in'] = 'te desangrarás en %s minutes %s seconds\n', + ['respawn_bleedout_prompt'] = 'Mantén [ E] reaparecer', + ['respawn_bleedout_fine'] = 'Mantén [ E] para reaparecer $%s', + ['respawn_bleedout_fine_msg'] = 'Tu pagaste para reaparecer.', + ['distress_send'] = 'Presiona [~bs~] para enviar señal de socorro', ['distress_sent'] = 'Se ha enviado una señal de socorro a las unidades disponibles.', -- Revive ['revive_help'] = 'Revivir un jugador', -- Item - ['used_medikit'] = 'Has usado ~y~1x~s~ Kit médico', - ['used_bandage'] = 'Has usado ~y~1x~s~ Vendas', - ['not_enough_medikit'] = 'Usted no tiene ~b~Kit médico~s~.', - ['not_enough_bandage'] = 'Usted no tiene ~b~Vendas~s~.', + ['used_medikit'] = 'Has usado 1x Kit médico', + ['used_bandage'] = 'Has usado 1x Vendas', + ['not_enough_medikit'] = 'Usted no tiene Kit médico.', + ['not_enough_bandage'] = 'Usted no tiene Vendas.', ['healed'] = 'Has sido tratado.', -- Blips ['blip_hospital'] = 'Hospital', diff --git a/[esx_addons]/esx_ambulancejob/locales/fi.lua b/[esx_addons]/esx_ambulancejob/locales/fi.lua index 4c9b0b0e..e03b036d 100644 --- a/[esx_addons]/esx_ambulancejob/locales/fi.lua +++ b/[esx_addons]/esx_ambulancejob/locales/fi.lua @@ -5,8 +5,8 @@ Locales['fi'] = { ['ems_clothes_ems'] = 'työkamppeet', -- Vehicles ['ambulance'] = 'ambulance', - ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Helicopter Actions~s~.', - ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Vehicle Actions~s~.', + ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the Helicopter Actions.', + ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the Vehicle Actions.', ['garage_title'] = 'vehicle Actions', ['garage_stored'] = 'stored', ['garage_notstored'] = 'not in garage', @@ -24,26 +24,26 @@ Locales['fi'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'vehicle Shop', ['vehicleshop_confirm'] = 'do you want to buy this vehicle?', - ['vehicleshop_bought'] = 'you have bought ~y~%s~s~ for ~g~$%s~s~', + ['vehicleshop_bought'] = 'you have bought %s for $%s', ['vehicleshop_money'] = 'you cannot afford that vehicle', - ['vehicleshop_awaiting_model'] = 'the vehicle is currently ~g~DOWNLOADING & LOADING~s~ please wait', + ['vehicleshop_awaiting_model'] = 'the vehicle is currently DOWNLOADING & LOADING please wait', ['confirm_no'] = 'no', ['confirm_yes'] = 'yes', -- Action Menu ['revive_inprogress'] = 'elvytys on menossa!', - ['revive_complete'] = 'sinä elvytit henkilön ~y~%s~s~', - ['revive_complete_award'] = 'sinä elvytit henkilön ~y~%s~s~ ja tienasit ~g~$%s~s~!', + ['revive_complete'] = 'sinä elvytit henkilön %s', + ['revive_complete_award'] = 'sinä elvytit henkilön %s ja tienasit $%s!', ['revive_fail_offline'] = 'that player is no longer online', ['heal_inprogress'] = 'sinä olet parantamassa!', - ['heal_complete'] = 'sinä paransit henkilön ~y~%s~s~', + ['heal_complete'] = 'sinä paransit henkilön %s', ['no_players'] = 'ei pelaajia lähettyvillä', ['player_not_unconscious'] = 'tämä pelaaja ei ole tajuton!', ['player_not_conscious'] = 'tämä pelaaja ei ole tajuissaan!', -- Boss Menu ['boss_actions'] = 'pomovalikko', -- Misc - ['invalid_amount'] = '~r~Virheellinen summa', - ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the ~y~Ambulance Actions~s~.', + ['invalid_amount'] = ' llinen summa', + ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the Ambulance Actions.', ['deposit_amount'] = 'talletettava summa', ['money_withdraw'] = 'nostettava summa', ['fast_travel'] = 'paina ~INPUT_CONTEXT~ liikkuaksesi nopeasti kerrosten välillä', @@ -64,20 +64,20 @@ Locales['fi'] = { -- Phone ['alert_ambulance'] = 'hälyytys Ensihoidolle', -- Death - ['respawn_available_in'] = 'respawn available in ~b~%s minutes %s seconds~s~', - ['respawn_bleedout_in'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n', - ['respawn_bleedout_prompt'] = 'hold [~b~E~s~] to respawn', - ['respawn_bleedout_fine'] = 'hold [~b~E~s~] to respawn for ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'you paid ~r~$%s~s~ to respawn.', - ['distress_send'] = 'press [~b~G~s~] to send distress signal', + ['respawn_available_in'] = 'respawn available in %s minutes %s seconds', + ['respawn_bleedout_in'] = 'you will bleed out in %s minutes %s seconds\n', + ['respawn_bleedout_prompt'] = 'hold [ E] to respawn', + ['respawn_bleedout_fine'] = 'hold [ E] to respawn for $%s', + ['respawn_bleedout_fine_msg'] = 'you paid to respawn.', + ['distress_send'] = 'press [~bs~] to send distress signal', ['distress_sent'] = 'distress signal has been sent to available units!', -- Revive ['revive_help'] = 'elvytä pelaaja', -- Item ['used_medikit'] = 'sinä käytit ensiapupakkauksen', ['used_bandage'] = 'sinä käytit sideharsoja', - ['not_enough_medikit'] = 'ei tarpeeksi ~b~ensiapupakkauksia~s~.', - ['not_enough_bandage'] = 'ei tarpeeksi ~b~sideharsoja~s~.', + ['not_enough_medikit'] = 'ei tarpeeksi ensiapupakkauksia.', + ['not_enough_bandage'] = 'ei tarpeeksi sideharsoja.', ['healed'] = 'sinua parannettiin', -- Blips ['blip_hospital'] = 'sairaala', diff --git a/[esx_addons]/esx_ambulancejob/locales/fr.lua b/[esx_addons]/esx_ambulancejob/locales/fr.lua index 07b4570d..eb279db6 100644 --- a/[esx_addons]/esx_ambulancejob/locales/fr.lua +++ b/[esx_addons]/esx_ambulancejob/locales/fr.lua @@ -5,8 +5,8 @@ Locales['fr'] = { ['ems_clothes_ems'] = 'tenue Ambulancier', -- Vehicles ['ambulance'] = 'ambulance', - ['helicopter_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder aux ~y~Actions de l\'hélicoptère~s~.', - ['garage_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder aux ~y~Actions des véhciules~s~.', + ['helicopter_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder aux Actions de l\'hélicoptère.', + ['garage_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder aux Actions des véhciules.', ['garage_title'] = 'actions véhicules', ['garage_stored'] = 'rangé', ['garage_notstored'] = 'en dehors du garage', @@ -24,26 +24,26 @@ Locales['fr'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'magasin véhicule', ['vehicleshop_confirm'] = 'voulez-vous acheter ce véhicule?', - ['vehicleshop_bought'] = 'vous avez acheté ~y~%s~s~ pour ~g~$%s~s~', + ['vehicleshop_bought'] = 'vous avez acheté %s pour $%s', ['vehicleshop_money'] = 'vous ne pouvez pas acheter ce véhicule', - ['vehicleshop_awaiting_model'] = 'le véhicule est actuellement en ~g~PRÉPARATION~s~ veuillez patienter', + ['vehicleshop_awaiting_model'] = 'le véhicule est actuellement en PRÉPARATION veuillez patienter', ['confirm_no'] = 'non', ['confirm_yes'] = 'oui', -- Action Menu ['revive_inprogress'] = 'réanimation en cours', - ['revive_complete'] = 'vous avez réanimé ~y~%s~s~', - ['revive_complete_award'] = 'vous avez réanimé ~y~%s~s~, ~g~$%s~s~', + ['revive_complete'] = 'vous avez réanimé %s', + ['revive_complete_award'] = 'vous avez réanimé %s, $%s', ['revive_fail_offline'] = 'ce joueur n\'est plus en ligne', ['heal_inprogress'] = 'vous soignez...', - ['heal_complete'] = 'vous avez soigné ~y~%s~s~', + ['heal_complete'] = 'vous avez soigné %s', ['no_players'] = 'aucun joueur à proximité', ['player_not_unconscious'] = 'n\'est pas inconscient', ['player_not_conscious'] = 'Cette personne est inconsciente!', -- Boss Menu ['boss_actions'] = 'action Patron', -- Misc - ['invalid_amount'] = '~r~montant invalide~s~', - ['actions_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ accédez aux ~y~Actions d\'Ambulance~s~.', + ['invalid_amount'] = ' t invalide', + ['actions_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ accédez aux Actions d\'Ambulance.', ['deposit_amount'] = 'montant du dépôt', ['money_withdraw'] = 'montant du retrait', ['fast_travel'] = 'appuyez sur ~INPUT_CONTEXT~ pour vous déplacer rapidement.', @@ -64,20 +64,20 @@ Locales['fr'] = { -- Phone ['alert_ambulance'] = 'alerte Ambulance', -- Death - ['respawn_available_in'] = 'réanimation possible dans ~b~%s minutes %s secondes~s~', - ['respawn_bleedout_in'] = 'vous allez souffrir d\'une hémorragie dans ~b~%s minutes %s secondes~s~\n', - ['respawn_bleedout_prompt'] = 'maintenez [~b~E~s~] pour être réanimé', - ['respawn_bleedout_fine'] = 'maintenez [~b~E~s~] pour être réanimé pour ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'vous avez payé ~r~$%s~s~ pour être réanimer.', - ['distress_send'] = 'appuyez sur [~b~G~s~] pour envoyer un signal de détresse', + ['respawn_available_in'] = 'réanimation possible dans %s minutes %s secondes', + ['respawn_bleedout_in'] = 'vous allez souffrir d\'une hémorragie dans %s minutes %s secondes\n', + ['respawn_bleedout_prompt'] = 'maintenez [ E] pour être réanimé', + ['respawn_bleedout_fine'] = 'maintenez [ E] pour être réanimé pour $%s', + ['respawn_bleedout_fine_msg'] = 'vous avez payé pour être réanimer.', + ['distress_send'] = 'appuyez sur [~bs~] pour envoyer un signal de détresse', ['distress_sent'] = 'un signal a été envoyé à toutes les unités disponibles!', -- Revive ['revive_help'] = 'relancer un joueur', -- Item ['used_medikit'] = 'vous avez utilisé 1x kit de soin', ['used_bandage'] = 'vous avez utilisé 1x bandage', - ['not_enough_medikit'] = 'vous n\'avez pas de ~b~kit de soin~s~.', - ['not_enough_bandage'] = 'vous n\'avez pas de ~b~bandage~s~.', + ['not_enough_medikit'] = 'vous n\'avez pas de kit de soin.', + ['not_enough_bandage'] = 'vous n\'avez pas de bandage.', ['healed'] = 'vous avez été soigné.', -- Blips ['blip_hospital'] = 'hôpital', diff --git a/[esx_addons]/esx_ambulancejob/locales/hu.lua b/[esx_addons]/esx_ambulancejob/locales/hu.lua index debffd18..8fdda7fb 100644 --- a/[esx_addons]/esx_ambulancejob/locales/hu.lua +++ b/[esx_addons]/esx_ambulancejob/locales/hu.lua @@ -5,54 +5,54 @@ Locales['hu'] = { ['ems_clothes_ems'] = 'Munkaruha', -- Vehicles ['ambulance'] = 'Mentőautó', - ['helicopter_prompt'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a helikopter listához.', - ['garage_prompt'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a kocsi listához.', + ['helicopter_prompt'] = ' [Információ]:omd meg az ~INPUT_CONTEXT~ gombot a helikopter listához.', + ['garage_prompt'] = ' [Információ]:omd meg az ~INPUT_CONTEXT~ gombot a kocsi listához.', ['garage_title'] = 'Autó funkciók', ['garage_stored'] = 'Garázsba', ['garage_notstored'] = 'Ismeretlen helyen', ['garage_storing'] = 'Próbáljuk betteni a kocsid a garázsodba, de előtte nézz körül, hogy biztos nincs melletted senki', - ['garage_has_stored'] = '~b~[Információ]:~s~ Sikeresen tároltad a garázsba!', - ['garage_has_notstored'] = '~r~[Információ]:~s~ Nincs a közeledben semmi!', - ['garage_notavailable'] = '~r~[Információ]:~s~ Nem tárolhatod a garázsba!', - ['garage_blocked'] = '~r~[Információ]:~s~ Valami gátolja a kocsi lehívását!', - ['garage_empty'] = '~r~[Információ]:~s~ Nem teheted a garázsba!', - ['garage_released'] = '~b~[Információ]:~s~ Sikeresen kivetted!', - ['garage_store_nearby'] = '~r~[Információ]:~s~ Nincs a közeledben semmi!', + ['garage_has_stored'] = ' [Információ]:keresen tároltad a garázsba!', + ['garage_has_notstored'] = ' máció]:ncs a közeledben semmi!', + ['garage_notavailable'] = ' máció]:m tárolhatod a garázsba!', + ['garage_blocked'] = ' máció]:lami gátolja a kocsi lehívását!', + ['garage_empty'] = ' máció]:m teheted a garázsba!', + ['garage_released'] = ' [Információ]:keresen kivetted!', + ['garage_store_nearby'] = ' máció]:ncs a közeledben semmi!', ['garage_storeditem'] = 'Garázs megnyitása', ['garage_storeitem'] = 'Kocsi berakása a garázsba', ['garage_buyitem'] = 'Kocsi igénylés', ['shop_item'] = '$%s', ['vehicleshop_title'] = 'Autókereskedés', ['vehicleshop_confirm'] = 'Megszeretnéd venni ezt a járművet?', - ['vehicleshop_bought'] = '~b~[Információ]:~s~ Sikeresen igényeltél egy ~b~%s~s~ ennyiért: ~r~%s~s~$', - ['vehicleshop_money'] = '~r~[Információ]:~s~ Ezt most nem tudod megtenni!', + ['vehicleshop_bought'] = ' [Információ]:keresen igényeltél egy %s enért: ', + ['vehicleshop_money'] = ' máció]:t most nem tudod megtenni!', ['vehicleshop_awaiting_model'] = 'Betöltés..', ['confirm_no'] = 'Vissza', ['confirm_yes'] = 'Igényel', -- Action Menu - ['revive_inprogress'] = '~b~[Információ]:~s~ Elkezdted az újraélesztést!', - ['revive_complete'] = '~b~[Információ]:~s~ Újraélesztetted: ~b~%s~s~', - ['revive_complete_award'] = '~b~[Információ]:~s~ Újraélesztetted: ~b~%s~s~ játékost.', + ['revive_inprogress'] = ' [Információ]:kezdted az újraélesztést!', + ['revive_complete'] = ' [Információ]:raélesztetted: %s', + ['revive_complete_award'] = ' [Információ]:raélesztetted: %s jáost.', ['revive_fail_offline'] = 'A játékos nem elérhető', - ['heal_inprogress'] = '~b~[Információ]:~s~ Elkezdted a gyógyítást!', - ['heal_complete'] = '~b~[Információ]:~s~ Meggyógyítottad: ~b~%s~s~ játékost.', - ['no_players'] = '~r~[Információ]:~s~ Nincs a közeledben senki!', - ['player_not_unconscious'] = '~b~[Információ]:~s~ A játékos nincs öntudatánál!', - ['player_not_conscious'] = '~b~[Információ]:~s~ A játékos nincs öntudatánál!', + ['heal_inprogress'] = ' [Információ]:kezdted a gyógyítást!', + ['heal_complete'] = ' [Információ]:ggyógyítottad: %s jáost.', + ['no_players'] = ' máció]:ncs a közeledben senki!', + ['player_not_unconscious'] = ' [Információ]:játékos nincs öntudatánál!', + ['player_not_conscious'] = ' [Információ]:játékos nincs öntudatánál!', -- Boss Menu ['boss_actions'] = 'Leader panel', -- Misc - ['invalid_amount'] = '~r~Érvénytelen mennyiség', - ['actions_prompt'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a panel megnyitásához.', + ['invalid_amount'] = ' telen mennyiség', + ['actions_prompt'] = ' [Információ]:omd meg az ~INPUT_CONTEXT~ gombot a panel megnyitásához.', ['deposit_amount'] = 'Összeg betétele', ['money_withdraw'] = 'Összeg kivétele', ['fast_travel'] = 'Nyomj ~INPUT_CONTEXT~ hogy használd a liftet', - ['open_pharmacy'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a gyógyszer kivételéhez.', + ['open_pharmacy'] = ' [Információ]:omd meg az ~INPUT_CONTEXT~ gombot a gyógyszer kivételéhez.', ['pharmacy_menu_title'] = 'Kellékek', ['pharmacy_take'] = 'Kivétel: %s', ['medikit'] = 'Elsősegély készlet', ['bandage'] = 'Kötszer', - ['max_item'] = '~r~[Információ]:~s~ Nem fér már el nálad!', + ['max_item'] = ' máció]:m fér már el nálad!', -- F6 Menu ['ems_menu'] = 'EMS menü', ['ems_menu_title'] = 'EMS Menu', @@ -64,21 +64,21 @@ Locales['hu'] = { -- Phone ['alert_ambulance'] = 'EMS értesités', -- Death - ['respawn_available_in'] = 'Újraéledés: ~r~%s : %s', - ['respawn_bleedout_in'] = 'Elfogsz vérezni ~b~%s perc %s másodperc~s~ múlva...\n', - ['respawn_bleedout_prompt'] = 'Nyomd meg az ~b~[E]~s~ gombot az újraéledéshez', - ['respawn_bleedout_fine'] = 'Újraéledéshez: ~b~[E]~s~', - ['respawn_bleedout_fine_msg'] = '~b~[Információ]:Ennyit fizettél ~r~$%s~s~, hogy újraéledj', - ['distress_send'] = 'Nyomd meg a ~r~[G]~s~ gombot a segítségkéréshez', - ['distress_sent'] = '~b~[Információ]:~s~ Egy civil értesítette az illetékes szervezetet!', + ['respawn_available_in'] = 'Újraéledés: s', + ['respawn_bleedout_in'] = 'Elfogsz vérezni %s perc %s másodperclva...\n', + ['respawn_bleedout_prompt'] = 'Nyomd meg az [E]mbot az újraéledéshez', + ['respawn_bleedout_fine'] = 'Újraéledéshez: [E]', + ['respawn_bleedout_fine_msg'] = ' [Információ]:Ennyit fizettél , hogy újraéledj', + ['distress_send'] = 'Nyomd meg a gombot a segítségkéréshez', + ['distress_sent'] = ' [Információ]:y civil értesítette az illetékes szervezetet!', -- Revive ['revive_help'] = 'újraéleszteni egy játékos', -- Item - ['used_medikit'] = '~b~[Információ]:~s~ Elhasználtál ~b~1x Segélytáskát~s~.', - ['used_bandage'] = '~b~[Információ]:~s~ Elhasználtál ~b~1x Kötszert~s~.', - ['not_enough_medikit'] = '~r~[Információ]:~s~ Nincs nálad: ~b~Defibrillátor~s~.', - ['not_enough_bandage'] = '~r~[Információ]:~s~ Nincs nálad: ~b~Kötszer~s~.', - ['healed'] = '~b~[Információ]:~s~ Meggyógyítottak!', + ['used_medikit'] = ' [Információ]:használtál 1x Segélytáskát.', + ['used_bandage'] = ' [Információ]:használtál 1x Kötszert.', + ['not_enough_medikit'] = ' máció]:ncs nálad: Defibrillátor.', + ['not_enough_bandage'] = ' máció]:ncs nálad: Kötszer.', + ['healed'] = ' [Információ]:ggyógyítottak!', -- Blips ['blip_hospital'] = 'Korház', ['blip_dead'] = 'Eszméletlen játékos', diff --git a/[esx_addons]/esx_ambulancejob/locales/nl.lua b/[esx_addons]/esx_ambulancejob/locales/nl.lua index 3efb3300..95a54297 100644 --- a/[esx_addons]/esx_ambulancejob/locales/nl.lua +++ b/[esx_addons]/esx_ambulancejob/locales/nl.lua @@ -5,8 +5,8 @@ Locales['nl'] = { ['ems_clothes_ems'] = 'Ambulance Kleding', -- Vehicles ['ambulance'] = 'Ambulance', - ['helicopter_prompt'] = 'Druk op ~INPUT_CONTEXT~ om de ~y~Lifeliners~s~ te beheren.', - ['garage_prompt'] = 'Druk op ~INPUT_CONTEXT~ om de ~y~Garage~s~ te openen.', + ['helicopter_prompt'] = 'Druk op ~INPUT_CONTEXT~ om de Lifeliners te beheren.', + ['garage_prompt'] = 'Druk op ~INPUT_CONTEXT~ om de Garage te openen.', ['garage_title'] = 'Garage', ['garage_stored'] = 'In Garage', ['garage_notstored'] = 'Niet In Garage', @@ -24,26 +24,26 @@ Locales['nl'] = { ['shop_item'] = '€%s', ['vehicleshop_title'] = 'Voertuigwinkel', ['vehicleshop_confirm'] = 'Wil je dit voertuig kopen?', - ['vehicleshop_bought'] = 'Je hebt een ~y~%s~s~ gekocht voor ~g~€%s~s~', + ['vehicleshop_bought'] = 'Je hebt een %s gekocht voor €%s', ['vehicleshop_money'] = 'Je kan dit voertuig niet betalen', - ['vehicleshop_awaiting_model'] = 'Het voertuig is aan het ~g~DOWNLOADEN & LADEN~s~, even geduld', + ['vehicleshop_awaiting_model'] = 'Het voertuig is aan het DOWNLOADEN & LADEN, even geduld', ['confirm_no'] = 'Nee', ['confirm_yes'] = 'Ja', -- Action Menu ['revive_inprogress'] = 'Reanimatie is in gang gezet!', - ['revive_complete'] = 'Je hebt ~y~%s~s~ gereanimeerd', - ['revive_complete_award'] = 'Je hebt ~y~%s~s~ gereanimeerd en ~g~€%s~s~ verdient!', + ['revive_complete'] = 'Je hebt %s gereanimeerd', + ['revive_complete_award'] = 'Je hebt %s gereanimeerd en €%s verdient!', ['revive_fail_offline'] = 'Deze speler is niet langer online', ['heal_inprogress'] = 'Je wordt genezen!', - ['heal_complete'] = 'Je hebt ~y~%s~s~ genezen', + ['heal_complete'] = 'Je hebt %s genezen', ['no_players'] = 'Geen spelers in de buurt', ['player_not_unconscious'] = 'Deze persoon is niet bewusteloos!', ['player_not_conscious'] = 'Deze persoon is bewusteloos!', -- Boss Menu ['boss_actions'] = 'Manager Acties', -- Misc - ['invalid_amount'] = '~r~Ongeldig aantal', - ['actions_prompt'] = 'Druk op ~INPUT_CONTEXT~ om de ~y~Ambulance Acties~s~ te bekijken.', + ['invalid_amount'] = ' ig aantal', + ['actions_prompt'] = 'Druk op ~INPUT_CONTEXT~ om de Ambulance Acties te bekijken.', ['deposit_amount'] = 'Bedrag om te storten', ['money_withdraw'] = 'Bedrag om op te nemen', ['fast_travel'] = 'Druk op ~INPUT_CONTEXT~ om snel te reizen.', @@ -63,20 +63,20 @@ Locales['nl'] = { -- Phone ['alert_ambulance'] = 'alert Ambulance', -- Death - ['respawn_available_in'] = 'Respawn beschikbaar in ~b~%s minuten en %s seconden~s~', - ['respawn_bleedout_in'] = 'Je zal doodbloeden in ~b~%s minuten %s seconden~s~\n', - ['respawn_bleedout_prompt'] = 'Houd [~b~E~s~] ingedrukt om te respawnen', - ['respawn_bleedout_fine'] = 'Houd [~b~E~s~] ingedrukt om te respawnen voor ~g~€%s~s~', - ['respawn_bleedout_fine_msg'] = 'Je hebt ~r~€%s~s~ betaald om te respawnen.', - ['distress_send'] = 'Druk op [~b~G~s~] om een noodsignaal te verzenden', + ['respawn_available_in'] = 'Respawn beschikbaar in %s minuten en %s seconden', + ['respawn_bleedout_in'] = 'Je zal doodbloeden in %s minuten %s seconden\n', + ['respawn_bleedout_prompt'] = 'Houd [ E] ingedrukt om te respawnen', + ['respawn_bleedout_fine'] = 'Houd [ E] ingedrukt om te respawnen voor €%s', + ['respawn_bleedout_fine_msg'] = 'Je hebt betaald om te respawnen.', + ['distress_send'] = 'Druk op [~bs~] om een noodsignaal te verzenden', ['distress_sent'] = 'Noodsignaal verzonden naar alle beschikbare eenheden!', -- Revive ['revive_help'] = 'Revive een speler', -- Item - ['used_medikit'] = 'Je hebt ~y~1~s~ spoedkoffer gebruikt', - ['used_bandage'] = 'Je hebt ~y~1~s~ verbandkoffer gebruikt', - ['not_enough_medikit'] = 'Je hebt geen ~b~spoedkoffer~s~ bij.', - ['not_enough_bandage'] = 'Je hebt geen ~b~verbandkoffer~s~ bij.', + ['used_medikit'] = 'Je hebt 1 spoedkoffer gebruikt', + ['used_bandage'] = 'Je hebt 1 verbandkoffer gebruikt', + ['not_enough_medikit'] = 'Je hebt geen spoedkoffer bij.', + ['not_enough_bandage'] = 'Je hebt geen verbandkoffer bij.', ['healed'] = 'Je bent behandeld.', -- Blips ['blip_hospital'] = 'Ziekenhuis', diff --git a/[esx_addons]/esx_ambulancejob/locales/pl.lua b/[esx_addons]/esx_ambulancejob/locales/pl.lua index d6b706cf..8c45e705 100644 --- a/[esx_addons]/esx_ambulancejob/locales/pl.lua +++ b/[esx_addons]/esx_ambulancejob/locales/pl.lua @@ -5,8 +5,8 @@ Locales['pl'] = { ['ems_clothes_ems'] = 'ubrania EMS', -- Vehicles ['ambulance'] = 'ambulance', - ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Helicopter Actions~s~.', - ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Vehicle Actions~s~.', + ['helicopter_prompt'] = 'press ~INPUT_CONTEXT~ to access the Helicopter Actions.', + ['garage_prompt'] = 'press ~INPUT_CONTEXT~ to access the Vehicle Actions.', ['garage_title'] = 'vehicle Actions', ['garage_stored'] = 'stored', ['garage_notstored'] = 'not in garage', @@ -24,26 +24,26 @@ Locales['pl'] = { ['shop_item'] = '$%s', ['vehicleshop_title'] = 'vehicle Shop', ['vehicleshop_confirm'] = 'do you want to buy this vehicle?', - ['vehicleshop_bought'] = 'you have bought ~y~%s~s~ for ~g~$%s~s~', + ['vehicleshop_bought'] = 'you have bought %s for $%s', ['vehicleshop_money'] = 'you cannot afford that vehicle', - ['vehicleshop_awaiting_model'] = 'the vehicle is currently ~g~DOWNLOADING & LOADING~s~ please wait', + ['vehicleshop_awaiting_model'] = 'the vehicle is currently DOWNLOADING & LOADING please wait', ['confirm_no'] = 'no', ['confirm_yes'] = 'yes', -- Action Menu ['revive_inprogress'] = 'trwa wskrzeszenie', - ['revive_complete'] = 'zostałeś wskrzeszony ~y~%s~s~', - ['revive_complete_award'] = 'zostałeś wskrzeszony ~y~%s~s~ i zarobiono ~g~$%s~s~!', + ['revive_complete'] = 'zostałeś wskrzeszony %s', + ['revive_complete_award'] = 'zostałeś wskrzeszony %s i zarobiono $%s!', ['revive_fail_offline'] = 'that player is no longer online', ['heal_inprogress'] = 'leczysz!', - ['heal_complete'] = 'zostałeś uleczony ~y~%s~s~', + ['heal_complete'] = 'zostałeś uleczony %s', ['no_players'] = 'brak graczy w pobliżu', ['player_not_unconscious'] = 'ten gracz nie jest nieprzytomny!', ['player_not_conscious'] = 'ten gracz nie jest świadomy!', -- Boss Menu ['boss_actions'] = 'akcje szefa', -- Misc - ['invalid_amount'] = '~r~Nieprawidłowa kwota', - ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the ~y~Ambulance Actions~s~.', + ['invalid_amount'] = ' widłowa kwota', + ['actions_prompt'] = 'press ~INPUT_CONTEXT~ access the Ambulance Actions.', ['deposit_amount'] = 'kwota depozytu', ['money_withdraw'] = 'wycofana kwota', ['fast_travel'] = 'naciśnij na ~INPUT_CONTEXT~ do szybkiej podróży.', @@ -64,20 +64,20 @@ Locales['pl'] = { -- Phone ['alert_ambulance'] = 'wezwij ambulans', -- Death - ['respawn_available_in'] = 'respawn available in ~b~%s minutes %s seconds~s~', - ['respawn_bleedout_in'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n', - ['respawn_bleedout_prompt'] = 'hold [~b~E~s~] to respawn', - ['respawn_bleedout_fine'] = 'hold [~b~E~s~] to respawn for ~g~$%s~s~', - ['respawn_bleedout_fine_msg'] = 'you paid ~r~$%s~s~ to respawn.', - ['distress_send'] = 'press [~b~G~s~] to send distress signal', + ['respawn_available_in'] = 'respawn available in %s minutes %s seconds', + ['respawn_bleedout_in'] = 'you will bleed out in %s minutes %s seconds\n', + ['respawn_bleedout_prompt'] = 'hold [ E] to respawn', + ['respawn_bleedout_fine'] = 'hold [ E] to respawn for $%s', + ['respawn_bleedout_fine_msg'] = 'you paid to respawn.', + ['distress_send'] = 'press [~bs~] to send distress signal', ['distress_sent'] = 'distress signal has been sent to available units!', -- Revive ['revive_help'] = 'ożyw gracza', -- Item ['used_medikit'] = 'użyłeś 1x Apteczki', ['used_bandage'] = 'użyłeś 1x Bandaża', - ['not_enough_medikit'] = 'nie posiadasz ~b~apteczki~s~.', - ['not_enough_bandage'] = 'nie posiadasz ~b~bandaża~s~.', + ['not_enough_medikit'] = 'nie posiadasz apteczki.', + ['not_enough_bandage'] = 'nie posiadasz bandaża.', ['healed'] = 'zostałeś potraktowany', -- Blips ['blip_hospital'] = 'szpital', diff --git a/[esx_addons]/esx_ambulancejob/locales/sv.lua b/[esx_addons]/esx_ambulancejob/locales/sv.lua index 45eb082a..1e77227c 100644 --- a/[esx_addons]/esx_ambulancejob/locales/sv.lua +++ b/[esx_addons]/esx_ambulancejob/locales/sv.lua @@ -5,8 +5,8 @@ Locales['sv'] = { ['ems_clothes_ems'] = 'ambulanskläder', -- Vehicles ['ambulance'] = 'ambulans', - ['helicopter_prompt'] = 'tryck ~INPUT_CONTEXT~ för att komma åt ~y~helikoptergaraget~s~.', - ['garage_prompt'] = 'tryck ~INPUT_CONTEXT~ för att komma åt ~y~garaget~s~.', + ['helicopter_prompt'] = 'tryck ~INPUT_CONTEXT~ för att komma åt helikoptergaraget.', + ['garage_prompt'] = 'tryck ~INPUT_CONTEXT~ för att komma åt garaget.', ['garage_title'] = 'garage', ['garage_stored'] = 'inställt', ['garage_notstored'] = 'uttaget', @@ -24,25 +24,25 @@ Locales['sv'] = { ['shop_item'] = '%s SEK', ['vehicleshop_title'] = 'fordonshandel', ['vehicleshop_confirm'] = 'vill du köpa detta fordon?', - ['vehicleshop_bought'] = 'du köpte ~y~%s~s~ för ~g~%s SEK~s~', + ['vehicleshop_bought'] = 'du köpte %s för %s SEK', ['vehicleshop_money'] = 'du har inte råd med detta fordon', - ['vehicleshop_awaiting_model'] = 'fordonet ~g~LADDAS NED OCH LADDAS IN~s~ var god vänta', + ['vehicleshop_awaiting_model'] = 'fordonet LADDAS NED OCH LADDAS IN var god vänta', ['confirm_no'] = 'nej', ['confirm_yes'] = 'ja', -- Action Menu ['revive_inprogress'] = 'en återupplivning har börjats', - ['revive_complete'] = 'du har återupplivat ~y~%s~s~, bra jobbat!', - ['revive_complete_award'] = 'du har återupplivat ~y~%s~s~ och tjänat ~g~%s SEK~s~ för dina tjänster, bra jobbat!', + ['revive_complete'] = 'du har återupplivat %s, bra jobbat!', + ['revive_complete_award'] = 'du har återupplivat %s och tjänat %s SEK för dina tjänster, bra jobbat!', ['revive_fail_offline'] = 'den spelaren har lämnat servern', ['heal_inprogress'] = 'du behandlar patienten!', - ['heal_complete'] = 'du har behandlat ~y~%s~s~', + ['heal_complete'] = 'du har behandlat %s', ['no_players'] = 'det finns inga spelare i närheten!', ['player_not_unconscious'] = 'spelaren är inte medvetslös!', ['player_not_conscious'] = 'spelaren är inte vid medvetande!', -- Boss Menu ['boss_actions'] = 'chefsmeny', -- Misc - ['invalid_amount'] = '~r~Ogiltig mängd', + ['invalid_amount'] = ' g mängd', ['actions_prompt'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', ['deposit_amount'] = 'mängd att sätta in', ['money_withdraw'] = 'mängd att ta ut', @@ -64,20 +64,20 @@ Locales['sv'] = { -- Phone ['alert_ambulance'] = 'ambulanssamtal', -- Death - ['respawn_available_in'] = 'respawn tillgänglig om ~b~%s:%s~s~', - ['respawn_bleedout_in'] = 'du kommer att förblöda om ~b~%s:%s~s~\n', - ['respawn_bleedout_prompt'] = 'håll [~b~E~s~] för att respawna', - ['respawn_bleedout_fine'] = 'håll [~b~E~s~] för att respawna, kostar ~g~%s SEK~s~', - ['respawn_bleedout_fine_msg'] = 'du betalade ~r~%s SEK~s~ för att respawna.', - ['distress_send'] = 'tryck ~b~[G]~s~ för att skicka nödsignal', + ['respawn_available_in'] = 'respawn tillgänglig om %s:%s', + ['respawn_bleedout_in'] = 'du kommer att förblöda om %s:%s\n', + ['respawn_bleedout_prompt'] = 'håll [ E] för att respawna', + ['respawn_bleedout_fine'] = 'håll [ E] för att respawna, kostar %s SEK', + ['respawn_bleedout_fine_msg'] = 'du betalade för att respawna.', + ['distress_send'] = 'tryck [G] för att skicka nödsignal', ['distress_sent'] = 'nödsignal har skickats till samtliga enheter!', -- Revive ['revive_help'] = 'återuppliva en spelare', -- Item - ['used_medikit'] = 'du har använt ~y~1x~s~ ~b~Akutväska~s~', - ['used_bandage'] = 'du har använt ~y~1x~s~ ~b~Bandage~s~', - ['not_enough_medikit'] = 'du har ingen ~b~Akutväska~s~.', - ['not_enough_bandage'] = 'du har inget ~b~Bandage~s~.', + ['used_medikit'] = 'du har använt 1x Akutväska', + ['used_bandage'] = 'du har använt 1x Bandage', + ['not_enough_medikit'] = 'du har ingen Akutväska.', + ['not_enough_bandage'] = 'du har inget Bandage.', ['healed'] = 'dina skador har blivit behandlade.', -- Blips ['blip_hospital'] = 'sjukhus', diff --git a/[esx_addons]/esx_ambulancejob/locales/tr.lua b/[esx_addons]/esx_ambulancejob/locales/tr.lua index 899b6466..1e45b830 100644 --- a/[esx_addons]/esx_ambulancejob/locales/tr.lua +++ b/[esx_addons]/esx_ambulancejob/locales/tr.lua @@ -5,8 +5,8 @@ Locales['tr'] = { ['ems_clothes_ems'] = 'acil Servis Kıyafetleri', -- Vehicles ['ambulance'] = 'medikal', - ['helicopter_prompt'] = '~y~Helikopter~s~ için ~INPUT_CONTEXT~ tuşuna basın.', - ['garage_prompt'] = '~y~Araba Garajı~s~ için ~INPUT_CONTEXT~ tuşuna basın', + ['helicopter_prompt'] = 'Helikopter için ~INPUT_CONTEXT~ tuşuna basın.', + ['garage_prompt'] = 'Araba Garajı için ~INPUT_CONTEXT~ tuşuna basın', ['garage_title'] = 'araba Garajı', ['garage_stored'] = 'garaja koyuldu', ['garage_notstored'] = 'garajda değil', @@ -24,30 +24,30 @@ Locales['tr'] = { ['shop_item'] = '%s TL', ['vehicleshop_title'] = 'araba Galerisi', ['vehicleshop_confirm'] = 'bu arabayı almak istiyor musun?', - ['vehicleshop_bought'] = '~g~%s~s~ liraya ~y~%s~s~ alındı', + ['vehicleshop_bought'] = '%s liraya %s alındı', ['vehicleshop_money'] = 'bu araca paranız yetmiyor', - ['vehicleshop_awaiting_model'] = 'bu araba şuanda ~g~İNDİRME & YÜKLEME~s~ yapıyor', + ['vehicleshop_awaiting_model'] = 'bu araba şuanda İNDİRME & YÜKLEME yapıyor', ['confirm_no'] = 'hayır', ['confirm_yes'] = 'evet', -- Action Menu ['revive_inprogress'] = 'Canlanma sürüyor!', - ['revive_complete'] = '~y~%s~s~ canlandırıldı', - ['revive_complete_award'] = '~y~%s~s~ canlandırıldın ve ~g~$%s~s~ kazandın!', + ['revive_complete'] = '%s canlandırıldı', + ['revive_complete_award'] = '%s canlandırıldın ve $%s kazandın!', ['revive_fail_offline'] = 'bu oyuncu artık online değil', ['heal_inprogress'] = 'iyileştiriliyorsun!', - ['heal_complete'] = '~y~%s~s~ iyileştirildi', + ['heal_complete'] = '%s iyileştirildi', ['no_players'] = 'yakınlarda oyuncu yok', ['player_not_unconscious'] = 'bu oyuncunun bilinci yerinde!', ['player_not_conscious'] = 'bu oyuncunun bilinci yerinde değil!', -- Boss Menu ['boss_actions'] = 'baş Hekim', -- Misc - ['invalid_amount'] = '~r~Hatalı miktar', - ['actions_prompt'] = '~y~Kıyafet Değiştirmek~s~ için ~INPUT_CONTEXT~ tuşuna basın.', + ['invalid_amount'] = ' miktar', + ['actions_prompt'] = 'Kıyafet Değiştirmek için ~INPUT_CONTEXT~ tuşuna basın.', ['deposit_amount'] = 'bırakılacak miktar', ['money_withdraw'] = 'alınacak miktar', ['fast_travel'] = '~INPUT_CONTEXT~ tuşuna basarak hızlı yolculuk edebilirsiniz.', - ['open_pharmacy'] = '~y~Eczane~s~ için ~INPUT_CONTEXT~ tuşuna basın.', + ['open_pharmacy'] = 'Eczane için ~INPUT_CONTEXT~ tuşuna basın.', ['pharmacy_menu_title'] = 'eczane', ['pharmacy_take'] = 'al %s', ['medikit'] = 'sağlık kiti', @@ -63,19 +63,19 @@ Locales['tr'] = { -- Phone ['alert_ambulance'] = 'hastane Acil Durum', -- Death - ['respawn_available_in'] = 'yeniden canlanmana ~b~%s dakika %s saniye~s~ kaldı', - ['respawn_bleedout_in'] = 'kanama ~b~%s dakika %s saniye~s~ boyunca devam edecek\n', - ['respawn_bleedout_prompt'] = 'yeniden canlanma için [~b~E~s~] basılı tut', - ['respawn_bleedout_fine'] = '~g~%s~s~ lira karşılığında canlanma için [~b~E~s~] basılı tut', - ['respawn_bleedout_fine_msg'] = 'yeniden doğmak için ~r~$%s~s~ ödediniz.', - ['distress_send'] = 'acile sinyal göndermek için [~b~G~s~] basın', + ['respawn_available_in'] = 'yeniden canlanmana %s dakika %s saniye kaldı', + ['respawn_bleedout_in'] = 'kanama %s dakika %s saniye boyunca devam edecek\n', + ['respawn_bleedout_prompt'] = 'yeniden canlanma için [ E] basılı tut', + ['respawn_bleedout_fine'] = '%s lira karşılığında canlanma için [ E] basılı tut', + ['respawn_bleedout_fine_msg'] = 'yeniden doğmak için ödediniz.', + ['distress_send'] = 'acile sinyal göndermek için [~bs~] basın', ['distress_sent'] = 'acil durum sinyali gönderildi!', ['revive_help'] = 'oyuncuyu canlandır', -- Item - ['used_medikit'] = '~y~1x~s~ sağlık kiti kullanıldı.', - ['used_bandage'] = '~y~1x~s~ bandaj kullanıldı.', - ['not_enough_medikit'] = '~b~sağlık kiti~s~ yok.', - ['not_enough_bandage'] = '~b~bandaj~s~. yok', + ['used_medikit'] = '1x sağlık kiti kullanıldı.', + ['used_bandage'] = '1x bandaj kullanıldı.', + ['not_enough_medikit'] = ' sağlık kiti yok.', + ['not_enough_bandage'] = ' bandaj. yok', ['healed'] = 'tedavi görüldü.', -- Blips ['blip_hospital'] = 'hastane', diff --git a/[esx_addons]/esx_ambulancejob/server/main.lua b/[esx_addons]/esx_ambulancejob/server/main.lua index e8990264..3644809d 100644 --- a/[esx_addons]/esx_ambulancejob/server/main.lua +++ b/[esx_addons]/esx_ambulancejob/server/main.lua @@ -11,19 +11,6 @@ end RegisterNetEvent('esx_ambulancejob:revive') AddEventHandler('esx_ambulancejob:revive', function(playerId) playerId = tonumber(playerId) - if source == '' and GetInvokingResource() == 'monitor' then -- txAdmin support - local xTarget = ESX.GetPlayerFromId(playerId) - if xTarget then - if deadPlayers[playerId] then - print(_U('revive_complete', xTarget.name)) - xTarget.triggerEvent('esx_ambulancejob:revive') - else - print(_U('player_not_unconscious')) - end - else - print(_U('revive_fail_offline')) - end - else local xPlayer = source and ESX.GetPlayerFromId(source) if xPlayer and xPlayer.job.name == 'ambulance' then @@ -46,6 +33,14 @@ AddEventHandler('esx_ambulancejob:revive', function(playerId) xPlayer.showNotification(_U('revive_fail_offline')) end end +end) + +AddEventHandler('txAdmin:events:healedPlayer', function(eventData) + if GetInvokingResource() ~= "monitor" or type(eventData) ~= "table" or type(eventData.id) ~= "number" then + return + end + if deadPlayers[eventData.id] then + TriggerClientEvent('esx_ambulancejob:revive', eventData.id) end end) diff --git a/[esx_addons]/esx_animations/fxmanifest.lua b/[esx_addons]/esx_animations/fxmanifest.lua index 24c81ee8..885048d1 100644 --- a/[esx_addons]/esx_animations/fxmanifest.lua +++ b/[esx_addons]/esx_animations/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Animations' -version '1.5.0' +version '1.7.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_atm/fxmanifest.lua b/[esx_addons]/esx_atm/fxmanifest.lua index dbfd8f65..f14bf2bb 100644 --- a/[esx_addons]/esx_atm/fxmanifest.lua +++ b/[esx_addons]/esx_atm/fxmanifest.lua @@ -4,35 +4,20 @@ game 'gta5' description 'ESX Atm' -version '1.5.0' +version '1.7.0' -shared_script '@es_extended/imports.lua' +shared_scripts { + '@es_extended/imports.lua', + '@es_extended/locale.lua', + 'locales/*.lua', + 'config.lua' +} server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'config.lua', 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_atm/locales/hu.lua b/[esx_addons]/esx_atm/locales/hu.lua new file mode 100644 index 00000000..7c643f94 --- /dev/null +++ b/[esx_addons]/esx_atm/locales/hu.lua @@ -0,0 +1,7 @@ +Locales["hu"] = { + ["invalid_amount"] = "~r~Érvénytelen a megadott összeg~s~", + ["deposit_money"] = "Befizettél ~g~$%s-t~s~", + ["withdraw_money"] = "Kivettél ~g~$%s-t~s~", + ["press_e_atm"] = "Nyomd meg a ~INPUT_PICKUP~ gombot az ~g~ATM~s~ használatához", + ["atm_blip"] = "ATM", +} diff --git a/[esx_addons]/esx_atm/locales/nl.lua b/[esx_addons]/esx_atm/locales/nl.lua new file mode 100644 index 00000000..0adcdc13 --- /dev/null +++ b/[esx_addons]/esx_atm/locales/nl.lua @@ -0,0 +1,7 @@ +Locales['nl'] = { + ['invalid_amount'] = '~r~Ongeldige hoeveelheid geld~s~', + ['deposit_money'] = '~g~€%s~s~ Gestort', + ['withdraw_money'] = '~g~€%s~s~ Opgenomen', + ['press_e_atm'] = 'Druk op ~INPUT_PICKUP~ om op te nemen of te storten ~g~PIN~s~', + ['atm_blip'] = 'PIN', +} diff --git a/[esx_addons]/esx_atm/locales/sv.lua b/[esx_addons]/esx_atm/locales/sv.lua index 9567b45a..00dd5de5 100644 --- a/[esx_addons]/esx_atm/locales/sv.lua +++ b/[esx_addons]/esx_atm/locales/sv.lua @@ -1,7 +1,7 @@ Locales['sv'] = { ['invalid_amount'] = '~r~Det är en ogiltig summa pengar~s~', - ['deposit_money'] = 'du satte in ~g~$%s~s~', - ['withdraw_money'] = 'du har tagit ut ~g~$%s~s~', - ['press_e_atm'] = 'tryck ~INPUT_PICKUP~ för att komma åt denna ~g~ATM~s~', - ['atm_blip'] = 'bankomat', + ['deposit_money'] = 'Du har satt in ~g~$%s~s~', + ['withdraw_money'] = 'Du har tagit ut ~g~$%s~s~', + ['press_e_atm'] = 'Tryck ~INPUT_PICKUP~ för att komma åt denna ~g~Bankomat~s~', + ['atm_blip'] = 'Bankomat', } diff --git a/[esx_addons]/esx_bankerjob/fxmanifest.lua b/[esx_addons]/esx_bankerjob/fxmanifest.lua index 55e07188..31782247 100644 --- a/[esx_addons]/esx_bankerjob/fxmanifest.lua +++ b/[esx_addons]/esx_bankerjob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Banker job' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' @@ -13,28 +13,14 @@ server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/hu.lua', + 'locales/*.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/hu.lua', + 'locales/*.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_bankerjob/locales/nl.lua b/[esx_addons]/esx_bankerjob/locales/nl.lua new file mode 100644 index 00000000..79f92a03 --- /dev/null +++ b/[esx_addons]/esx_bankerjob/locales/nl.lua @@ -0,0 +1,18 @@ +Locales['nl'] = { + ['actions'] = 'acties', + ['amount'] = 'bedrag', + ['balance'] = 'saldo', + ['bank'] = 'bank', + ['bill_amount'] = 'rekening bedrag', + ['billing'] = 'rekeningen', + ['customer'] = 'klant', + ['customers'] = 'klanten', + ['deposit'] = 'storten', + ['invalid_amount'] = 'ongedig bedrag', + ['no_player_nearby'] = 'geen speler in de omgeving', + ['press_input_context_to_open_menu'] = 'druk op ~INPUT_CONTEXT~ om het ~g~Bank Menu~s~te openen.', + ['withdraw'] = 'opnemen', + ['boss_actions'] = 'baas acties', + ['phone_receive'] = 'bank klant', + ['phone_label'] = 'bank', +} diff --git a/[esx_addons]/esx_bankerjob/locales/sv.lua b/[esx_addons]/esx_bankerjob/locales/sv.lua index eaef4ade..e56f5808 100644 --- a/[esx_addons]/esx_bankerjob/locales/sv.lua +++ b/[esx_addons]/esx_bankerjob/locales/sv.lua @@ -1,18 +1,18 @@ Locales['sv'] = { - ['actions'] = 'handling', - ['amount'] = 'belopp', - ['balance'] = 'balans', - ['bank'] = 'bank', - ['bill_amount'] = 'räkning belopp', - ['billing'] = 'räkning', - ['customer'] = 'kund', - ['customers'] = 'kunder', - ['deposit'] = 'insättning', - ['invalid_amount'] = 'ogiltig belopp', - ['no_player_nearby'] = 'det hittades inga spelare i närheten.', - ['press_input_context_to_open_menu'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~g~bankmenyn~s~.', - ['withdraw'] = 'ta ut', - ['boss_actions'] = 'chef handlingar', - ['phone_receive'] = 'bank meddelande mottaget', - ['phone_label'] = 'bank', + ['actions'] = 'Handlingar', + ['amount'] = 'Belopp', + ['balance'] = 'Saldo', + ['bank'] = 'Bank', + ['bill_amount'] = 'Räkningsbelopp', + ['billing'] = 'Fakturering', + ['customer'] = 'Kund', + ['customers'] = 'Kunder', + ['deposit'] = 'Insättning', + ['invalid_amount'] = 'Ogiltig belopp', + ['no_player_nearby'] = 'Ingen spelare i närheten', + ['press_input_context_to_open_menu'] = 'Tryck ~INPUT_CONTEXT~ för att öppna ~g~Bankmenyn~s~.', + ['withdraw'] = 'Ta ut', + ['boss_actions'] = 'Chef handlingar', + ['phone_receive'] = 'Bank meddelande mottaget', + ['phone_label'] = 'Bank', } diff --git a/[esx_addons]/esx_barbershop/fxmanifest.lua b/[esx_addons]/esx_barbershop/fxmanifest.lua index 4f8210ae..c6874a58 100644 --- a/[esx_addons]/esx_barbershop/fxmanifest.lua +++ b/[esx_addons]/esx_barbershop/fxmanifest.lua @@ -4,38 +4,20 @@ game 'gta5' description 'ESX Barber Shop' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/cs.lua', - 'locales/pl.lua', - 'locales/tr.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/cs.lua', - 'locales/pl.lua', - 'locales/tr.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_basicneeds/fxmanifest.lua b/[esx_addons]/esx_basicneeds/fxmanifest.lua index 921eea3e..dd9c4601 100644 --- a/[esx_addons]/esx_basicneeds/fxmanifest.lua +++ b/[esx_addons]/esx_basicneeds/fxmanifest.lua @@ -4,38 +4,20 @@ game 'gta5' description 'ESX Basic Needs' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/tr.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/tr.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql new file mode 100644 index 00000000..f6dff30d --- /dev/null +++ b/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `es_extended`; + +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Kenyér', 1), + ('water', 'Víz', 1) +; diff --git a/[esx_addons]/esx_billing/fxmanifest.lua b/[esx_addons]/esx_billing/fxmanifest.lua index 9acbb0f5..6288f13c 100644 --- a/[esx_addons]/esx_billing/fxmanifest.lua +++ b/[esx_addons]/esx_billing/fxmanifest.lua @@ -4,41 +4,21 @@ game 'gta5' description 'ESX Billing' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/cs.lua', - 'locales/tr.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/cs.lua', - 'locales/tr.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_boat/fxmanifest.lua b/[esx_addons]/esx_boat/fxmanifest.lua index 3b23847b..cece3ce8 100644 --- a/[esx_addons]/esx_boat/fxmanifest.lua +++ b/[esx_addons]/esx_boat/fxmanifest.lua @@ -4,31 +4,21 @@ game 'gta5' description 'ESX Boat' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/es.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/es.lua', - 'locales/hu.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua', 'client/marker.lua' diff --git a/[esx_addons]/esx_boat/locales/nl.lua b/[esx_addons]/esx_boat/locales/nl.lua new file mode 100644 index 00000000..69935cfb --- /dev/null +++ b/[esx_addons]/esx_boat/locales/nl.lua @@ -0,0 +1,31 @@ +Locales['nl'] = { + -- shop + ['boat_shop'] = 'boten winkel', + ['boat_shop_open'] = 'Druk op ~INPUT_CONTEXT~ tom de ~y~boten winkel~s~te openen.', + ['boat_shop_confirm'] = 'Koop %s voor €%s?', + ['boat_shop_bought'] = 'Je hebt een ~y~gekocht~s~een ~b~%s~s~ voor ~g~€%s~s~', + ['boat_shop_nomoney'] = 'Deze boot kan je niet betalen!', + ['confirm_no'] = 'nee', + ['confirm_yes'] = 'ja', + + -- garage + ['garage'] = 'boten garage', + ['garage_open'] = 'Druk op ~INPUT_CONTEXT~ om je ~y~boten garage~s~te openen.', + ['garage_store'] = 'Druk op ~INPUT_CONTEXT~ om je boot op te slaan.', + ['garage_taken'] = 'de boot staat klaar!', + ['garage_stored'] = 'de boot is opgeslagen in je garage!', + ['garage_noboats'] = 'je hebt geen opgeslagen boten! Ga naar de ~y~boten winkel~s~ om er een te kopen.', + ['garage_blocked'] = 'de boot kan er niet uit omdat iets het spawnpunt blokkeerd!', + ['garage_notowner'] = 'je bent geen eigenaar van deze boot!', + + -- license + ['license_menu'] = 'Koop Vaarbewijs?', + ['license_buy_no'] = 'nee', + ['license_buy_yes'] = 'Koop vaarbewijs €%s', + ['license_bought'] = 'je kocht het ~y~Vaar Bewijs~s~ voor ~g~€%s~s~', + ['license_nomoney'] = 'je kan het ~y~Vaar Bewijs~s~niet betalen! ', + + -- blips + ['blip_garage'] = 'boten garage', + ['blip_shop'] = 'boten winkel', +} diff --git a/[esx_addons]/esx_boat/localization/hu_esx_boat.sql b/[esx_addons]/esx_boat/localization/hu_esx_boat.sql new file mode 100644 index 00000000..750fa0fe --- /dev/null +++ b/[esx_addons]/esx_boat/localization/hu_esx_boat.sql @@ -0,0 +1,5 @@ +USE `es_extended`; + +INSERT INTO `licenses` (`type`, `label`) VALUES + ('boat', 'Hajó engedély') +; diff --git a/[esx_addons]/esx_clotheshop/fxmanifest.lua b/[esx_addons]/esx_clotheshop/fxmanifest.lua index b0210181..2b1cd8af 100644 --- a/[esx_addons]/esx_clotheshop/fxmanifest.lua +++ b/[esx_addons]/esx_clotheshop/fxmanifest.lua @@ -4,35 +4,21 @@ game 'gta5' description 'ESX Clothes Shop' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_clotheshop/locales/hu.lua b/[esx_addons]/esx_clotheshop/locales/hu.lua new file mode 100644 index 00000000..527c7017 --- /dev/null +++ b/[esx_addons]/esx_clotheshop/locales/hu.lua @@ -0,0 +1,12 @@ +Locales["hu"] = { + ["valid_this_purchase"] = "Megerősíted a vásárlást?", + ["yes"] = "igen", + ["no"] = "nem", + ["not_enough_money"] = "Nincs elég pénzed", + ["press_menu"] = "Nyomd meg a ~INPUT_CONTEXT~ gombot a ~y~Ruhabolt~s~ megnyitásához.", + ["clothes"] = "ruhabolt", + ["you_paid"] = "fizettél ~g~%s$-t~s~", + ["save_in_dressing"] = "Menteni szeretnéd a ruhát az ingatlanodban?", + ["name_outfit"] = "Ruha neve", + ["saved_outfit"] = "Ruha mentésre került!", +} diff --git a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua index e3f46819..5d471cc0 100644 --- a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua +++ b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'CruiseControl System for ESX' -version '1.5.0' +version '1.7.0' dependencies { 'es_extended' diff --git a/[esx_addons]/esx_cruisecontrol/locales/hu.lua b/[esx_addons]/esx_cruisecontrol/locales/hu.lua new file mode 100644 index 00000000..7a892f66 --- /dev/null +++ b/[esx_addons]/esx_cruisecontrol/locales/hu.lua @@ -0,0 +1,4 @@ +Locales['hu'] = { + ['activated'] = 'Bekapcsolva', + ['deactivated'] = 'Kikapcsolva', +} diff --git a/[esx_addons]/esx_datastore/fxmanifest.lua b/[esx_addons]/esx_datastore/fxmanifest.lua index 3d331a77..86c34836 100644 --- a/[esx_addons]/esx_datastore/fxmanifest.lua +++ b/[esx_addons]/esx_datastore/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Data Store' -version '1.5.0' +version '1.7.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_dmvschool/fxmanifest.lua b/[esx_addons]/esx_dmvschool/fxmanifest.lua index 736e155f..050311a5 100644 --- a/[esx_addons]/esx_dmvschool/fxmanifest.lua +++ b/[esx_addons]/esx_dmvschool/fxmanifest.lua @@ -4,32 +4,20 @@ game 'gta5' description 'ESX DMV School' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/pl.lua', - 'locales/sv.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/pl.lua', - 'locales/sv.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_dmvschool/html/questions_es.js b/[esx_addons]/esx_dmvschool/html/questions_es.js new file mode 100644 index 00000000..efd70570 --- /dev/null +++ b/[esx_addons]/esx_dmvschool/html/questions_es.js @@ -0,0 +1,91 @@ +var tableauQuestion = [ + { + question: "Si vas a 80 km / h, y te aproximas a una zona residencial, debes:", + propositionA: "Acelerar", + propositionB: "Mantienes tu velocidad, si no pasas otros vehículos.", + propositionC: "Frenas", + propositionD: "Mantienes la velocidad", + reponse: "C" + }, + + { + question: "Si está girando a la derecha en un semáforo, pero ve un cruce de peatones, ¿qué hace?", + propositionA: "Pasas del peaton", + propositionB: "Comprueba que no hay otros vehículos alrededor.", + propositionC: "Esperas hasta que el peatón haya cruzado.", + propositionD: "Disparas al peatón y sigues conduciendo.", + reponse: "C" + }, + + { + question: "Sin ninguna indicación previa, la velocidad en una zona residencial es de: __ km / h", + propositionA: "30 km/h", + propositionB: "50 km/h", + propositionC: "40 km/h", + propositionD: "60 km/h", + reponse: "B" + }, + + { + question: "Antes de cada cambio de carril debe:", + propositionA: "Mirar por los espejos", + propositionB: "Comprobar los puntos muertos del vehiculo", + propositionC: "Señalizar tu intención de girar", + propositionD: "Todas las anteriores", + reponse: "D" + }, + + { + question: "¿Qué nivel de alcohol en la sangre se clasifica como conducir bajo los efectos del alcohol?", + propositionA: "0,5", + propositionB: "0,1", + propositionC: "0,8", + propositionD: "0,0", + reponse: "C" + }, + + { + question: "¿Cuándo puedes continuar conduciendo en un semáforo?", + propositionA: "Cuando esta verde", + propositionB: "Cuando no esta cruzando nadie", + propositionC: "Cuando estas en una zona de colegio", + propositionD: "Cuando estas entre un 60 u 80 km/h", + reponse: "A" + }, + + { + question: "Un peatón tiene una señal de no cruzar, ¿qué haces?", + propositionA: "Le dejas cruzar", + propositionB: "Te quedas mirandolo", + propositionC: "Le dices que cruce para que lo puedas atropellar", + propositionD: "Continuas porque tu señal de tráfico esta en verde", + reponse: "D" + }, + + { + question: "¿Que esta permitido cuando adelantas a otro vehículo?", + propositionA: "Lo sigues de cerca para pasarlo más rápido.", + propositionB: "Lo adelantas por la acera si es necesario.", + propositionC: "Conduce por el lado opuesto de la carretera para adelantarlo.", + propositionD: "Lo adelantas rapido", + reponse: "C" + }, + + { + question: "Usted está conduciendo en una carretera que indica una velocidad máxima de 120 km / h. Pero la mayoría de los conductores conducen a 125 km / h, por lo que no debe conducir más rápido que:", + propositionA: "120 km/h", + propositionB: "125 km/h", + propositionC: "130 km/h", + propositionD: "110 km/h", + reponse: "A" + }, + + { + question: "Cuando es superado por otro vehículo, es importante NO:", + propositionA: "Seguir con la misma velocidad", + propositionB: "Comprobar los espejos", + propositionC: "Mirar a otros conductores", + propositionD: "Aumentar la velocidad", + reponse: "D" + }, +] diff --git a/[esx_addons]/esx_dmvschool/html/ui_es.html b/[esx_addons]/esx_dmvschool/html/ui_es.html new file mode 100644 index 00000000..ce2cf51c --- /dev/null +++ b/[esx_addons]/esx_dmvschool/html/ui_es.html @@ -0,0 +1,119 @@ + + + + + + +
+
+ +
+

Escuela de Conducción

+
+ +
+
+ +
+ +
+

Bienvenido a la Escuela de Conducción +

+
+
Todos los ciudadanos de la ciudad deben aprobar su examen antes de poder conducir. +
Tómese su tiempo, responda con sentido común y no conteste al azar. +
+
Examen teórico +
- La prueba teórica cuesta $ 200, esto no se reembolsa si falla la prueba. +
- No tenga miedo, la escuela de conducción acepta crédito, pero tenga cuidado de no entrar en deuda. +
- Si falla la prueba la primera vez, no puede volver a tomarla de inmediato, tendrá que realizarla más adelante. +
+
Examen de Conducir +
- La prueba de conducir cuesta $500, al igual que la prueba de la teoría, este pago no se devolverá si fallas. +
- ¡Asegúrate de estar alerta mientras conduces y de evitar accidentes!

+
+
+
+ Empezar +
+
+

Progreso

+ +
+
+ +
+
+

+

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+

Progreso

+ +
+
+ +
+
+
+

¡Buen trabajo!

+
+
Lo hiciste bien durante el examen. +
+
Puede cerrar esta ventana y tomar la prueba de conducción. +
+
+
+ Cerrar +
+
+

Progress

+ +
+
+
+
+
+

Has fallado

+
+
No estabas listo para esta prueba, inténtalo de nuevo más tarde ... +
+
+
+
+
+ Cerrar +
+
+

Progress

+ +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/[esx_addons]/esx_dmvschool/locales/hu.lua b/[esx_addons]/esx_dmvschool/locales/hu.lua new file mode 100644 index 00000000..b8d05026 --- /dev/null +++ b/[esx_addons]/esx_dmvschool/locales/hu.lua @@ -0,0 +1,29 @@ +Locales['hu'] = { + ['you_paid'] = 'Fizettél ~g~$%s~s~ az autósiskolának iskolának!', + ['go_next_point'] = 'Menj a kövtkező ponthoz!', + ['in_town_speed'] = 'Beértél a városba, figyelj a sebességedre! A sebesség határ: ~y~%s~s~ km/h', + ['next_point_speed'] = 'Menj a következő ponthoz! Sebesség határ: ~y~%s~s~ km/h', + ['stop_for_ped'] = 'Mindig ~r~álj~s~ meg a ~y~zebránál!', + ['good_lets_cont'] = '~g~Ügyes~s~, folytasd a vezetést.', + ['stop_look_left'] = '~r~Álj meg~s~ és néz ~y~balra~s~. Sebesség határ: ~y~%s~s~ km/h', + ['good_turn_right'] = '~g~Ügyes~s~, fordulj jobbra, és kövesd a vonalat', + ['watch_traffic_lightson'] = 'Nézd a forgalmat, és ~y~kapcsold fel a fényszóróidat~s~!', + ['stop_for_passing'] = '~r~Álj meg~s~ a keresztező autóknak!', + ['hway_time'] = 'Itt az idő, hogy először vezess autópályán! Sebesség határ: ~y~%s~s~ km/h', + ['gratz_stay_alert'] = 'Levagyok nyűgözve, de sose feledd, ~r~NE~s~ vezess fáradtan!', + ['passed_test'] = '~g~Átmentél~s~ a vizsgán, gratulálok!', + ['failed_test'] = '~r~Megbuktál~s~ a vizsgán, pár óra plusz vezetés után próbáld újra!', + ['theory_test'] = 'Elméleti vizsga', + ['road_test_car'] = 'Személyautó vizsga', + ['road_test_bike'] = ' Nagy motor vizsga', + ['road_test_truck'] = 'Teher autó vizsga', + ['school_item'] = '$%s', + ['driving_school'] = 'Autósiskola', + ['press_open_menu'] = 'Nyomd meg a(z) ~INPUT_CONTEXT~ gombot, hogy megnyisd a menüt.', + ['driving_school_blip'] = 'Autósiskola', + ['driving_test_complete'] = 'A vizsga sikeres volt', + ['driving_too_fast'] = '~r~Túl gyorsan hajtasz,~s~a végén még megállít a rendőr. A sebesség határ: ~y~%s~s~ km/h!', + ['errors'] = 'Hibapontok: ~r~%s~s~/%s', + ['you_damaged_veh'] = 'Összetörted az autót, ez drága lesz.', + ['not_enough_money'] = 'Nincs elég pénzed!', +} diff --git a/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql new file mode 100644 index 00000000..385369db --- /dev/null +++ b/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql @@ -0,0 +1,8 @@ +USE `es_extended`; + +INSERT INTO `licenses` (`type`, `label`) VALUES + ('dmv', 'Vezetési engedély'), + ('drive', 'Jogosítvány'), + ('drive_bike', 'Motoros Jogosítvány'), + ('drive_truck', 'Kereskedelmi Jogosítvány') +; diff --git a/[esx_addons]/esx_drugs/client/main.lua b/[esx_addons]/esx_drugs/client/main.lua index 04304c16..bfc5cd2f 100644 --- a/[esx_addons]/esx_drugs/client/main.lua +++ b/[esx_addons]/esx_drugs/client/main.lua @@ -32,7 +32,9 @@ end) --drawk marker CreateThread(function() while true do + local Sleep = 1500 if(inRangeMarkerDrugShop) then + Sleep = 0 local coordsMarker = Config.CircleZones.DrugDealer.coords local color = cfgMarker.Color DrawMarker(cfgMarker.Type, coordsMarker.x, coordsMarker.y,coordsMarker.z - 1.0, @@ -40,23 +42,22 @@ CreateThread(function() cfgMarker.Size, color.r,color.g,color.b,color.a, false, true, 2, false, nil, nil, false) end - Wait(0) + Wait(Sleep) end end) --main loop CreateThread(function () while true do - if inZoneDrugShop then - if(not menuOpen) then - ESX.ShowHelpNotification(_U('dealer_prompt'),true) - if IsControlJustPressed(0, 38) then - OpenDrugShop() - end + local Sleep = 1500 + if inZoneDrugShop and not menuOpen then + Sleep = 0 + ESX.ShowHelpNotification(_U('dealer_prompt'),true) + if IsControlJustPressed(0, 38) then + OpenDrugShop() end end - - Wait(15) + Wait(Sleep) end end) diff --git a/[esx_addons]/esx_drugs/client/weed.lua b/[esx_addons]/esx_drugs/client/weed.lua index b31f9685..0b821c18 100644 --- a/[esx_addons]/esx_drugs/client/weed.lua +++ b/[esx_addons]/esx_drugs/client/weed.lua @@ -26,20 +26,19 @@ CreateThread(function() end if IsControlJustReleased(0, 38) and not isProcessing then - if Config.LicenseEnable then - ESX.TriggerServerCallback('esx_license:checkLicense', function(hasProcessingLicense) - if hasProcessingLicense then - ProcessWeed() - else - OpenBuyLicenseMenu('weed_processing') - end - end, GetPlayerServerId(PlayerId()), 'weed_processing') - else - ESX.TriggerServerCallback('esx_drugs:cannabis_count', function(xCannabis) + ESX.TriggerServerCallback('esx_drugs:cannabis_count', function(xCannabis) + if Config.LicenseEnable then + ESX.TriggerServerCallback('esx_license:checkLicense', function(hasProcessingLicense) + if hasProcessingLicense then + ProcessWeed(xCannabis) + else + OpenBuyLicenseMenu('weed_processing') + end + end, GetPlayerServerId(PlayerId()), 'weed_processing') + else ProcessWeed(xCannabis) - end) - - end + end + end) end end Wait(wait) @@ -73,7 +72,7 @@ end CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) @@ -86,6 +85,7 @@ CreateThread(function() end if nearbyObject and IsPedOnFoot(playerPed) then + Sleep = 0 if not isPickingUp then ESX.ShowHelpNotification(_U('weed_pickupprompt')) end @@ -114,9 +114,8 @@ CreateThread(function() isPickingUp = false end, 'cannabis') end - else - Wait(500) end + Wait(Sleep) end end) diff --git a/[esx_addons]/esx_drugs/fxmanifest.lua b/[esx_addons]/esx_drugs/fxmanifest.lua index 39b58d5e..98b04247 100644 --- a/[esx_addons]/esx_drugs/fxmanifest.lua +++ b/[esx_addons]/esx_drugs/fxmanifest.lua @@ -4,29 +4,21 @@ game 'gta5' description 'ESX Drugs' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/br.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/br.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua', 'client/weed.lua' diff --git a/[esx_addons]/esx_drugs/locales/hu.lua b/[esx_addons]/esx_drugs/locales/hu.lua new file mode 100644 index 00000000..cbed1164 --- /dev/null +++ b/[esx_addons]/esx_drugs/locales/hu.lua @@ -0,0 +1,31 @@ +Locales ['hu'] = { + -- weed + ['weed_pickupprompt'] = 'Nyomd meg a ~INPUT_CONTEXT~ gombot a betakarításhoz ~g~Kannabisz~s~', + ['weed_quitprocess'] = 'Nyomd meg a ~INPUT_CONTEXT~ gombot a betakarítás befejezéséhez', + ['weed_inventoryfull'] = 'Nincs több hely a ~g~Kannabisz~s~ számára.', + ['weed_processprompt'] = 'Nyomd meg a ~INPUT_CONTEXT~ gombot a kezdéshez ~g~Kannabisz betakarítása~s~.', + ['weed_processingstarted'] = 'Folyamatban ~g~Kannabisz~s~ into ~g~Marihuana~s~...', + ['weed_processingfull'] = 'Betakarítás ~r~befejezve~s~ a raktár tele', + ['weed_processingenough'] = 'Rendelkezned kell ~b~3x~s~ ~g~Kannabisz~s~ a végrehajtáshoz', + ['weed_processed'] = 'Feldolgoztad ~b~3x~s~ ~g~Kannabisz~s~ to ~b~1x~s~ ~g~Marihuana~s~', + ['weed_processingtoofar'] = 'A feldolgozás ~r~megszakadt~s~ elhagytad a területet.', + + -- drug dealer + ['dealer_prompt'] = 'Nyomd meg a ~INPUT_CONTEXT~ gombot a találkozáshoz a ~r~Dílerrel~s~.', + ['dealer_title'] = 'Díler', + ['dealer_item'] = '$%s', + ['dealer_notenough'] = 'Nincs elég anyagod az eladáshoz', + ['dealer_sold'] = 'Sikeres eladás ~b~%sx~s~ ~y~%s~s~ for ~g~$%s~s~', + + -- license + ['license_title'] = 'A feldolgozáshoz engedélyek kellenek, melyeket itt megvehetsz', + ['license_no'] = 'Nem', + ['license_bought'] = 'Megvetted a ~b~%s~s~ for ~r~$%s~s~', + ['license_bought_fail'] = 'Nincs elég pénzed ~b~%s~s~!', + ['license_weed'] = 'Kannabisz Feldolgozási Engedély', + + -- blips + ['blip_weedfield'] = 'Kannabisz ültetvény', + ['blip_weedprocessing'] = 'Kannabisz feldolgozás', + ['blip_drugdealer'] = 'Díler', +} diff --git a/[esx_addons]/esx_drugs/locales/pl.lua b/[esx_addons]/esx_drugs/locales/pl.lua new file mode 100644 index 00000000..dd45a036 --- /dev/null +++ b/[esx_addons]/esx_drugs/locales/pl.lua @@ -0,0 +1,31 @@ +Locales ['pl'] = { + -- weed (marihuana) + ['weed_pickupprompt'] = 'naciśnij ~INPUT_CONTEXT~ aby zebrać liście ~g~Konopii~s~.', + ['weed_quitprocess'] = 'naciśnij ~INPUT_CONTEXT~ aby przestać ~g~Przerabianie Marihuany~s~.', + ['weed_inventoryfull'] = '~r~Nie możesz~s~ zebrać więcej konopii, nie masz wystarczająco miejsca w ekwipunku!', + ['weed_processprompt'] = 'naciśnij ~INPUT_CONTEXT~ aby rozpocząć ~g~Przerabianie Marihuany~s~.', + ['weed_processingstarted'] = 'przerabianie ~g~Konopii~s~ na ~g~Marihuane~s~...', + ['weed_processingfull'] = 'przerabianie ~r~przerwane~s~ ponieważ masz pełny ekwipunek!', + ['weed_processingenough'] = 'potrzebujesz ~b~3x~s~ ~g~Konopii~s~ aby rozpocząć przerabianie.', + ['weed_processed'] = 'przerobiłeś ~b~3x~s~ ~g~Konopii~s~ na ~b~1x~s~ ~g~Marihuane~s~', + ['weed_processingtoofar'] = 'przerabianie zostało ~r~przerwane~s~ ponieważ opuściłeś teren.', + + -- drug dealer (dealer narkotyków) + ['dealer_prompt'] = 'naciśnij ~INPUT_CONTEXT~ aby rozmawiać z ~r~Dealerem Narkotyków~s~.', + ['dealer_title'] = 'dealer Narkotyków', + ['dealer_item'] = '$%s', + ['dealer_notenough'] = 'nie masz tego wystarczająco aby to sprzedać!', + ['dealer_sold'] = 'sprzedałeś ~b~%sx~s~ ~y~%s~s~ za ~g~$%s~s~', + + -- license (licencje) + ['license_title'] = 'musisz posiadać licencję na przetwarzanie aby przerobić ten produkt, możesz zakupić ją tutaj.', + ['license_no'] = 'nie', + ['license_bought'] = 'kupiłeś ~b~%s~s~ za ~r~$%s~s~', + ['license_bought_fail'] = 'nie stać cię na ~b~%s~s~!', + ['license_weed'] = 'licencja na przetwarzanie zioła', + + -- blips (znaczniki) + ['blip_weedfield'] = 'plantacja Marihuany', + ['blip_weedprocessing'] = 'przeróbka Marihuany', + ['blip_drugdealer'] = 'dealer Narkotyków', +} diff --git a/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql b/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql new file mode 100644 index 00000000..1a93c1ab --- /dev/null +++ b/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql @@ -0,0 +1,10 @@ +USE `es_extended`; + +INSERT INTO `items` (`name`, `label`, `weight`, `rare`, `can_remove`) VALUES + ('cannabis', 'Cannabis', 3, 0, 1), + ('marijuana', 'Marihuána', 2, 0, 1) +; + +INSERT INTO `licenses` (`type`, `label`) VALUES + ('weed_processing', 'Fű termesztési engedély') +; diff --git a/[esx_addons]/esx_garage/fxmanifest.lua b/[esx_addons]/esx_garage/fxmanifest.lua index 1576e4a2..e58338e2 100644 --- a/[esx_addons]/esx_garage/fxmanifest.lua +++ b/[esx_addons]/esx_garage/fxmanifest.lua @@ -4,19 +4,13 @@ game 'gta5' description 'ESX Garage' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', '@oxmysql/lib/MySQL.lua', 'config.lua', 'server/main.lua' @@ -24,13 +18,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_garage/locales/hu.lua b/[esx_addons]/esx_garage/locales/hu.lua new file mode 100644 index 00000000..c6fb3d8a --- /dev/null +++ b/[esx_addons]/esx_garage/locales/hu.lua @@ -0,0 +1,5 @@ +Locales['hu'] = { + ['veh_released'] = 'A jármü sikersen kivéve', + ['veh_stored'] = 'A jármü sikersen eltárolva', + ['veh_health'] = 'Tárolás elött meg kell javitanod a jármüvet', +} diff --git a/[esx_addons]/esx_holdup/fxmanifest.lua b/[esx_addons]/esx_holdup/fxmanifest.lua index 2616b54b..fc66394e 100644 --- a/[esx_addons]/esx_holdup/fxmanifest.lua +++ b/[esx_addons]/esx_holdup/fxmanifest.lua @@ -4,32 +4,20 @@ game 'gta5' description 'ESX Holdup' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } server_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } diff --git a/[esx_addons]/esx_holdup/locales/hu.lua b/[esx_addons]/esx_holdup/locales/hu.lua new file mode 100644 index 00000000..2f38cda8 --- /dev/null +++ b/[esx_addons]/esx_holdup/locales/hu.lua @@ -0,0 +1,16 @@ +Locales['hu'] = { + ['shop_robbery'] = 'Boltrablás', + ['press_to_rob'] = 'Nyomd meg az ~INPUT_CONTEXT~ gombot ~o~rablás~s~ indításához ~b~%s~s~', + ['robbery_timer'] = 'Ennyi idö van a rablásból: ~r~%s~s~ másodperc', + ['recently_robbed'] = 'Ezt a boltot már rabolták. Várj a következö rablásig: ~y~%s~s~ másodperc', + ['rob_in_prog'] = '~r~Rablás indult: ~b~%s~s~', + ['started_to_rob'] = 'Elindítottál egy rablást: ~y~%s~s~', + ['alarm_triggered'] = 'Vészjelzö elindult!', + ['robbery_complete'] = '~r~Rablás sikeres~s~, ennyit kaptál: ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Rablás sikeres: ~y~%s~s~', + ['robbery_cancelled'] = 'Rablást félbe szakítottad!', + ['robbery_cancelled_at'] = '~r~Rablást megszakították: ~b~%s~s~!', + ['min_police'] = 'Legalább ~b~%s rendőrnek~s~ kell lennie a városban a rabláshoz.', + ['robbery_already'] = '~r~Rablás folyamatban.', + ['no_threat'] = 'nem jelentesz veszélyzt az üzletvezetőre', +} \ No newline at end of file diff --git a/[esx_addons]/esx_joblisting/README.md b/[esx_addons]/esx_joblisting/README.md index 3af12895..ab7707a6 100644 --- a/[esx_addons]/esx_joblisting/README.md +++ b/[esx_addons]/esx_joblisting/README.md @@ -1,34 +1,11 @@ # esx_joblisting -Simple job listing script, you can specify what jobs you want to be whitelisted in db. +Simple job listing/Job Centre script, you can specify what jobs you want to be whitelisted in db. -## Download & Installation +## Legal -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_joblisting -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_joblisting [esx]/esx_joblisting -``` - -### Manually -- Download https://github.com/ESX-Org/esx_joblisting/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Import `esx_joblisting.sql` in your database -- Add this in your `server.cfg`: - -``` -start esx_joblisting -``` - -# Legal ### License + esx_joblisting - job listing script Copyright (C) 2015-2022 Jérémie N'gadi diff --git a/[esx_addons]/esx_joblisting/client/main.lua b/[esx_addons]/esx_joblisting/client/main.lua index 811eac57..d21c5a1d 100644 --- a/[esx_addons]/esx_joblisting/client/main.lua +++ b/[esx_addons]/esx_joblisting/client/main.lua @@ -1,13 +1,14 @@ -local menuIsShowed, hasAlreadyEnteredMarker, isInMarker = false, false, false +local menuIsShowed = false function ShowJobListingMenu() + menuIsShowed = true ESX.TriggerServerCallback('esx_joblisting:getJobsList', function(jobs) local elements = {} - for i=1, #jobs, 1 do + for k,v in pairs(jobs) do table.insert(elements, { - label = jobs[i].label, - job = jobs[i].job + label = v.label, + job = k }) end @@ -18,8 +19,10 @@ function ShowJobListingMenu() }, function(data, menu) TriggerServerEvent('esx_joblisting:setJob', data.current.job) ESX.ShowNotification(_U('new_job')) + menuIsShowed = false menu.close() end, function(data, menu) + menuIsShowed = false menu.close() end) @@ -33,7 +36,7 @@ end) -- Activate menu when player is inside marker, and draw markers CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local coords = GetEntityCoords(PlayerPedId()) isInMarker = false @@ -42,23 +45,24 @@ CreateThread(function() local distance = #(coords - Config.Zones[i]) if distance < Config.DrawDistance then + Sleep = 0 DrawMarker(Config.MarkerType, Config.Zones[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + else + if menuIsShowed then + ESX.UI.Menu.CloseAll() + menuIsShowed = false + end end if distance < (Config.ZoneSize.x / 2) then - isInMarker = true ESX.ShowHelpNotification(_U('access_job_center')) + if IsControlJustReleased(0, 38) and not menuIsShowed then + ESX.UI.Menu.CloseAll() + ShowJobListingMenu() + end end end - - if isInMarker and not hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = true - end - - if not isInMarker and hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = false - TriggerEvent('esx_joblisting:hasExitedMarker') - end + Wait(Sleep) end end) @@ -67,26 +71,14 @@ CreateThread(function() for i=1, #Config.Zones, 1 do local blip = AddBlipForCoord(Config.Zones[i]) - SetBlipSprite (blip, 407) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.2) - SetBlipColour (blip, 27) - SetBlipAsShortRange(blip, true) + SetBlipSprite (blip, Config.Blip.Sprite) + SetBlipDisplay(blip, Config.Blip.Display) + SetBlipScale (blip, Config.Blip.Scale) + SetBlipColour (blip, Config.Blip.Colour) + SetBlipAsShortRange(blip, Config.Blip.ShortRange) BeginTextCommandSetBlipName("STRING") AddTextComponentSubstringPlayerName(_U('job_center')) EndTextCommandSetBlipName(blip) end end) - --- Menu Controls -CreateThread(function() - while true do - Wait(0) - - if IsControlJustReleased(0, 38) and isInMarker and not menuIsShowed then - ESX.UI.Menu.CloseAll() - ShowJobListingMenu() - end - end -end) diff --git a/[esx_addons]/esx_joblisting/config.lua b/[esx_addons]/esx_joblisting/config.lua index 72dbdcb9..a053d362 100644 --- a/[esx_addons]/esx_joblisting/config.lua +++ b/[esx_addons]/esx_joblisting/config.lua @@ -1,12 +1,20 @@ Config = {} Config.DrawDistance = 10.0 -Config.ZoneSize = {x = 3.0, y = 3.0, z = 0.5} -Config.MarkerColor = {r = 100, g = 100, b = 204} -Config.MarkerType = 1 +Config.ZoneSize = {x = 2.7, y = 2.7, z = 0.5} +Config.MarkerColor = {r = 100, g = 200, b = 104} +Config.MarkerType = 27 Config.Locale = 'en' Config.Zones = { - vector3(-265.0, -963.6, 30.2) + vector3(-265.08, -964.1, 30.3) } + +Config.Blip = { + Sprite = 407, + Display = 4, + Scale = 0.9, + Colour = 27, + ShortRange = true +} \ No newline at end of file diff --git a/[esx_addons]/esx_joblisting/fxmanifest.lua b/[esx_addons]/esx_joblisting/fxmanifest.lua index 33a05f31..5e209a1a 100644 --- a/[esx_addons]/esx_joblisting/fxmanifest.lua +++ b/[esx_addons]/esx_joblisting/fxmanifest.lua @@ -1,42 +1,19 @@ -fx_version 'adamant' - +fx_version 'bodacious' game 'gta5' description 'ESX Job Listing' -version '1.5.0' +version '1.7.0' -shared_script '@es_extended/imports.lua' - -server_scripts { - '@oxmysql/lib/MySQL.lua', +shared_scripts { + '@es_extended/imports.lua', '@es_extended/locale.lua', - 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/cs.lua', - 'server/main.lua' + 'locales/*.lua', + 'config.lua' } -client_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/cs.lua', - 'client/main.lua' -} +server_script 'server/main.lua' + +client_script 'client/main.lua' dependency 'es_extended' diff --git a/[esx_addons]/esx_joblisting/locales/hu.lua b/[esx_addons]/esx_joblisting/locales/hu.lua new file mode 100644 index 00000000..0c23eecd --- /dev/null +++ b/[esx_addons]/esx_joblisting/locales/hu.lua @@ -0,0 +1,5 @@ +Locales['hu'] = { + ['new_job'] = 'Felvetted a munkát!', + ['access_job_center'] = 'Nyomj ~INPUT_PICKUP~ hogy megnézd a munkákat', + ['job_center'] = 'Munkaügyi központ', +} diff --git a/[esx_addons]/esx_joblisting/server/main.lua b/[esx_addons]/esx_joblisting/server/main.lua index 732010e5..83c5e330 100644 --- a/[esx_addons]/esx_joblisting/server/main.lua +++ b/[esx_addons]/esx_joblisting/server/main.lua @@ -1,32 +1,42 @@ -local availableJobs = {} - -MySQL.ready(function() - MySQL.query('SELECT name, label FROM jobs WHERE whitelisted = @whitelisted', { - ['@whitelisted'] = false - }, function(result) - for i=1, #result, 1 do - table.insert(availableJobs, { - job = result[i].name, - label = result[i].label - }) +function getJobs() + local jobs = ESX.GetJobs() + local availableJobs = {} + for k,v in pairs(jobs) do + if v.whitelisted == false then + availableJobs[k] = {label = v.label} end - end) -end) + end + return availableJobs +end ESX.RegisterServerCallback('esx_joblisting:getJobsList', function(source, cb) - cb(availableJobs) + local jobs = getJobs() + cb(jobs) end) +function IsNearCentre(player) + local Ped = GetPlayerPed(player) + local PedCoords = GetEntityCoords(Ped) + local Zones = Config.Zones + + for i=1, #Config.Zones, 1 do + local distance = #(PedCoords - Config.Zones[i]) + + if distance < Config.DrawDistance then + return true + end + end +end + RegisterServerEvent('esx_joblisting:setJob') AddEventHandler('esx_joblisting:setJob', function(job) + local source = source local xPlayer = ESX.GetPlayerFromId(source) + local jobs = getJobs() - if xPlayer then - for k,v in ipairs(availableJobs) do - if v.job == job then - xPlayer.setJob(job, 0) - break - end + if xPlayer and IsNearCentre(source) then + if jobs[job] then + xPlayer.setJob(job, 0) end end end) diff --git a/[esx_addons]/esx_jobs/README.md b/[esx_addons]/esx_jobs/README.md index d2274108..9bb5865e 100644 --- a/[esx_addons]/esx_jobs/README.md +++ b/[esx_addons]/esx_jobs/README.md @@ -1,46 +1,27 @@ # esx_jobs -### Requirements + +## Requirements + - [esx_addonaccount](https://github.com/ESX-Org/esx_addonaccount) - [esx_skin](https://github.com/ESX-Org/esx_skin) ### Features + - Jobs: slaughterer, miner, fisherman, journalist, fueler, tailor - Security deposit when renting a job vehicle (given back in case of crash, to the amount of damage the vehicle has already taken) - Easy system to create jobs (samples in jobs folder) - Item farming jobs This addon is an easy way to have farming jobs on your server, there is no player management. -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_jobs -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_jobs [esx]/esx_jobs -``` - -### Manually -- Download https://github.com/ESX-Org/esx_jobs/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Import `esx_jobs.sql` into your database -- Add this into your `server.cfg` -``` -start esx_jobs -``` - ## iZone integreation (optional) + - You can use iZone with esx_jobs by creating polynomial zones with iZone. When you finish the zone creation, take the zone name and set a Zone field on the job like so: + ``` CloakRoom = { Zone = "miner_room", -- HERE Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U("m_miner_locker"), @@ -49,11 +30,13 @@ CloakRoom = { GPS = {x = 884.86, y = -2176.51, z = 29.51} } ``` + - Note that this is just to have custom zone and avoid using radius. + ### [How to install and use iZone](https://github.com/izio38/iZone) -# Legal -### License +## Legal + esx_jobs - jobs Copyright (C) 2015-2022 Jérémie N'gadi @@ -62,4 +45,4 @@ This program Is free software: you can redistribute it And/Or modify it under th 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 +You should have received a copy Of the GNU General Public License along with this program. If Not, see . diff --git a/[esx_addons]/esx_jobs/client/main.lua b/[esx_addons]/esx_jobs/client/main.lua index 53915dc2..9acd4d49 100644 --- a/[esx_addons]/esx_jobs/client/main.lua +++ b/[esx_addons]/esx_jobs/client/main.lua @@ -1,23 +1,6 @@ -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 -} - -local menuIsShowed = false -local hintIsShowed = false -local hasAlreadyEnteredMarker = false local Blips = {} local JobBlips = {} local isInMarker = false -local isInPublicMarker = false - local hintToDisplay = "no hint to display" local onDuty = false local spawner = 0 @@ -28,12 +11,21 @@ local vehicleInCaseofDrop = nil local vehicleMaxHealth = nil -RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer) +RegisterNetEvent('esx:playerLoaded', function(xPlayer) ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true refreshBlips() end) +RegisterNetEvent('esx:onPlayerLogout',function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} +end) + +RegisterNetEvent('esx:setJob',function(job) + ESX.PlayerData.job = job +end) + function OpenMenu() ESX.UI.Menu.CloseAll() @@ -47,16 +39,32 @@ function OpenMenu() }, function(data, menu) if data.current.value == 'citizen_wear' then onDuty = false - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) + ESX.ShowNotification(_U('offduty'),"success") + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + local isMale = skin.sex == 0 + + TriggerEvent('skinchanger:loadDefaultModel', isMale, function() + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + end) end) elseif data.current.value == 'job_wear' then onDuty = true + ESX.ShowNotification(_U('onduty'), "success") ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) if skin.sex == 0 then - TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_male) + if #(jobSkin.skin_male) >= 1 then + TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_male) + else + ESX.ShowNotification(_U('no_male_clothing'), "error") + end else - TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female) + if #(jobSkin.skin_female) >= 1 then + TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female) + else + ESX.ShowNotification(_U('no_female_clothing'), "error") + end end end) end @@ -72,8 +80,6 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey) if zone.Type == "cloakroom" then OpenMenu() elseif zone.Type == "work" then - hintToDisplay = "no hint to display" - hintIsShowed = false local playerPed = PlayerPedId() if IsPedInAnyVehicle(playerPed, false) then @@ -176,9 +182,6 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey) RemoveBlip(Blips['delivery']) Blips['delivery'] = nil end - - hintToDisplay = "no hint to display" - hintIsShowed = false TriggerServerEvent('esx_jobs:startWork', zone.Item, zoneKey) end --nextStep(zone.GPS) @@ -199,15 +202,11 @@ end AddEventHandler('esx_jobs:hasExitedMarker', function(zone) TriggerServerEvent('esx_jobs:stopWork') - hintToDisplay = "no hint to display" menuIsShowed = false - hintIsShowed = false isInMarker = false end) -RegisterNetEvent('esx:setJob') -AddEventHandler('esx:setJob', function(job) - ESX.PlayerData.job = job +RegisterNetEvent('esx:setJob', function(job) onDuty = false myPlate = {} -- loosing vehicle caution in case player changes job. spawner = 0 @@ -230,7 +229,6 @@ function refreshBlips() if ESX.PlayerData.job ~= nil then for jobKey,jobValues in pairs(Config.Jobs) do - if jobKey == ESX.PlayerData.job.name then for zoneKey,zoneValues in pairs(jobValues.Zones) do @@ -245,11 +243,10 @@ function refreshBlips() else _Pos = zoneValues.Pos end - print(_Pos.x) local blip = AddBlipForCoord(_Pos.x, _Pos.y, _Pos.z) SetBlipSprite (blip, jobValues.BlipInfos.Sprite) SetBlipDisplay (blip, 4) - SetBlipScale (blip, 1.2) + SetBlipScale (blip, 0.8) SetBlipCategory(blip, 3) SetBlipColour (blip, jobValues.BlipInfos.Color) SetBlipAsShortRange(blip, true) @@ -266,13 +263,11 @@ function refreshBlips() end function spawnVehicle(spawnPoint, vehicle, vehicleCaution) - hintToDisplay = 'no hint to display' hintIsShowed = false TriggerServerEvent('esx_jobs:caution', 'take', vehicleCaution, spawnPoint, vehicle) end -RegisterNetEvent('esx_jobs:spawnJobVehicle') -AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) +RegisterNetEvent('esx_jobs:spawnJobVehicle',function(spawnPoint, vehicle) local playerPed = PlayerPedId() ESX.Game.SpawnVehicle(vehicle.Hash, spawnPoint.Pos, spawnPoint.Heading, function(spawnedVehicle) @@ -299,101 +294,79 @@ AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) end) end) --- Show top left hint -CreateThread(function() - while true do - Wait(0) - - if hintIsShowed then - ESX.ShowHelpNotification(hintToDisplay) - else - Wait(500) - end - end -end) - -- Display markers (only if on duty and the player's job ones) CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local zones = {} - - if ESX.PlayerData.job ~= nil then + + if ESX.PlayerData.job then for k,v in pairs(Config.Jobs) do if ESX.PlayerData.job.name == k then + Sleep = 0 zones = v.Zones end end local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(zones) do - if onDuty or v.Type == "cloakroom" or ESX.PlayerData.job.name == "reporter" then + if onDuty or v.Type == "cloakroom" then if (v.Zone) then TriggerEvent("izone:getZoneCenter", v.Zone, function(center) if (not(center == nil)) then if(v.Marker ~= -1 and #(coords - center) < Config.DrawDistance) then + Sleep = 0 DrawMarker(v.Marker, center.x, center.y, center.z - 1, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) end end end) else - if(v.Marker ~= -1 and #(coords - v.Pos) < Config.DrawDistance) then + local Pos = vector3(v.Pos.x, v.Pos.y, v.Pos.z) + if(v.Marker ~= -1 and #(coords - Pos) < Config.DrawDistance) then + Sleep = 0 DrawMarker(v.Marker, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) end end end end end + Wait(Sleep) end end) -- Display public markers CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.PublicZones) do if(v.Marker ~= -1 and #(coords - v.Pos) < Config.DrawDistance) then + Sleep = 0 DrawMarker(v.Marker, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) end end + Wait(Sleep) end end) -- Activate public marker CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local coords = GetEntityCoords(PlayerPedId()) - local position = nil - local zone = nil for k,v in pairs(Config.PublicZones) do if #(coords - v.Pos) < v.Size.x/2 then - isInPublicMarker = true - position = v.Teleport - zone = v - break - else - isInPublicMarker = false + Sleep = 0 + ESX.ShowHelpNotification(v.Hint) + hintIsShowed = true + if IsControlJustReleased(0, 38) then + ESX.Game.Teleport(PlayerPedId(), position) + end end end - if IsControlJustReleased(0, Keys['E']) and isInPublicMarker then - ESX.Game.Teleport(PlayerPedId(), position) - isInPublicMarker = false - end - - -- hide or show top left zone hints - if isInPublicMarker then - hintToDisplay = zone.Hint - hintIsShowed = true - else - if not isInMarker then - hintToDisplay = "no hint to display" - hintIsShowed = false - end - end + Wait(Sleep) end end) @@ -401,20 +374,21 @@ end) CreateThread(function() while true do - Wait(0) + local Sleep = 500 - if ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name ~= 'unemployed' then + if ESX.PlayerData.job and ESX.PlayerData.job.name ~= 'unemployed' then local zones = nil local job = nil for k,v in pairs(Config.Jobs) do if ESX.PlayerData.job.name == k then + Sleep = 0 job = v zones = v.Zones end end - if zones ~= nil then + if zones then local coords = GetEntityCoords(PlayerPedId()) local currentZone = nil local zone = nil @@ -425,6 +399,7 @@ CreateThread(function() if v.Zone then TriggerEvent("izone:isPlayerInZone", v.Zone, function(isIn) if isIn then + Sleep = 0 isInMarker = true currentZone = k zone = v @@ -439,7 +414,9 @@ CreateThread(function() end -- Else use radius defined from center else - if #(coords - v.Pos) < v.Size.x then + local Pos = vector3(v.Pos.x, v.Pos.y, v.Pos.z) + if #(coords - Pos) < v.Size.x then + Sleep = 0 isInMarker = true currentZone = k zone = v @@ -451,8 +428,8 @@ CreateThread(function() end - if IsControlJustReleased(0, Keys['E']) and not menuIsShowed and isInMarker then - if onDuty or zone.Type == "cloakroom" or ESX.PlayerData.job.name == "reporter" then + if IsControlJustReleased(0, 38) and not menuIsShowed and isInMarker then + if onDuty or zone.Type == "cloakroom" then TriggerEvent('esx_jobs:action', job, zone, currentZone) end end @@ -460,10 +437,10 @@ CreateThread(function() -- hide or show top left zone hints if isInMarker and not menuIsShowed then hintIsShowed = true - if (onDuty or zone.Type == "cloakroom" or ESX.PlayerData.job.name == "reporter") and zone.Type ~= "vehdelete" then + if (onDuty or zone.Type == "cloakroom") and zone.Type ~= "vehdelete" then hintToDisplay = zone.Hint - hintIsShowed = true - elseif zone.Type == "vehdelete" and (onDuty or ESX.PlayerData.job.name == "reporter") then + ESX.ShowHelpNotification(hintToDisplay) + elseif zone.Type == "vehdelete" and (onDuty) then local playerPed = PlayerPedId() if IsPedInAnyVehicle(playerPed, false) then @@ -483,19 +460,16 @@ CreateThread(function() else hintToDisplay = _U('not_your_vehicle') + ESX.ShowHelpNotification(hintToDisplay) end else hintToDisplay = _U('in_vehicle') + ESX.ShowHelpNotification(hintToDisplay) end hintIsShowed = true elseif onDuty and zone.Spawner ~= spawner then hintToDisplay = _U('wrong_point') - hintIsShowed = true - else - if not isInPublicMarker then - hintToDisplay = "no hint to display" - hintIsShowed = false - end + ESX.ShowHelpNotification(hintToDisplay) end end @@ -509,20 +483,21 @@ CreateThread(function() end end end + Wait(Sleep) end end) -CreateThread(function() - -- Slaughterer - RemoveIpl("CS1_02_cf_offmission") - RequestIpl("CS1_02_cf_onmission1") - RequestIpl("CS1_02_cf_onmission2") - RequestIpl("CS1_02_cf_onmission3") - RequestIpl("CS1_02_cf_onmission4") - - -- Tailor - RequestIpl("id2_14_during_door") - RequestIpl("id2_14_during1") -end) - +if Config.RequestIPL then + CreateThread(function() + -- Slaughterer + RemoveIpl("CS1_02_cf_offmission") + RequestIpl("CS1_02_cf_onmission1") + RequestIpl("CS1_02_cf_onmission2") + RequestIpl("CS1_02_cf_onmission3") + RequestIpl("CS1_02_cf_onmission4") + -- Tailor + RequestIpl("id2_14_during_door") + RequestIpl("id2_14_during1") + end) +end if ESX.PlayerLoaded then refreshBlips() end diff --git a/[esx_addons]/esx_jobs/config.lua b/[esx_addons]/esx_jobs/config.lua index 016cb490..5fd0ae9a 100644 --- a/[esx_addons]/esx_jobs/config.lua +++ b/[esx_addons]/esx_jobs/config.lua @@ -1,16 +1,17 @@ Config = {} Config.DrawDistance = 10.0 -Config.Locale = 'en' +Config.Locale = 'en' Config.Jobs = {} Config.MaxCaution = 10000 -- the max caution allowed +Config.RequestIPL = true Config.PublicZones = { EnterBuilding = { Pos = vector3(-118.21, -607.14, 35.28), Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker= 1, Blip = false, Name = _U('reporter_name'), @@ -22,7 +23,7 @@ Config.PublicZones = { ExitBuilding = { Pos = vector3( -139.45, -617.32, 167.82), Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker= 1, Blip = false, Name = _U('reporter_name'), diff --git a/[esx_addons]/esx_jobs/esx_jobs.sql b/[esx_addons]/esx_jobs/esx_jobs.sql index 7d4a4b9a..2328f641 100644 --- a/[esx_addons]/esx_jobs/esx_jobs.sql +++ b/[esx_addons]/esx_jobs/esx_jobs.sql @@ -15,13 +15,13 @@ INSERT INTO `jobs` (name, label) VALUES ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('lumberjack', 0, 'employee', 'Intérimaire', 0, '{}', '{}'), - ('fisherman', 0, 'employee', 'Intérimaire', 0, '{}', '{}'), - ('fueler', 0, 'employee', 'Intérimaire', 0, '{}', '{}'), - ('reporter', 0, 'employee', 'Intérimaire', 0, '{}', '{}'), - ('tailor',0,'employee','Intérimaire',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), - ('miner', 0, 'employee', 'Intérimaire', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), - ('slaughterer',0,'employee','Intérimaire',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') + ('lumberjack', 0, 'employee', 'Employee', 0, '{}', '{}'), + ('fisherman', 0, 'employee', 'Employee', 0, '{}', '{}'), + ('fueler', 0, 'employee', 'Employee', 0, '{}', '{}'), + ('reporter', 0, 'employee', 'Employee', 0, '{}', '{}'), + ('tailor',0,'employee','Employee',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), + ('miner', 0, 'employee', 'Employee', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), + ('slaughterer',0,'employee','Employee',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; INSERT INTO `items` (`name`, `label`, `weight`) VALUES diff --git a/[esx_addons]/esx_jobs/fxmanifest.lua b/[esx_addons]/esx_jobs/fxmanifest.lua index 8b16cd1b..44c8b0ff 100644 --- a/[esx_addons]/esx_jobs/fxmanifest.lua +++ b/[esx_addons]/esx_jobs/fxmanifest.lua @@ -4,58 +4,21 @@ game 'gta5' description 'ESX Jobs' -version '1.5.0' +version '1.7.0' -shared_script '@es_extended/imports.lua' - -server_scripts { +shared_scripts { + '@es_extended/imports.lua', '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'locales/de.lua', + 'locales/*.lua', 'config.lua', - - 'jobs/fisherman.lua', - 'jobs/fueler.lua', - 'jobs/lumberjack.lua', - 'jobs/miner.lua', - 'jobs/reporter.lua', - 'jobs/slaughterer.lua', - 'jobs/tailor.lua', - - 'server/main.lua' + 'jobs/*.lua', +} +server_scripts { + 'server/main.lua', } client_scripts { - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/fi.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'config.lua', - - 'jobs/fisherman.lua', - 'jobs/fueler.lua', - 'jobs/lumberjack.lua', - 'jobs/miner.lua', - 'jobs/reporter.lua', - 'jobs/slaughterer.lua', - 'jobs/tailor.lua', - - 'client/main.lua' + 'client/main.lua', } -dependencies { - 'es_extended', - 'esx_addonaccount', - 'skinchanger', - 'esx_skin' -} +dependency 'es_extended' diff --git a/[esx_addons]/esx_jobs/jobs/fisherman.lua b/[esx_addons]/esx_jobs/jobs/fisherman.lua index 26186520..c49243b1 100644 --- a/[esx_addons]/esx_jobs/jobs/fisherman.lua +++ b/[esx_addons]/esx_jobs/jobs/fisherman.lua @@ -26,10 +26,10 @@ Config.Jobs.fisherman = { Zones = { CloakRoom = { - Pos = {x = 868.39, y = -1639.75, z = 29.33}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, + Pos = {x = 868.39, y = -1639.75, z = 30.33}, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('fm_fish_locker'), Type = 'cloakroom', @@ -39,8 +39,8 @@ Config.Jobs.fisherman = { FishingSpot = { Pos = {x = 4435.21, y = 4829.60, z = 0.34}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 110.0, y = 110.0, z = 10.0}, + Size = {x = 100.0, y = 100.0, z = 50.0}, + Color = {r = 50, g = 200, b = 50}, Marker= 1, Blip = true, Name = _U('fm_fish_area'), @@ -51,10 +51,10 @@ Config.Jobs.fisherman = { { name = _U('fm_fish'), db_name= 'fish', - time = 2, + time = 10, max = 100, add = 1, - remove = 1, + remove = 0, requires = 'nothing', requires_name = 'Nothing', drop = 100 @@ -64,10 +64,10 @@ Config.Jobs.fisherman = { }, BoatSpawner = { - Pos = {x = 3867.44, y = 4463.62, z = 1.72}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, + Pos = {x = 3866.268, y = 4463.868, z = 2.72}, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('fm_spawnboat_title'), Type = 'vehspawner', @@ -79,7 +79,8 @@ Config.Jobs.fisherman = { BoatSpawnPoint = { Pos = {x = 3888.3, y = 4468.09, z = 0.0}, - Size = {x = 3.0, y = 3.0, z = 1.0}, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, Marker= -1, Blip = false, Name = _U('fm_boat_title'), @@ -91,9 +92,9 @@ Config.Jobs.fisherman = { BoatDeletePoint = { Pos = {x = 3859.43, y = 4448.83, z = 0.39}, - Size = {x = 10.0, y = 10.0, z = 1.0}, - Color = {r = 255, g = 0, b = 0}, - Marker= 1, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = false, Name = _U('fm_boat_return_title'), Type = 'vehdelete', @@ -106,9 +107,9 @@ Config.Jobs.fisherman = { VehicleSpawner = { Pos = {x = 880.74, y = -1663.96, z = 29.37}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = false, Name = _U('spawn_veh'), Type = 'vehspawner', @@ -120,8 +121,9 @@ Config.Jobs.fisherman = { VehicleSpawnPoint = { Pos = {x = 859.35, y = -1656.21, z = 29.56}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = false, Name = _U('service_vh'), Type = 'vehspawnpt', @@ -132,9 +134,9 @@ Config.Jobs.fisherman = { VehicleDeletePoint = { Pos = {x = 863.23, y = -1718.28, z = 28.63}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 255, g = 0, b = 0}, - Marker= 1, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = false, Name = _U('return_vh'), Type = 'vehdelete', @@ -146,10 +148,10 @@ Config.Jobs.fisherman = { }, Delivery = { - Pos = {x = -1012.64, y = -1354.62, z = 5.54}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Marker= 1, + Pos = {x = -1037.96, y = -1397.09, z = 5.54}, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('delivery_point'), Type = 'delivery', diff --git a/[esx_addons]/esx_jobs/jobs/fueler.lua b/[esx_addons]/esx_jobs/jobs/fueler.lua index 8b6edeb6..961b449d 100644 --- a/[esx_addons]/esx_jobs/jobs/fueler.lua +++ b/[esx_addons]/esx_jobs/jobs/fueler.lua @@ -19,10 +19,10 @@ Config.Jobs.fueler = { Zones = { CloakRoom = { - Pos = {x = 557.93, y = -2327.90, z = 4.82}, - Size = {x = 3.0, y = 3.0, z = 2.0}, - Color = {r = 204, g = 204, b = 0}, - Marker = 1, + Pos = {x = 557.93, y = -2327.90, z = 5.82}, + Size = {x = 0.5, y = 0.5, z = 0.8}, + Color = {r = 50, g = 200, b = 50}, + Marker = 20, Blip = true, Name = _U('f_oil_refiner'), Type = 'cloakroom', @@ -33,7 +33,7 @@ Config.Jobs.fueler = { OilFarm = { Pos = {x = 609.58, y = 2856.74, z = 38.90}, Size = {x = 20.0, y = 20.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('f_drill_oil'), @@ -45,7 +45,7 @@ Config.Jobs.fueler = { time = 5, max = 24, add = 1, - remove = 1, + remove = 0, requires = 'nothing', requires_name = 'Nothing', drop = 100 @@ -58,7 +58,7 @@ Config.Jobs.fueler = { OilRefinement = { Pos = {x = 2736.94, y = 1417.99, z = 23.48}, Size = {x = 10.0, y = 10.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('f_fuel_refine'), @@ -83,7 +83,7 @@ Config.Jobs.fueler = { OilMix = { Pos = {x = 265.75, y = -3013.39, z = 4.73}, Size = {x = 10.0, y = 10.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('f_fuel_mixture'), @@ -108,7 +108,7 @@ Config.Jobs.fueler = { VehicleSpawner = { Pos = {x = 554.59, y = -2314.43, z = 4.86}, Size = {x = 3.0, y = 3.0, z = 2.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('spawn_veh'), @@ -122,6 +122,7 @@ Config.Jobs.fueler = { VehicleSpawnPoint = { Pos = {x = 570.54, y = -2309.70, z = 4.90}, Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, Marker = -1, Blip = false, Name = _U('service_vh'), @@ -134,7 +135,7 @@ Config.Jobs.fueler = { VehicleDeletePoint = { Pos = {x = 520.68, y = -2124.21, z = 4.98}, Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 255, g = 0, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('return_vh'), @@ -148,7 +149,7 @@ Config.Jobs.fueler = { Delivery = { Pos = {x = 491.40, y = -2163.37, z = 4.91}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 10.0, y = 10.0, z = 1.0}, Marker = 1, Blip = true, diff --git a/[esx_addons]/esx_jobs/jobs/lumberjack.lua b/[esx_addons]/esx_jobs/jobs/lumberjack.lua index 2b248cc5..487a552d 100644 --- a/[esx_addons]/esx_jobs/jobs/lumberjack.lua +++ b/[esx_addons]/esx_jobs/jobs/lumberjack.lua @@ -20,9 +20,9 @@ Config.Jobs.lumberjack = { CloakRoom = { Pos = {x = 1200.63, y = -1276.87, z = 34.38}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker = 1, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('lj_locker_room'), Type = 'cloakroom', @@ -32,7 +32,7 @@ Config.Jobs.lumberjack = { Wood = { Pos = {x = -534.32, y = 5373.79, z = 69.50}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('lj_mapblip'), @@ -44,7 +44,7 @@ Config.Jobs.lumberjack = { time = 3, max = 20, add = 1, - remove = 1, + remove = 0, requires = 'nothing', requires_name = 'Nothing', drop = 100 @@ -56,7 +56,7 @@ Config.Jobs.lumberjack = { CuttedWood = { Pos = {x = -552.21, y = 5326.90, z = 72.59}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('lj_woodcutting'), @@ -80,7 +80,7 @@ Config.Jobs.lumberjack = { Planks = { Pos = {x = -501.38, y = 5280.53, z = 79.61}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('lj_board'), @@ -104,7 +104,7 @@ Config.Jobs.lumberjack = { VehicleSpawner = { Pos = {x = 1191.96, y = -1261.77, z = 34.17}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('spawn_veh'), @@ -142,7 +142,7 @@ Config.Jobs.lumberjack = { Delivery = { Pos = {x = 1201.35, y = -1327.51, z = 34.22}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, diff --git a/[esx_addons]/esx_jobs/jobs/miner.lua b/[esx_addons]/esx_jobs/jobs/miner.lua index 58c45cf3..cd51be2d 100644 --- a/[esx_addons]/esx_jobs/jobs/miner.lua +++ b/[esx_addons]/esx_jobs/jobs/miner.lua @@ -1,7 +1,7 @@ Config.Jobs.miner = { BlipInfos = { - Sprite = 318, + Sprite = 68, Color = 5 }, @@ -20,9 +20,9 @@ Config.Jobs.miner = { CloakRoom = { Pos = {x = 892.35, y = -2172.77, z = 31.28}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker = 1, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('m_miner_locker'), Type = 'cloakroom', @@ -33,7 +33,7 @@ Config.Jobs.miner = { Mine = { Pos = {x = 2962.40, y = 2746.20, z = 42.39}, Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('m_rock'), @@ -45,7 +45,7 @@ Config.Jobs.miner = { time = 3, max = 7, add = 1, - remove = 1, + remove = 0, requires = 'nothing', requires_name = 'Nothing', drop = 100 @@ -58,7 +58,7 @@ Config.Jobs.miner = { StoneWash = { Pos = {x = 289.24, y = 2862.90, z = 42.64}, Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('m_washrock'), @@ -83,12 +83,12 @@ Config.Jobs.miner = { Foundry = { Pos = {x = 1109.14, y = -2007.87, z = 30.01}, Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('m_rock_smelting'), Type = 'work', - Item = { + Item = { { name = _U('m_copper'), db_name = 'copper', @@ -129,7 +129,7 @@ Config.Jobs.miner = { VehicleSpawner = { Pos = {x = 884.86, y = -2176.51, z = 29.51}, Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('spawn_veh'), @@ -169,7 +169,7 @@ Config.Jobs.miner = { CopperDelivery = { Pos = {x = -169.481, y = -2659.16, z = 5.00103}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, @@ -194,7 +194,7 @@ Config.Jobs.miner = { IronDelivery = { Pos = {x = -148.78, y = -1040.38, z = 26.27}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, @@ -219,7 +219,7 @@ Config.Jobs.miner = { GoldDelivery = { Pos = {x = 261.48, y = 207.35, z = 109.28}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, @@ -244,7 +244,7 @@ Config.Jobs.miner = { DiamondDelivery = { Pos = {x = -621.04, y = -228.53, z = 37.05}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, diff --git a/[esx_addons]/esx_jobs/jobs/reporter.lua b/[esx_addons]/esx_jobs/jobs/reporter.lua deleted file mode 100644 index 71766d2e..00000000 --- a/[esx_addons]/esx_jobs/jobs/reporter.lua +++ /dev/null @@ -1,61 +0,0 @@ -Config.Jobs.reporter = { - - BlipInfos = { - Sprite = 184, - Color = 1 - }, - - Vehicles = { - - Truck = { - Spawner = 1, - Hash = 'rumpo', - Trailer = 'none', - HasCaution = true - } - - }, - - Zones = { - - VehicleSpawner = { - Pos = {x = -141.41, y = -620.80, z = 167.82}, - Size = {x = 2.0, y = 2.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker = 1, - Blip = true, - Name = _U('reporter_name'), - Type = 'vehspawner', - Spawner = 1, - Hint = _U('reporter_garage'), - Caution = 2000 - }, - - VehicleSpawnPoint = { - Pos = {x = -149.32, y = -592.17, z = 31.42}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker = -1, - Blip = false, - Name = _U('service_vh'), - Type = 'vehspawnpt', - Spawner = 1, - Heading = 200.1 - }, - - VehicleDeletePoint = { - Pos = {x = -144.22, y = -577.02, z = 31.42}, - Size = {x = 5.0, y = 5.0, z = 0.2}, - Color = {r = 255, g = 0, b = 0}, - Marker = 1, - Blip = false, - Name = _U('return_vh'), - Type = 'vehdelete', - Hint = _U('return_vh_button'), - Spawner = 1, - Caution = 2000, - GPS = 0, - Teleport = {x = -139.09, y = -620.74, z = 167.82} - } - - } -} diff --git a/[esx_addons]/esx_jobs/jobs/slaughterer.lua b/[esx_addons]/esx_jobs/jobs/slaughterer.lua index d07077c6..c76dc248 100644 --- a/[esx_addons]/esx_jobs/jobs/slaughterer.lua +++ b/[esx_addons]/esx_jobs/jobs/slaughterer.lua @@ -18,10 +18,10 @@ Config.Jobs.slaughterer = { Zones = { CloakRoom = { - Pos = {x = -1071.13, y = -2003.78, z = 14.78}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker = 1, + Pos = {x = -1071.13, y = -2003.78, z = 15.78}, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('s_slaughter_locker'), Type = 'cloakroom', @@ -31,7 +31,7 @@ Config.Jobs.slaughterer = { AliveChicken = { Pos = {x = -62.90, y = 6241.46, z = 30.09}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('s_hen'), @@ -43,7 +43,7 @@ Config.Jobs.slaughterer = { time = 3, max = 20, add = 1, - remove = 1, + remove = 0, requires = 'nothing', requires_name = 'Nothing', drop = 100 @@ -55,7 +55,7 @@ Config.Jobs.slaughterer = { SlaughterHouse = { Pos = {x = -77.99, y = 6229.06, z = 30.09}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('s_slaughtered'), @@ -79,7 +79,7 @@ Config.Jobs.slaughterer = { Packaging = { Pos = {x = -101.97, y = 6208.79, z = 30.02}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('s_package'), @@ -103,7 +103,7 @@ Config.Jobs.slaughterer = { VehicleSpawner = { Pos = {x = -1042.94, y = -2023.25, z = 12.16}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('spawn_veh'), @@ -141,7 +141,7 @@ Config.Jobs.slaughterer = { Delivery = { Pos = {x = -596.15, y = -889.32, z = 24.50}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 1.0}, Marker = 1, Blip = true, diff --git a/[esx_addons]/esx_jobs/jobs/tailor.lua b/[esx_addons]/esx_jobs/jobs/tailor.lua index bac08078..210d36c0 100644 --- a/[esx_addons]/esx_jobs/jobs/tailor.lua +++ b/[esx_addons]/esx_jobs/jobs/tailor.lua @@ -19,10 +19,10 @@ Config.Jobs.tailor = { Zones = { CloakRoom = { - Pos = {x = 706.73, y = -960.90, z = 29.39}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker = 1, + Pos = {x = 706.73, y = -960.90, z = 30.39}, + Size = {x = 0.8, y = 0.5, z = 1.0}, + Color = {r = 50, g = 200, b = 50}, + Marker= 20, Blip = true, Name = _U('dd_dress_locker'), Type = 'cloakroom', @@ -33,7 +33,7 @@ Config.Jobs.tailor = { Wool = { Pos = {x = 1978.92, y = 5171.70, z = 46.63}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = true, Name = _U('dd_wool'), @@ -45,7 +45,7 @@ Config.Jobs.tailor = { time = 3, max = 40, add = 1, - remove = 1, + remove = 0, requires = 'nothing', requires_name = 'Nothing', drop = 100 @@ -58,7 +58,7 @@ Config.Jobs.tailor = { Fabric = { Pos = {x = 715.95, y = -959.63, z = 29.39}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('dd_fabric'), @@ -83,7 +83,7 @@ Config.Jobs.tailor = { Clothe = { Pos = {x = 712.92, y = -970.58, z = 29.39}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('dd_clothing'), @@ -108,7 +108,7 @@ Config.Jobs.tailor = { VehicleSpawner = { Pos = {x = 740.80, y = -970.06, z = 23.46}, Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Marker = 1, Blip = false, Name = _U('spawn_veh'), @@ -148,7 +148,7 @@ Config.Jobs.tailor = { Delivery = { Pos = {x = 429.59, y = -807.34, z = 28.49}, - Color = {r = 204, g = 204, b = 0}, + Color = {r = 50, g = 200, b = 50}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, diff --git a/[esx_addons]/esx_jobs/locales/en.lua b/[esx_addons]/esx_jobs/locales/en.lua index aaca224f..63dcdf06 100644 --- a/[esx_addons]/esx_jobs/locales/en.lua +++ b/[esx_addons]/esx_jobs/locales/en.lua @@ -1,115 +1,119 @@ Locales['en'] = { -- Global menus ['cloakroom'] = 'locker Room', - ['cloak_change'] = 'press ~INPUT_PICKUP~ to change clothes.', + ['cloak_change'] = 'press [E] to change clothes.', ['citizen_wear'] = 'civilian clothes', ['job_wear'] = 'workers clothes', - ['bank_deposit_returned'] = 'a security deposit of ~g~$%s~s~ was returned to you.', - ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', - ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', + ['bank_deposit_returned'] = 'a security deposit of $%s was returned to you.', + ['bank_deposit_taken'] = 'a security deposit of $%s was taken from you.', + ['caution_afford'] = 'you cannot afford the caution of $%s', ['foot_work'] = 'you have to be on foot to be able to work.', ['next_point'] = 'go to the next step after completing this one.', ['not_your_vehicle'] = 'you are not the driver of this vehicle.', ['in_vehicle'] = 'you must sit in a vehicle.', ['wrong_point'] = 'you are not at the right point of delivery.', - ['max_limit'] = 'you cannot carry more ~y~%s~s~', - ['not_enough'] = 'you do not have enough ~y~%s~s~ to continue this task.', + ['onduty'] = "You are On-Duty!", + ['offduty'] = "You are Off-Duty!", + ['no_male_clothing'] = "Warning: Job has no male clothing!", + ['no_female_clothing'] = "Warning: Job has no female clothing!", + ['max_limit'] = 'you cannot carry more %s', + ['not_enough'] = 'you do not have enough %s to continue this task.', ['spawn_veh'] = 'spawn vehicle', - ['spawn_veh_button'] = 'press ~INPUT_PICKUP~ to call the delivery vehicle.', - ['spawn_truck_button'] = 'press ~INPUT_PICKUP~ to spawn the truck.', + ['spawn_veh_button'] = 'press [E] to call the delivery vehicle.', + ['spawn_truck_button'] = 'press [E] to spawn the truck.', ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', ['service_vh'] = 'service vehicle', ['return_vh'] = 'vehicle return', - ['return_vh_button'] = 'press ~INPUT_PICKUP~ to return the vehicle.', + ['return_vh_button'] = 'press [E] to return the vehicle.', ['delivery_point'] = 'delivery point', ['delivery'] = 'delivery', - ['public_enter'] = 'press ~INPUT_PICKUP~ to enter the building.', - ['public_leave'] = 'press ~INPUT_PICKUP~ to go to the entrance of the building.', + ['public_enter'] = 'press [E] to enter the building.', + ['public_leave'] = 'press [E] to go to the entrance of the building.', -- Lumber Jack job - ['lj_locker_room'] = 'lumberjack\'s Locker Room', + ['lj_locker_room'] = "lumberjack's Locker Room", ['lj_mapblip'] = 'wood pile', ['lj_wood'] = 'wood', - ['lj_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wood.', + ['lj_pickup'] = 'press [E] to retrieve wood.', ['lj_woodcutting'] = 'wood cutting', - ['lj_cutwood_button'] = 'press ~INPUT_PICKUP~ to cut wood.', + ['lj_cutwood_button'] = 'press [E] to cut wood.', ['lj_board'] = 'boards', ['lj_planks'] = 'package board', ['lj_cutwood'] = 'cut wood', - ['lj_pick_boards'] = 'press ~INPUT_PICKUP~ to retrieve boards.', - ['lj_deliver_button'] = 'press ~INPUT_PICKUP~ to deliver the boards.', + ['lj_pick_boards'] = 'press [E] to retrieve boards.', + ['lj_deliver_button'] = 'press [E] to deliver the boards.', -- Fisherman ['fm_fish_locker'] = 'fishermen\'s Locker Room', ['fm_fish'] = 'fish', ['fm_fish_area'] = 'fishing area', - ['fm_fish_button'] = 'press ~INPUT_PICKUP~ to fish.', + ['fm_fish_button'] = 'press [E] to fish.', ['fm_spawnboat_title'] = 'spawn boat', - ['fm_spawnboat'] = 'press ~INPUT_PICKUP~ to call the boat.', + ['fm_spawnboat'] = 'press [E] to call the boat.', ['fm_boat_title'] = 'boat', ['fm_boat_return_title'] = 'boat return', - ['fm_boat_return_button'] = 'press ~INPUT_PICKUP~ to return the boat.', - ['fm_deliver_fish'] = 'press ~INPUT_PICKUP~ to deliver the fish.', + ['fm_boat_return_button'] = 'press [E] to return the boat.', + ['fm_deliver_fish'] = 'press [E] to deliver the fish.', -- Fuel ['f_oil_refiner'] = 'oil Refiner Locker Room', ['f_drill_oil'] = 'drill for oil', ['f_fuel'] = 'oil', - ['f_drillbutton'] = 'press ~INPUT_PICKUP~ to drill.', + ['f_drillbutton'] = 'press [E] to drill.', ['f_fuel_refine'] = 'refine oil', - ['f_refine_fuel_button'] = 'press ~INPUT_PICKUP~ to refine.', + ['f_refine_fuel_button'] = 'press [E] to refine.', ['f_fuel_mixture'] = 'mix refined oil', ['f_gas'] = 'gas', - ['f_fuel_mixture_button'] = 'press ~INPUT_PICKUP~ to mix oil.', + ['f_fuel_mixture_button'] = 'press [E] to mix oil.', ['f_deliver_gas'] = 'deliver Gas', - ['f_deliver_gas_button'] = 'press ~INPUT_PICKUP~ to deliver gasoline.', + ['f_deliver_gas_button'] = 'press [E] to deliver gasoline.', -- Miner ['m_miner_locker'] = 'miner\'s Locker Room', ['m_rock'] = 'rock', - ['m_pickrocks'] = 'press ~INPUT_PICKUP~ to retrieve rocks.', + ['m_pickrocks'] = 'press [E] to retrieve rocks.', ['m_washrock'] = 'rock Washing', - ['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.', + ['m_rock_button'] = 'press [E] to wash the rocks.', ['m_rock_smelting'] = 'rock Smelting', ['m_copper'] = 'copper', ['m_sell_copper'] = 'copper Seller', - ['m_deliver_copper'] = 'press ~INPUT_PICKUP~ to deliver the copper.', + ['m_deliver_copper'] = 'press [E] to deliver the copper.', ['m_iron'] = 'iron', ['m_sell_iron'] = 'iron Seller', - ['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.', + ['m_deliver_iron'] = 'press [E] to deliver the iron.', ['m_gold'] = 'gold', ['m_sell_gold'] = 'gold Seller', - ['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.', + ['m_deliver_gold'] = 'press [E] to deliver the gold.', ['m_diamond'] = 'diamond', ['m_sell_diamond'] = 'diamond Seller', - ['m_deliver_diamond'] = 'press ~INPUT_PICKUP~ to deliver the diamonds.', - ['m_melt_button'] = 'press ~INPUT_PICKUP~ to melt the rocks.', + ['m_deliver_diamond'] = 'press [E] to deliver the diamonds.', + ['m_melt_button'] = 'press [E] to melt the rocks.', -- Reporter ['reporter_name'] = 'san Andreas Times', - ['reporter_garage'] = 'press ~INPUT_PICKUP~ to go down to the garage.', + ['reporter_garage'] = 'press [E] to go down to the garage.', -- Slaughterer ['s_slaughter_locker'] = 'butcher\'s Locker Room', ['s_hen'] = 'chicken coop', ['s_alive_chicken'] = 'live Chicken', - ['s_catch_hen'] = 'press ~INPUT_PICKUP~ to catch live chickens.', + ['s_catch_hen'] = 'press [E] to catch live chickens.', ['s_slaughtered_chicken'] = 'chicken to be packed', - ['s_chop_animal'] = 'press ~INPUT_PICKUP~ to chop the chickens.', + ['s_chop_animal'] = 'press [E] to chop the chickens.', ['s_slaughtered'] = 'slaughter house', ['s_package'] = 'packaging', ['s_packagechicken'] = 'chicken in tray', ['s_unpackaged'] = 'chicken to be packed', - ['s_unpackaged_button'] = 'press ~INPUT_PICKUP~ to set the chicken in a tray.', - ['s_deliver'] = 'press ~INPUT_PICKUP~ to deliver the chicken trays.', + ['s_unpackaged_button'] = 'press [E] to set the chicken in a tray.', + ['s_deliver'] = 'press [E] to deliver the chicken trays.', -- Dress Designer ['dd_dress_locker'] = 'dress Designer\'s Locker Room', ['dd_wool'] = 'wool', - ['dd_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wool.', + ['dd_pickup'] = 'press [E] to retrieve wool.', ['dd_fabric'] = 'fabric', - ['dd_makefabric'] = 'press ~INPUT_PICKUP~ to make fabric.', + ['dd_makefabric'] = 'press [E] to make fabric.', ['dd_clothing'] = 'clothing', - ['dd_makeclothing'] = 'press ~INPUT_PICKUP~ to retrieve clothing.', - ['dd_deliver_clothes'] = 'press ~INPUT_PICKUP~ to deliver the clothes.', - } + ['dd_makeclothing'] = 'press [E] to retrieve clothing.', + ['dd_deliver_clothes'] = 'press [E] to deliver the clothes.', +} diff --git a/[esx_addons]/esx_jobs/locales/hu.lua b/[esx_addons]/esx_jobs/locales/hu.lua new file mode 100644 index 00000000..54dde098 --- /dev/null +++ b/[esx_addons]/esx_jobs/locales/hu.lua @@ -0,0 +1,113 @@ +Locales['hu'] = { + -- Global menus + ['cloakroom'] = 'Öltözö szoba', + ['cloak_change'] = 'Nyomj ~INPUT_PICKUP~ gombot a ruha választáshos.', + ['citizen_wear'] = 'Civil ruha', + ['job_wear'] = 'Munka ruha', + ['bank_deposit_returned'] = 'Visszakaptál ~g~$%s~s~ letétet.', + ['bank_deposit_taken'] = 'Biztonsági letétet ~r~$%s~s~ fizettél.', + ['foot_work'] = 'gyalog kell dolgoznod.', + ['next_point'] = 'Menj a következö lépéshez ha ezzel kész vagy.', + ['not_your_vehicle'] = 'Ez nem a te kocsid vagy soförnek kell lenned.', + ['in_vehicle'] = 'kocsiban kell ülnöd.', + ['wrong_point'] = 'nem a megfelelö szállítási ponton vagy.', + ['max_limit'] = 'nem tudsz többet szállítani ~y~%s~s~', + ['not_enough'] = 'Nincs elég ~y~%s~s~ hogy folytasd.', + ['spawn_veh'] = 'Autó lekérés', + ['spawn_veh_button'] = 'Nyomj ~INPUT_PICKUP~ hogy lekérd a szállító autót.', + ['spawn_truck_button'] = 'Nyomj ~INPUT_PICKUP~ hogy lekérd az autót.', + ['spawn_blocked'] = 'egy autó elzárja a lekérési pontot!', + ['service_vh'] = 'munka autó', + ['return_vh'] = 'autó visszakérés', + ['return_vh_button'] = 'Nyomj ~INPUT_PICKUP~ gombot hogy vissza add az autót.', + ['delivery_point'] = 'szállítási pont', + ['delivery'] = 'szállítás', + ['public_enter'] = 'nyomj ~INPUT_PICKUP~ gombot hogy belépj az épületbe.', + ['public_leave'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kilépj az épületböl.', + + -- Lumber Jack job + ['lj_locker_room'] = 'favágó Öltözö szoba', + ['lj_mapblip'] = 'farakás', + ['lj_wood'] = 'fa', + ['lj_pickup'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kiszedd a fát.', + ['lj_cutwood'] = 'favágás', + ['lj_cutwood_button'] = 'nyomj ~INPUT_PICKUP~ gombot a favágáshoz.', + ['lj_board'] = 'táblák', + ['lj_planks'] = 'tábla csomagolás', + ['lj_pick_boards'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kiszedd a táblát.', + ['lj_deliver_button'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a táblát.', + + -- Fisherman + ['fm_fish_locker'] = 'horgász Öltözö szoba', + ['fm_fish'] = 'hal', + ['fm_fish_area'] = 'horgászati terület', + ['fm_fish_button'] = 'nyomjd ~INPUT_PICKUP~ gombot a horgászathoz.', + ['fm_spawnboat_title'] = 'hajó lekérés', + ['fm_spawnboat'] = 'nyomjd ~INPUT_PICKUP~ gombot hogy hívd a hajót.', + ['fm_boat_title'] = 'hajó', + ['fm_boat_return_title'] = 'visszetérés a hajóra', + ['fm_boat_return_button'] = 'nyomj ~INPUT_PICKUP~ gombot hogy visszatért a hajóra.', + ['fm_deliver_fish'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a halat.', + + -- Fuel + ['f_oil_refiner'] = 'olajfinomító Öltözö szoba', + ['f_drill_oil'] = 'olaj fúrása', + ['f_fuel'] = 'olaj', + ['f_drillbutton'] = 'nyomj ~INPUT_PICKUP~ gombot a fúráshoz.', + ['f_fuel_refine'] = 'olaj finomítás', + ['f_refine_fuel_button'] = 'nyomj ~INPUT_PICKUP~ gombot a finomításhoz.', + ['f_fuel_mixture'] = 'újra finomított olaj mix', + ['f_gas'] = 'gáz', + ['f_fuel_mixture_button'] = 'nyomj ~INPUT_PICKUP~ gombot a mixeléshez.', + ['f_deliver_gas'] = 'gáz szállítás', + ['f_deliver_gas_button'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a gázt.', + + -- Miner + ['m_miner_locker'] = 'bányász Öltözö szoba', + ['m_rock'] = 'kő', + ['m_pickrocks'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kiszedd a követ.', + ['m_washrock'] = 'kő mosás', + ['m_rock_button'] = 'nyomj ~INPUT_PICKUP~ gombot a kövek mosásához.', + ['m_rock_smelting'] = 'kő olvasztás', + ['m_copper'] = 'réz', + ['m_sell_copper'] = 'réz eladás', + ['m_deliver_copper'] = 'nyomj ~INPUT_PICKUP~ gombot a réz eladásához.', + ['m_iron'] = 'vas', + ['m_sell_iron'] = 'vas eladás', + ['m_deliver_iron'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a vasat.', + ['m_gold'] = 'arany', + ['m_sell_gold'] = 'arany eladás', + ['m_deliver_gold'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd az aranyat.', + ['m_diamond'] = 'gyémánt', + ['m_sell_diamond'] = 'gyémánt eladás', + ['m_deliver_diamond'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a gyémántot.', + ['m_melt_button'] = 'nyomj ~INPUT_PICKUP~ gombot a szikla olvasztáshoz.', + + -- Reporter + ['reporter_name'] = 'Fivem hírek', + ['reporter_garage'] = 'nyomj ~INPUT_PICKUP~ gombot a garázshoz.', + + -- Slaughterer + ['s_slaughter_locker'] = 'hentes Öltözö szoba', + ['s_hen'] = 'csírkefarm', + ['s_alive_chicken'] = 'élő csírke', + ['s_catch_hen'] = 'nyomj ~INPUT_PICKUP~ gombot hogy megfogj egy csírkét.', + ['s_slaughtered_chicken'] = 'csírke csomagolás', + ['s_chop_animal'] = 'nyomj ~INPUT_PICKUP~ gombot a csírkék csomagolásához.', + ['s_slaughtered'] = 'Hentes ház', + ['s_package'] = 'csomagolás', + ['s_packagechicken'] = 'csírke a tálcán', + ['s_unpackaged'] = 'csírke kicsomagolás', + ['s_unpackaged_button'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kitedd egy tálcára a csírkét.', + ['s_deliver'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a csírketálat.', + + -- Dress Designer + ['dd_dress_locker'] = 'ruha tervező Öltözö szoba', + ['dd_wool'] = 'gyapjú', + ['dd_pickup'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kivedd a gyapjút.', + ['dd_fabric'] = 'szövet', + ['dd_makefabric'] = 'nyomj ~INPUT_PICKUP~ gombot hogy szövetet készíts.', + ['dd_clothing'] = 'ruha', + ['dd_makeclothing'] = 'nyomj ~INPUT_PICKUP~ gombot hogy kivedd a ruhát.', + ['dd_deliver_clothes'] = 'nyomj ~INPUT_PICKUP~ gombot hogy leszállítsd a ruhát.', +} diff --git a/[esx_addons]/esx_jobs/locales/nl.lua b/[esx_addons]/esx_jobs/locales/nl.lua new file mode 100644 index 00000000..435ec469 --- /dev/null +++ b/[esx_addons]/esx_jobs/locales/nl.lua @@ -0,0 +1,116 @@ +Locales['nl'] = { + -- Global menus + ['cloakroom'] = 'Kleedkamer', + ['cloak_change'] = 'Druk op ~INPUT_PICKUP~ om je werkkleding aan/uit te doen.', + ['citizen_wear'] = 'Burgerkleding', + ['job_wear'] = 'Werkkleding', + ['bank_deposit_returned'] = 'a security deposit of ~g~$%s~s~ was returned to you.', + ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', + ['foot_work'] = 'Je moet uit een voertuig zijn om te werken', + ['next_point'] = 'Ga naar de volgende stap zodra je klaar bent met deze.', + ['not_your_vehicle'] = 'Dit is niet jou voertuig of je moet de bestuurder zijn.', + ['in_vehicle'] = 'Je moet in een voertuig zitten', + ['wrong_point'] = 'Je bent bij het verkeerde afleverpunt', + ['max_limit'] = 'Je hebt al het maximale ~y~%s~s~ bij je', + ['not_enough'] = 'Je hebt niet genoeg ~y~%s~s~ om het werk te voltooien', + ['spawn_veh'] = 'Pak werkvoertuig', + ['spawn_veh_button'] = 'Druk op ~INPUT_PICKUP~ om je werkvoertuig op te roepen', + ['spawn_truck_button'] = 'Druk op ~INPUT_PICKUP~ om een vrachtwagen te pakken', + ['spawn_blocked'] = 'Een voertuig blokkerd het spawnpoint!', + ['service_vh'] = 'service voertuig', + ['return_vh'] = 'Voertuig terug zetten', + ['return_vh_button'] = 'Druk op ~INPUT_PICKUP~ om het voertuig terug te zetten', + ['delivery_point'] = 'Afleverpunt', + ['delivery'] = 'Afleveren', + ['public_enter'] = 'Druk op ~INPUT_PICKUP~ om het gebouw te betreden', + ['public_leave'] = 'Druk op ~INPUT_PICKUP~ om het gebouw te verlaten', + + -- Lumber Jack job + ['lj_locker_room'] = 'Houthakker kleedkamer', + ['lj_mapblip'] = 'Houthandel', + ['lj_wood'] = 'Hout', + ['lj_pickup'] = 'Druk op ~INPUT_PICKUP~ om hout op te halen', + ['lj_cutwood'] = 'Het hout word gezaagd', + ['lj_cutwood_button'] = 'Druk op ~INPUT_PICKUP~ om het hout te zagen', + ['lj_board'] = 'Plaken', + ['lj_planks'] = 'pakket met planken', + ['lj_pick_boards'] = 'Druk op ~INPUT_PICKUP~ om hout te zagen', + ['lj_deliver_button'] = 'Druk op ~INPUT_PICKUP~ om het hout te leveren', + + -- Fisherman + ['fm_fish_locker'] = 'Vissers kleedkamer', + ['fm_fish'] = 'Vis', + ['fm_fish_area'] = 'Vis gebied', + ['fm_fish_button'] = 'Druk op ~INPUT_PICKUP~ om te beginnen met vissen', + ['fm_spawnboat_title'] = 'Pak een vissersboot', + ['fm_spawnboat'] = 'Druk op ~INPUT_PICKUP~ om de boot op te roepen', + ['fm_boat_title'] = 'boot', + ['fm_boat_return_title'] = 'Boot terugzetten', + ['fm_boat_return_button'] = 'Druk op ~INPUT_PICKUP~ om de boot terug te zetten', + ['fm_deliver_fish'] = 'Druk op ~INPUT_PICKUP~ om de vis af te leveren', + + -- Fuel + ['f_oil_refiner'] = 'Olie transporteur kleedkamer', + ['f_drill_oil'] = 'Olieboor', + ['f_fuel'] = 'Olie', + ['f_drillbutton'] = 'Druk op ~INPUT_PICKUP~ om te beginnen met olie boren', + ['f_fuel_refine'] = 'olie raffineren', + ['f_refine_fuel_button'] = 'Druk op ~INPUT_PICKUP~ om te raffineren', + ['f_fuel_mixture'] = 'mix geraffineerde olie', + ['f_gas'] = 'Brandstof', + ['f_fuel_mixture_button'] = 'Druk op ~INPUT_PICKUP~ om olie te mixen', + ['f_deliver_gas'] = 'Brandstof afleveren', + ['f_deliver_gas_button'] = 'Druk op ~INPUT_PICKUP~ om de brandstof af te leveren', + ['caution_afford'] = 'Je hebt onvoldoende Geld opzak om een voertuig te leasen!', + + -- Miner + ['m_miner_locker'] = 'Kleedkamer', + ['m_rock'] = 'Metaal erts', + ['m_pickrocks'] = 'Druk op ~INPUT_PICKUP~ om erts te verzamelen', + ['m_washrock'] = 'erts verwerken', + ['m_rock_button'] = 'Druk op ~INPUT_PICKUP~ om de erts te verwerken', + ['m_rock_smelting'] = 'erts omsmelten', + ['m_copper'] = 'Koper', + ['m_sell_copper'] = 'Koper verkopen', + ['m_deliver_copper'] = 'druk op ~INPUT_PICKUP~ om Koper te verkopen', + ['m_iron'] = 'Aluminium', + ['m_sell_iron'] = 'Aluminium verkoop', + ['m_deliver_iron'] = 'Drup op ~INPUT_PICKUP~ om Aluminium te verkopen', + ['m_gold'] = 'Goud', + ['m_sell_gold'] = 'Goud verkopen', + ['m_deliver_gold'] = 'Druk op ~INPUT_PICKUP~ om Goud te verkopen', + ['m_diamond'] = 'Diamant', + ['m_sell_diamond'] = 'Diamanten verkopen', + ['m_deliver_diamond'] = 'Druk op ~INPUT_PICKUP~ om Diamant te verkopen', + ['m_melt_button'] = 'Druk op ~INPUT_PICKUP~ om de erts om te smelten', + + -- Reporter + ['reporter_locker'] = 'Kleedkamer', + ['reporter_name'] = 'OmroepZeeland', + ['reporter_garage'] = 'Druk op ~INPUT_PICKUP~ om nara de garage te gaan', + + -- Slaughterer + ['s_slaughter_locker'] = 'Kûppen kleedkamer', + ['s_hen'] = 'Kûppenhok', + ['s_alive_chicken'] = 'Levende Kûppen', + ['s_catch_hen'] = 'Druk op ~INPUT_PICKUP~ om levende Kûppen te vangen', + ['s_slaughtered_chicken'] = 'Kûppen om te verpakken', + ['s_chop_animal'] = 'Druk op ~INPUT_PICKUP~ om de Kûppen te slachten', + ['s_slaughtered'] = 'Slachthuis', + ['s_package'] = 'verpakken', + ['s_packagechicken'] = 'krat met Kûpfilet', + ['s_unpackaged'] = 'Kûppen om te verpakken', + ['s_unpackaged_button'] = 'Druk op ~INPUT_PICKUP~ om de Kûpfilet in de krat te doen', + ['s_deliver'] = 'Druk op ~INPUT_PICKUP~ om de kratten met Kûppen af te leveren', + + -- Dress Designer + ['dd_dress_locker'] = 'kleding ontwerper kleedkamer', + ['dd_wool'] = 'wol', + ['dd_pickup'] = 'Druk op ~INPUT_PICKUP~ om schapenwol te verzamelen', + ['dd_fabric'] = 'kleding stof', + ['dd_makefabric'] = 'Druk op ~INPUT_PICKUP~ om van wol kleding stof te maken', + ['dd_clothing'] = 'Kleding', + ['dd_makeclothing'] = 'Druk op ~INPUT_PICKUP~ om kleding te maken', + ['dd_deliver_clothes'] = 'Druk op ~INPUT_PICKUP~ om kleding af te leveren', +} + \ No newline at end of file diff --git a/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql new file mode 100644 index 00000000..2b81d9eb --- /dev/null +++ b/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql @@ -0,0 +1,47 @@ +USE `es_extended`; + +INSERT INTO `addon_account` (name, label, shared) VALUES + ('caution', 'caution', 0) +; + +INSERT INTO `jobs` (name, label) VALUES + ('slaughterer', 'Hentes'), + ('fisherman', 'Halász'), + ('miner', 'Bányász'), + ('lumberjack', 'Favágó'), + ('fueler', 'Üzemanyagtöltő'), + ('reporter', 'Riporter'), + ('tailor', 'Szabó') +; + +INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES + ('lumberjack', 0, 'employee', 'Munkavállaló', 0, '{}', '{}'), + ('fisherman', 0, 'employee', 'Munkavállaló', 0, '{}', '{}'), + ('fueler', 0, 'employee', 'Munkavállaló', 0, '{}', '{}'), + ('reporter', 0, 'employee', 'Munkavállaló', 0, '{}', '{}'), + ('tailor', 0, 'employee', 'Munkavállaló', 0, '{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), + ('miner', 0, 'employee', 'Munkavállaló', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), + ('slaughterer', 0, 'employee', 'Munkavállaló', 0, '{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') +; + +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('alive_chicken', 'Élő csirke', 1), + ('slaughtered_chicken', 'Levágott csirke', 1), + ('packaged_chicken', 'Csirkefilé', 1), + ('fish', 'Hal', 1), + ('stone', 'Kő', 1), + ('washed_stone', 'Mosott kő', 1), + ('copper', 'Réz', 1), + ('iron', 'Vas', 1), + ('gold', 'Arany', 1), + ('diamond', 'Gyémánt', 1), + ('wood', 'Fa', 1), + ('cutted_wood', 'Vágott fa', 1), + ('packaged_plank', 'Csomagolt wood', 1), + ('petrol', 'Olaj', 1), + ('petrol_raffin', 'Feldolgozott oil', 1), + ('essence', 'Gáz', 1), + ('wool', 'Gyapjú', 1), + ('fabric', 'Szövet', 1), + ('clothe', 'Ruha', 1) +; diff --git a/[esx_addons]/esx_jobs/server/main.lua b/[esx_addons]/esx_jobs/server/main.lua index 2dbcbd8c..0ad5d5a4 100644 --- a/[esx_addons]/esx_jobs/server/main.lua +++ b/[esx_addons]/esx_jobs/server/main.lua @@ -72,8 +72,7 @@ CreateThread(function() end end) -RegisterServerEvent('esx_jobs:startWork') -AddEventHandler('esx_jobs:startWork', function(zoneIndex, zoneKey) +RegisterServerEvent('esx_jobs:startWork', function(zoneIndex, zoneKey) if not playersWorking[source] then local xPlayer = ESX.GetPlayerFromId(source) @@ -96,15 +95,13 @@ AddEventHandler('esx_jobs:startWork', function(zoneIndex, zoneKey) end end) -RegisterServerEvent('esx_jobs:stopWork') -AddEventHandler('esx_jobs:stopWork', function() +RegisterServerEvent('esx_jobs:stopWork', function() if playersWorking[source] then playersWorking[source] = nil end end) -RegisterNetEvent('esx_jobs:caution') -AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle) +RegisterNetEvent('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle) local xPlayer = ESX.GetPlayerFromId(source) if cautionType == 'take' then diff --git a/[esx_addons]/esx_license/fxmanifest.lua b/[esx_addons]/esx_license/fxmanifest.lua index e65e3786..eeee83f9 100644 --- a/[esx_addons]/esx_license/fxmanifest.lua +++ b/[esx_addons]/esx_license/fxmanifest.lua @@ -4,10 +4,9 @@ game 'gta5' description 'ESX License' -version '1.5.0' +version '1.7.0' server_scripts { - '@async/async.lua', '@es_extended/imports.lua', '@oxmysql/lib/MySQL.lua', 'server/main.lua' diff --git a/[esx_addons]/esx_lscustom/README.md b/[esx_addons]/esx_lscustom/README.md index b569359f..dd0044de 100644 --- a/[esx_addons]/esx_lscustom/README.md +++ b/[esx_addons]/esx_lscustom/README.md @@ -1,34 +1,11 @@ # esx_lscustom ## Requirements + - [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop) -## Download & Installation +## Legal -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_lscustom -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_lscustom [esx]/esx_lscustom -``` - -### Manually -- Download https://github.com/ESX-Org/esx_lscustom/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Add this to your `server.cfg`: - -``` -start esx_lscustom -``` - -# Legal -### License esx_lscustoms - The best LS Custom out there for FX Copyright (C) 2015-2022 Jérémie N'gadi diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index 237837c6..50d2470a 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -1,12 +1,8 @@ -local Vehicles = {} -local lsMenuIsShowed = false -local isInLSMarker = false -local myCar = {} - +local Vehicles, myCar = {},{} +local lsMenuIsShowed, isInLSMarker = false, false RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - ESX.PlayerData = xPlayer ESX.PlayerLoaded = true ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles) @@ -14,11 +10,6 @@ AddEventHandler('esx:playerLoaded', function(xPlayer) end) end) -RegisterNetEvent('esx:setJob') -AddEventHandler('esx:setJob', function(job) - ESX.PlayerData.job = job -end) - RegisterNetEvent('esx_lscustom:installMod') AddEventHandler('esx_lscustom:installMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -123,28 +114,33 @@ function UpdateMods(data) local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) if data.modType then - local props = {} - - if data.wheelType then - props['wheels'] = data.wheelType - ESX.Game.SetVehicleProperties(vehicle, props) - props = {} - elseif data.modType == 'neonColor' then - if data.modNum[1] == 0 and data.modNum[2] == 0 and data.modNum[3] == 0 then - props['neonEnabled'] = { false, false, false, false } - else - props['neonEnabled'] = { true, true, true, true } + local props = {} + + if data.wheelType then + props['wheels'] = data.wheelType + + if GetVehicleClass(vehicle) == 8 then -- Fix bug wheels for bikes. + props['modBackWheels'] = data.modNum + end + + ESX.Game.SetVehicleProperties(vehicle, props) + props = {} + elseif data.modType == 'neonColor' then + if data.modNum[1] == 0 and data.modNum[2] == 0 and data.modNum[3] == 0 then + props['neonEnabled'] = { false, false, false, false } + else + props['neonEnabled'] = { true, true, true, true } + end + ESX.Game.SetVehicleProperties(vehicle, props) + props = {} + elseif data.modType == 'tyreSmokeColor' then + props['modSmokeEnabled'] = true + ESX.Game.SetVehicleProperties(vehicle, props) + props = {} end - ESX.Game.SetVehicleProperties(vehicle, props) - props = {} - elseif data.modType == 'tyreSmokeColor' then - props['modSmokeEnabled'] = true - ESX.Game.SetVehicleProperties(vehicle, props) - props = {} - end - props[data.modType] = data.modNum - ESX.Game.SetVehicleProperties(vehicle, props) + props[data.modType] = data.modNum + ESX.Game.SetVehicleProperties(vehicle, props) end end @@ -378,7 +374,7 @@ end) -- Activate menu when player is inside marker CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local playerPed = PlayerPedId() if IsPedInAnyVehicle(playerPed, false) then @@ -388,58 +384,44 @@ CreateThread(function() if (ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then for k,v in pairs(Config.Zones) do local zonePos = vector3(v.Pos.x, v.Pos.y, v.Pos.z) - if #(coords - zonePos) < v.Size.x and not lsMenuIsShowed then - isInLSMarker = true - ESX.ShowHelpNotification(v.Hint) - break - else - isInLSMarker = false + if #(coords - zonePos) < v.Size.x then + Sleep = 0 + if not lsMenuIsShowed then + ESX.ShowHelpNotification(v.Hint) + if IsControlJustReleased(0, 38) then + lsMenuIsShowed = true + + local vehicle = GetVehiclePedIsIn(playerPed, false) + FreezeEntityPosition(vehicle, true) + myCar = ESX.Game.GetVehicleProperties(vehicle) + + ESX.UI.Menu.CloseAll() + GetAction({value = 'main'}) + + -- Prevent Free Tunning Bug + CreateThread(function() + while true do + local Sleep = 1000 + if lsMenuIsShowed then + Sleep = 0 + DisableControlAction(2, 288, true) + DisableControlAction(2, 289, true) + DisableControlAction(2, 170, true) + DisableControlAction(2, 167, true) + DisableControlAction(2, 168, true) + DisableControlAction(2, 23, true) + DisableControlAction(0, 75, true) -- Disable exit vehicle + DisableControlAction(27, 75, true) -- Disable exit vehicle + end + Wait(0) + end + end) + end end end end - - if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then - if (ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then - lsMenuIsShowed = true - - local vehicle = GetVehiclePedIsIn(playerPed, false) - FreezeEntityPosition(vehicle, true) - - myCar = ESX.Game.GetVehicleProperties(vehicle) - - ESX.UI.Menu.CloseAll() - GetAction({value = 'main'}) - end - end - - if isInLSMarker and not hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = true - end - - if not isInLSMarker and hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = false - end - end end -end) - --- Prevent Free Tunning Bug -CreateThread(function() - while true do - Wait(0) - - if lsMenuIsShowed then - DisableControlAction(2, 288, true) - DisableControlAction(2, 289, true) - DisableControlAction(2, 170, true) - DisableControlAction(2, 167, true) - DisableControlAction(2, 168, true) - DisableControlAction(2, 23, true) - DisableControlAction(0, 75, true) -- Disable exit vehicle - DisableControlAction(27, 75, true) -- Disable exit vehicle - else - Wait(500) - end + Wait(Sleep) end end) diff --git a/[esx_addons]/esx_lscustom/fxmanifest.lua b/[esx_addons]/esx_lscustom/fxmanifest.lua index eb4f7c76..1625d950 100644 --- a/[esx_addons]/esx_lscustom/fxmanifest.lua +++ b/[esx_addons]/esx_lscustom/fxmanifest.lua @@ -4,29 +4,21 @@ game 'gta5' description 'ESX LS Customs' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/pl.lua', - 'locales/br.lua', - 'locales/de.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/pl.lua', - 'locales/br.lua', - 'locales/de.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_lscustom/locales/hu.lua b/[esx_addons]/esx_lscustom/locales/hu.lua new file mode 100644 index 00000000..5ca894a9 --- /dev/null +++ b/[esx_addons]/esx_lscustom/locales/hu.lua @@ -0,0 +1,269 @@ +Locales['hu'] = { + ['by_default'] = 'alapértelmezett', + ['installed'] = 'telepítve', + ['already_own'] = 'már használod: ~b~%s~s~', + ['not_enough_money'] = 'nincs pénzed erre az alkatrészre!', + ['purchased'] = 'megvásároltad ezt az alkatrészt!', + ['press_custom'] = 'nyomd meg az ~INPUT_PICKUP~ betüt a ~y~jármü~s~ tuningolásához.', + ['level'] = 'szint %s', + ['neon'] = 'neon', + ['blip_name'] = 'Tuning mühely', +-- Paint Colors + -- Black + ['black'] = 'fekete', + ['graphite'] = 'grafit', + ['black_metallic'] = 'metál fekete', + ['caststeel'] = 'fényezett acél', + ['black_anth'] = 'antraktív fekete', + ['matteblack'] = 'matt fekete', + ['darknight'] = 'éjsötét', + ['deepblack'] = 'mély fekete', + ['oil'] = 'olaj', + ['carbon'] = 'karbon', + -- White + ['white'] = 'fehér', + ['vanilla'] = 'vanilla', + ['creme'] = 'krém', + ['polarwhite'] = 'polár fehér', + ['beige'] = 'bézs', + ['mattewhite'] = 'matt fehér', + ['snow'] = 'hó', + ['cotton'] = 'pamut fehér', + ['alabaster'] = 'alabástrom', + ['purewhite'] = 'tiszta fehér', + -- Grey + ['grey'] = 'szürke', + ['silver'] = 'ezüst', + ['metallicgrey'] = 'metál szürke', + ['laminatedsteel'] = 'laminált acél szürke', + ['darkgray'] = 'sötétszürkeszürke', + ['rockygray'] = 'sziklás szürke', + ['graynight'] = 'éjszürke', + ['aluminum'] = 'alumínium szürke', + ['graymat'] = 'matt szürke', + ['lightgrey'] = 'világos szürke', + ['asphaltgray'] = 'aszfalt szürke', + ['grayconcrete'] = 'beton szürke', + ['darksilver'] = 'sötét ezüst', + ['magnesite'] = 'magnezit szürke', + ['nickel'] = 'nikkel szürke', + ['zinc'] = 'cink szürke', + ['dolomite'] = 'dolomit szürke', + ['bluesilver'] = 'kék ezüst', + ['titanium'] = 'titán szürke', + ['steelblue'] = 'kék acél', + ['champagne'] = 'pezsgö szürke', + ['grayhunter'] = 'vadász szürke', + -- Red + ['red'] = 'piros', + ['torino_red'] = 'torinó piros', + ['poppy'] = 'mák piros', + ['copper_red'] = 'rézvörös', + ['cardinal'] = 'bíbor piros', + ['brick'] = 'tégla vörös', + ['garnet'] = 'gránit vörös', + ['cabernet'] = 'kabernetabernet piros', + ['candy'] = 'cukorka piros', + ['matte_red'] = 'matt piros', + ['dark_red'] = 'sötét piros', + ['red_pulp'] = 'pép vörös', + ['bril_red'] = 'ragyogó piros', + ['pale_red'] = 'halvány piros', + ['wine_red'] = 'bor vörös', + ['volcano'] = 'Vulkán', + -- Pink + ['pink'] = 'rózsaszín', + ['electricpink'] = 'elektromos rózsaszín', + ['brightpink'] = 'világos rózsaszín', + ['salmon'] = 'lazac rózsaszín', + ['sugarplum'] = 'cukorka rózsaszín', + -- Blue + ['blue'] = 'kék', + ['topaz'] = 'topáz kék', + ['light_blue'] = 'világos kék', + ['galaxy_blue'] = 'galaktikus kék', + ['dark_blue'] = 'sötét Blue', + ['azure'] = 'azúr kék', + ['navy_blue'] = 'hadi kék', + ['lapis'] = 'lazurit kék', + ['blue_diamond'] = 'gyémánt kék', + ['surfer'] = 'szörf kék', + ['pastel_blue'] = 'pasztel kék', + ['celeste_blue'] = 'keleszt kék', + ['rally_blue'] = 'rally kék', + ['blue_paradise'] = 'paradicsom kék', + ['blue_night'] = 'kék éjszaka', + ['cyan_blue'] = 'cián kék', + ['cobalt'] = 'kobalt kék', + ['electric_blue'] = 'elektromos kék', + ['horizon_blue'] = 'horizont kék', + ['metallic_blue'] = 'metál kék', + ['aquamarine'] = 'akvamarin kék', + ['blue_agathe'] = 'kék agát', + ['zirconium'] = 'cirkónium kék', + ['spinel'] = 'spinell kék', + ['tourmaline'] = 'turmalin kék', + ['paradise'] = 'parádia kék', + ['bubble_gum'] = 'rágógumi kék', + ['midnight_blue'] = 'éjkék', + ['forbidden_blue'] = 'tiltott kék', + ['glacier_blue'] = 'gleccser kék', + -- Yellow + ['yellow'] = 'sárga', + ['wheat'] = 'búza sárga', + ['raceyellow'] = 'verseny sárga', + ['paleyellow'] = 'halványsárga', + ['lightyellow'] = 'világos sárga', + -- Green + ['green'] = 'zöld', + ['met_dark_green'] = 'metál sötétzöld', + ['rally_green'] = 'rally zöld', + ['pine_green'] = 'fenyö zöld', + ['olive_green'] = 'oliva zöld', + ['light_green'] = 'világos zöld', + ['lime_green'] = 'lime zöld', + ['forest_green'] = 'erdö zöld', + ['lawn_green'] = 'gyep zöld', + ['imperial_green'] = 'birodalmi zöld', + ['green_bottle'] = 'üveg zöld', + ['citrus_green'] = 'citrus zöld', + ['green_anis'] = 'zöld ánizs', + ['khaki'] = 'khaki zöld', + ['army_green'] = 'katonai zöld', + ['dark_green'] = 'sötét zöld', + ['hunter_green'] = 'vadász zöld', + ['matte_foilage_green'] = 'matt lombozat zöld', + -- Orange + ['orange'] = 'narancssárga', + ['tangerine'] = 'mandarin sárga', + ['matteorange'] = 'matt narancssárga', + ['lightorange'] = 'világos narancssárga', + ['peach'] = 'öszibarack narancssárga', + ['pumpkin'] = 'tök narancssárga', + ['orangelambo'] = 'lambo narancssárga', + -- Brown + ['brown'] = 'barna', + ['copper'] = 'réz', + ['lightbrown'] = 'világos barna', + ['darkbrown'] = 'sötét barna', + ['bronze'] = 'bronz', + ['brownmetallic'] = 'metál barna', + ['espresso'] = 'eszpresszó barna', + ['chocolate'] = 'csokoládé barna', + ['terracotta'] = 'terrakotta', + ['marble'] = 'márvány', + ['sand'] = 'homok barnca', + ['sepia'] = 'Szépia barna', + ['bison'] = 'bölény barna', + ['palm'] = 'tenyér barna', + ['caramel'] = 'karamella barna', + ['rust'] = 'rozsda barna', + ['chestnut'] = 'gesztenye barna', + ['hazelnut'] = 'mogyoró barna', + ['shell'] = 'héj barna', + ['mahogany'] = 'mahagóni barna', + ['cauldron'] = 'üst barna', + ['blond'] = 'szökés barna', + ['gravel'] = 'kavics barna', + ['darkearth'] = 'sötét föld barna', + ['desert'] = 'sivatag barna', + -- Purple + ['purple'] = 'lila', + ['indigo'] = 'Indigó', + ['deeppurple'] = 'mély lila', + ['darkviolet'] = 'sötét lila', + ['amethyst'] = 'ametiszt lila', + ['mysticalviolet'] = 'misztikus lila', + ['purplemetallic'] = 'metál lila', + ['matteviolet'] = 'matt lila', + ['mattedeeppurple'] = 'mély matt lila', + -- Chrome + ['chrome'] = 'króm', + ['brushedchrome'] = 'csiszolt króm', + ['blackchrome'] = 'króm fekete', + ['brushedaluminum'] = 'szálcsiszolt alumínium', + -- Metal + ['gold'] = 'arany', + ['puregold'] = 'tiszta arany', + ['brushedgold'] = 'csiszolt arany', + ['lightgold'] = 'világos arany', +-- License Plates + ['blue_on_white_1'] = 'kék és fehér 1', + ['yellow_on_black'] = 'sárga és fekete', + ['yellow_blue'] = 'sárga és kék', + ['blue_on_white_2'] = 'kék és fehér 2', + ['blue_on_white_3'] = 'kék és fehér 3', +-- Upgrades + ['upgrades'] = 'fejlesztések', + ['engine'] = 'motor', + ['brakes'] = 'fék', + ['transmission'] = 'váltó', + ['suspension'] = 'lengéscsillapító', + ['armor'] = 'páncél', + ['turbo'] = 'turbó', + ['no_turbo'] = 'turbó nélkül', +-- Cosmetics + ['cosmetics'] = 'kozmetika', + -- Body Parts + ['bodyparts'] = 'karosszéria elemek', + ['leftfender'] = 'bal oldali sárvédö', + ['rightfender'] = 'jobb oldali sárvédö', + ['spoilers'] = 'spoilerek', + ['sideskirt'] = 'oldalsó szoknyák', + ['cage'] = 'kaszni', + ['hood'] = 'motorháztetö', + ['grille'] = 'rács', + ['rearbumper'] = 'hátsó lökhárító', + ['frontbumper'] = 'elsö lökhárító', + ['exhaust'] = 'kipufogó', + ['roof'] = 'tetö', + -- Paint + ['respray'] = 'átfestés', + ['primary'] = 'elsödleges', + ['secondary'] = 'másodlagos', + ['pearlescent'] = 'gyöngyházfényü', + -- Misc + ['headlights'] = 'fényszórók', + ['licenseplates'] = 'rendszámtábla', + ['windowtint'] = 'ablak üveg szín', + ['horns'] = 'dudák', + -- Neon + ['neons'] = 'neonok', + -- Wheels + ['wheels'] = 'kerekek', + ['tiresmoke'] = 'gumi füst', + ['wheel_type'] = 'kerék típus', + ['wheel_color'] = 'kerék szín', + ['sport'] = 'sport kerék', + ['muscle'] = 'izomautó kerék', + ['lowrider'] = 'lowrider kerék', + ['suv'] = 'utcai terepjáró kerék', + ['allterrain'] = 'terepjáró kerék', + ['tuning'] = 'tuning kerék', + ['motorcycle'] = 'motorbicikli kerék', + ['highend'] = 'magas szintü kerék', + + ['modplateholder'] = 'rendszámtábla - hátsó', + ['modvanityplate'] = 'rendszámtábla - elsö', + ['interior'] = 'belsö', + ['trim'] = 'állapot', + ['dashboard'] = 'müszerfal', + ['speedometer'] = 'sebességmérö', + ['door_speakers'] = 'ajtó hangszórók', + ['seats'] = 'ülések', + ['steering_wheel'] = 'kormánykerék', + ['gear_lever'] = 'váltókar', + ['quarter_deck'] = 'hátsó fedélzet', + ['speakers'] = 'hangszórók', + ['trunk'] = 'csomagtartó', + ['hydraulic'] = 'hidraulika', + ['engine_block'] = 'motorblokk', + ['air_filter'] = 'légszürö', + ['struts'] = 'merevítés', + ['arch_cover'] = 'arch borító', + ['aerials'] = 'antennák', + ['wings'] = 'szárnyak', + ['fuel_tank'] = 'üzemanyag tartály', + ['windows'] = 'ablakok', + ['stickers'] = 'matricák', +} diff --git a/[esx_addons]/esx_mechanicjob/client/main.lua b/[esx_addons]/esx_mechanicjob/client/main.lua index 36dfe516..b7accd91 100644 --- a/[esx_addons]/esx_mechanicjob/client/main.lua +++ b/[esx_addons]/esx_mechanicjob/client/main.lua @@ -46,7 +46,7 @@ function StopNPCJob(cancel) NPCHasBeenNextToTowable = false if cancel then - ESX.ShowNotification(_U('mission_canceled')) + ESX.ShowNotification(_U('mission_canceled'), "error") else --TriggerServerEvent('esx_mechanicjob:onNPCJobCompleted') end @@ -279,11 +279,11 @@ function OpenMobileMechanicActionsMenu() local amount = tonumber(data.value) if amount == nil or amount < 0 then - ESX.ShowNotification(_U('amount_invalid')) + ESX.ShowNotification(_U('amount_invalid'), "error") else local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestPlayer == -1 or closestDistance > 3.0 then - ESX.ShowNotification(_U('no_players_nearby')) + ESX.ShowNotification(_U('no_players_nearby'), "error") else menu.close() TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(closestPlayer), 'society_mechanic', _U('mechanic'), amount) @@ -771,9 +771,10 @@ end) -- Pop NPC mission vehicle when inside area CreateThread(function() while true do - Wait(0) + local Sleep = 1500 if NPCTargetTowableZone and not NPCHasSpawnedTowable then + Sleep = 0 local coords = GetEntityCoords(PlayerPedId()) local zone = Config.Zones[NPCTargetTowableZone] @@ -789,14 +790,17 @@ CreateThread(function() end if NPCTargetTowableZone and NPCHasSpawnedTowable and not NPCHasBeenNextToTowable then + Sleep = 500 local coords = GetEntityCoords(PlayerPedId()) local zone = Config.Zones[NPCTargetTowableZone] if #(coords - zone.Pos) < Config.NPCNextToDistance then + Sleep = 0 ESX.ShowNotification(_U('please_tow')) NPCHasBeenNextToTowable = true end end + Wait(Sleep) end end) @@ -818,31 +822,28 @@ end) -- Display markers CreateThread(function() while true do - Wait(0) + local Sleep = 2000 if ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then + Sleep = 500 local coords, letSleep = GetEntityCoords(PlayerPedId()), true for k,v in pairs(Config.Zones) do if v.Type ~= -1 and #(coords - v.Pos) < Config.DrawDistance then - DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, nil, nil, false) + Sleep = 0 + DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, true, true, 2, true, nil, nil, false) letSleep = false end end - - if letSleep then - Wait(500) - end - else - Wait(500) end + Wait(Sleep) end end) -- Enter / Exit marker events CreateThread(function() while true do - Wait(0) + local Sleep = 500 if ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then @@ -852,6 +853,7 @@ CreateThread(function() for k,v in pairs(Config.Zones) do if(#(coords - v.Pos) < v.Size.x) then + Sleep = 0 isInMarker = true currentZone = k end @@ -867,8 +869,8 @@ CreateThread(function() HasAlreadyEnteredMarker = false TriggerEvent('esx_mechanicjob:hasExitedMarker', LastZone) end - end + Wait(Sleep) end end) @@ -918,13 +920,12 @@ end) -- Key Controls CreateThread(function() while true do - Wait(0) - + local sleep = 500 if CurrentAction then + sleep = 0 ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, 38) and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then - if CurrentAction == 'mechanic_actions_menu' then OpenMechanicActionsMenu() elseif CurrentAction == 'mechanic_harvest_menu' then @@ -932,60 +933,58 @@ CreateThread(function() elseif CurrentAction == 'mechanic_craft_menu' then OpenMechanicCraftMenu() elseif CurrentAction == 'delete_vehicle' then + if Config.EnableSocietyOwnedVehicles then - if Config.EnableSocietyOwnedVehicles then + local vehicleProps = ESX.Game.GetVehicleProperties(CurrentActionData.vehicle) + TriggerServerEvent('esx_society:putVehicleInGarage', 'mechanic', vehicleProps) + else + local entityModel = GetEntityModel(CurrentActionData.vehicle) - local vehicleProps = ESX.Game.GetVehicleProperties(CurrentActionData.vehicle) - TriggerServerEvent('esx_society:putVehicleInGarage', 'mechanic', vehicleProps) - - else - local entityModel = GetEntityModel(CurrentActionData.vehicle) - - if - entityModel == GetHashKey("flatbed") or - entityModel == GetHashKey("towtruck2") or - entityModel == GetHashKey("slamvan3") - then - TriggerServerEvent('esx_service:disableService', 'mechanic') - end - - end - - ESX.Game.DeleteVehicle(CurrentActionData.vehicle) - - elseif CurrentAction == 'remove_entity' then - DeleteEntity(CurrentActionData.entity) + if entityModel == GetHashKey("flatbed") or entityModel == GetHashKey("towtruck2") or entityModel == GetHashKey("slamvan3") then + TriggerServerEvent('esx_service:disableService', 'mechanic') + end + end + ESX.Game.DeleteVehicle(CurrentActionData.vehicle) + elseif CurrentAction == 'remove_entity' then + DeleteEntity(CurrentActionData.entity) end CurrentAction = nil - end - end - - if IsControlJustReleased(0, 167) and not isDead and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then + end + end + Wait(sleep) + end +end) +RegisterCommand('mechanicMenu', function() + if ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then OpenMobileMechanicActionsMenu() end +end, false) - if IsControlJustReleased(0, 178) and not isDead and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then + + +RegisterCommand('startmechanicjob', function() + local playerPed = PlayerPedId() + if ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then if NPCOnJob then if GetGameTimer() - NPCLastCancel > 5 * 60000 then StopNPCJob(true) NPCLastCancel = GetGameTimer() else - ESX.ShowNotification(_U('wait_five')) + ESX.ShowNotification(_U('wait_five'), "error") end else - local playerPed = PlayerPedId() - if IsPedInAnyVehicle(playerPed, false) and IsVehicleModel(GetVehiclePedIsIn(playerPed, false), GetHashKey('flatbed')) then StartNPCJob() else - ESX.ShowNotification(_U('must_in_flatbed')) + ESX.ShowNotification(_U('must_in_flatbed'), "error") end end end +end, false) - end -end) +RegisterKeyMapping('mechanicMenu', 'Open Mechanic Menu', 'keyboard', 'F6') +RegisterKeyMapping('mechanicjob', 'Togggle NPC Job', 'keyboard', 'F6') AddEventHandler('esx:onPlayerDeath', function(data) isDead = true end) AddEventHandler('esx:onPlayerSpawn', function(spawn) isDead = false end) diff --git a/[esx_addons]/esx_mechanicjob/config.lua b/[esx_addons]/esx_mechanicjob/config.lua index eb6271a4..e8dc1dff 100644 --- a/[esx_addons]/esx_mechanicjob/config.lua +++ b/[esx_addons]/esx_mechanicjob/config.lua @@ -25,24 +25,24 @@ Config.Vehicles = { Config.Zones = { MechanicActions = { - Pos = vector3(-342.291, -133.370, 38.009 ), - Size = { x = 1.5, y = 1.5, z = 1.0 }, - Color = { r = 204, g = 204, b = 0 }, - Type = 1 + Pos = vector3(-342.291, -133.370, 39.009 ), + Size = { x = 1.0, y = 1.0, z = 1.0 }, + Color = { r = 50, g = 200, b = 50 }, + Type = 21 }, Garage = { - Pos = vector3(-97.5, 6496.1, 30.4 ), - Size = { x = 1.5, y = 1.5, z = 1.0 }, - Color = { r = 204, g = 204, b = 0 }, - Type = 1 + Pos = vector3(-97.5, 6496.1, 31.4 ), + Size = { x = 1.0, y = 1.0, z = 1.0 }, + Color = { r = 50, g = 200, b = 50 }, + Type = 21 }, Craft = { - Pos = vector3( -323.140, -129.882, 37.999 ), - Size = { x = 1.5, y = 1.5, z = 1.0 }, - Color = { r = 204, g = 204, b = 0 }, - Type = 1 + Pos = vector3( -323.140, -129.882, 38.999 ), + Size = { x = 1.0, y = 1.0, z = 1.0 }, + Color = { r = 50, g = 200, b = 50 }, + Type = 21 }, VehicleSpawnPoint = { diff --git a/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql b/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql index b048dd78..6493bf1b 100644 --- a/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql +++ b/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql @@ -1,19 +1,19 @@ USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_mechanic', 'Mécano', 1) + ('society_mechanic', 'Mechanic', 1) ; INSERT INTO `addon_inventory` (name, label, shared) VALUES - ('society_mechanic', 'Mécano', 1) + ('society_mechanic', 'Mechanic', 1) ; INSERT INTO `datastore` (name, label, shared) VALUES - ('society_mechanic', 'Mécano', 1) + ('society_mechanic', 'Mechanic', 1) ; INSERT INTO `jobs` (name, label) VALUES - ('mechanic', 'Mécano') + ('mechanic', 'Mechanic') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES diff --git a/[esx_addons]/esx_mechanicjob/fxmanifest.lua b/[esx_addons]/esx_mechanicjob/fxmanifest.lua index 9fcebfe4..1bcceed0 100644 --- a/[esx_addons]/esx_mechanicjob/fxmanifest.lua +++ b/[esx_addons]/esx_mechanicjob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Mechanic Job' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_mechanicjob/locales/en.lua b/[esx_addons]/esx_mechanicjob/locales/en.lua index 45a04246..38d48934 100644 --- a/[esx_addons]/esx_mechanicjob/locales/en.lua +++ b/[esx_addons]/esx_mechanicjob/locales/en.lua @@ -1,7 +1,7 @@ Locales['en'] = { ['mechanic'] = 'mechanic', - ['drive_to_indicated'] = '~y~Drive~s~ to the indicated location.', - ['mission_canceled'] = 'Mission ~r~canceled~s~', + ['drive_to_indicated'] = 'Drive to the indicated location.', + ['mission_canceled'] = 'Mission canceled', ['vehicle_list'] = 'vehicle List', ['work_wear'] = 'workwear', ['civ_wear'] = 'civilian clothes', @@ -12,10 +12,10 @@ Locales['en'] = { ['flat_bed'] = 'flatbed', ['tow_truck'] = 'tow Truck', ['service_full'] = 'service full: ', - ['open_actions'] = 'Press ~INPUT_CONTEXT~ to access the menu.', + ['open_actions'] = 'Press [E] to access the menu.', ['harvest'] = 'harvest', - ['harvest_menu'] = 'press ~INPUT_CONTEXT~ to access the harvest menu.', - ['not_experienced_enough'] = 'you are not ~r~experienced enough~s~ to perform this action.', + ['harvest_menu'] = 'press [E] to access the harvest menu.', + ['not_experienced_enough'] = 'you are not experienced enough to perform this action.', ['gas_can'] = 'gas Can', ['repair_tools'] = 'repair Tools', ['body_work_tools'] = 'bodywork Tools', @@ -23,7 +23,7 @@ Locales['en'] = { ['repair_kit'] = 'repair Kit', ['body_kit'] = 'body Kit', ['craft'] = 'craft', - ['craft_menu'] = 'press ~INPUT_CONTEXT~ to access the crafting menu.', + ['craft_menu'] = 'press [E] to access the crafting menu.', ['billing'] = 'billing', ['hijack'] = 'hijack', ['repair'] = 'repair', @@ -35,19 +35,19 @@ Locales['en'] = { ['no_players_nearby'] = 'there is no nearby player', ['no_vehicle_nearby'] = 'there is no nearby vehicle', ['inside_vehicle'] = 'you can\'t do this from inside the vehicle!', - ['vehicle_unlocked'] = 'the vehicle has been ~g~unlocked', - ['vehicle_repaired'] = 'the vehicle has been ~g~repaired', - ['vehicle_cleaned'] = 'the vehicle has been ~g~cleaned', - ['vehicle_impounded'] = 'the vehicle has been ~r~impounded', + ['vehicle_unlocked'] = 'the vehicle has been unlocked', + ['vehicle_repaired'] = 'the vehicle has been repaired', + ['vehicle_cleaned'] = 'the vehicle has been cleaned', + ['vehicle_impounded'] = 'the vehicle has been impounded', ['must_seat_driver'] = 'you must be in the driver seat!', - ['must_near'] = 'you must be ~r~near a vehicle~s~ to impound it.', - ['vehicle_success_attached'] = 'vehicle successfully ~b~attached~s~', + ['must_near'] = 'you must be near a vehicle to impound it.', + ['vehicle_success_attached'] = 'vehicle successfully attached', ['please_drop_off'] = 'please drop off the vehicle at the garage', - ['cant_attach_own_tt'] = '~r~you can\'t~s~ attach own tow truck', - ['no_veh_att'] = 'there is no ~r~vehicle~s~ to be attached', + ['cant_attach_own_tt'] = 'you can\'t attach own tow truck', + ['no_veh_att'] = 'there is no vehicle to be attached', ['not_right_veh'] = 'this is not the right vehicle', - ['veh_det_succ'] = 'vehicle successfully ~b~dettached~s~!', - ['imp_flatbed'] = '~r~Action impossible!~s~ You need a ~b~Flatbed~s~ to load a vehicle', + ['veh_det_succ'] = 'vehicle successfully dettached!', + ['imp_flatbed'] = 'Action impossible! You need a Flatbed to load a vehicle', ['objects'] = 'objects', ['roadcone'] = 'roadcone', ['toolbox'] = 'toolbox', @@ -55,31 +55,31 @@ Locales['en'] = { ['quantity'] = 'quantity', ['invalid_quantity'] = 'invalid quantity', ['inventory'] = 'inventory', - ['veh_unlocked'] = '~g~Vehicle Unlocked', - ['hijack_failed'] = '~r~Hijack Failed', - ['body_repaired'] = '~g~Body repaired', - ['veh_repaired'] = '~g~Vehicle Repaired', - ['veh_stored'] = 'press ~INPUT_CONTEXT~ to store the vehicle.', - ['press_remove_obj'] = 'press ~INPUT_CONTEXT~ to remove the object', - ['please_tow'] = 'please ~y~tow~s~ the vehicle', - ['wait_five'] = 'you must ~r~wait~s~ 5 mintes', + ['veh_unlocked'] = 'Vehicle Unlocked', + ['hijack_failed'] = 'Hijack Failed', + ['body_repaired'] = 'Body repaired', + ['veh_repaired'] = 'Vehicle Repaired', + ['veh_stored'] = 'press [E] to store the vehicle.', + ['press_remove_obj'] = 'press [E] to remove the object', + ['please_tow'] = 'please tow the vehicle', + ['wait_five'] = 'you must wait 5 mintes', ['must_in_flatbed'] = 'you must be in a flatbed to being the mission', ['mechanic_customer'] = 'mechanic Customer', - ['you_do_not_room'] = '~r~You do not have more room', - ['recovery_gas_can'] = '~b~Gas Can~s~ Retrieval...', - ['recovery_repair_tools'] = '~b~Repair Tools~s~ Retrieval...', - ['recovery_body_tools'] = '~b~Body Tools~s~ Retrieval...', - ['not_enough_gas_can'] = 'You do not ~r~have enough~s~ gas cans.', - ['assembling_blowtorch'] = 'Assembling ~b~Blowtorch~s~...', - ['not_enough_repair_tools'] = 'You do not ~r~have enough~s~ repair tools.', - ['assembling_repair_kit'] = 'Assembling ~b~Repair Kit~s~...', - ['not_enough_body_tools'] = 'You do not ~r~have enough~s~ body tools.', - ['assembling_body_kit'] = 'Assembling ~b~Body Kit~s~...', - ['your_comp_earned'] = 'your company has ~g~earned~s~ ~g~$', - ['you_used_blowtorch'] = 'you used a ~b~blowtorch', - ['you_used_repair_kit'] = 'you used a ~b~Repair Kit', - ['you_used_body_kit'] = 'you used a ~b~Body Kit', - ['have_withdrawn'] = 'you have withdrawn ~y~x%s~s~ ~b~%s~s~', - ['have_deposited'] = 'you have deposited ~y~x%s~s~ ~b~%s~s~', - ['player_cannot_hold'] = 'you do ~r~not~s~ have enough ~y~free space~s~ in your inventory!', + ['you_do_not_room'] = 'You do not have more room', + ['recovery_gas_can'] = 'Gas Can Retrieval...', + ['recovery_repair_tools'] = 'Repair Tools Retrieval...', + ['recovery_body_tools'] = 'Body Tools Retrieval...', + ['not_enough_gas_can'] = 'You do not have enough gas cans.', + ['assembling_blowtorch'] = 'Assembling Blowtorch...', + ['not_enough_repair_tools'] = 'You do not have enough repair tools.', + ['assembling_repair_kit'] = 'Assembling Repair Kit...', + ['not_enough_body_tools'] = 'You do not have enough body tools.', + ['assembling_body_kit'] = 'Assembling Body Kit...', + ['your_comp_earned'] = 'your company has earned $', + ['you_used_blowtorch'] = 'you used a blowtorch', + ['you_used_repair_kit'] = 'you used a Repair Kit', + ['you_used_body_kit'] = 'you used a Body Kit', + ['have_withdrawn'] = 'you have withdrawn x%s %s', + ['have_deposited'] = 'you have deposited x%s %s', + ['player_cannot_hold'] = 'you do not have enough free space in your inventory!', } diff --git a/[esx_addons]/esx_mechanicjob/locales/hu.lua b/[esx_addons]/esx_mechanicjob/locales/hu.lua new file mode 100644 index 00000000..99348375 --- /dev/null +++ b/[esx_addons]/esx_mechanicjob/locales/hu.lua @@ -0,0 +1,88 @@ +Locales['hu'] = { + ['mechanic'] = 'LS Custom Tuningoló telep', + ['drive_to_indicated'] = '~b~[Információ]:~s~ Menj a kijelölt pontra.', + ['mission_canceled'] = 'Küldetés ~r~megszakítva~s~', + ['vehicle_list'] = 'Munkajárművek', + ['work_wear'] = 'Munkaruha', + ['civ_wear'] = 'Civil ruházat', + ['deposit_stock'] = 'Készlet berakás', + ['withdraw_stock'] = 'Készlet kivétel', + ['boss_actions'] = 'Leader Panel', + ['service_vehicle'] = 'szervíz jármű', + ['flat_bed'] = 'Platós kocsi', + ['flat_bed3'] = 'Platós vontatókocsi', + ['guardian'] = 'Guardian', + ['flat_bedASD'] = 'Platóra fel/le', + ['tow_truck'] = 'Vontató', + ['service_full'] = 'Szervíz full: ', + ['open_actions'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a menü megnyitásához', + ['harvest'] = 'aratás', + ['harvest_menu'] = 'nyomd meg a ~INPUT_CONTEXT~ gombot az aratás menühöz.', + ['not_experienced_enough'] = 'nem vagy elég tapasztalt hogy végrehatjsd a műveletet', + ['gas_can'] = 'nitro', + ['repair_tools'] = 'Javítószerszámok', + ['body_work_tools'] = 'karosszéria szerszámok', + ['blowtorch'] = 'fújólámpa', + ['repair_kit'] = 'javítókészlet', + ['body_kit'] = 'body Kit', + ['craft'] = 'barkácsolás', + ['craft_menu'] = 'nyomd meg a ~INPUT_CONTEXT~ gombot a barkácsolás menü elérséhez', + ['billing'] = 'Munkadíj átadása', + ['hijack'] = 'Kocsi feltörése', + ['repair'] = 'Javítás', + ['clean'] = 'Kocsi lemosása', + ['imp_veh'] = 'Lefoglalás', + ['place_objects'] = 'Objectek lerakása', + ['invoice_amount'] = 'Írd be az összeget (( Szabályzat alapján ))', + ['amount_invalid'] = '~r~[Információ]:~s~ Ismeretlen érték!', + ['no_players_nearby'] = '~r~[Információ]:~s~ Nincs a közeledben játékos!', + ['no_vehicle_nearby'] = '~r~[Információ]:~s~ Nincs a közeledben kocsi!', + ['inside_vehicle'] = 'Jármű belsejéből nem csinálhatod!', + ['vehicle_unlocked'] = '~b~[Információ]:~s~ Sikeresen feltörted a kijelölt kocsit!', + ['vehicle_repaired'] = '~b~[Információ]:~s~ Kocsi sikeresen megjavítva! Oszd ki a munkadíjat!', + ['vehicle_cleaned'] = '~b~[Információ]:~s~ Kocsi sikeresen lemosva!', + ['vehicle_impounded'] = '~b~[Információ]:~s~ Kocsi sikeresen lefoglalva!', + ['must_seat_driver'] = 'vezetőülésben kell lenned!', + ['must_near'] = '~r~[Információ]:~s~ Nincs a közeledben kocsi amit lefoglalhatnál!', + ['vehicle_success_attached'] = '~b~[Információ]:~s~ A kocsit sikeresen felraktad a platóra.', + ['please_drop_off'] = '~b~[Információ]:~s~ Most vidd el a kijelölt pontra!', + ['cant_attach_own_tt'] = '~r~[Információ]:~s~ Nem teheted meg!', + ['no_veh_att'] = 'nincs csatlakoztatható ~r~jármű~s~', + ['not_right_veh'] = 'ez nem megfelelő jármű', + ['veh_det_succ'] = '~b~[Információ]:~s~ Sikeresen levetted a kocsit a platóról!', + ['imp_flatbed'] = '~r~[Információ]:~s~ Nem teheted meg!', + ['objects'] = 'objectek', + ['roadcone'] = 'útkúp', + ['toolbox'] = 'eszköztár', + ['mechanic_stock'] = 'Szerelő készlet', + ['quantity'] = 'mennyiség', + ['invalid_quantity'] = 'érvénytelen mennyiség', + ['inventory'] = 'leltár', + ['veh_unlocked'] = '~b~Jármű kinyitva', + ['hijack_failed'] = '~r~Eltérítés sikertelen', + ['body_repaired'] = '~b~Body javítva', + ['veh_repaired'] = '~b~Jármű javítva', + ['veh_stored'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a kocsi lerakásához.', + ['press_remove_obj'] = '~b~[Információ]:~s~ Nyomd meg az ~INPUT_CONTEXT~ gombot a tárgy törléséhez', + ['please_tow'] = '~b~[Információ]:~s~ Rakd fel a platóra a kocsit! (( F6 panel ))', + ['wait_five'] = 'Neked muszáj ~r~várni~s~ 5 percet', + ['must_in_flatbed'] = '~b~[Információ]:~s~ Csak platós kocsival tudsz küldetést csinálni!', + ['mechanic_customer'] = 'Szerelő ügyfél', + ['you_do_not_room'] = '~r~Nincs több helyed', + ['recovery_gas_can'] = '~b~Gázpalack~s~ Visszakeresés...', + ['recovery_repair_tools'] = '~b~Javító szerszámok~s~ Visszakeresés...', + ['recovery_body_tools'] = '~b~Body szerszámok~s~ Visszakeresés...', + ['not_enough_gas_can'] = 'Nincs elég gázpalackod', + ['assembling_blowtorch'] = 'Összeszerelés ~b~Fújólámpa~s~...', + ['not_enough_repair_tools'] = 'Nincs elég javítószerszámod', + ['assembling_repair_kit'] = 'Összeszerelés ~b~Javító készlet~s~...', + ['not_enough_body_tools'] = 'Nincs elég body szerszámod', + ['assembling_body_kit'] = 'Összeszerelés ~b~Body készlet~s~...', + ['your_comp_earned'] = '~b~[Információ]:~s~ Gratulálok, kapott egy kis pénzt a frakció és te is! ~r~', + ['you_used_blowtorch'] = 'használtál egy ~b~fújólámpát', + ['you_used_repair_kit'] = 'használtál egy ~b~Javító készletet', + ['you_used_body_kit'] = 'használtál egy ~b~Body készletet', + ['have_withdrawn'] = 'Kivettél ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'Beraktál ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = 'Nincs elég szabad hely az inventorydban', +} \ No newline at end of file diff --git a/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql new file mode 100644 index 00000000..7473b241 --- /dev/null +++ b/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql @@ -0,0 +1,34 @@ +USE `es_extended`; + +INSERT INTO `addon_account` (name, label, shared) VALUES + ('society_mechanic', 'Szerelő', 1) +; + +INSERT INTO `addon_inventory` (name, label, shared) VALUES + ('society_mechanic', 'Szerelő', 1) +; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('society_mechanic', 'Szerelő', 1) +; + +INSERT INTO `jobs` (name, label) VALUES + ('mechanic', 'Szerelő') +; + +INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES + ('mechanic', 0, 'recrue', 'Újonc', 12, '{}', '{}'), + ('mechanic', 1, 'novice', 'Kezdő', 24, '{}', '{}'), + ('mechanic', 2, 'experimente', 'Tapasztalt', 36, '{}', '{}'), + ('mechanic', 3, 'chief', 'Vezető', 48, '{}', '{}'), + ('mechanic', 4, 'boss', 'Főnök', 0, '{}' ,'{}') +; + +INSERT INTO `items` (name, label, weight) VALUES + ('gazbottle', 'Gázpalack', 2), + ('fixtool', 'Javítószerszámok', 2), + ('carotool', 'Szerszámok', 2), + ('blowpipe', 'Fújólámpa', 2), + ('fixkit', 'Javító készlet', 3), + ('carokit', 'Body Kit', 3) +; diff --git a/[esx_addons]/esx_multicharacter b/[esx_addons]/esx_multicharacter deleted file mode 160000 index 02352a8e..00000000 --- a/[esx_addons]/esx_multicharacter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 02352a8e18176cb9f369ba608aab66ccf0311fe0 diff --git a/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql index 15737afc..3385586b 100644 --- a/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql +++ b/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql @@ -3,9 +3,3 @@ USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('beer', 'Beer', 1) ; - -INSERT INTO `shops` (store, item, price) VALUES - ('TwentyFourSeven', 'beer', 45), - ('RobsLiquor', 'beer', 45), - ('LTDgasoline', 'beer', 45) -; diff --git a/[esx_addons]/esx_optionalneeds/fxmanifest.lua b/[esx_addons]/esx_optionalneeds/fxmanifest.lua index 61de3d63..505943aa 100644 --- a/[esx_addons]/esx_optionalneeds/fxmanifest.lua +++ b/[esx_addons]/esx_optionalneeds/fxmanifest.lua @@ -4,17 +4,13 @@ game 'gta5' description 'ESX Optional Needs' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } diff --git a/[esx_addons]/esx_optionalneeds/locales/hu.lua b/[esx_addons]/esx_optionalneeds/locales/hu.lua new file mode 100644 index 00000000..9d9dc0c9 --- /dev/null +++ b/[esx_addons]/esx_optionalneeds/locales/hu.lua @@ -0,0 +1,3 @@ +Locales['hu'] = { + ['used_beer'] = 'Ittál egy ~y~Sört~s~', +} \ No newline at end of file diff --git a/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql new file mode 100644 index 00000000..82012c58 --- /dev/null +++ b/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql @@ -0,0 +1,5 @@ +USE `es_extended`; + +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('beer', 'Sör', 1) +; diff --git a/[esx_addons]/esx_phone/fxmanifest.lua b/[esx_addons]/esx_phone/fxmanifest.lua index 3b16be41..6e96da6a 100644 --- a/[esx_addons]/esx_phone/fxmanifest.lua +++ b/[esx_addons]/esx_phone/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Phone' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' @@ -12,28 +12,14 @@ server_scripts { '@oxmysql/lib/MySQL.lua', 'config.lua', '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/it.lua', + 'locales/*.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/it.lua', + 'locales/*.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_phone/html/ui.html b/[esx_addons]/esx_phone/html/ui.html index d958ac00..c02e423b 100644 --- a/[esx_addons]/esx_phone/html/ui.html +++ b/[esx_addons]/esx_phone/html/ui.html @@ -19,20 +19,20 @@
    -
  • Repertoire
    • +
  • Contacts
  • Messages
- Répertoire + Contacts
-

Aucun contact

+

No contacts

@@ -45,7 +45,7 @@
-

Aucun message

+

No messages

@@ -57,23 +57,23 @@
- - - - + + + +
-
Ajouter - un contact
+
Add a + contact
- - - - + + + +
@@ -87,4 +87,4 @@ - \ No newline at end of file + diff --git a/[esx_addons]/esx_phone/ui_es.html b/[esx_addons]/esx_phone/html/ui_es.html similarity index 100% rename from [esx_addons]/esx_phone/ui_es.html rename to [esx_addons]/esx_phone/html/ui_es.html diff --git a/[esx_addons]/esx_phone/html/ui_hu.html b/[esx_addons]/esx_phone/html/ui_hu.html new file mode 100644 index 00000000..99dc892a --- /dev/null +++ b/[esx_addons]/esx_phone/html/ui_hu.html @@ -0,0 +1,84 @@ + + + + + + + + +
+
+
+ + ismeretlen +
+ +
+
    +
  • Kapcsolatok
    • +
  • Üzenetek
    • +
+
+ +
+
+ Kapcsolatok + +
+
+
+
+

Nincsenek kapcsolatok

+
+
+
+
+ +
+
+ Üzenetek + +
+
+
+
+

Nincs üzenet

+
+
+
+
+ +
+
+ +
+
+
+ + + + + +
+
+
+ +
+
Kapcsolat hozzáadása
+
+
+ + + + +
+
+
+
+
+ + + + + + diff --git a/[esx_addons]/esx_phone/locales/hu.lua b/[esx_addons]/esx_phone/locales/hu.lua new file mode 100644 index 00000000..60d23498 --- /dev/null +++ b/[esx_addons]/esx_phone/locales/hu.lua @@ -0,0 +1,13 @@ +Locales['hu'] = { + ['new_message'] = '~b~Kaptál egy üzenetet:~s~ %s', + ['press_take_call'] = '%s - Nyomd meg a ~INPUT_CONTEXT~ gombot a hívás fogadásához', + ['taken_call'] = '~y~%s~s~ fogadta a hívást', + ['gps_position'] = 'az úti cél hozzáadva a GPS-hez.', + ['message_sent'] = 'az üzenet elküldve', + ['cannot_add_self'] = 'nem adhatod hozzá magad!', + ['number_in_contacts'] = 'ez a szám már szerepel a névjegyzékében', + ['contact_added'] = 'a névjegy hozzáadva!', + ['contact_removed'] = 'a névjegy eltávolítva!', + ['number_not_assigned'] = 'a szám nincs hozzárendelve!', + ['invalid_number'] = 'ez nem érvényes szám!', +} diff --git a/[esx_addons]/esx_policejob/fxmanifest.lua b/[esx_addons]/esx_policejob/fxmanifest.lua index 1f6c47bd..5df469bc 100644 --- a/[esx_addons]/esx_policejob/fxmanifest.lua +++ b/[esx_addons]/esx_policejob/fxmanifest.lua @@ -4,43 +4,21 @@ game 'gta5' description 'ESX Police Job' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/pl.lua', - 'locales/fr.lua', - 'locales/fi.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/ko.lua', - 'locales/cs.lua', - 'locales/nl.lua', - 'locales/tr.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/pl.lua', - 'locales/fr.lua', - 'locales/fi.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/ko.lua', - 'locales/cs.lua', - 'locales/nl.lua', - 'locales/tr.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua', 'client/vehicle.lua' diff --git a/[esx_addons]/esx_policejob/locales/hu.lua b/[esx_addons]/esx_policejob/locales/hu.lua new file mode 100644 index 00000000..1feb20eb --- /dev/null +++ b/[esx_addons]/esx_policejob/locales/hu.lua @@ -0,0 +1,154 @@ +Locales['hu'] = { + -- Cloakroom + ['cloakroom'] = 'Zárt helyiség', + ['citizen_wear'] = 'Civil öltözet', + ['police_wear'] = 'Egyenruha', + ['gilet_wear'] = 'Láthatósági mellény', + ['bullet_wear'] = 'Golyóálló mellény', + ['no_outfit'] = 'there\'s no uniform that fits you!', + ['open_cloackroom'] = 'Nyomj ~INPUT_CONTEXT~ betüt, hogy ~y~átöltözz~s~.', + -- Armory + ['remove_object'] = 'Tárgy kivétele', + ['deposit_object'] = 'Tárgy berakás', + ['get_weapon'] = 'Fegyver kivétele', + ['put_weapon'] = 'Fegyver berakás', + ['buy_weapons'] = 'Fegyver vásárlás', + ['armory'] = 'Fegyvertár', + ['open_armory'] = 'Nyomj ~INPUT_CONTEXT~ betüt, hogy hozzáférj: ~y~Armory~s~.', + ['armory_owned'] = 'saját', + ['armory_free'] = 'ingyenes', + ['armory_item'] = '%s Ft', + ['armory_weapontitle'] = 'fegyvertár - vásárlás', + ['armory_componenttitle'] = 'fegyvertár - kiegészitöks', + ['armory_bought'] = 'vásároltál: ~y~%s~s~ ennyiért: ~r~%s Ft~s~', + ['armory_money'] = 'Ez számodra nem engedélyezett', + ['armory_hascomponent'] = 'kiegészitö felvéve!', + ['get_weapon_menu'] = 'Fegyvertár - fegyver kivétele', + ['put_weapon_menu'] = 'Fegyvertár - fegyver berakása', + -- Vehicles + ['vehicle_menu'] = 'jármü', + ['vehicle_blocked'] = 'Lerakási hely blokkolva!', + ['garage_prompt'] = 'Nyomj ~INPUT_CONTEXT~ hogy hozzáférj: ~y~Vehicle Actions~s~.', + ['garage_title'] = 'Jármü opciók', + ['garage_stored'] = 'tárolva', + ['garage_notstored'] = 'nincs a garázsban', + ['garage_storing'] = 'megpróbáljuk eltávolítani a járművet, ügyeljen arra, hogy senki ne tartózkodjon körülütte.', + ['garage_has_stored'] = 'jármü tárolva', + ['garage_has_notstored'] = 'nincs a közeledben jármü', + ['garage_notavailable'] = 'a jármü nem tárolható a garázsban.', + ['garage_blocked'] = 'nem elérhetö lerakási pont!', + ['garage_empty'] = 'nincs jármüved garázsban.', + ['garage_released'] = 'jármü kiengedve.', + ['garage_store_nearby'] = 'nincs jármü a közeledben.', + ['garage_storeditem'] = 'garázs megnyitása', + ['garage_storeitem'] = 'jármü tárolása a garázsban', + ['garage_buyitem'] = 'Autó shop', + ['helicopter_prompt'] = 'Nyomj~INPUT_CONTEXT~ betüt, hogy hozzáférj: ~y~Helicopter Actions~s~.', + ['helicopter_notauthorized'] = 'Nem használhatsz helikoptert.', + ['shop_item'] = '%s Ft', + ['vehicleshop_title'] = 'Autó shop', + ['vehicleshop_confirm'] = 'Meg szeretnéd venni?', + ['vehicleshop_bought'] = 'vásároltál ~y~%s~s~ ezért: ~r~%s Ft~s~', + ['vehicleshop_money'] = 'Ezt nem engedheted meg.', + ['vehicleshop_awaiting_model'] = 'A jármű ~g~DOWNLOADING & LOADING~s~ kérlek várj', + ['confirm_no'] = 'nem', + ['confirm_yes'] = 'igen', + -- Service + ['service_max'] = 'Nem léphet szolgálatba. Maximális létszám: %s/%s', + ['service_not'] = 'Elöször vedd fel a szolgálatot...', + ['service_anonunce'] = 'információk', + ['service_in'] = 'Szolgálatba léptél, üdvözlünk!', + ['service_in_announce'] = 'operátor ~y~%s~s~ szolgálatba lépett!', + ['service_out'] = 'elhagytad a szolgálatot.', + ['service_out_announce'] = 'operátor ~y~%s~s~ leadta a szolgálatot.', + -- Action Menu + ['citizen_interaction'] = 'Ember interakciók', + ['vehicle_interaction'] = 'Jármű interakciók', + ['object_spawner'] = 'Objektum lerakása', + + ['id_card'] = 'Személyi igazolvány', + ['search'] = 'keresés', + ['handcuff'] = 'kötözés / elengedés', + ['drag'] = 'kisérés', + ['put_in_vehicle'] = 'berakás jármübe', + ['out_the_vehicle'] = 'kivétel jármüböl', + ['fine'] = 'birság', + ['unpaid_bills'] = 'fizetetlen számlák kezelése', + ['license_check'] = 'engedélyek kezelése', + ['license_revoke'] = 'engedélyek visszavonása', + ['license_revoked'] = '~b~%s~s~ ~y~revoked~s~!', + ['licence_you_revoked'] = 'visszavonta ~b~%s~s~ ~y~%s~s~ engedélyét', + ['no_players_nearby'] = 'nincs a közeledben játékos!', + ['being_searched'] = 'Téged éppen megmotoztak!', + -- Vehicle interaction + ['vehicle_info'] = 'Jármü infó', + ['pick_lock'] = 'Jármü feltörése', + ['vehicle_unlocked'] = 'Jármü feltörve ~g~feltörve~s~', + ['no_vehicles_nearby'] = 'nincs jármü a közelben', + ['impound'] = 'jármü lefoglalása', + ['impound_prompt'] = 'nyomj ~INPUT_CONTEXT~ hogy ~y~megszakítsd~s~', + ['impound_canceled'] = 'lefoglalás megszakitva', + ['impound_canceled_moved'] = 'lefoglalás nem sikerült, mert a jármü mozgásban volt', + ['impound_successful'] = 'sikeres lefoglalás', + ['search_database'] = 'Keresés rendszám alapján', + ['search_database_title'] = 'jármü információk - keresés rendszám alapján', + ['search_database_error_invalid'] = 'ez ~r~nem~s~ egy ~y~érvényes~s~ rendszám', + ['search_database_error_not_found'] = 'ez a rendszám: ~s~ nincs regisztrálva!', + ['search_database_found'] = 'jármü ~y~regisztrálva~s~ : ~b~%s~s~', + -- Traffic interaction + ['traffic_interaction'] = 'Útzárak', + ['cone'] = 'bólya', + ['barrier'] = 'útakadály', + ['spikestrips'] = 'szögesdrót', + ['box'] = 'doboz', + ['cash'] = 'pénzesdoboz', + -- ID Card Menu + ['name'] = 'név: %s', + ['job'] = 'munka: %s', + ['sex'] = 'neme: %s', + ['dob'] = 'DOB: %s', + ['height'] = 'magasság: %s', + ['id'] = 'ID: %s', + ['bac'] = 'BAC: %s', + ['unknown'] = 'ismeretlen', + ['male'] = 'férfi', + ['female'] = 'nö', + -- Body Search Menu + ['guns_label'] = '--- FEGYVEREK ---', + ['inventory_label'] = '--- LELTÁR ---', + ['license_label'] = ' --- ENGEDÉLYEK ---', + ['confiscate'] = 'elkobzás %s', + ['confiscate_weapon'] = 'elkobzás %s %s töltényekkel együtt', + ['confiscate_inv'] = 'elkobzás %sx %s', + ['confiscate_dirty'] = 'fekete pénz elkobzása: %s Ft', + ['you_confiscated'] = 'elkoboztad ~y~%sx~s~ ~b~%s~s~ töle: ~b~%s~s~', + ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ elkobozta: ~y~%s~s~', + ['you_confiscated_account'] = 'elkoboztad ~g~%s Ft~s~ (%s) töle ~b~%s~s~', + ['got_confiscated_account'] = '~g~%s Ft~s~ (%s) was confiscated by ~y~%s~s~', + ['you_confiscated_weapon'] = '~b~%s~s~ elkobozta: ~b~%s~s~ ~o~%s~s~ töltényekkel együtt', + ['got_confiscated_weapon'] = '~b~%s~s~ ~o~%s~s~ elkobozta: ~y~%s~s~', + ['traffic_offense'] = 'forgalmi vétségek', + ['minor_offense'] = 'kisebb büncselekmények', + ['average_offense'] = 'közepes büncselekmények', + ['major_offense'] = 'súlyos büncselekmények', + ['fine_total'] = 'birság: %s', + -- Vehicle Info Menu + ['plate'] = 'rendszám: %s', + ['owner_unknown'] = 'tulajdonos: ismeretlen', + ['owner'] = 'tulajdonos: %s', + -- Boss Menu + ['open_bossmenu'] = 'nyomj ~INPUT_CONTEXT~ gombot a menü eléréséhez', + ['quantity_invalid'] = 'érvénytelen mennyiség', + ['have_withdrawn'] = 'Kivetted ~y~%sx~s~ ~b~%s~s~', + ['have_deposited'] = 'Beraktad ~y~%sx~s~ ~b~%s~s~', + ['quantity'] = 'mennyiség', + ['inventory'] = 'leltár', + ['police_stock'] = 'Állomány', + -- Misc + ['remove_prop'] = 'Nyomj ~INPUT_CONTEXT~ gombot az objektum törléséhez', + ['map_blip'] = 'LSPD', + ['unrestrained_timer'] = '...', + -- Notifications + ['alert_police'] = 'riasztás', + ['phone_police'] = 'rendörség', +} diff --git a/[esx_addons]/esx_property/client/main.lua b/[esx_addons]/esx_property/client/main.lua index 93ba3f6a..8b1fd481 100644 --- a/[esx_addons]/esx_property/client/main.lua +++ b/[esx_addons]/esx_property/client/main.lua @@ -318,7 +318,7 @@ function OpenGatewayOwnedPropertiesMenu(property) local elements = {{label = _U('enter'), value = 'enter'}} if not Config.EnablePlayerManagement then - table.insert(elements, {label = _U('leave'), value = 'leave'}) + table.insert(elements, {label = _U('move_out'), value = 'leave'}) end ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'gateway_owned_properties_actions', { @@ -860,7 +860,7 @@ CreateThread(function() end if letSleep then - Wait(500) + Wait(1500) end end end) @@ -868,9 +868,9 @@ end) -- Key controls CreateThread(function() while true do - Wait(0) - - if CurrentAction then + local Sleep = 1500 + if CurrentAction then + Sleep = 0 ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, 38) then @@ -890,8 +890,7 @@ CreateThread(function() CurrentAction = nil end - else - Wait(500) - end end + Wait(Sleep) +end end) diff --git a/[esx_addons]/esx_property/config.lua b/[esx_addons]/esx_property/config.lua index 23bd8dc1..e7869012 100644 --- a/[esx_addons]/esx_property/config.lua +++ b/[esx_addons]/esx_property/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.DrawDistance = 100 +Config.DrawDistance = 10.0 Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} Config.MarkerColor = {r = 102, g = 102, b = 204} Config.RoomMenuMarkerColor = {r = 102, g = 204, b = 102} diff --git a/[esx_addons]/esx_property/fxmanifest.lua b/[esx_addons]/esx_property/fxmanifest.lua index 72f2d9e0..7ebdabe8 100644 --- a/[esx_addons]/esx_property/fxmanifest.lua +++ b/[esx_addons]/esx_property/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Property' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' @@ -12,30 +12,14 @@ server_scripts { '@async/async.lua', '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/tr.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/tr.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_property/locales/hu.lua b/[esx_addons]/esx_property/locales/hu.lua new file mode 100644 index 00000000..b92ff860 --- /dev/null +++ b/[esx_addons]/esx_property/locales/hu.lua @@ -0,0 +1,37 @@ +Locales['hu'] = { + ['have_withdrawn'] = 'Kivettél ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'Beraktál ~y~x%s~s~ ~b~%s~s~', + ['free_prop'] = 'Ingatlan', + ['property'] = 'Ingatlan', + ['enter'] = 'Belépés', + ['move_out'] = 'Kilépés', + ['move_out_sold'] = 'Ingatlan eladása ennyiért: $%s', + ['moved_out'] = 'Elköltözött és többé már nem bérli az ingatlant', + ['moved_out_sold'] = 'Ennyiért adtad el az ingatlant: ~g~$%s~s~', + ['buy'] = 'Ingatlan megvétele ennyiért: $%s', + ['buy_for'] = 'Vettél egy ingatlant ennyiért: ~g~$%s~s~', + ['rent'] = 'Béreltél egy ingatlant ennyiért: $%s / week', + ['rent_for'] = 'Béretél egy ingatlant ~g~$%s~s~ / hét, autómatikus fizetés', + ['press_to_menu'] = 'Nyomj ~INPUT_CONTEXT~ betüt hogy megnyisd a menüt.', + ['owned_properties'] = 'Ingatlanjaim', + ['available_properties'] = 'Elérhetö ingatlanok', + ['invite_player'] = 'Játékos meghivása', + ['you_invited'] = 'Meghivtad: ~y~%s~s~', + ['player_clothes'] = 'Ruhatár', + ['remove_cloth'] = 'Ruha törlés', + ['removed_cloth'] = 'A ruházat sikeresen kitörölve!', + ['remove_object'] = 'Tárgy kivétele', + ['deposit_object'] = 'Tárgy betétele', + ['invite'] = 'Meghivás', + ['dirty_money'] = 'Piszkos pénz: $%s', + ['inventory'] = 'Leltár', + ['amount'] = 'Mennyiség?', + ['amount_invalid'] = 'Érvénytelen összeg', + ['press_to_exit'] = 'Nyomd meg a ~INPUT_CONTEXT~ gombot hogy elhagyd az ingatlant', + ['not_enough'] = 'Nincsen elég pénzed', + ['invalid_quantity'] = 'invalid quantity', + ['paid_rent'] = 'Kifizettél ~g~%s~s~ $-ot a kibérelt ingatlanod miatt.', + ['paid_rent_evicted'] = 'Kilakoltattak innen: ~y~%s~s~', + ['not_enough_in_property'] = 'Nincs elég ~r~mennyiség~s~ ebböl a tárgybol!', + ['player_cannot_hold'] = 'Nincs több féröhelyed az inventorydban!', +} diff --git a/[esx_addons]/esx_realestateagentjob/client/main.lua b/[esx_addons]/esx_realestateagentjob/client/main.lua index 022a8aeb..2413d022 100644 --- a/[esx_addons]/esx_realestateagentjob/client/main.lua +++ b/[esx_addons]/esx_realestateagentjob/client/main.lua @@ -225,22 +225,24 @@ end) -- Display markers CreateThread(function() while true do - Wait(0) + local Sleep = 1500 local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do if(v.Type ~= -1 and #(coords - v.Pos) < Config.DrawDistance) then + Sleep = 0 DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end end + Wait(Sleep) end end) -- Enter / Exit marker events CreateThread(function() while true do - Wait(0) + local Sleep = 500 local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false @@ -248,6 +250,7 @@ CreateThread(function() for k,v in pairs(Config.Zones) do if #(coords - v.Pos) < v.Size.x then + Sleep = 0 isInMarker = true currentZone = k end @@ -263,15 +266,14 @@ CreateThread(function() hasAlreadyEnteredMarker = false TriggerEvent('esx_realestateagentjob:hasExitedMarker', LastZone) end + Wait(Sleep) end end) -- Key controls CreateThread(function() - while true do + while CurrentAction do Wait(0) - - if CurrentAction then ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, 38) then @@ -281,9 +283,6 @@ CreateThread(function() CurrentAction = nil end - else - Wait(500) - end end end) diff --git a/[esx_addons]/esx_realestateagentjob/fxmanifest.lua b/[esx_addons]/esx_realestateagentjob/fxmanifest.lua index cc4e4b8f..f76eb49e 100644 --- a/[esx_addons]/esx_realestateagentjob/fxmanifest.lua +++ b/[esx_addons]/esx_realestateagentjob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Real Estate Job' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_realestateagentjob/locales/hu.lua b/[esx_addons]/esx_realestateagentjob/locales/hu.lua new file mode 100644 index 00000000..fabfabdc --- /dev/null +++ b/[esx_addons]/esx_realestateagentjob/locales/hu.lua @@ -0,0 +1,27 @@ +Locales['hu'] = { + ['properties'] = 'tulajdonságok', + ['clients'] = 'kliensek', + ['realtor'] = 'ingatlanügynök', + ['amount_withdraw'] = 'kifizetett összeg', + ['invalid_amount'] = 'érvénytelen mennyiség', + ['press_to_access'] = 'nyomd meg a ~INPUT_CONTEXT~ gombot a menü eléréséhez', + ['amount'] = 'mennyiség', + ['no_play_near'] = 'nincs a közelben játékos', + ['realtors'] = 'intaglatügynökök', + ['boss_action'] = 'főnök műveletek', + ['client_poor'] = 'a kliens nem engedheti meg magának', + + -- Property menu + ['property_name'] = 'ingatlan', + ['property_actions'] = 'műveletek', + ['property_actionbuttons'] = '{{Hozzárendelés [Eladás]|sell}} {{Hozzárendelés [Bérlés]|rent}} {{GPS|gps}}', + + -- Customer menu + ['customer_client'] = 'kliens', + ['customer_property'] = 'ingatlan', + ['customer_agreement'] = 'megegyezés', + ['customer_actions'] = 'műveletek', + ['customer_contractbuttons'] = '{{Szerződés visszavonása|revoke}} {{GPS|gps}}', + ['customer_rent'] = 'bérelt', + ['customer_sell'] = 'eladott', +} diff --git a/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql new file mode 100644 index 00000000..c95cbf5d --- /dev/null +++ b/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql @@ -0,0 +1,16 @@ +USE `es_extended`; + +INSERT INTO `addon_account` (name, label, shared) VALUES + ('society_realestateagent','Ingatlan közvetítő',1) +; + +INSERT INTO `jobs` (name, label) VALUES + ('realestateagent','Ingatlanügynök') +; + +INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES + ('realestateagent',0,'location','Bérbeadó ügynök',10,'{}','{}'), + ('realestateagent',1,'vendeur','Ügynök',25,'{}','{}'), + ('realestateagent',2,'gestion','Menedzsment',40,'{}','{}'), + ('realestateagent',3,'boss','Bróker',0,'{}','{}') +; diff --git a/[esx_addons]/esx_rpchat/fxmanifest.lua b/[esx_addons]/esx_rpchat/fxmanifest.lua index de6ed9ec..4193b120 100644 --- a/[esx_addons]/esx_rpchat/fxmanifest.lua +++ b/[esx_addons]/esx_rpchat/fxmanifest.lua @@ -4,28 +4,20 @@ game 'gta5' description 'ESX RP Chat' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@es_extended/locale.lua', - 'locales/sv.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/cs.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/sv.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/cs.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_rpchat/locales/hu.lua b/[esx_addons]/esx_rpchat/locales/hu.lua new file mode 100644 index 00000000..0e7e5ac5 --- /dev/null +++ b/[esx_addons]/esx_rpchat/locales/hu.lua @@ -0,0 +1,11 @@ +Locales['hu'] = { + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'tweet küldése', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'személyes cselekvés', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'RP információ', + ['do_prefix'] = 'do | %s', + ['generic_argument_name'] = 'üzenet', + ['generic_argument_help'] = 'az üzenet', +} diff --git a/[esx_addons]/esx_service/fxmanifest.lua b/[esx_addons]/esx_service/fxmanifest.lua index 60acf055..98347192 100644 --- a/[esx_addons]/esx_service/fxmanifest.lua +++ b/[esx_addons]/esx_service/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Service' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_shops/config.lua b/[esx_addons]/esx_shops/config.lua index c5c86dce..616ce8d5 100644 --- a/[esx_addons]/esx_shops/config.lua +++ b/[esx_addons]/esx_shops/config.lua @@ -21,14 +21,14 @@ Config.Zones = { } }, Pos = { - vector3(373.8, 325.8, 102.5), - vector3(2557.4, 382.2, 107.6), - vector3(-3038.9, 585.9, 6.9), - vector3(-3241.9, 1001.4, 11.8), - vector3(547.4, 2671.7, 41.1), - vector3(1961.4, 3740.6, 31.3), - vector3(2678.9, 3280.6, 54.2), - vector3(1729.2, 6414.1, 34.0) + vector3(373.8, 325.8, 103.5), + vector3(2557.4, 382.2, 108.6), + vector3(-3038.9, 585.9, 7.9), + vector3(-3241.9, 1001.4, 12.8), + vector3(547.4, 2671.7, 42.1), + vector3(1961.4, 3740.6, 32.3), + vector3(2678.9, 3280.6, 55.2), + vector3(1729.2, 6414.1, 35.0) }, Size = 1.0, Type = 59, @@ -51,15 +51,15 @@ Config.Zones = { } }, Pos = { - vector3(1135.8, -982.2, 45.4), - vector3(-1222.9, -906.9, 11.3), - vector3(-1487.5, -379.1, 39.1), - vector3(-2968.2, 390.9, 14.0), - vector3(1166.0, 2708.9, 37.1), - vector3(1392.5, 3604.6, 33.9), - vector3(127.8, -1284.7, 28.2), --StripClub - vector3(-1393.4, -606.6, 29.3), --Tequila la - vector3(-559.9, 287.0, 81.1) --Bahamamas + vector3(1135.8, -982.2, 46.4), + vector3(-1222.9, -906.9, 12.3), + vector3(-1487.5, -379.1, 40.1), + vector3(-2968.2, 390.9, 15.0), + vector3(1166.0, 2708.9, 38.1), + vector3(1392.5, 3604.6, 34.9), + vector3(127.8, -1284.7, 29.2), --StripClub + vector3(-1393.4, -606.6, 30.3), --Tequila la + vector3(-559.9, 287.0, 82.1) --Bahamamas }, Size = 1.0, Type = 59, @@ -82,11 +82,11 @@ Config.Zones = { } }, Pos = { - vector3(-48.5, -1757.5, 28.4), - vector3(1163.3, -323.8, 68.2), - vector3(-707.5, -914.2, 18.2), - vector3(-1820.5, 792.5, 137.1), - vector3(1698.3, 4924.4, 41.0) + vector3(-48.5, -1757.5, 29.4), + vector3(1163.3, -323.8, 69.2), + vector3(-707.5, -914.2, 19.2), + vector3(-1820.5, 792.5, 138.1), + vector3(1698.3, 4924.4, 42.0) }, Size = 1.0, Type = 59, @@ -95,3 +95,4 @@ Config.Zones = { ShowMarker = true } } + diff --git a/[esx_addons]/esx_shops/fxmanifest.lua b/[esx_addons]/esx_shops/fxmanifest.lua index efd4bba9..f0446731 100644 --- a/[esx_addons]/esx_shops/fxmanifest.lua +++ b/[esx_addons]/esx_shops/fxmanifest.lua @@ -4,20 +4,13 @@ game 'gta5' description 'ESX Shops' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } @@ -25,14 +18,7 @@ client_scripts { server_scripts { '@es_extended/locale.lua', '@oxmysql/lib/MySQL.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/sv.lua', - 'locales/pl.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } diff --git a/[esx_addons]/esx_shops/locales/hu.lua b/[esx_addons]/esx_shops/locales/hu.lua new file mode 100644 index 00000000..05298dd9 --- /dev/null +++ b/[esx_addons]/esx_shops/locales/hu.lua @@ -0,0 +1,12 @@ +Locales['hu'] = { + ['shop'] = 'Bolt', + ['shops'] = 'Bolt', + ['press_menu'] = 'Nyomd meg a ~INPUT_CONTEXT~ gombot hogy megnézd a kinálatot', + ['shop_item'] = '%s$', + ['bought'] = 'Vettél ~y~%sx~s~ ~b~%s~s~ ennyiért: ~r~$%s~s~', + ['not_enough'] = 'Nincsen elég pénzed', + ['player_cannot_hold'] = 'Nincsen elég szabad helyed!', + ['shop_confirm'] = 'Veszel %sx %s ennyiért $%s?', + ['no'] = 'Nem', + ['yes'] = 'Igen', +} diff --git a/[esx_addons]/esx_sit/config.lua b/[esx_addons]/esx_sit/config.lua index 45ff65b6..a00bc82c 100644 --- a/[esx_addons]/esx_sit/config.lua +++ b/[esx_addons]/esx_sit/config.lua @@ -12,7 +12,7 @@ Config.Interactables = { 'prop_bench_04', 'prop_bench_05', 'prop_bench_06', - 'prop_bench_05', + 'prop_bench_07', 'prop_bench_08', 'prop_bench_09', 'prop_bench_10', @@ -30,7 +30,7 @@ Config.Interactables = { 'prop_chair_04b', 'prop_chair_05', 'prop_chair_06', - 'prop_chair_05', + 'prop_chair_07', 'prop_chair_08', 'prop_chair_09', 'prop_chair_10', diff --git a/[esx_addons]/esx_sit/fxmanifest.lua b/[esx_addons]/esx_sit/fxmanifest.lua index cf16b31c..68e76410 100644 --- a/[esx_addons]/esx_sit/fxmanifest.lua +++ b/[esx_addons]/esx_sit/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Sit' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_sit/lists/seat.lua b/[esx_addons]/esx_sit/lists/seat.lua index 6cb5df31..c54f51b2 100644 --- a/[esx_addons]/esx_sit/lists/seat.lua +++ b/[esx_addons]/esx_sit/lists/seat.lua @@ -32,7 +32,7 @@ Config.Sitable = { prop_chair_04b = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, prop_chair_05 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, prop_chair_06 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, - prop_chair_057 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, + prop_chair_07 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, prop_chair_08 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, prop_chair_09 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, prop_chair_10 = { scenario = 'PROP_HUMAN_SEAT_BENCH', verticalOffset = -0.5, forwardOffset = 0.0, leftOffset = 0.0}, diff --git a/[esx_addons]/esx_society/fxmanifest.lua b/[esx_addons]/esx_society/fxmanifest.lua index fbb6aa67..dbfa74d7 100644 --- a/[esx_addons]/esx_society/fxmanifest.lua +++ b/[esx_addons]/esx_society/fxmanifest.lua @@ -4,39 +4,21 @@ game 'gta5' description 'ESX Society' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/nl.lua', - 'locales/cs.lua', - 'locales/tr.lua', + 'locales/*.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/es.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'locales/nl.lua', - 'locales/cs.lua', - 'locales/tr.lua', + 'locales/*.lua', 'config.lua', 'client/main.lua' } diff --git a/[esx_addons]/esx_society/locales/hu.lua b/[esx_addons]/esx_society/locales/hu.lua new file mode 100644 index 00000000..08cba602 --- /dev/null +++ b/[esx_addons]/esx_society/locales/hu.lua @@ -0,0 +1,37 @@ +Locales['hu'] = { + ['actions'] = 'Cselekvések', + ['boss_menu'] = 'Fönök Menü', + ['money_generic'] = '%s $', + ['deposit_amount'] = 'Frakcio pénz berakása', + ['deposit_society_money'] = 'Frakcio pénz berakása', + ['do_you_want_to_recruit'] = 'Felszeretnéd venni %s?', + ['employee'] = 'Munkavállalo', + ['employee_list'] = 'Munkavállalok Listája', + ['employee_management'] = 'Munkavállalok Kezelése', + ['fire'] = 'Kirugás', + ['grade'] = 'Fokozat', + ['have_deposited'] = 'Sikeresen beraktál ~r~%s~s~ $', + ['have_withdrawn'] = 'Sikeresen kivettél ~g~%s~s~ $', + ['invalid_amount'] = 'Érvénytelen mennyiség', + ['invalid_amount_max'] = 'Ez az összeg több mint a megengedett', + ['no'] = 'Nem', + ['promote'] = 'Elöléptetés', + ['promote_employee'] = 'Elöléptetés %s', + ['recruit'] = 'Felvétel', + ['recruiting'] = 'Felvétel', + ['salary_amount'] = 'Fizetés', + ['salary_management'] = 'Fizetések kezelése', + ['wash_money'] = 'Pénz mosás', + ['wash_money_amount'] = 'Piszkos pénz mennyiség', + ['withdraw_amount'] = 'Pénz mennyiség', + ['withdraw_society_money'] = 'Frakcio pénz kivétele', + ['yes'] = 'Igen', + ['you_have'] = '~g~%s$~s~ várakozik a ~y~pénzmosásra~s~ (24h).', + ['you_have_laundered'] = '~r~Kimostál~s~ ennyi pénzt: ~g~%s$~s~', + ['you_have_hired'] = 'Sikeresen felvetted %s', + ['you_have_been_hired'] = 'Sikeresen fel lettél véve %s', + ['you_have_fired'] = 'Sikeresen kirugtad %s', + ['you_have_been_fired'] = 'Ki lettél rugva innen: %s', + ['you_have_promoted'] = 'Elöléptettek: %s rang: %s', + ['you_have_been_promoted'] = 'Sikeresen ~b~elöléptettek~s~!', +} diff --git a/[esx_addons]/esx_status/fxmanifest.lua b/[esx_addons]/esx_status/fxmanifest.lua index 84a128c5..5ef2deef 100644 --- a/[esx_addons]/esx_status/fxmanifest.lua +++ b/[esx_addons]/esx_status/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Status' -version '1.5.0' +version '1.7.0' lua54 'yes' diff --git a/[esx_addons]/esx_taxijob/client/main.lua b/[esx_addons]/esx_taxijob/client/main.lua index d2bb1bf1..4a5cf813 100644 --- a/[esx_addons]/esx_taxijob/client/main.lua +++ b/[esx_addons]/esx_taxijob/client/main.lua @@ -1,6 +1,24 @@ local HasAlreadyEnteredMarker, OnJob, IsNearCustomer, CustomerIsEnteringVehicle, CustomerEnteredVehicle, CurrentActionData = false, false, false, false, false, {} local CurrentCustomer, CurrentCustomerBlip, DestinationBlip, targetCoords, LastZone, CurrentAction, CurrentActionMsg + +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + +RegisterNetEvent('esx:onPlayerLogout') +AddEventHandler('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} +end) + +RegisterNetEvent('esx:setJob') +AddEventHandler('esx:setJob', function(job) + ESX.PlayerData.job = job +end) + function DrawSub(msg, time) ClearPrints() BeginTextCommandPrint('STRING') @@ -426,15 +444,6 @@ function OpenPutStocksMenu() end) end -RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer) - ESX.PlayerData = xPlayer -end) - -RegisterNetEvent('esx:setJob') -AddEventHandler('esx:setJob', function(job) - ESX.PlayerData.job = job -end) AddEventHandler('esx_taxijob:hasEnteredMarker', function(zone) if zone == 'VehicleSpawner' then @@ -495,10 +504,10 @@ end) -- Enter / Exit marker events, and draw markers CreateThread(function() - while true do - Wait(0) + while true do + local sleep = 1500 + if ESX.PlayerData.job and ESX.PlayerData.job.name == 'taxi' then - if ESX.PlayerData.job and ESX.PlayerData.job.name == 'taxi' then local coords = GetEntityCoords(PlayerPedId()) local isInMarker, letSleep, currentZone = false, true @@ -507,7 +516,7 @@ CreateThread(function() local distance = #(coords - zonePos) if v.Type ~= -1 and distance < Config.DrawDistance then - letSleep = false + sleep = 0 DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, false, 2, v.Rotate, nil, nil, false) end @@ -524,25 +533,17 @@ CreateThread(function() if not isInMarker and HasAlreadyEnteredMarker then HasAlreadyEnteredMarker = false TriggerEvent('esx_taxijob:hasExitedMarker', LastZone) + end end - - if letSleep then - Wait(500) - end - else - Wait(1000) - end + Wait(sleep) end end) -- Taxi Job CreateThread(function() - while true do - + while OnJob do Wait(0) - local playerPed = PlayerPedId() - - if OnJob then + local playerPed = PlayerPedId() if CurrentCustomer == nil then DrawSub(_U('drive_search_pass'), 5000) @@ -695,9 +696,6 @@ CreateThread(function() else DrawSub(_U('return_to_veh'), 5000) end - end - else - Wait(500) end end end) @@ -718,9 +716,9 @@ end) -- Key Controls CreateThread(function() while true do - Wait(0) - + local sleep = 1500 if CurrentAction and not ESX.PlayerData.dead then + sleep = 0 ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, 38) and ESX.PlayerData.job and ESX.PlayerData.job.name == 'taxi' then @@ -735,10 +733,13 @@ CreateThread(function() end CurrentAction = nil - end - end + end + end + Wait(sleep) end end) + + RegisterCommand('taximenu', function() if not ESX.PlayerData.dead and Config.EnablePlayerManagement and ESX.PlayerData.job and ESX.PlayerData.job.name == 'taxi' then OpenMobileTaxiActionsMenu() diff --git a/[esx_addons]/esx_taxijob/fxmanifest.lua b/[esx_addons]/esx_taxijob/fxmanifest.lua index 55d9ab7b..fe79968b 100644 --- a/[esx_addons]/esx_taxijob/fxmanifest.lua +++ b/[esx_addons]/esx_taxijob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Taxi Job' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_taxijob/locales/hu.lua b/[esx_addons]/esx_taxijob/locales/hu.lua new file mode 100644 index 00000000..563e00fe --- /dev/null +++ b/[esx_addons]/esx_taxijob/locales/hu.lua @@ -0,0 +1,51 @@ +Locales['hu'] = { + -- cloakroom + ['cloakroom_menu'] = 'öltözö', + ['cloakroom_prompt'] = 'nyomd meg a ~INPUT_CONTEXT~ gombot a ~y~megnyitáshoz~s~.', + ['wear_citizen'] = 'civil ruha', + ['wear_work'] = 'taxis munkaruha', + + -- garage + ['spawner_prompt'] = 'nyomd meg a ~INPUT_CONTEXT~ gombot a ~y~garázshoz~s~.', + ['store_veh'] = 'nyomd meg a ~INPUT_CONTEXT~ gombot az autó tárolásához', + ['spawn_veh'] = 'autó lehívás', + ['spawnpoint_blocked'] = 'egy autó blokkolja a lehívási helyet!', + ['only_taxi'] = 'Csak taxikat tárolhatsz.', + + ['taking_service'] = 'szolgálat vállalás: Taxi/Uber', + ['full_service'] = 'teljes szolgálat: ', + ['amount_invalid'] = 'érvénytelen összeg', + ['press_to_open'] = 'nyomj ~INPUT_CONTEXT~ gombot a menühöz', + ['billing'] = 'számlázás', + ['billing_sent'] = 'a számlát regisztrálták!', + ['invoice_amount'] = 'számla összeg', + ['no_players_near'] = 'nincs a közeledben játékos', + ['start_job'] = 'indítás / leállítás NPC munkák F6', + ['drive_search_pass'] = 'vezess és keress ~y~utasokat', + ['customer_found'] = '~g~találtál~s~ egy fuvart, menj közelebb hozzá', + ['client_unconcious'] = 'a kliensed ~r~tudatlan~s~, nézz egy másik után', + ['arrive_dest'] = '~g~megérkeztél~s~ a cél állomáshoz.', + ['take_me_to_near'] = '~s~Vigyél engem~y~ %s~s~, közel ~y~%s', + ['take_me_to'] = '~s~Vigyél engem ~y~%s', + ['close_to_client'] = 'túl messze vagy a kliensedtöl, menj közelebb hozzá', + ['return_to_veh'] = 'ülj vissza a kocsiba hogy folytatni tudd a munkát', + ['must_in_taxi'] = 'egy ~y~taxi~s~ autóba kell lenned a küldetés indításához', + ['must_in_vehicle'] = 'jármüben kell lenned a küldetés megkezdéséhez', + ['have_earned'] = 'kerestél: ~g~$%s~s~', + ['comp_earned'] = '- a vállalkozása keresett: ~g~$%s~s~\n- te kerestél: ~g~$%s~s~', + ['deposit_stock'] = 'készlet betétele', + ['take_stock'] = 'készlet kivétel', + ['boss_actions'] = 'főnök müveletek', + ['mission_complete'] = 'sikeres küldetés!', + ['quantity'] = 'Mennyiség', + ['quantity_invalid'] = 'érvénytelen összeg!', + ['inventory'] = 'leltár', + ['taxi_client'] = 'taxi ügyfél', + ['have_withdrawn'] = 'kivettél ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'betettél ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = '~r~nincs~s~ elég ~y~üres~s~ helyed a leltárban!', + ['blip_taxi'] = 'Taxitársaság', + ['phone_taxi'] = 'Taxi Hívás.', + ['taxi'] = 'taxi', + ['taxi_stock'] = 'taxi készlet' +} diff --git a/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql new file mode 100644 index 00000000..7acf19cf --- /dev/null +++ b/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql @@ -0,0 +1,25 @@ +USE `es_extended`; + +INSERT INTO `addon_account` (name, label, shared) VALUES + ('society_taxi', 'Taxi', 1) +; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('society_taxi', 'Taxi', 1) +; + +INSERT INTO `addon_inventory` (name, label, shared) VALUES + ('society_taxi', 'Taxi', 1) +; + +INSERT INTO `jobs` (name, label) VALUES + ('taxi', 'Taxi') +; + +INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES + ('taxi',0,'recrue','Újonc',12,'{"hair_2":0,"hair_color_2":0,"torso_1":32,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":31,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":0,"age_2":0,"glasses_2":0,"ears_2":0,"arms":27,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":0,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":0,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":10,"pants_1":24}', '{"hair_2":0,"hair_color_2":0,"torso_1":57,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":38,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":1,"age_2":0,"glasses_2":0,"ears_2":0,"arms":21,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":1,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":5,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":49,"pants_1":11}'), + ('taxi',1,'novice','Taxisofőr',24,'{"hair_2":0,"hair_color_2":0,"torso_1":32,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":31,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":0,"age_2":0,"glasses_2":0,"ears_2":0,"arms":27,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":0,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":0,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":10,"pants_1":24}', '{"hair_2":0,"hair_color_2":0,"torso_1":57,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":38,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":1,"age_2":0,"glasses_2":0,"ears_2":0,"arms":21,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":1,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":5,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":49,"pants_1":11}'), + ('taxi',2,'experimente','Tapasztalt',36,'{"hair_2":0,"hair_color_2":0,"torso_1":26,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":57,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":4,"age_2":0,"glasses_2":0,"ears_2":0,"arms":11,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":0,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":0,"bproof_1":0,"mask_1":0,"decals_1":0,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":10,"pants_1":24}', '{"hair_2":0,"hair_color_2":0,"torso_1":57,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":38,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":1,"age_2":0,"glasses_2":0,"ears_2":0,"arms":21,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":1,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":5,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":49,"pants_1":11}'), + ('taxi',3,'uber','Uber Sofőr',48,'{"hair_2":0,"hair_color_2":0,"torso_1":26,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":57,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":4,"age_2":0,"glasses_2":0,"ears_2":0,"arms":11,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":0,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":0,"bproof_1":0,"mask_1":0,"decals_1":0,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":10,"pants_1":24}', '{"hair_2":0,"hair_color_2":0,"torso_1":57,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":38,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":1,"age_2":0,"glasses_2":0,"ears_2":0,"arms":21,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":1,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":5,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":49,"pants_1":11}'), + ('taxi',4,'boss','Vezető Sofőr',0,'{"hair_2":0,"hair_color_2":0,"torso_1":29,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":31,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":4,"age_2":0,"glasses_2":0,"ears_2":0,"arms":1,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":0,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":0,"bproof_1":0,"mask_1":0,"decals_1":0,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":4,"eyebrows_1":0,"face":0,"shoes_1":10,"pants_1":24}', '{"hair_2":0,"hair_color_2":0,"torso_1":57,"bags_1":0,"helmet_2":0,"chain_2":0,"eyebrows_3":0,"makeup_3":0,"makeup_2":0,"tshirt_1":38,"makeup_1":0,"bags_2":0,"makeup_4":0,"eyebrows_4":0,"chain_1":0,"lipstick_4":0,"bproof_2":0,"hair_color_1":0,"decals_2":0,"pants_2":1,"age_2":0,"glasses_2":0,"ears_2":0,"arms":21,"lipstick_1":0,"ears_1":-1,"mask_2":0,"sex":1,"lipstick_3":0,"helmet_1":-1,"shoes_2":0,"beard_2":0,"beard_1":0,"lipstick_2":0,"beard_4":0,"glasses_1":5,"bproof_1":0,"mask_1":0,"decals_1":1,"hair_1":0,"eyebrows_2":0,"beard_3":0,"age_1":0,"tshirt_2":0,"skin":0,"torso_2":0,"eyebrows_1":0,"face":0,"shoes_1":49,"pants_1":11}') +; diff --git a/[esx_addons]/esx_vehicleshop/fxmanifest.lua b/[esx_addons]/esx_vehicleshop/fxmanifest.lua index a046a9ff..e5e9c3dc 100644 --- a/[esx_addons]/esx_vehicleshop/fxmanifest.lua +++ b/[esx_addons]/esx_vehicleshop/fxmanifest.lua @@ -6,12 +6,11 @@ lua54 'yes' description 'ESX Vehicle Shop' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' server_scripts { - '@async/async.lua', '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/*.lua', diff --git a/[esx_addons]/esx_vehicleshop/locales/es.lua b/[esx_addons]/esx_vehicleshop/locales/es.lua index 7b4b8f7f..cfc01aff 100644 --- a/[esx_addons]/esx_vehicleshop/locales/es.lua +++ b/[esx_addons]/esx_vehicleshop/locales/es.lua @@ -1,13 +1,13 @@ Locales['es'] = { -- global menus - ['not_enough_in_society'] = 'No hay mas de ese item en la socieda!', + ['not_enough_in_society'] = 'No hay mas de ese item en la sociedad!', ['player_cannot_hold'] = '~r~no~s~ tienes ~y~suficiente espacio~s~ en tu inventario!', - ['vehicle_belongs'] = 'a vehicle with plate ~y~%s~s~ now belongs to ~b~you~s~', + ['vehicle_belongs'] = 'un vehiculo con matricula ~y~%s~s~ ahora es ~b~tuyo~s~', ['broke_company'] = 'No hay dinero en la compañía', ['license_missing'] = 'no tenes licencia de conducir!', ['buy_vehicle_shop'] = 'queres comprar %s por $%s?', ['buy_vehicle'] = 'comprar vehiculo', - ['car_dealer'] = 'Vendedor de autosship', + ['car_dealer'] = 'Concesionario', ['shop_awaiting_model'] = 'El vehiculo esta cargando, por favor espera', ['create_bill'] = 'crear factura', ['dealer_boss'] = 'Vendedor de autos - Boss', @@ -29,7 +29,7 @@ Locales['es'] = { ['pop_vehicle'] = 'Poner vehiculo a la venta', ['rent_vehicle'] = 'Vendedor de autos - Vehiculos para rentar', ['return_provider_menu'] = 'Vendedor de autos - Devolver a proveedor', - ['rental_amount'] = 'rental amount', + ['rental_amount'] = 'Cantidad de renta', ['sell_menu'] = 'Presiona ~INPUT_CONTEXT~ para vender tu ~y~%s~s~ por ~g~$%s~s~', ['set_vehicle_owner_rent'] = 'Alquilar vehiculo', ['set_vehicle_owner_sell'] = 'Vender vehiculo', @@ -37,7 +37,7 @@ Locales['es'] = { ['generic_shopitem'] = '$%s', ['vehicle_dealer'] = 'Vehiculo - Vendedor de autos', ['vehicle_menu'] = 'Presiona ~INPUT_CONTEXT~ to give back the rented vehicle', - ['vehicle_purchased'] = 'you bought a vehicle', + ['vehicle_purchased'] = 'has comprado un vehiculo', ['vehicle_set_owned'] = 'el vehiculo ~y~%s~s~ fue asignado a ~b~%s~s~', ['vehicle_set_rented'] = 'el vehiculo ~y~%s~s~ fue rentado a ~b~%s~s~', ['vehicle_sold_for'] = 'el ~b~%s~s~ fue ~y~vendido~s~ por ~g~$%s~s~', diff --git a/[esx_addons]/esx_vehicleshop/locales/hu.lua b/[esx_addons]/esx_vehicleshop/locales/hu.lua new file mode 100644 index 00000000..0cbf24e9 --- /dev/null +++ b/[esx_addons]/esx_vehicleshop/locales/hu.lua @@ -0,0 +1,66 @@ +Locales['hu'] = { + -- global menus + ['not_enough_in_society'] = 'nincs elég ~r~tárgyad~s~ a vállalkozásban!', + ['player_cannot_hold'] = '~r~nincs~s~ elég ~y~helyed~s~ a leltárban!', + ['vehicle_belongs'] = 'egy jármü engedélyel ~y~%s~s~ most már hozzád ~b~tartozik~s~', + ['broke_company'] = 'nincs elég pénz a vállalati számlán', + ['license_missing'] = 'nincs jogosítványod tedd le!', + ['purchase_type'] = 'a vásárlás típusa', + ['society_type'] = 'vállalkozás', + ['staff_type'] = 'személyes használat', + ['buy_vehicle_shop'] = 'meg szeretnéd vásárolni %s ennyiért: %s NP-ért?', + ['buy_vehicle'] = 'vásárlás', + ['car_dealer'] = 'Autókereskedés', + ['shop_awaiting_model'] = 'az autó ~g~töltése~s~ folyamantban kérlek várj', + ['create_bill'] = 'számla létrehozása', + ['dealer_boss'] = 'Autó kereskedö - Fönök', + ['delivered'] = 'az autó ~g~leszállítva~s~ a kereskedőnek', + ['depop_vehicle'] = 'jármü visszaküldés', + ['return_provider'] = 'jármü visszaküldése a szollgáltatónak', + ['get_rented_vehicles'] = 'jármüvek bérlése', + ['invalid_amount'] = 'érvénytelen összeg', + ['invoice_amount'] = 'számla összeg', + ['no'] = 'Nem', + ['yes'] = 'Igen', + ['no_players'] = 'nincs játékos a közeledben', + ['not_enough_money'] = 'nincs elég pénzed', + ['not_rental'] = 'ez nem ~r~bérelhetö autó~s~', + ['not_yours'] = 'ez az autó nem tartozik hozzád', + ['paid_rental'] = '~g~fizettél~s~ a kölcsönzönek: ~g~%s NP~s~', + ['pop_vehicle'] = 'tedd a jármüvet eladásra', + ['rent_vehicle'] = 'Autókereskedö - Jármüvek bérlése', + ['return_provider_menu'] = 'Autókereskedö - Jámrü vissza adás a szollgáltatónak', + ['rental_amount'] = 'bérlési költség', + ['sell_menu'] = 'nyomj ~INPUT_CONTEXT~ gombot hogy eladd a ~y~%s~s~ ennyiért ~g~%s NP~s~', + ['set_vehicle_owner_rent'] = 'jármü kijelölése [Location]', + ['set_vehicle_owner_sell'] = 'jármü eladása', + ['set_vehicle_owner_sell_society'] = 'jármü kijelölése [Sale] [Society]', + ['shop_menu'] = 'nyomj ~INPUT_CONTEXT~ gombot a vásárláshoz', + ['generic_shopitem'] = '%s NP', + ['vehicle_dealer'] = 'jármü - Autókereskedö', + ['vehicle_menu'] = 'nyomj ~INPUT_CONTEXT~ gombot hogy vissza add a bérelt jármüvet', + ['vehicle_purchased'] = 'vásároltál egy jármüvet', + ['vehicle_set_owned'] = 'jármü ~y~%s~s~ megvéve ennyiért: ~b~%s~s~', + ['vehicle_set_rented'] = 'jármü ~y~%s~s~ kibérelve ennyiért: ~b~%s~s~', + ['vehicle_sold_for'] = 'A ~b~%s~s~ jármü ~y~eladva~s~ ennyiért ~g~%s NP~s~', + ['vehicle_sold_to'] = 'a jármü rendszámmal ~y~%s~s~ eladva neki: ~b~%s~s~', + ['deposit_stock'] = 'beteszek a készletbe', + ['take_stock'] = 'kiveszek a készletböl', + ['dealership_stock'] = 'kereskedés készlet', + ['amount'] = 'összeg', + ['quantity_invalid'] = 'ez érvénytelen mennyiség', + ['inventory'] = 'leltár', + ['dealership'] = 'Autókereskedő', + ['dealer_customers'] = 'kereskedő ügyfelek', + ['have_withdrawn'] = 'kivettél ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'betettél ~y~x%s~s~ ~b~%s~s~', + ['boss_actions'] = 'fönök müveletek', + + -- sold vehicles + ['boss_sold'] = 'Az eladott járművek listája', + ['customer_client'] = 'Ügyfél neve', + ['customer_model'] = 'Autómodell', + ['customer_plate'] = 'Rendszám', + ['customer_soldby'] = 'Álltal értékesített', + ['customer_date'] = 'Dátum', +} diff --git a/[esx_addons]/esx_vehicleshop/server/main.lua b/[esx_addons]/esx_vehicleshop/server/main.lua index 5e8f86c5..da16243b 100644 --- a/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/[esx_addons]/esx_vehicleshop/server/main.lua @@ -84,7 +84,7 @@ AddEventHandler('esx_vehicleshop:setVehicleOwnedPlayerId', function(playerId, ve end) ESX.RegisterServerCallback('esx_vehicleshop:getSoldVehicles', function(source, cb) - MySQL.query('SELECT client, model, plate, soldby, date FROM vehicle_sold', function(result) + MySQL.query('SELECT client, model, plate, soldby, date FROM vehicle_sold ORDER BY DATE DESC', function(result) cb(result) end) end) diff --git a/[esx_addons]/esx_voice/fxmanifest.lua b/[esx_addons]/esx_voice/fxmanifest.lua index 1e7b97ad..b936325e 100644 --- a/[esx_addons]/esx_voice/fxmanifest.lua +++ b/[esx_addons]/esx_voice/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Voice Controller' -version '1.5.0' +version '1.7.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_voice/locales/hu.lua b/[esx_addons]/esx_voice/locales/hu.lua new file mode 100644 index 00000000..97a12f9c --- /dev/null +++ b/[esx_addons]/esx_voice/locales/hu.lua @@ -0,0 +1,6 @@ +Locales ['hu'] = { + ['voice'] = '~y~Beszéd: ~s~%s', + ['normal'] = 'normál', + ['shout'] = 'kiáltás', + ['whisper'] = 'suttogás', +} diff --git a/[esx_addons]/esx_voice/locales/sv.lua b/[esx_addons]/esx_voice/locales/sv.lua index c5c716e9..67a85af5 100644 --- a/[esx_addons]/esx_voice/locales/sv.lua +++ b/[esx_addons]/esx_voice/locales/sv.lua @@ -1,6 +1,6 @@ Locales ['sv'] = { ['voice'] = '~y~Röst: ~s~%s', - ['normal'] = 'prata', - ['shout'] = 'skrik', - ['whisper'] = 'viska', + ['normal'] = 'Prata', + ['shout'] = 'Skrik', + ['whisper'] = 'Viska', } diff --git a/[esx_addons]/esx_weaponshop/README.md b/[esx_addons]/esx_weaponshop/README.md index 827916e4..b6e29da8 100644 --- a/[esx_addons]/esx_weaponshop/README.md +++ b/[esx_addons]/esx_weaponshop/README.md @@ -2,33 +2,7 @@ ESX Weapon Shop adds.. well you guessed it - weapon shops to the already existing shops in the world. -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_weaponshop -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_weaponshop.git [esx]/esx_weaponshop -``` - -### Manually -- Download https://github.com/ESX-Org/esx_weaponshop/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Import `esx_weaponshop.sql` in your database -- Add this to your `server.cfg`: - -``` -start esx_weaponshop -``` - # Legal -### License esx_weaponshop - Legal and illegal weapon shops Copyright (C) 2015-2022 Jérémie N'gadi diff --git a/[esx_addons]/esx_weaponshop/client/main.lua b/[esx_addons]/esx_weaponshop/client/main.lua index d494ba0f..2b0b2930 100644 --- a/[esx_addons]/esx_weaponshop/client/main.lua +++ b/[esx_addons]/esx_weaponshop/client/main.lua @@ -5,19 +5,6 @@ local CurrentActionMsg = '' local CurrentActionData = {} local ShopOpen = false -ESX.TriggerServerCallback('esx_weaponshop:getShop', function(shopItems) - for k,v in pairs(shopItems) do - Config.Zones[k].Items = v - end -end) - -RegisterNetEvent('esx_weaponshop:sendShop') -AddEventHandler('esx_weaponshop:sendShop', function(shopItems) - for k,v in pairs(shopItems) do - Config.Zones[k].Items = v - end -end) - function OpenBuyLicenseMenu(zone) ESX.UI.Menu.CloseAll() @@ -48,11 +35,12 @@ function OpenShopMenu(zone) for i=1, #Config.Zones[zone].Items, 1 do local item = Config.Zones[zone].Items[i] + item.label = ESX.GetWeaponLabel(item.name) table.insert(elements, { label = ('%s - %s'):format(item.label, _U('shop_menu_item', ESX.Math.GroupDigits(item.price))), price = item.price, - weaponName = item.item + weaponName = item.name }) end @@ -95,7 +83,6 @@ function DisplayBoughtScaleform(weaponName, price) ScaleformMovieMethodAddParamInt(GetHashKey(weaponName)) ScaleformMovieMethodAddParamTextureNameString('') ScaleformMovieMethodAddParamInt(100) - EndScaleformMovieMethod() PlaySoundFrontend(-1, 'WEAPON_PURCHASE', 'HUD_AMMO_SHOP_SOUNDSET', false) @@ -110,19 +97,6 @@ function DisplayBoughtScaleform(weaponName, price) end) end -AddEventHandler('esx_weaponshop:hasEnteredMarker', function(zone) - if zone == 'GunShop' or zone == 'BlackWeashop' then - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu_prompt') - CurrentActionData = { zone = zone } - end -end) - -AddEventHandler('esx_weaponshop:hasExitedMarker', function(zone) - CurrentAction = nil - ESX.UI.Menu.CloseAll() -end) - AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then if ShopOpen then @@ -140,7 +114,7 @@ CreateThread(function() SetBlipSprite (blip, 110) SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.0) + SetBlipScale (blip, 0.8) SetBlipColour (blip, 81) SetBlipAsShortRange(blip, true) @@ -163,69 +137,28 @@ CreateThread(function() for i = 1, #v.Locations, 1 do if (Config.Type ~= -1 and #(coords - v.Locations[i]) < Config.DrawDistance) then Sleep = 0 + ESX.ShowHelpNotification(_U('shop_menu_prompt')) + + if IsControlJustReleased(0, 38) then + if Config.LicenseEnable and v.Legal then + ESX.TriggerServerCallback('esx_license:checkLicense', function(hasWeaponLicense) + if hasWeaponLicense then + OpenShopMenu(k) + else + OpenBuyLicenseMenu(k) + end + end, GetPlayerServerId(PlayerId()), 'weapon') + else + OpenShopMenu(k) + end + end DrawMarker(Config.Type, v.Locations[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) - end - end - end - Wait(Sleep) - end -end) - --- Enter / Exit marker events -CreateThread(function() - while true do - local Sleep = 1000 - - local coords = GetEntityCoords(PlayerPedId()) - local isInMarker, currentZone = false, nil - - for k,v in pairs(Config.Zones) do - for i=1, #v.Locations, 1 do - if #(coords - v.Locations[i]) < Config.Size.x then - Sleep = 0 - isInMarker, ShopItems, currentZone, LastZone = true, v.Items, k, k - end - end - end - if isInMarker and not HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = true - TriggerEvent('esx_weaponshop:hasEnteredMarker', currentZone) - end - - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_weaponshop:hasExitedMarker', LastZone) - end - Wait(Sleep) - end -end) - --- Key Controls -CreateThread(function() - while true do - local Sleep = 1500 - - if CurrentAction ~= nil then - Sleep = 0 - ESX.ShowHelpNotification(CurrentActionMsg) - - if IsControlJustReleased(0, 38) then - - if CurrentAction == 'shop_menu' then - if Config.LicenseEnable and Config.Zones[CurrentActionData.zone].Legal then - ESX.TriggerServerCallback('esx_license:checkLicense', function(hasWeaponLicense) - if hasWeaponLicense then - OpenShopMenu(CurrentActionData.zone) - else - OpenBuyLicenseMenu(CurrentActionData.zone) - end - end, GetPlayerServerId(PlayerId()), 'weapon') - else - OpenShopMenu(CurrentActionData.zone) + else + if ShopOpen then + ESX.UI.Menu.CloseAll() + ShopOpen = false end end - - CurrentAction = nil end end Wait(Sleep) diff --git a/[esx_addons]/esx_weaponshop/config.lua b/[esx_addons]/esx_weaponshop/config.lua index 63a3b425..33da63f4 100644 --- a/[esx_addons]/esx_weaponshop/config.lua +++ b/[esx_addons]/esx_weaponshop/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.DrawDistance = 10 +Config.DrawDistance = 10.0 Config.Size = { x = 1.5, y = 1.5, z = 0.5 } Config.Color = { r = 0, g = 128, b = 255 } Config.Type = 1 @@ -16,7 +16,76 @@ Config.Zones = { GunShop = { Legal = true, - Items = {}, + Items = { + { + name = "WEAPON_PISTOL", + price = 500 + }, + { + name = "WEAPON_FLASHLIGHT", + price = 70 + }, + { + name = "WEAPON_MACHETE", + price = 110 + }, + { + name = "WEAPON_NIGHTSTICK", + price = 150 + }, + { + name = "WEAPON_BAT", + price = 50 + }, + { + name = "WEAPON_STUNGUN", + price = 60 + }, + { + name = "WEAPON_MICROSMG", + price = 1700 + }, + { + name = "WEAPON_ASSAULTRIFLE", + price = 11000 + }, + { + name = "WEAPON_STUNGUN", + price = 60 + }, + { + name = "WEAPON_SPECIALCARBINE", + price = 15000 + }, + { + name = "WEAPON_SNIPERRIFLE", + price = 24000 + }, + { + name = "WEAPON_FIREWORK", + price = 21000 + }, + { + name = "WEAPON_GRENADE", + price = 700 + }, + { + name = "WEAPON_BZGAS", + price = 200 + }, + { + name = "WEAPON_FIREEXTINGUISHER", + price = 100 + }, + { + name = "WEAPON_BALL", + price = 30 + }, + { + name = "WEAPON_SMOKEGRENADE", + price = 100 + }, + }, Locations = { vector3(-662.1, -935.3, 20.8), vector3(810.2, -2157.3, 28.6), @@ -32,10 +101,78 @@ Config.Zones = { BlackWeashop = { Legal = false, - Items = {}, + Items = { + { + name = "WEAPON_PISTOL", + price = 500 + }, + { + name = "WEAPON_FLASHLIGHT", + price = 70 + }, + { + name = "WEAPON_MACHETE", + price = 110 + }, + { + name = "WEAPON_NIGHTSTICK", + price = 150 + }, + { + name = "WEAPON_BAT", + price = 50 + }, + { + name = "WEAPON_STUNGUN", + price = 60 + }, + { + name = "WEAPON_MICROSMG", + price = 1700 + }, + { + name = "WEAPON_ASSAULTRIFLE", + price = 11000 + }, + { + name = "WEAPON_STUNGUN", + price = 60 + }, + { + name = "WEAPON_SPECIALCARBINE", + price = 15000 + }, + { + name = "WEAPON_SNIPERRIFLE", + price = 24000 + }, + { + name = "WEAPON_FIREWORK", + price = 21000 + }, + { + name = "WEAPON_GRENADE", + price = 700 + }, + { + name = "WEAPON_BZGAS", + price = 200 + }, + { + name = "WEAPON_FIREEXTINGUISHER", + price = 100 + }, + { + name = "WEAPON_BALL", + price = 30 + }, + { + name = "WEAPON_SMOKEGRENADE", + price = 100 + }, + }, Locations = { vector3(-1306.2, -394.0, 35.6) } } - } diff --git a/[esx_addons]/esx_weaponshop/esx_weaponshop.sql b/[esx_addons]/esx_weaponshop/esx_weaponshop.sql index 9f866ec5..7f46bb4f 100644 --- a/[esx_addons]/esx_weaponshop/esx_weaponshop.sql +++ b/[esx_addons]/esx_weaponshop/esx_weaponshop.sql @@ -1,58 +1,5 @@ USE `es_extended`; -CREATE TABLE `weashops` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `zone` varchar(255) NOT NULL, - `item` varchar(255) NOT NULL, - `price` int(11) NOT NULL, - - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - - INSERT INTO `licenses` (`type`, `label`) VALUES - ('weapon', "Permis de port d'arme") -; - -INSERT INTO `weashops` (`zone`, `item`, `price`) VALUES - ('GunShop','WEAPON_PISTOL', 300), - ('BlackWeashop','WEAPON_PISTOL', 500), - ('GunShop', 'WEAPON_FLASHLIGHT', 60), - ('BlackWeashop', 'WEAPON_FLASHLIGHT', 70), - ('GunShop', 'WEAPON_MACHETE', 90), - ('BlackWeashop', 'WEAPON_MACHETE', 110), - ('GunShop', 'WEAPON_NIGHTSTICK', 150), - ('BlackWeashop', 'WEAPON_NIGHTSTICK', 150), - ('GunShop', 'WEAPON_BAT', 100), - ('BlackWeashop', 'WEAPON_BAT', 100), - ('GunShop', 'WEAPON_STUNGUN', 50), - ('BlackWeashop', 'WEAPON_STUNGUN', 50), - ('GunShop', 'WEAPON_MICROSMG', 1400), - ('BlackWeashop', 'WEAPON_MICROSMG', 1700), - ('GunShop', 'WEAPON_PUMPSHOTGUN', 3400), - ('BlackWeashop', 'WEAPON_PUMPSHOTGUN', 3500), - ('GunShop', 'WEAPON_ASSAULTRIFLE', 10000), - ('BlackWeashop', 'WEAPON_ASSAULTRIFLE', 11000), - ('GunShop', 'WEAPON_SPECIALCARBINE', 15000), - ('BlackWeashop', 'WEAPON_SPECIALCARBINE', 16500), - ('GunShop', 'WEAPON_SNIPERRIFLE', 22000), - ('BlackWeashop', 'WEAPON_SNIPERRIFLE', 24000), - ('GunShop', 'WEAPON_FIREWORK', 18000), - ('BlackWeashop', 'WEAPON_FIREWORK', 20000), - ('GunShop', 'WEAPON_GRENADE', 500), - ('BlackWeashop', 'WEAPON_GRENADE', 650), - ('GunShop', 'WEAPON_BZGAS', 200), - ('BlackWeashop', 'WEAPON_BZGAS', 350), - ('GunShop', 'WEAPON_FIREEXTINGUISHER', 100), - ('BlackWeashop', 'WEAPON_FIREEXTINGUISHER', 100), - ('GunShop', 'WEAPON_BALL', 50), - ('BlackWeashop', 'WEAPON_BALL', 50), - ('GunShop', 'WEAPON_SMOKEGRENADE', 100), - ('BlackWeashop', 'WEAPON_SMOKEGRENADE', 100), - ('BlackWeashop', 'WEAPON_APPISTOL', 1100), - ('BlackWeashop', 'WEAPON_CARBINERIFLE', 12000), - ('BlackWeashop', 'WEAPON_HEAVYSNIPER', 30000), - ('BlackWeashop', 'WEAPON_MINIGUN', 45000), - ('BlackWeashop', 'WEAPON_RAILGUN', 50000), - ('BlackWeashop', 'WEAPON_STICKYBOMB', 500) + ('weapon', "Weapon licence") ; diff --git a/[esx_addons]/esx_weaponshop/fxmanifest.lua b/[esx_addons]/esx_weaponshop/fxmanifest.lua index 9353760e..6733c898 100644 --- a/[esx_addons]/esx_weaponshop/fxmanifest.lua +++ b/[esx_addons]/esx_weaponshop/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Weapon Shop' -version '1.5.0' +version '1.7.0' shared_scripts { '@es_extended/imports.lua', @@ -14,7 +14,6 @@ shared_scripts { } server_scripts { - '@oxmysql/lib/MySQL.lua', 'server/main.lua' } diff --git a/[esx_addons]/esx_weaponshop/locales/hu.lua b/[esx_addons]/esx_weaponshop/locales/hu.lua new file mode 100644 index 00000000..9eb7ca30 --- /dev/null +++ b/[esx_addons]/esx_weaponshop/locales/hu.lua @@ -0,0 +1,13 @@ +Locales ['hu'] = { + ['buy_license'] = 'Veszel fegyver engedélyt?', + ['yes'] = '%s', + ['no'] = 'Igen', + ['weapon_bought'] = 'Megvetted ennyiért: %s$', + ['not_enough_black'] = 'Nincsen elég pénzed', + ['not_enough'] = 'Nincsen elég pénzed', + ['already_owned'] = 'Van már ilyened!', + ['shop_menu_title'] = 'Fegyverbolt', + ['shop_menu_prompt'] = 'Nyomj ~INPUT_CONTEXT~ hogy megnézd a kinálatot', + ['shop_menu_item'] = '%s$', + ['map_blip'] = 'Fegyverbolt', +} diff --git a/[esx_addons]/esx_weaponshop/locales/sv.lua b/[esx_addons]/esx_weaponshop/locales/sv.lua index 57da682d..4ca921b9 100644 --- a/[esx_addons]/esx_weaponshop/locales/sv.lua +++ b/[esx_addons]/esx_weaponshop/locales/sv.lua @@ -1,13 +1,13 @@ Locales ['sv'] = { - ['buy_license'] = 'vill du köpa ett vapenlicens?', + ['buy_license'] = 'Köpa vapenlicens?', ['yes'] = '%s', - ['no'] = 'nej tack', - ['weapon_bought'] = 'köpt för %s SEK', - ['not_enough_black'] = 'du har inte tillräckligt med svarta pengar', - ['not_enough'] = 'du har inte råd för detta', - ['already_owned'] = 'du äger redan detta vapen!', - ['shop_menu_title'] = 'vapenaffär', - ['shop_menu_prompt'] = 'tryck ~INPUT_CONTEXT~ för att komma åt ~y~vapenaffären~s~.', + ['no'] = 'Nej', + ['weapon_bought'] = 'Köpt för %s SEK', + ['not_enough_black'] = 'Du har inte tillräckligt med svarta pengar', + ['not_enough'] = 'Du har inte tillräckligt med pengar', + ['already_owned'] = 'Du äger redan det här vapnet!', + ['shop_menu_title'] = 'Vapenaffär', + ['shop_menu_prompt'] = 'Tryck ~INPUT_CONTEXT~ för att komma åt ~y~vapenaffären~s~.', ['shop_menu_item'] = '%s SEK', - ['map_blip'] = 'vapenaffär', + ['map_blip'] = 'Vapenaffär', } diff --git a/[esx_addons]/esx_weaponshop/server/main.lua b/[esx_addons]/esx_weaponshop/server/main.lua index 2f19e15b..5558cee6 100644 --- a/[esx_addons]/esx_weaponshop/server/main.lua +++ b/[esx_addons]/esx_weaponshop/server/main.lua @@ -1,28 +1,3 @@ -local shopItems = {} - -MySQL.ready(function() - - MySQL.query('SELECT * FROM weashops', function(result) - for i=1, #result, 1 do - if shopItems[result[i].zone] == nil then - shopItems[result[i].zone] = {} - end - - table.insert(shopItems[result[i].zone], { - item = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - end - - TriggerClientEvent('esx_weaponshop:sendShop', -1, shopItems) - end) - -end) - -ESX.RegisterServerCallback('esx_weaponshop:getShop', function(source, cb) - cb(shopItems) -end) ESX.RegisterServerCallback('esx_weaponshop:buyLicense', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) @@ -77,13 +52,16 @@ ESX.RegisterServerCallback('esx_weaponshop:buyWeapon', function(source, cb, weap end) function GetPrice(weaponName, zone) - local price = MySQL.scalar.await('SELECT price FROM weashops WHERE zone = @zone AND item = @item', { - ['@zone'] = zone, - ['@item'] = weaponName - }) + local weapon = nil + for k,v in pairs(Config.Zones[zone].Items) do + if v.name == weaponName then + weapon = v + break + end + end - if price then - return price + if weapon then + return weapon.price else return 0 end diff --git a/[esx_addons]/esx_whitelist/README.md b/[esx_addons]/esx_whitelist/README.md index a6a9cf72..9ea7a128 100644 --- a/[esx_addons]/esx_whitelist/README.md +++ b/[esx_addons]/esx_whitelist/README.md @@ -1,32 +1,6 @@ # esx_whitelist -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_whitelist -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_whitelist [esx]/esx_whitelist -``` - -### Manually -- Download https://github.com/ESX-Org/esx_whitelist/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Import `esx_whitelist.sql` to your database -- Add this in your `server.cfg`: - -``` -start esx_whitelist -``` - # Legal -### License esx_whitelist - Whitelist script Copyright (C) 2015-2022 Jérémie N'gadi diff --git a/[esx_addons]/esx_whitelist/esx_whitelist.sql b/[esx_addons]/esx_whitelist/esx_whitelist.sql deleted file mode 100644 index 68bcf92a..00000000 --- a/[esx_addons]/esx_whitelist/esx_whitelist.sql +++ /dev/null @@ -1,8 +0,0 @@ -USE `es_extended`; - -CREATE TABLE `whitelist` ( - `identifier` varchar(60) NOT NULL, - - PRIMARY KEY (`identifier`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - diff --git a/[esx_addons]/esx_whitelist/fxmanifest.lua b/[esx_addons]/esx_whitelist/fxmanifest.lua index c801733a..c6edf0e4 100644 --- a/[esx_addons]/esx_whitelist/fxmanifest.lua +++ b/[esx_addons]/esx_whitelist/fxmanifest.lua @@ -4,14 +4,14 @@ game 'gta5' description 'ESX Whitelist' -version '1.5.0' +version '1.7.0' + +server_only 'yes' server_scripts { '@es_extended/imports.lua', - '@oxmysql/lib/MySQL.lua', '@es_extended/locale.lua', 'config.lua', 'locales/*.lua', - 'server/main.lua', - 'server/commands.lua' + 'server/main.lua' } diff --git a/[esx_addons]/esx_whitelist/locales/en.lua b/[esx_addons]/esx_whitelist/locales/en.lua index 8b7443c6..398c3964 100644 --- a/[esx_addons]/esx_whitelist/locales/en.lua +++ b/[esx_addons]/esx_whitelist/locales/en.lua @@ -1,8 +1,8 @@ Locales['en'] = { - ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', - ['not_whitelisted'] = 'you are not whitelisted on this server', - ['whitelist_empty'] = 'the whitelist hasn\'t been loaded yet, or alternatively no one has been whitelisted!', - ['license_missing'] = 'your license could not be found', + ['whitelist_check'] = 'Checking you are Allowlisted.', + ['not_whitelisted'] = 'You Must be Allowlisted to join this server!', + ['whitelist_empty'] = 'There Are no whitelists saved for this server.', + ['license_missing'] = 'Error: Your Identifier is missing!', ['help_whitelist_add'] = 'add someone to the whitelist', ['help_whitelist_load'] = 'reload the whitelist', } diff --git a/[esx_addons]/esx_whitelist/locales/hu.lua b/[esx_addons]/esx_whitelist/locales/hu.lua new file mode 100644 index 00000000..4b1c7de1 --- /dev/null +++ b/[esx_addons]/esx_whitelist/locales/hu.lua @@ -0,0 +1,8 @@ +Locales['hu'] = { + ['whitelist_check'] = 'Ellenőrzi, hogy fent vagy-e az engedélyezett listára.', + ['not_whitelisted'] = 'Engedélyezettnek kell lenned ahhoz, hogy csatlakozz ehhez a szerverhez!', + ['whitelist_empty'] = 'Ehhez a szerverhez nincsenek mentett engedélyezési listák.', + ['license_missing'] = 'Hiba: Te Identifier-ed hiányzik!', + ['help_whitelist_add'] = 'jétékos felvéltele a whitelist-re', + ['help_whitelist_load'] = 'whitelist újratöltése', +} diff --git a/[esx_addons]/esx_whitelist/locales/sv.lua b/[esx_addons]/esx_whitelist/locales/sv.lua index 6270ffb0..13b888cb 100644 --- a/[esx_addons]/esx_whitelist/locales/sv.lua +++ b/[esx_addons]/esx_whitelist/locales/sv.lua @@ -1,8 +1,8 @@ Locales['sv'] = { - ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', - ['not_whitelisted'] = 'du är inte whitelistad på denna server!', - ['whitelist_empty'] = 'whitelisten har ännu inte laddats in, eller så är ingen whitelitad!', - ['license_missing'] = 'din licens kunde ej hittas', - ['help_whitelist_add'] = 'lägg till någon till whitelisten', - ['help_whitelist_load'] = 'ladda om whitelist', + ['whitelist_check'] = 'Ser till att du är vitlistad på den här servern. . .', + ['not_whitelisted'] = 'Du är inte vitlistad på den här servern', + ['whitelist_empty'] = 'Vitlistan har inte laddats ännu, eller alternativt har ingen blivit vitlistad!', + ['license_missing'] = 'Din licens kunde inte hittas', + ['help_whitelist_add'] = 'Lägg till någon på vitlistan', + ['help_whitelist_load'] = 'Ladda om vitlistan', } diff --git a/[esx_addons]/esx_whitelist/players.json b/[esx_addons]/esx_whitelist/players.json new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/[esx_addons]/esx_whitelist/players.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/[esx_addons]/esx_whitelist/server/commands.lua b/[esx_addons]/esx_whitelist/server/commands.lua deleted file mode 100644 index e9d8193e..00000000 --- a/[esx_addons]/esx_whitelist/server/commands.lua +++ /dev/null @@ -1,26 +0,0 @@ -ESX.RegisterCommand('wlrefresh', 'admin', function(xPlayer, args, showError) - loadWhiteList(function() - showError('Whitelist reloaded') - end) -end, true, {help = _U('help_whitelist_load')}) - -ESX.RegisterCommand('wladd', 'admin', function(xPlayer, args, showError) - args.license = args.license:lower() - - if string.len(args.license) == 40 then - if WhiteList[args.license] then - showError('The player is already whitelisted on this server!') - else - MySQL.update('INSERT INTO whitelist (identifier) VALUES (@identifier)', { - ['@identifier'] = args.license - }, function(rowsChanged) - WhiteList[args.license] = true - showError('The player has been whitelisted!') - end) - end - else - showError('Invalid license ID length!') - end -end, true, {help = _U('help_whitelist_add'), validate = true, arguments = { - {name = 'license', help = 'the player license', type = 'string'} -}}) diff --git a/[esx_addons]/esx_whitelist/server/main.lua b/[esx_addons]/esx_whitelist/server/main.lua index 399ed818..2983e090 100644 --- a/[esx_addons]/esx_whitelist/server/main.lua +++ b/[esx_addons]/esx_whitelist/server/main.lua @@ -1,28 +1,20 @@ WhiteList = {} -function loadWhiteList(cb) - Whitelist = {} +function loadWhiteList() + Whitelist = nil - MySQL.query('SELECT identifier FROM whitelist', function(result) - for k,v in ipairs(result) do - WhiteList[v.identifier] = true - end - - if cb then - cb() - end - end) + local List = LoadResourceFile(GetCurrentResourceName(),'players.json') + if List then + Whitelist = json.decode(List) + end end -MySQL.ready(function() - loadWhiteList() -end) +loadWhiteList() AddEventHandler('playerConnecting', function(name, setCallback, deferrals) - if #GetPlayers() < Config.MinPlayer then + if #(GetPlayers()) < Config.MinPlayer then deferrals.done() - end - + else -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() @@ -49,4 +41,39 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) else deferrals.done() end + end end) + +ESX.RegisterCommand('wlrefresh', 'admin', function(xPlayer, args, showError) + loadWhiteList(function() + showError('Whitelist reloaded') + end) +end, true, {help = _U('help_whitelist_load')}) + +ESX.RegisterCommand('wladd', 'admin', function(xPlayer, args, showError) + args.license = args.license:lower() + + if WhiteList[args.license] then + showError('The player is already allowlisted on this server!') + else + WhiteList[args.license] = true + SaveResourceFile(GetCurrentResourceName(), 'players.json', json.encode(WhiteList)) + loadWhiteList() + end +end, true, {help = _U('help_whitelist_add'), validate = true, arguments = { + {name = 'license', help = 'the player license', type = 'string'} +}}) + +ESX.RegisterCommand('wlremove', 'admin', function(xPlayer, args, showError) + args.license = args.license:lower() + + if WhiteList[args.license] then + WhiteList[args.license] = nil + SaveResourceFile(GetCurrentResourceName(), 'players.json', json.encode(WhiteList)) + loadWhiteList() + else + showError('Identifier is not Allowlisted on this server!') + end +end, true, {help = _U('help_whitelist_add'), validate = true, arguments = { + {name = 'license', help = 'the player license', type = 'string'} +}}) diff --git a/[esx_addons]/instance/fxmanifest.lua b/[esx_addons]/instance/fxmanifest.lua index d1518ac1..790ca7d9 100644 --- a/[esx_addons]/instance/fxmanifest.lua +++ b/[esx_addons]/instance/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'Instance' -version '1.5.0' +version '1.7.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/instance/locales/sv.lua b/[esx_addons]/instance/locales/sv.lua index ae466b65..a3b8ca6b 100644 --- a/[esx_addons]/instance/locales/sv.lua +++ b/[esx_addons]/instance/locales/sv.lua @@ -1,8 +1,8 @@ Locales['sv'] = { - ['left_instance'] = 'du har lämnat byggnaden', - ['invite_expired'] = 'din inbjudan har nekas', - ['press_to_enter'] = 'tryck ~INPUT_CONTEXT~ för att gå in i byggnaden', - ['entered_instance'] = 'du är inne i byggnaden', + ['left_instance'] = 'Du har lämnat byggnaden', + ['invite_expired'] = 'Inbjudan har löpt ut', + ['press_to_enter'] = 'Tryck ~INPUT_CONTEXT~ för att gå in i byggnaden', + ['entered_instance'] = 'Du gick in i byggnaden', ['entered_into'] = '%s gick in i byggnaden', ['left_out'] = '%s har lämnat byggnaden', -} \ No newline at end of file +} diff --git a/[esx_addons]/instance/server/main.lua b/[esx_addons]/instance/server/main.lua index 3f51be44..7accbc07 100644 --- a/[esx_addons]/instance/server/main.lua +++ b/[esx_addons]/instance/server/main.lua @@ -3,16 +3,16 @@ local instances = {} function GetInstancedPlayers() local players = {} - for k,v in pairs(instances) do - for k2,v2 in ipairs(v.players) do - players[v2] = true + for i = 1, #(instances) do + for player = 1, #(instances[i].players) do + players[instances[i].players[player]] = true end end return players end -AddEventHandler('playerDropped', function(reason) +AddEventHandler('playerDropped', function() if instances[source] then CloseInstance(source) end diff --git a/esx_example/client/main.lua b/esx_example/client/main.lua index 6a5da8b3..fe995759 100644 --- a/esx_example/client/main.lua +++ b/esx_example/client/main.lua @@ -1,11 +1,12 @@ RegisterNetEvent('esx:playerLoaded') -- Store the players data AddEventHandler('esx:playerLoaded', function(xPlayer, isNew) + print("Player Loaded. New | " .. isNew) ESX.PlayerData = xPlayer ESX.PlayerLoaded = true end) RegisterNetEvent('esx:playerLogout') -- When a player logs out (multicharacter), reset their data -AddEventHandler('esx:playerLogout', function(xPlayer, isNew) +AddEventHandler('esx:playerLogout', function() ESX.PlayerLoaded = false ESX.PlayerData = {} end) diff --git a/esx_example/server/main.lua b/esx_example/server/main.lua index 8f8b56e8..cc333502 100644 --- a/esx_example/server/main.lua +++ b/esx_example/server/main.lua @@ -4,16 +4,19 @@ CreateThread(function() end) RegisterNetEvent('esx:playerLoaded') -- When a player loads in, we can store some basic information about them locally -AddEventHandler('esx:playerLoaded', function(playerId, xPlayer, isNew) +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) + print("Player | ".. playerId .. "spawned in") ESX.Players[playerId] = xPlayer.job.name end) RegisterNetEvent('esx:setJob') -- The stored data does not sync with the framework unless we tell it to -AddEventHandler('esx:setJob', function(playerId, job, lastJob) +AddEventHandler('esx:setJob', function(playerId, job) + print("Player | ".. playerId .. " | Changed Job. Job |".. job.label) ESX.Players[playerId] = job.name end) AddEventHandler('esx:playerDropped', function(playerId, reason) -- Remove any cached data once the player no longer exists + print("Player | ".. playerId .. "Dropped. Reason | ".. reason) ESX.Players[playerId] = nil end) @@ -28,10 +31,11 @@ AddEventHandler('onResourceStart', function(resourceName) -- The resource just r end end) -ESX.RegisterCommand('get', 'user', function(xPlayer, args, showError) +ESX.RegisterCommand('get', 'user', function(xPlayer, args) + print("Player |".. xPlayer.source.. "| Fetching all users.") local xPlayers = ESX.GetExtendedPlayers(args.key, args.val) -- New hitchless xPlayer loop, with the ability to only return players with specific data - for _, xPlayer in pairs(xPlayers) do -- Job and any non-table variable will work, ie. name, group, identifier, source - print(xPlayer.source, xPlayer.job.grade_label, xPlayer.name) + for _, xTarget in pairs(xPlayers) do -- Job and any non-table variable will work, ie. name, group, identifier, source + print("ID - ".. xTarget.source.." | Name - "..xTarget.getName().." | Job - ".. xTarget.job.label) end end, true, {help = 'Display all online players with specific player data', validate = false, arguments = { {name = 'key', help = 'Variable to check (ie. job)', type = 'string'}, diff --git a/README.md b/readme.md similarity index 89% rename from README.md rename to readme.md index 468ce6ba..4607d927 100644 --- a/README.md +++ b/readme.md @@ -1,29 +1,29 @@ -

ESX Legacy

Discord - Website - Documentation - -**IMPORTANT**: ESX Legacy now supports ox Inventory. **HOWEVER, THIS SHOULD ONLY BE USED IF YOU ARE EXPERIENCED AND KNOW WHAT YOU ARE DOING**. - -##### ESX is the leading framework for creating roleplay servers on FiveM, with many official and community resources designed to utilise the tools provided here. For a taste of what's available - -> esx_identity: Enables character registration defining a players name, sex, height, and date of birth -> esx_society: Allows job resources to register a society, gaining employee management, society funds, and more -> esx_billing: Allows members of some societies to send fines or bills to other players -> esx_vehicleshop: Allow players to purchase vehicles from a dealership, or setup society support for a player-managed dealership -> esx_ambulancejob: Adds a death and respawn system while allowing players to work as EMS to heal and revive others - -Many more resources are included in this repository, or you can browse the [ESX Community Github](https://github.com/esx-community/) or [Cfx.re Releases board](https://forum.cfx.re/tag/esx) for more. - -

- -### License - -es_extended - ESX framework for FiveM - -Copyright (C) 2015-2022 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 . - -
+

ESX Legacy

Discord - Website - Documentation + +**IMPORTANT**: ESX Legacy now supports ox Inventory. **HOWEVER, THIS SHOULD ONLY BE USED IF YOU ARE EXPERIENCED AND KNOW WHAT YOU ARE DOING**. + +##### ESX is the leading framework for creating roleplay servers on FiveM, with many official and community resources designed to utilise the tools provided here. For a taste of what's available + +> esx_identity: Enables character registration defining a players name, sex, height, and date of birth +> esx_society: Allows job resources to register a society, gaining employee management, society funds, and more +> esx_billing: Allows members of some societies to send fines or bills to other players +> esx_vehicleshop: Allow players to purchase vehicles from a dealership, or setup society support for a player-managed dealership +> esx_ambulancejob: Adds a death and respawn system while allowing players to work as EMS to heal and revive others + +Many more resources are included in this repository, or you can browse the [ESX Community Github](https://github.com/esx-community/) or [Cfx.re Releases board](https://forum.cfx.re/tag/esx) for more. + +

+ +### License + +es_extended - ESX framework for FiveM + +Copyright (C) 2015-2022 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 . + +