diff --git a/__resource.lua b/__resource.lua index 51e9c9df..90167455 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/pl.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } @@ -24,6 +25,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/pl.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } diff --git a/client/main.lua b/client/main.lua index 54e9a37a..2b339ed5 100644 --- a/client/main.lua +++ b/client/main.lua @@ -117,25 +117,20 @@ function StartTaxiJob() end function StopTaxiJob() + local playerPed = GetPlayerPed(-1) - local playerPed = GetPlayerPed(-1) + if IsPedInAnyVehicle(playerPed, false) and CurrentCustomer ~= nil then + local vehicle = GetVehiclePedIsIn(playerPed, false) + TaskLeaveVehicle(CurrentCustomer, vehicle, 0) - if IsPedInAnyVehicle(playerPed, false) and CurrentCustomer ~= nil then - local vehicle = GetVehiclePedIsIn(playerPed, false) - TaskLeaveVehicle(CurrentCustomer, vehicle, 0) - - if CustomerEnteredVehicle then - TaskGoStraightToCoord(CurrentCustomer, TargetCoords.x, TargetCoords.y, TargetCoords.z, 1.0, -1, 0.0, 0.0) - end - - end - - ClearCurrentMission() - - OnJob = false - - DrawSub(_U('mission_complete'), 5000) + if CustomerEnteredVehicle then + TaskGoStraightToCoord(CurrentCustomer, TargetCoords.x, TargetCoords.y, TargetCoords.z, 1.0, -1, 0.0, 0.0) + end + end + ClearCurrentMission() + OnJob = false + DrawSub(_U('mission_complete'), 5000) end function OpenTaxiActionsMenu() @@ -785,92 +780,84 @@ end) -- Key Controls Citizen.CreateThread(function() - while true do + while true do - Citizen.Wait(0) + Citizen.Wait(0) - if CurrentAction ~= nil then + if CurrentAction ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + SetTextComponentFormat('STRING') + AddTextComponentString(CurrentActionMsg) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) - if IsControlJustReleased(0, Keys['E']) and PlayerData.job ~= nil and PlayerData.job.name == 'taxi' then + if IsControlJustReleased(0, Keys['E']) and PlayerData.job ~= nil and PlayerData.job.name == 'taxi' then - if CurrentAction == 'taxi_actions_menu' then - OpenTaxiActionsMenu() - end + if CurrentAction == 'taxi_actions_menu' then + OpenTaxiActionsMenu() + elseif CurrentAction == 'delete_vehicle' then - if CurrentAction == 'delete_vehicle' then + local playerPed = PlayerPedId() - local playerPed = GetPlayerPed(-1) + if Config.EnableSocietyOwnedVehicles then + local vehicleProps = ESX.Game.GetVehicleProperties(CurrentActionData.vehicle) + TriggerServerEvent('esx_society:putVehicleInGarage', 'taxi', vehicleProps) + else + if GetEntityModel(CurrentActionData.vehicle) == GetHashKey('taxi') then + ESX.Game.DeleteVehicle(CurrentActionData.vehicle) - if Config.EnableSocietyOwnedVehicles then - local vehicleProps = ESX.Game.GetVehicleProperties(CurrentActionData.vehicle) - TriggerServerEvent('esx_society:putVehicleInGarage', 'taxi', vehicleProps) - else - if GetEntityModel(CurrentActionData.vehicle) == GetHashKey('taxi') then - if Config.MaxInService ~= -1 then - TriggerServerEvent('esx_service:disableService', 'taxi') - end - end - end + if Config.MaxInService ~= -1 then + TriggerServerEvent('esx_service:disableService', 'taxi') + end + else + ESX.ShowNotification(_U('only_taxi')) + end + end - ESX.Game.DeleteVehicle(CurrentActionData.vehicle) + end - end + CurrentAction = nil - CurrentAction = nil + elseif IsControlJustReleased(0, Keys['F6']) and GetLastInputMethod(2) and not IsDead and Config.EnablePlayerManagement and PlayerData.job ~= nil and PlayerData.job.name == 'taxi' then + OpenMobileTaxiActionsMenu() + elseif IsControlJustReleased(0, Keys['DELETE']) and GetLastInputMethod(2) and not IsDead then - end + if OnJob then + StopTaxiJob() + else - end + if PlayerData.job ~= nil and PlayerData.job.name == 'taxi' then - if IsControlJustReleased(0, Keys['F6']) and not IsDead and Config.EnablePlayerManagement and PlayerData.job ~= nil and PlayerData.job.name == 'taxi' then - OpenMobileTaxiActionsMenu() - end + local playerPed = PlayerPedId() + if IsPedInAnyVehicle(playerPed, false) then - if IsControlJustReleased(0, Keys['DELETE']) and not IsDead then + local vehicle = GetVehiclePedIsIn(playerPed, false) + if PlayerData.job.grade >= 3 then + StartTaxiJob() + else + if GetEntityModel(vehicle) == GetHashKey('taxi') then + StartTaxiJob() + else + ESX.ShowNotification(_U('must_in_taxi')) + end + end - if OnJob then - StopTaxiJob() - else + else - if PlayerData.job ~= nil and PlayerData.job.name == 'taxi' then + if PlayerData.job.grade >= 3 then + ESX.ShowNotification(_U('must_in_vehicle')) + else + ESX.ShowNotification(_U('must_in_taxi')) + end - local playerPed = GetPlayerPed(-1) + end - if IsPedInAnyVehicle(playerPed, false) then + end - local vehicle = GetVehiclePedIsIn(playerPed, false) + end - if PlayerData.job.grade >= 3 then - StartTaxiJob() - else - if GetEntityModel(vehicle) == GetHashKey('taxi') then - StartTaxiJob() - else - ESX.ShowNotification(_U('must_in_taxi')) - end - end - - else - - if PlayerData.job.grade >= 3 then - ESX.ShowNotification(_U('must_in_vehicle')) - else - ESX.ShowNotification(_U('must_in_taxi')) - end - - end - - end - - end - - end - - end + end + end + end end) AddEventHandler('esx:onPlayerDeath', function() diff --git a/locales/br.lua b/locales/br.lua index 71957680..90096a02 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,14 +1,8 @@ Locales['br'] = { ['taking_service'] = 'Pegando serviço: ', ['spawn_veh'] = 'pegar veículo', - ['remove_comp_money'] = 'Remover dinheiro da empresa', - ['deposit_money'] = 'Depositar dinheiro', - ['launder_money'] = 'Lavar dinheiro', ['full_service'] = 'Serviço completo: ', - ['withdraw_amount'] = 'Valor do saque', ['amount_invalid'] = 'Valor inválido', - ['deposit_amount'] = 'Valor para deposito', - ['launder_amount'] = 'Valor para lavagem', ['press_to_open'] = 'Pressione ~INPUT_CONTEXT~ para acessar o menu', ['billing'] = 'Faturamento', ['invoice_amount'] = 'Valor da fatura', @@ -25,7 +19,17 @@ Locales['br'] = { ['only_taxi'] = 'Você só pode guardar taxis.', ['must_in_taxi'] = 'Você deve estar em um táxi para começar a missão', ['must_in_vehicle'] = 'Você deve estar em um veículo para começar a missão', - ['have_earned'] = 'Você ganhou ~g~$', - ['comp_earned'] = 'Sua empresa ganhou ~g~$', - ['player_cannot_hold'] = 'you do ~r~not~w~ have enough ~y~free space~w~ in your inventory!', -} + ['have_earned'] = 'Você ganhou ~g~$%s~s~', + ['comp_earned'] = '- Sua empresa ganhou ~g~$%s~s~\n- Você ganhou ~g~$%s~s~', + ['deposit_stock'] = 'deposit Stock', + ['take_stock'] = 'take Stock', + ['boss_actions'] = 'boss Actions', + ['mission_complete'] = 'mission Completed', + ['quantity'] = 'quantity', + ['quantity_invalid'] = 'that is an invalid quantity!', + ['inventory'] = 'inventory', + ['taxi_client'] = 'taxi Client', + ['have_withdrawn'] = 'você retirou ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'você depositou ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = 'você não tem espaço suficiente em seu inventário!', +} \ No newline at end of file diff --git a/locales/de.lua b/locales/de.lua index 3568e468..0c671c0f 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,14 +1,8 @@ Locales['de'] = { ['taking_service'] = 'Service annehmen: ', ['spawn_veh'] = 'Fahrzeug spawnen', - ['remove_comp_money'] = 'Firmengeld abheben', - ['deposit_money'] = 'Geld einzahlen', - ['launder_money'] = 'Geld waschen', ['full_service'] = 'Voller Service: ', - ['withdraw_amount'] = 'Betrag zum abheben', ['amount_invalid'] = 'Betrag ungültig', - ['deposit_amount'] = 'Betrag zum einzahlen', - ['launder_amount'] = 'Betrag zum waschen', ['press_to_open'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen', ['billing'] = 'Rechnung', ['invoice_amount'] = 'Rechnugsbetrag', @@ -16,16 +10,26 @@ Locales['de'] = { ['store_veh'] = 'Drücke ~INPUT_CONTEXT~ um das Fahrzeug zu parken', ['drive_search_pass'] = 'Auf der Suche nach ~y~Passagieren', ['customer_found'] = 'du hast einen Passagier ~g~gefunden~s~ , Fahre in zum Ziel', - ['client_unconcious'] = 'dein Passagier ist ~r~bewusstlos~w~. Suche nach einem anderen.', + ['client_unconcious'] = 'dein Passagier ist ~r~bewusstlos~s~. Suche nach einem anderen.', ['arrive_dest'] = 'du bist an deinem Ziel ~g~angekommen~s~', - ['take_me_to_near'] = '~w~Bring mich nach~y~ %s~w~, in der Nähe von~y~ %s', - ['take_me_to'] = '~w~Bring mich nach~y~ %s', + ['take_me_to_near'] = '~s~Bring mich nach~y~ %s~s~, in der Nähe von~y~ %s', + ['take_me_to'] = '~s~Bring mich nach~y~ %s', ['close_to_client'] = 'du bist nahe an dem Passagier, du musst noch näher ran', ['return_to_veh'] = 'bitte kehre zu deinem Fahezeug zurück umd die Mission fortzuführen', ['only_taxi'] = 'Du kannst nur Taxis parken.', ['must_in_taxi'] = 'Du musst in einem Taxis sein umd die Mission starten zu können', ['must_in_vehicle'] = 'Du musst in einem Fahrzeug sein um die Mission starten zu können', - ['have_earned'] = 'verdient ~g~$', - ['comp_earned'] = 'Die Firma verdient ~g~$', - ['player_cannot_hold'] = 'you do ~r~not~w~ have enough ~y~free space~w~ in your inventory!', -} + ['have_earned'] = 'verdient ~g~$%s~s~', + ['comp_earned'] = '- Die Firma verdient ~g~$\n- Verdient ~g~$%s~s~', + ['deposit_stock'] = 'deposit Stock', + ['take_stock'] = 'take Stock', + ['boss_actions'] = 'boss Actions', + ['mission_complete'] = 'mission Completed', + ['quantity'] = 'quantity', + ['quantity_invalid'] = 'that is an invalid quantity!', + ['inventory'] = 'inventory', + ['taxi_client'] = 'taxi Client', + ['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!', +} \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index 46e3b8a3..31d41c9e 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,14 +1,8 @@ Locales['en'] = { ['taking_service'] = 'taking service: ', ['spawn_veh'] = 'spawn vehicle', - ['remove_comp_money'] = 'remove company money', - ['deposit_money'] = 'deposit money', - ['launder_money'] = 'launder money', ['full_service'] = 'full service: ', - ['withdraw_amount'] = 'amount of withdrawal', ['amount_invalid'] = 'amount invalid', - ['deposit_amount'] = 'amount to deposit', - ['launder_amount'] = 'amount to launder', ['press_to_open'] = 'press ~INPUT_CONTEXT~ to access the menu', ['billing'] = 'billing', ['invoice_amount'] = 'invoice amount', @@ -16,26 +10,26 @@ Locales['en'] = { ['store_veh'] = 'press ~INPUT_CONTEXT~ to store the vehicle', ['drive_search_pass'] = 'driving in search of ~y~passengers', ['customer_found'] = 'you have ~g~found~s~ a customer, drive until last', - ['client_unconcious'] = 'your client is ~r~unconscious~w~. Look for another one.', + ['client_unconcious'] = 'your client is ~r~unconscious~s~. Look for another one.', ['arrive_dest'] = 'you have ~g~arrived~s~ at your destination', - ['take_me_to_near'] = '~w~Take me to~y~ %s~w~, near~y~ %s', - ['take_me_to'] = '~w~Take me to~y~ %s', - ['close_to_client'] = 'you are close to the client, get close to them', + ['take_me_to_near'] = '~s~Take me to~y~ %s~s~, near ~y~%s', + ['take_me_to'] = '~s~Take me to ~y~%s', + ['close_to_client'] = 'you are too far from the client, get close to them', ['return_to_veh'] = 'please return to your vehicle to continue the mission', - ['only_taxi'] = 'you can only storee taxis.', + ['only_taxi'] = 'you can only store taxis.', ['must_in_taxi'] = 'you must be in a taxi to start the mission', ['must_in_vehicle'] = 'you must be in a vehicle to begin the mission', - ['have_earned'] = 'you have earned ~g~$', - ['comp_earned'] = 'your company has earned ~g~$', + ['have_earned'] = 'you have earned ~g~$%s~s~', + ['comp_earned'] = '- your company has earned ~g~$%s~s~\n- you have earned ~g~$%s~s~', ['deposit_stock'] = 'deposit Stock', ['take_stock'] = 'take Stock', ['boss_actions'] = 'boss Actions', ['mission_complete'] = 'mission Completed', ['quantity'] = 'quantity', - ['quantity_invalid'] = 'invalid Quantity', + ['quantity_invalid'] = 'that is an invalid quantity!', ['inventory'] = 'inventory', ['taxi_client'] = 'taxi Client', - ['have_withdrawn'] = 'you have withdrawn x', - ['added'] = 'you added x', - ['player_cannot_hold'] = 'you do ~r~not~w~ have enough ~y~free space~w~ in your inventory!', -} + ['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!', +} \ No newline at end of file diff --git a/locales/fi.lua b/locales/fi.lua index 3e195443..1559ba1e 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,14 +1,8 @@ Locales['fi'] = { ['taking_service'] = 'Aloitetaan työ: ', ['spawn_veh'] = 'spawnaa ajoneuvo', - ['remove_comp_money'] = 'Nosta yrityksen rahoja', - ['deposit_money'] = 'talleta rahaa', - ['launder_money'] = 'pese rahaa', ['full_service'] = 'täysi palvelu: ', - ['withdraw_amount'] = 'noston summa', ['amount_invalid'] = 'virheellinen summa', - ['deposit_amount'] = 'talletuksen summa', - ['launder_amount'] = 'pestävä määrä', ['press_to_open'] = 'paina ~INPUT_CONTEXT~ avataksesi valikko', ['billing'] = 'Laskutus', ['invoice_amount'] = 'laskun määrä', @@ -16,17 +10,17 @@ Locales['fi'] = { ['store_veh'] = 'paina ~INPUT_CONTEXT~ laittaaksesi auto talliin', ['drive_search_pass'] = 'Ajele ympäriinsä etsi uusia ~y~asiakkaita', ['customer_found'] = 'Sinä ~g~löysit~s~ asiakkaan, aja lähemmäksi', - ['client_unconcious'] = 'Sinun asiakkaasi on ~r~tajuton~w~. Etsi uusi.', + ['client_unconcious'] = 'Sinun asiakkaasi on ~r~tajuton~s~. Etsi uusi.', ['arrive_dest'] = 'Sinä ~g~saavuit~s~ kohteeseen', - ['take_me_to_near'] = '~w~Vie minut ~y~ %s~w~, lähellä~y~ %s', - ['take_me_to'] = '~w~Vie minut~y~ %s', + ['take_me_to_near'] = '~s~Vie minut ~y~ %s~s~, lähellä~y~ %s', + ['take_me_to'] = '~s~Vie minut~y~ %s', ['close_to_client'] = 'Olet asiakkaan lähellä, mene lähemmäksi', ['return_to_veh'] = 'Mene takaisin ajoneuvoon, jatkaaksesi töitä', ['only_taxi'] = 'Voit vain tallettaa taxeja', ['must_in_taxi'] = 'Sinun pitää olla taxissa että voit alottaa työn', ['must_in_vehicle'] = 'Sinun pitää olla ajoneuvossa että voit alottaa työn', - ['have_earned'] = 'Sinä tienasit ~g~€', - ['comp_earned'] = 'Yrityksesi tienasi ~g~€', + ['have_earned'] = 'Sinä tienasit ~g~€%s~s~', + ['comp_earned'] = '- Yrityksesi tienasi ~g~€%s~s~\n- Sinä tienasit ~g~€%s~s~', ['deposit_stock'] = 'Talleta varastoon', ['take_stock'] = 'ota varastosta', ['boss_actions'] = 'pomon toiminnot', @@ -35,7 +29,7 @@ Locales['fi'] = { ['quantity_invalid'] = 'virheellinen Määrä', ['inventory'] = 'reppu', ['taxi_client'] = 'taxi Asiakas', - ['have_withdrawn'] = 'sinä otit x', - ['added'] = 'sinä laitoit x', - ['player_cannot_hold'] = 'sinulla ~r~ei ole~w~ enempää ~y~vapaata tilaa~w~ repussasi!', + ['have_withdrawn'] = 'sinä nostit ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'sinä talletit ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = 'sinulla ~r~ei ole~s~ enempää ~y~vapaata tilaa~s~ repussasi!', } diff --git a/locales/fr.lua b/locales/fr.lua index 515374e0..c031c579 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,14 +1,8 @@ Locales['fr'] = { ['taking_service'] = 'prise de service : ', ['spawn_veh'] = 'sortir véhicule', - ['remove_comp_money'] = 'retirer argent société', - ['deposit_money'] = 'déposer argent', - ['launder_money'] = 'blanchir argent', ['full_service'] = 'service complet : ', - ['withdraw_amount'] = 'montant du retrait', ['amount_invalid'] = 'montant invalide', - ['deposit_amount'] = 'montant du dépôt', - ['launder_amount'] = 'montant à blanchir', ['press_to_open'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', ['billing'] = 'facuration', ['invoice_amount'] = 'montant de la facture', @@ -25,8 +19,8 @@ Locales['fr'] = { ['only_taxi'] = 'vous ne pouvez ranger que les taxi', ['must_in_taxi'] = 'vous devez être dans un taxi pour commencer la mission', ['must_in_vehicle'] = 'vous devez être dans un véhicule pour commencer la mission', - ['have_earned'] = 'vous avez gagné ~g~$', - ['comp_earned'] = 'votre société a gagné ~g~$', + ['have_earned'] = 'vous avez gagné ~g~$%s~s~', + ['comp_earned'] = '- Votre société a gagné ~g~$%s~s~\n- Vous avez gagné ~g~$%s~s~', ['deposit_stock'] = 'Déposer Stock', ['take_stock'] = 'Prendre Stock', ['boss_actions'] = 'action Patron', @@ -35,7 +29,7 @@ Locales['fr'] = { ['quantity_invalid'] = 'Quantité invalide', ['inventory'] = 'Inventaire', ['taxi_client'] = 'client Taxi', - ['have_withdrawn'] = 'Vous avez retiré x', - ['added'] = 'Vous avez ajouté x', - ['player_cannot_hold'] = 'you do ~r~not~w~ have enough ~y~free space~w~ in your inventory!', + ['have_withdrawn'] = 'vous avez pris ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'vous avez déposé ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = 'vous n\'avez pas assez ~y~de place~s~ dans votre inventaire!', } diff --git a/locales/pl.lua b/locales/pl.lua index f40f8b1e..5333044a 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,14 +1,8 @@ Locales['pl'] = { ['taking_service'] = 'przyjmowanie usługi: ', ['spawn_veh'] = 'sprowadź pojazd', - ['remove_comp_money'] = 'usuń pieniądze firmy', - ['deposit_money'] = 'zdeponuj pieniądze', - ['launder_money'] = 'wypierz pieniądze', ['full_service'] = 'pełny serwis: ', - ['withdraw_amount'] = 'wartość wypłaty', ['amount_invalid'] = 'wartość nieprawidłowa', - ['deposit_amount'] = 'wartość do depozytu', - ['launder_amount'] = 'wartość do wyprania', ['press_to_open'] = 'naciśnij ~INPUT_CONTEXT~ aby wejść do menu', ['billing'] = 'rachunek', ['invoice_amount'] = 'wartość należności', @@ -16,17 +10,17 @@ Locales['pl'] = { ['store_veh'] = 'naciśnij ~INPUT_CONTEXT~ aby zdać pojazd', ['drive_search_pass'] = 'jazda w poszukiwaniu ~y~pasażerów', ['customer_found'] = '~g~Znalazłeś~s~ klienta, jedź do niego', - ['client_unconcious'] = 'twój jest ~r~nieprzytomny xD~w~. Poszukaj innego.', + ['client_unconcious'] = 'twój jest ~r~nieprzytomny xD~s~. Poszukaj innego.', ['arrive_dest'] = '~g~Dojechałeś~s~ do celu', - ['take_me_to_near'] = '~w~Zabierz mnie do~y~ %s~w~, w pobliżu ~y~ %s', - ['take_me_to'] = '~w~Weź mnie do~y~ %s', + ['take_me_to_near'] = '~s~Zabierz mnie do~y~ %s~s~, w pobliżu ~y~ %s', + ['take_me_to'] = '~s~Weź mnie do~y~ %s', ['close_to_client'] = 'jesteś blisko klienta, podjedź do niego bliżej', ['return_to_veh'] = 'proszę wróć do swojego pojazdu aby kontynuować misję', ['only_taxi'] = 'możesz przechowywać tylko taksówki.', ['must_in_taxi'] = 'musisz być w taksówce aby rozpocząć misję', ['must_in_vehicle'] = 'musisz być w pojeździe aby rozpocząć misję', - ['have_earned'] = 'zarobiłeś ~g~$', - ['comp_earned'] = 'twoja firma zarobiła ~g~$', + ['have_earned'] = 'zarobiłeś ~g~$%s~s~', + ['comp_earned'] = '- Twoja firma zarobiła ~g~$%s~s~\n- Zarobiłeś ~g~$%s~s~', ['deposit_stock'] = 'depozyt', ['take_stock'] = 'weź depozyt', ['boss_actions'] = 'akcje szefa', @@ -35,7 +29,7 @@ Locales['pl'] = { ['quantity_invalid'] = 'nieprawidłowa ilość', ['inventory'] = 'wkwipunek', ['taxi_client'] = 'klient taksówki', - ['have_withdrawn'] = 'wypłaciłeś x', - ['added'] = 'dodałeś x', - ['player_cannot_hold'] = '~r~Nie~w~ masz wystarczająco ~y~wolnego miejsca~w~ w swoim ekwipunku!', + ['have_withdrawn'] = 'wyciągnąłeś/aś ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'zdeponowałeś/aś ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = '~r~Nie~s~ masz wystarczająco ~y~wolnego miejsca~s~ w swoim ekwipunku!', } diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..a627de0c --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,35 @@ +Locales['sv'] = { + ['taking_service'] = 'du deltog tjänst: ', + ['spawn_veh'] = 'plocka ut taxi', + ['full_service'] = 'du kan inte delta tjänst: ', + ['amount_invalid'] = 'ogiltig mängd!', + ['press_to_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['billing'] = 'skapa räkning', + ['invoice_amount'] = 'faktureringsbelopp', + ['no_players_near'] = 'det finns ingen spelare i närheten!', + ['store_veh'] = 'tryck ~INPUT_CONTEXT~ för att ~y~spara~s~ fordonet.', + ['drive_search_pass'] = 'åk runt för att hitta ~y~kunder~s~', + ['customer_found'] = 'du har ~g~hittat~s~ en kund!', + ['client_unconcious'] = 'din kund är ~r~medvetslös~s~. Hitta en ny.', + ['arrive_dest'] = 'du har ~g~anlänt~s~ till din destination', + ['take_me_to_near'] = '~s~Ta mig till ~y~%s~s~, vid ~y~%s~s~', + ['take_me_to'] = '~s~Ta mig till ~y~%s~s~', + ['close_to_client'] = 'åk närmare din kund!', + ['return_to_veh'] = 'vänligen återvänd till ditt fordon och återuppta körningen.', + ['only_taxi'] = 'du kan endast lagra ~y~taxi fordon~s~ här..', + ['must_in_taxi'] = 'du måste vara i en ~y~taxi~s~ för att starta uppdraget.', + ['must_in_vehicle'] = 'du måste vara i ett ~b~fordon~s~ för att starta uppdraget.', + ['have_earned'] = 'du har tjärnat ~g~%s SEK~s~', + ['comp_earned'] = '- ditt företag har tjärnat ~g~%s SEK~s~\n- du har tjärnat ~g~%s SEK~s~', + ['deposit_stock'] = 'lagra objekt', + ['take_stock'] = 'ta ut objekt', + ['boss_actions'] = 'chefmeny', + ['mission_complete'] = 'uppdraget har ~y~slutförts~s~!', + ['quantity'] = 'mängd', + ['quantity_invalid'] = 'det är en ogiltig mängd', + ['inventory'] = 'inventory', + ['taxi_client'] = 'taxi klient', + ['have_withdrawn'] = 'du har tagit ut ~y~x%s~s~ ~b~%s~s~', + ['have_deposited'] = 'du har lagrat ~y~x%s~s~ ~b~%s~s~', + ['player_cannot_hold'] = 'du har ~r~inte~s~ tillräckligt med ~y~utrymme~s~ för att hålla det!', +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 0fac5893..1c349242 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,7 +3,7 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) if Config.MaxInService ~= -1 then - TriggerEvent('esx_service:activateService', 'taxi', Config.MaxInService) + TriggerEvent('esx_service:activateService', 'taxi', Config.MaxInService) end TriggerEvent('esx_phone:registerNumber', 'taxi', _U('taxi_client'), true, true) @@ -11,38 +11,34 @@ TriggerEvent('esx_society:registerSociety', 'taxi', 'Taxi', 'society_taxi', 'soc RegisterServerEvent('esx_taxijob:success') AddEventHandler('esx_taxijob:success', function() + math.randomseed(os.time()) - math.randomseed(os.time()) + local xPlayer = ESX.GetPlayerFromId(source) + local total = math.random(Config.NPCJobEarnings.min, Config.NPCJobEarnings.max) + local societyAccount = nil - local xPlayer = ESX.GetPlayerFromId(source) - local total = math.random(Config.NPCJobEarnings.min, Config.NPCJobEarnings.max); - local societyAccount = nil + if xPlayer.job.grade >= 3 then + total = total * 2 + end - if xPlayer.job.grade >= 3 then - total = total * 2 - end + TriggerEvent('esx_addonaccount:getSharedAccount', 'society_taxi', function(account) + societyAccount = account + end) - TriggerEvent('esx_addonaccount:getSharedAccount', 'society_taxi', function(account) - societyAccount = account - end) + if societyAccount ~= nil then - if societyAccount ~= nil then + local playerMoney = math.floor(total / 100 * 30) + local societyMoney = math.floor(total / 100 * 70) - local playerMoney = math.floor(total / 100 * 30) - local societyMoney = math.floor(total / 100 * 70) + xPlayer.addMoney(playerMoney) + societyAccount.addMoney(societyMoney) - xPlayer.addMoney(playerMoney) - societyAccount.addMoney(societyMoney) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('comp_earned', societyMoney, playerMoney)) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_earned') .. playerMoney) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('comp_earned') .. societyMoney) - - else - - xPlayer.addMoney(total) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_earned') .. total) - - end + else + xPlayer.addMoney(total) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_earned', total)) + end end) @@ -63,7 +59,7 @@ AddEventHandler('esx_taxijob:getStockItem', function(itemName, count) else inventory.removeItem(itemName, count) xPlayer.addInventoryItem(itemName, count) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_withdrawn') .. count .. ' ' .. item.label) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_withdrawn', count, item.label)) end else TriggerClientEvent('esx:showNotification', xPlayer.source, _U('quantity_invalid')) @@ -72,42 +68,33 @@ AddEventHandler('esx_taxijob:getStockItem', function(itemName, count) end) ESX.RegisterServerCallback('esx_taxijob:getStockItems', function(source, cb) - - TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory) - cb(inventory.items) - end) - + TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory) + cb(inventory.items) + end) end) RegisterServerEvent('esx_taxijob:putStockItems') AddEventHandler('esx_taxijob:putStockItems', function(itemName, count) + local xPlayer = ESX.GetPlayerFromId(source) - local xPlayer = ESX.GetPlayerFromId(source) + TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory) + local item = inventory.getItem(itemName) - TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory) + if item.count >= 0 then + xPlayer.removeInventoryItem(itemName, count) + inventory.addItem(itemName, count) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_deposited', count, item.label)) + else + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('quantity_invalid')) + end - local item = inventory.getItem(itemName) - - if item.count >= 0 then - xPlayer.removeInventoryItem(itemName, count) - inventory.addItem(itemName, count) - else - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('quantity_invalid')) - end - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('added') .. count .. ' ' .. item.label) - - end) + end) end) ESX.RegisterServerCallback('esx_taxijob:getPlayerInventory', function(source, cb) + local xPlayer = ESX.GetPlayerFromId(source) + local items = xPlayer.inventory - local xPlayer = ESX.GetPlayerFromId(source) - local items = xPlayer.inventory - - cb({ - items = items - }) - + cb( { items } ) end)