chore(coding-style): correct indentation

This commit is contained in:
Romain Lanz
2017-09-14 16:54:37 +02:00
parent 12f4c6f377
commit 5c4ca0168e
10 changed files with 954 additions and 952 deletions
+9
View File
@@ -0,0 +1,9 @@
root = true
[*]
indent_size = 2
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
+14 -14
View File
@@ -3,21 +3,21 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
description 'ESX Taxi Job'
client_scripts {
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'config.lua',
'client/main.lua'
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'config.lua',
'client/main.lua'
}
server_scripts {
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'config.lua',
'server/main.lua'
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'config.lua',
'server/main.lua'
}
+535 -534
View File
File diff suppressed because it is too large Load Diff
+109 -109
View File
@@ -8,119 +8,119 @@ Config.Locale = 'fr'
Config.Zones = {
TaxiActions = {
Pos = {x = 915.039, y = -162.187, z = 73.684},
Size = {x = 1.5, y = 1.5, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
},
TaxiActions = {
Pos = {x = 915.039, y = -162.187, z = 73.684},
Size = {x = 1.5, y = 1.5, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
},
VehicleSpawnPoint = {
Pos = {x = 911.108, y = -177.867, z = 74.283},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
VehicleSpawnPoint = {
Pos = {x = 911.108, y = -177.867, z = 74.283},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
VehicleDeleter = {
Pos = {x = 908.317, y = -183.070, z = 73.201},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
}
VehicleDeleter = {
Pos = {x = 908.317, y = -183.070, z = 73.201},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
}
}
Config.JobLocations = {
{x = 293.476, y = -590.163, z = 42.7371},
{x = 253.404, y = -375.86, z = 44.0819},
{x = 120.808, y = -300.416, z = 45.1399},
{x = -38.4132, y = -381.576, z = 38.3456},
{x = -107.442, y = -614.377, z = 35.6703},
{x = -252.292, y = -856.474, z = 30.5626},
{x = -236.138, y = -988.382, z = 28.7749},
{x = -276.989, y = -1061.18, z = 25.6853},
{x = -576.451, y = -998.989, z = 21.785},
{x = -602.798, y = -952.63, z = 21.6353},
{x = -790.653, y = -961.855, z = 14.8932},
{x = -912.588, y = -864.756, z = 15.0057},
{x = -1069.77, y = -792.513, z = 18.8075},
{x = -1306.94, y = -854.085, z = 15.0959},
{x = -1468.51, y = -681.363, z = 26.178},
{x = -1380.89, y = -452.7, z = 34.0843},
{x = -1326.35, y = -394.81, z = 36.0632},
{x = -1383.68, y = -269.985, z = 42.4878},
{x = -1679.61, y = -457.339, z = 39.4048},
{x = -1812.45, y = -416.917, z = 43.6734},
{x = -2043.64, y = -268.291, z = 22.9927},
{x = -2186.45, y = -421.595, z = 12.6776},
{x = -1862.08, y = -586.528, z = 11.1747},
{x = -1859.5, y = -617.563, z = 10.8788},
{x = -1634.95, y = -988.302, z = 12.6241},
{x = -1283.99, y = -1154.16, z = 5.30998},
{x = -1126.47, y = -1338.08, z = 4.63434},
{x = -867.907, y = -1159.67, z = 5.00795},
{x = -847.55, y = -1141.38, z = 6.27591},
{x = -722.625, y = -1144.6, z = 10.2176},
{x = -575.503, y = -318.446, z = 34.5273},
{x = -592.309, y = -224.853, z = 36.1209},
{x = -559.594, y = -162.873, z = 37.7547},
{x = -534.992, y = -65.6695, z = 40.634},
{x = -758.234, y = -36.6906, z = 37.2911},
{x = -1375.88, y = 20.9516, z = 53.2255},
{x = -1320.25, y = -128.018, z = 48.097},
{x = -1285.71, y = 294.287, z = 64.4619},
{x = -1245.67, y = 386.533, z = 75.0908},
{x = -760.355, y = 285.015, z = 85.0667},
{x = -626.786, y = 254.146, z = 81.0964},
{x = -563.609, y = 267.962, z = 82.5116},
{x = -486.806, y = 271.977, z = 82.8187},
{x = 88.295, y = 250.867, z = 108.188},
{x = 234.087, y = 344.678, z = 105.018},
{x = 434.963, y = 96.707, z = 99.1713},
{x = 482.617, y = -142.533, z = 58.1936},
{x = 762.651, y = -786.55, z = 25.8915},
{x = 809.06, y = -1290.8, z = 25.7946},
{x = 490.819, y = -1751.37, z = 28.0987},
{x = 432.351, y = -1856.11, z = 27.0352},
{x = 164.348, y = -1734.54, z = 28.8982},
{x = -57.6909, y = -1501.4, z = 31.1084},
{x = 52.2241, y = -1566.65, z = 29.006},
{x = 310.222, y = -1376.76, z = 31.4442},
{x = 181.967, y = -1332.79, z = 28.8773},
{x = -74.6091, y = -1100.64, z = 25.738},
{x = -887.045, y = -2187.46, z = 8.13248},
{x = -749.584, y = -2296.59, z = 12.4627},
{x = -1064.83, y = -2560.66, z = 19.6811},
{x = -1033.44, y = -2730.24, z = 19.6868},
{x = -1018.67, y = -2732, z = 13.2687},
{x = 797.354, y = -174.423, z = 72.708},
{x = 508.156, y = -117.908, z = 60.78},
{x = 159.458, y = -27.555, z = 67.38},
{x = -36.382, y = -106.912, z = 56.982},
{x = -355.801, y = -270.404, z = 33.011},
{x = -831.196, y = -76.871, z = 37.323},
{x = -1038.707, y = -214.593, z = 37},
{x = 1918.448, y = 3691.41, z = 32.261},
{x = 1820.217, y = 3697.115, z = 33.493},
{x = 1619.323, y = 3827.162, z = 34.482},
{x = 1418.628, y = 3602.243, z = 34.511},
{x = 1944.858, y = 3856.252, z = 31.741},
{x = 2285.278, y = 3839.444, z = 34.023},
{x = 2760.945, y = 3387.813, z = 55.659},
{x = 1952.819, y = 2627.731, z = 45.368},
{x = 1051.414, y = 474.833, z = 93.653},
{x = 866.393, y = 17.635, z = 78.654},
{x = 318.985, y = 167.41, z = 103.335},
{x = 88.836, y = 254.054, z = 108.236},
{x = -44.852, y = 70.414, z = 72.437},
{x = -115.496, y = 84.333, z = 70.792},
{x = -384.806, y = 226.868, z = 83.548},
{x = -578.669, y = 139.085, z = 61.337},
{x = -651.334, y = -584.879, z = 34.116},
{x = -571.847, y = -1195.648, z = 17.869},
{x = -1513.271, y = -670.039, z = 28.362},
{x = -1297.484, y = -654.913, z = 26.123},
{x = -1645.546, y = 144.571, z = 61.664},
{x = -1160.618, y = 744.418, z = 154.571},
{x = -798.09, y = 831.699, z = 204.351},
{x = 293.476, y = -590.163, z = 42.7371},
{x = 253.404, y = -375.86, z = 44.0819},
{x = 120.808, y = -300.416, z = 45.1399},
{x = -38.4132, y = -381.576, z = 38.3456},
{x = -107.442, y = -614.377, z = 35.6703},
{x = -252.292, y = -856.474, z = 30.5626},
{x = -236.138, y = -988.382, z = 28.7749},
{x = -276.989, y = -1061.18, z = 25.6853},
{x = -576.451, y = -998.989, z = 21.785},
{x = -602.798, y = -952.63, z = 21.6353},
{x = -790.653, y = -961.855, z = 14.8932},
{x = -912.588, y = -864.756, z = 15.0057},
{x = -1069.77, y = -792.513, z = 18.8075},
{x = -1306.94, y = -854.085, z = 15.0959},
{x = -1468.51, y = -681.363, z = 26.178},
{x = -1380.89, y = -452.7, z = 34.0843},
{x = -1326.35, y = -394.81, z = 36.0632},
{x = -1383.68, y = -269.985, z = 42.4878},
{x = -1679.61, y = -457.339, z = 39.4048},
{x = -1812.45, y = -416.917, z = 43.6734},
{x = -2043.64, y = -268.291, z = 22.9927},
{x = -2186.45, y = -421.595, z = 12.6776},
{x = -1862.08, y = -586.528, z = 11.1747},
{x = -1859.5, y = -617.563, z = 10.8788},
{x = -1634.95, y = -988.302, z = 12.6241},
{x = -1283.99, y = -1154.16, z = 5.30998},
{x = -1126.47, y = -1338.08, z = 4.63434},
{x = -867.907, y = -1159.67, z = 5.00795},
{x = -847.55, y = -1141.38, z = 6.27591},
{x = -722.625, y = -1144.6, z = 10.2176},
{x = -575.503, y = -318.446, z = 34.5273},
{x = -592.309, y = -224.853, z = 36.1209},
{x = -559.594, y = -162.873, z = 37.7547},
{x = -534.992, y = -65.6695, z = 40.634},
{x = -758.234, y = -36.6906, z = 37.2911},
{x = -1375.88, y = 20.9516, z = 53.2255},
{x = -1320.25, y = -128.018, z = 48.097},
{x = -1285.71, y = 294.287, z = 64.4619},
{x = -1245.67, y = 386.533, z = 75.0908},
{x = -760.355, y = 285.015, z = 85.0667},
{x = -626.786, y = 254.146, z = 81.0964},
{x = -563.609, y = 267.962, z = 82.5116},
{x = -486.806, y = 271.977, z = 82.8187},
{x = 88.295, y = 250.867, z = 108.188},
{x = 234.087, y = 344.678, z = 105.018},
{x = 434.963, y = 96.707, z = 99.1713},
{x = 482.617, y = -142.533, z = 58.1936},
{x = 762.651, y = -786.55, z = 25.8915},
{x = 809.06, y = -1290.8, z = 25.7946},
{x = 490.819, y = -1751.37, z = 28.0987},
{x = 432.351, y = -1856.11, z = 27.0352},
{x = 164.348, y = -1734.54, z = 28.8982},
{x = -57.6909, y = -1501.4, z = 31.1084},
{x = 52.2241, y = -1566.65, z = 29.006},
{x = 310.222, y = -1376.76, z = 31.4442},
{x = 181.967, y = -1332.79, z = 28.8773},
{x = -74.6091, y = -1100.64, z = 25.738},
{x = -887.045, y = -2187.46, z = 8.13248},
{x = -749.584, y = -2296.59, z = 12.4627},
{x = -1064.83, y = -2560.66, z = 19.6811},
{x = -1033.44, y = -2730.24, z = 19.6868},
{x = -1018.67, y = -2732, z = 13.2687},
{x = 797.354, y = -174.423, z = 72.708},
{x = 508.156, y = -117.908, z = 60.78},
{x = 159.458, y = -27.555, z = 67.38},
{x = -36.382, y = -106.912, z = 56.982},
{x = -355.801, y = -270.404, z = 33.011},
{x = -831.196, y = -76.871, z = 37.323},
{x = -1038.707, y = -214.593, z = 37},
{x = 1918.448, y = 3691.41, z = 32.261},
{x = 1820.217, y = 3697.115, z = 33.493},
{x = 1619.323, y = 3827.162, z = 34.482},
{x = 1418.628, y = 3602.243, z = 34.511},
{x = 1944.858, y = 3856.252, z = 31.741},
{x = 2285.278, y = 3839.444, z = 34.023},
{x = 2760.945, y = 3387.813, z = 55.659},
{x = 1952.819, y = 2627.731, z = 45.368},
{x = 1051.414, y = 474.833, z = 93.653},
{x = 866.393, y = 17.635, z = 78.654},
{x = 318.985, y = 167.41, z = 103.335},
{x = 88.836, y = 254.054, z = 108.236},
{x = -44.852, y = 70.414, z = 72.437},
{x = -115.496, y = 84.333, z = 70.792},
{x = -384.806, y = 226.868, z = 83.548},
{x = -578.669, y = 139.085, z = 61.337},
{x = -651.334, y = -584.879, z = 34.116},
{x = -571.847, y = -1195.648, z = 17.869},
{x = -1513.271, y = -670.039, z = 28.362},
{x = -1297.484, y = -654.913, z = 26.123},
{x = -1645.546, y = 144.571, z = 61.664},
{x = -1160.618, y = 744.418, z = 154.571},
{x = -798.09, y = 831.699, z = 204.351},
}
+28 -30
View File
@@ -1,32 +1,30 @@
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',
['no_players_near'] = 'Nenhum jogador nas proximidades',
['store_veh'] = 'Pressione ~INPUT_CONTEXT~ para guardar o veículo',
['drive_search_pass'] = 'Dirigindo em busca de ~y~passageiros',
['customer_found'] = 'Você ~g~encontrou~s~ um passageiro, dirija até o destino',
['client_unconcious'] = 'Seu passageiro está ~r~insconsciente~w~. Procure por outro.',
['arrive_dest'] = 'Você ~g~chegou~s~ ao seu destino',
['take_me_to_near'] = '~w~Leve me para~y~ %s~w~, perto~y~ %s',
['take_me_to'] = '~w~Leve me para~y~ %s',
['close_to_client'] = 'Você está perto do passageiro, aproximisse dele',
['return_to_veh'] = 'Volte para o seu veículo para continuar a missão',
['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~$',
['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',
['no_players_near'] = 'Nenhum jogador nas proximidades',
['store_veh'] = 'Pressione ~INPUT_CONTEXT~ para guardar o veículo',
['drive_search_pass'] = 'Dirigindo em busca de ~y~passageiros',
['customer_found'] = 'Você ~g~encontrou~s~ um passageiro, dirija até o destino',
['client_unconcious'] = 'Seu passageiro está ~r~insconsciente~w~. Procure por outro.',
['arrive_dest'] = 'Você ~g~chegou~s~ ao seu destino',
['take_me_to_near'] = '~w~Leve me para~y~ %s~w~, perto~y~ %s',
['take_me_to'] = '~w~Leve me para~y~ %s',
['close_to_client'] = 'Você está perto do passageiro, aproximisse dele',
['return_to_veh'] = 'Volte para o seu veículo para continuar a missão',
['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~$',
}
+28 -30
View File
@@ -1,32 +1,30 @@
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',
['no_players_near'] = 'Kein Spieler in der Nähe',
['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.',
['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',
['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~$',
['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',
['no_players_near'] = 'Kein Spieler in der Nähe',
['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.',
['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',
['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~$',
}
+38 -40
View File
@@ -1,42 +1,40 @@
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',
['no_players_near'] = 'no players nearby',
['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.',
['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',
['return_to_veh'] = 'please return to your vehicle to continue the mission',
['only_taxi'] = 'you can only storee 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~$',
['deposit_stock'] = 'deposit Stock',
['take_stock'] = 'take Stock',
['boss_actions'] = 'boss Actions',
['mission_complete'] = 'mission Completed',
['quantity'] = 'quantity',
['quantity_invalid'] = 'invalid Quantity',
['inventory'] = 'inventory',
['taxi_client'] = 'taxi Client',
['have_withdrawn'] = 'you have withdrawn x',
['added'] = 'you added x',
['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',
['no_players_near'] = 'no players nearby',
['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.',
['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',
['return_to_veh'] = 'please return to your vehicle to continue the mission',
['only_taxi'] = 'you can only storee 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~$',
['deposit_stock'] = 'deposit Stock',
['take_stock'] = 'take Stock',
['boss_actions'] = 'boss Actions',
['mission_complete'] = 'mission Completed',
['quantity'] = 'quantity',
['quantity_invalid'] = 'invalid Quantity',
['inventory'] = 'inventory',
['taxi_client'] = 'taxi Client',
['have_withdrawn'] = 'you have withdrawn x',
['added'] = 'you added x',
}
+38 -40
View File
@@ -1,42 +1,40 @@
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',
['no_players_near'] = 'aucun joueur à proximité',
['store_veh'] = 'appuyez sur ~INPUT_CONTEXT~ pour ranger le véhicule',
['drive_search_pass'] = 'conduisez à la recherche de ~y~passagers',
['customer_found'] = 'vous avez ~g~trouvé~s~ un client, conduisez jusqu\'à ce dernier',
['client_unconcious'] = 'votre client est ~r~inconscient~w~. Cherchez-en un autre.',
['arrive_dest'] = 'vous êtes ~g~arrivé~s~ à destination',
['take_me_to_near'] = '~w~Emmenez-moi à~y~ %s~w~, près de~y~ %s',
['take_me_to'] = '~w~Emmenez-moi à~y~ %s',
['close_to_client'] = 'vous êtes à proximité du client, approchez-vous de lui',
['return_to_veh'] = 'veuillez remonter dans votre véhicule pour continuer la mission',
['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~$',
['deposit_stock'] = 'Déposer Stock',
['take_stock'] = 'Prendre Stock',
['boss_actions'] = 'action Patron',
['mission_complete'] = 'Mission terminée',
['quantity'] = 'Quantité',
['quantity_invalid'] = 'Quantité invalide',
['inventory'] = 'Inventaire',
['taxi_client'] = 'client Taxi',
['have_withdrawn'] = 'Vous avez retiré x',
['added'] = 'Vous avez ajouté x',
['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',
['no_players_near'] = 'aucun joueur à proximité',
['store_veh'] = 'appuyez sur ~INPUT_CONTEXT~ pour ranger le véhicule',
['drive_search_pass'] = 'conduisez à la recherche de ~y~passagers',
['customer_found'] = 'vous avez ~g~trouvé~s~ un client, conduisez jusqu\'à ce dernier',
['client_unconcious'] = 'votre client est ~r~inconscient~w~. Cherchez-en un autre.',
['arrive_dest'] = 'vous êtes ~g~arrivé~s~ à destination',
['take_me_to_near'] = '~w~Emmenez-moi à~y~ %s~w~, près de~y~ %s',
['take_me_to'] = '~w~Emmenez-moi à~y~ %s',
['close_to_client'] = 'vous êtes à proximité du client, approchez-vous de lui',
['return_to_veh'] = 'veuillez remonter dans votre véhicule pour continuer la mission',
['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~$',
['deposit_stock'] = 'Déposer Stock',
['take_stock'] = 'Prendre Stock',
['boss_actions'] = 'action Patron',
['mission_complete'] = 'Mission terminée',
['quantity'] = 'Quantité',
['quantity_invalid'] = 'Quantité invalide',
['inventory'] = 'Inventaire',
['taxi_client'] = 'client Taxi',
['have_withdrawn'] = 'Vous avez retiré x',
['added'] = 'Vous avez ajouté x',
}
+109 -109
View File
@@ -7,119 +7,119 @@ Config.Locale = 'de'
Config.Zones = {
TaxiActions = {
Pos = {x = 915.039, y = -162.187, z = 73.684},
Size = {x = 1.5, y = 1.5, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
},
TaxiActions = {
Pos = {x = 915.039, y = -162.187, z = 73.684},
Size = {x = 1.5, y = 1.5, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
},
VehicleSpawnPoint = {
Pos = {x = 911.108, y = -177.867, z = 74.283},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
VehicleSpawnPoint = {
Pos = {x = 911.108, y = -177.867, z = 74.283},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
VehicleDeleter = {
Pos = {x = 908.317, y = -183.070, z = 73.201},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
}
VehicleDeleter = {
Pos = {x = 908.317, y = -183.070, z = 73.201},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Type = 1
}
}
Config.JobLocations = {
{x = 293.476, y = -590.163, z = 42.7371},
{x = 253.404, y = -375.86, z = 44.0819},
{x = 120.808, y = -300.416, z = 45.1399},
{x = -38.4132, y = -381.576, z = 38.3456},
{x = -107.442, y = -614.377, z = 35.6703},
{x = -252.292, y = -856.474, z = 30.5626},
{x = -236.138, y = -988.382, z = 28.7749},
{x = -276.989, y = -1061.18, z = 25.6853},
{x = -576.451, y = -998.989, z = 21.785},
{x = -602.798, y = -952.63, z = 21.6353},
{x = -790.653, y = -961.855, z = 14.8932},
{x = -912.588, y = -864.756, z = 15.0057},
{x = -1069.77, y = -792.513, z = 18.8075},
{x = -1306.94, y = -854.085, z = 15.0959},
{x = -1468.51, y = -681.363, z = 26.178},
{x = -1380.89, y = -452.7, z = 34.0843},
{x = -1326.35, y = -394.81, z = 36.0632},
{x = -1383.68, y = -269.985, z = 42.4878},
{x = -1679.61, y = -457.339, z = 39.4048},
{x = -1812.45, y = -416.917, z = 43.6734},
{x = -2043.64, y = -268.291, z = 22.9927},
{x = -2186.45, y = -421.595, z = 12.6776},
{x = -1862.08, y = -586.528, z = 11.1747},
{x = -1859.5, y = -617.563, z = 10.8788},
{x = -1634.95, y = -988.302, z = 12.6241},
{x = -1283.99, y = -1154.16, z = 5.30998},
{x = -1126.47, y = -1338.08, z = 4.63434},
{x = -867.907, y = -1159.67, z = 5.00795},
{x = -847.55, y = -1141.38, z = 6.27591},
{x = -722.625, y = -1144.6, z = 10.2176},
{x = -575.503, y = -318.446, z = 34.5273},
{x = -592.309, y = -224.853, z = 36.1209},
{x = -559.594, y = -162.873, z = 37.7547},
{x = -534.992, y = -65.6695, z = 40.634},
{x = -758.234, y = -36.6906, z = 37.2911},
{x = -1375.88, y = 20.9516, z = 53.2255},
{x = -1320.25, y = -128.018, z = 48.097},
{x = -1285.71, y = 294.287, z = 64.4619},
{x = -1245.67, y = 386.533, z = 75.0908},
{x = -760.355, y = 285.015, z = 85.0667},
{x = -626.786, y = 254.146, z = 81.0964},
{x = -563.609, y = 267.962, z = 82.5116},
{x = -486.806, y = 271.977, z = 82.8187},
{x = 88.295, y = 250.867, z = 108.188},
{x = 234.087, y = 344.678, z = 105.018},
{x = 434.963, y = 96.707, z = 99.1713},
{x = 482.617, y = -142.533, z = 58.1936},
{x = 762.651, y = -786.55, z = 25.8915},
{x = 809.06, y = -1290.8, z = 25.7946},
{x = 490.819, y = -1751.37, z = 28.0987},
{x = 432.351, y = -1856.11, z = 27.0352},
{x = 164.348, y = -1734.54, z = 28.8982},
{x = -57.6909, y = -1501.4, z = 31.1084},
{x = 52.2241, y = -1566.65, z = 29.006},
{x = 310.222, y = -1376.76, z = 31.4442},
{x = 181.967, y = -1332.79, z = 28.8773},
{x = -74.6091, y = -1100.64, z = 25.738},
{x = -887.045, y = -2187.46, z = 8.13248},
{x = -749.584, y = -2296.59, z = 12.4627},
{x = -1064.83, y = -2560.66, z = 19.6811},
{x = -1033.44, y = -2730.24, z = 19.6868},
{x = -1018.67, y = -2732, z = 13.2687},
{x = 797.354, y = -174.423, z = 72.708},
{x = 508.156, y = -117.908, z = 60.78},
{x = 159.458, y = -27.555, z = 67.38},
{x = -36.382, y = -106.912, z = 56.982},
{x = -355.801, y = -270.404, z = 33.011},
{x = -831.196, y = -76.871, z = 37.323},
{x = -1038.707, y = -214.593, z = 37},
{x = 1918.448, y = 3691.41, z = 32.261},
{x = 1820.217, y = 3697.115, z = 33.493},
{x = 1619.323, y = 3827.162, z = 34.482},
{x = 1418.628, y = 3602.243, z = 34.511},
{x = 1944.858, y = 3856.252, z = 31.741},
{x = 2285.278, y = 3839.444, z = 34.023},
{x = 2760.945, y = 3387.813, z = 55.659},
{x = 1952.819, y = 2627.731, z = 45.368},
{x = 1051.414, y = 474.833, z = 93.653},
{x = 866.393, y = 17.635, z = 78.654},
{x = 318.985, y = 167.41, z = 103.335},
{x = 88.836, y = 254.054, z = 108.236},
{x = -44.852, y = 70.414, z = 72.437},
{x = -115.496, y = 84.333, z = 70.792},
{x = -384.806, y = 226.868, z = 83.548},
{x = -578.669, y = 139.085, z = 61.337},
{x = -651.334, y = -584.879, z = 34.116},
{x = -571.847, y = -1195.648, z = 17.869},
{x = -1513.271, y = -670.039, z = 28.362},
{x = -1297.484, y = -654.913, z = 26.123},
{x = -1645.546, y = 144.571, z = 61.664},
{x = -1160.618, y = 744.418, z = 154.571},
{x = -798.09, y = 831.699, z = 204.351},
{x = 293.476, y = -590.163, z = 42.7371},
{x = 253.404, y = -375.86, z = 44.0819},
{x = 120.808, y = -300.416, z = 45.1399},
{x = -38.4132, y = -381.576, z = 38.3456},
{x = -107.442, y = -614.377, z = 35.6703},
{x = -252.292, y = -856.474, z = 30.5626},
{x = -236.138, y = -988.382, z = 28.7749},
{x = -276.989, y = -1061.18, z = 25.6853},
{x = -576.451, y = -998.989, z = 21.785},
{x = -602.798, y = -952.63, z = 21.6353},
{x = -790.653, y = -961.855, z = 14.8932},
{x = -912.588, y = -864.756, z = 15.0057},
{x = -1069.77, y = -792.513, z = 18.8075},
{x = -1306.94, y = -854.085, z = 15.0959},
{x = -1468.51, y = -681.363, z = 26.178},
{x = -1380.89, y = -452.7, z = 34.0843},
{x = -1326.35, y = -394.81, z = 36.0632},
{x = -1383.68, y = -269.985, z = 42.4878},
{x = -1679.61, y = -457.339, z = 39.4048},
{x = -1812.45, y = -416.917, z = 43.6734},
{x = -2043.64, y = -268.291, z = 22.9927},
{x = -2186.45, y = -421.595, z = 12.6776},
{x = -1862.08, y = -586.528, z = 11.1747},
{x = -1859.5, y = -617.563, z = 10.8788},
{x = -1634.95, y = -988.302, z = 12.6241},
{x = -1283.99, y = -1154.16, z = 5.30998},
{x = -1126.47, y = -1338.08, z = 4.63434},
{x = -867.907, y = -1159.67, z = 5.00795},
{x = -847.55, y = -1141.38, z = 6.27591},
{x = -722.625, y = -1144.6, z = 10.2176},
{x = -575.503, y = -318.446, z = 34.5273},
{x = -592.309, y = -224.853, z = 36.1209},
{x = -559.594, y = -162.873, z = 37.7547},
{x = -534.992, y = -65.6695, z = 40.634},
{x = -758.234, y = -36.6906, z = 37.2911},
{x = -1375.88, y = 20.9516, z = 53.2255},
{x = -1320.25, y = -128.018, z = 48.097},
{x = -1285.71, y = 294.287, z = 64.4619},
{x = -1245.67, y = 386.533, z = 75.0908},
{x = -760.355, y = 285.015, z = 85.0667},
{x = -626.786, y = 254.146, z = 81.0964},
{x = -563.609, y = 267.962, z = 82.5116},
{x = -486.806, y = 271.977, z = 82.8187},
{x = 88.295, y = 250.867, z = 108.188},
{x = 234.087, y = 344.678, z = 105.018},
{x = 434.963, y = 96.707, z = 99.1713},
{x = 482.617, y = -142.533, z = 58.1936},
{x = 762.651, y = -786.55, z = 25.8915},
{x = 809.06, y = -1290.8, z = 25.7946},
{x = 490.819, y = -1751.37, z = 28.0987},
{x = 432.351, y = -1856.11, z = 27.0352},
{x = 164.348, y = -1734.54, z = 28.8982},
{x = -57.6909, y = -1501.4, z = 31.1084},
{x = 52.2241, y = -1566.65, z = 29.006},
{x = 310.222, y = -1376.76, z = 31.4442},
{x = 181.967, y = -1332.79, z = 28.8773},
{x = -74.6091, y = -1100.64, z = 25.738},
{x = -887.045, y = -2187.46, z = 8.13248},
{x = -749.584, y = -2296.59, z = 12.4627},
{x = -1064.83, y = -2560.66, z = 19.6811},
{x = -1033.44, y = -2730.24, z = 19.6868},
{x = -1018.67, y = -2732, z = 13.2687},
{x = 797.354, y = -174.423, z = 72.708},
{x = 508.156, y = -117.908, z = 60.78},
{x = 159.458, y = -27.555, z = 67.38},
{x = -36.382, y = -106.912, z = 56.982},
{x = -355.801, y = -270.404, z = 33.011},
{x = -831.196, y = -76.871, z = 37.323},
{x = -1038.707, y = -214.593, z = 37},
{x = 1918.448, y = 3691.41, z = 32.261},
{x = 1820.217, y = 3697.115, z = 33.493},
{x = 1619.323, y = 3827.162, z = 34.482},
{x = 1418.628, y = 3602.243, z = 34.511},
{x = 1944.858, y = 3856.252, z = 31.741},
{x = 2285.278, y = 3839.444, z = 34.023},
{x = 2760.945, y = 3387.813, z = 55.659},
{x = 1952.819, y = 2627.731, z = 45.368},
{x = 1051.414, y = 474.833, z = 93.653},
{x = 866.393, y = 17.635, z = 78.654},
{x = 318.985, y = 167.41, z = 103.335},
{x = 88.836, y = 254.054, z = 108.236},
{x = -44.852, y = 70.414, z = 72.437},
{x = -115.496, y = 84.333, z = 70.792},
{x = -384.806, y = 226.868, z = 83.548},
{x = -578.669, y = 139.085, z = 61.337},
{x = -651.334, y = -584.879, z = 34.116},
{x = -571.847, y = -1195.648, z = 17.869},
{x = -1513.271, y = -670.039, z = 28.362},
{x = -1297.484, y = -654.913, z = 26.123},
{x = -1645.546, y = 144.571, z = 61.664},
{x = -1160.618, y = 744.418, z = 154.571},
{x = -798.09, y = 831.699, z = 204.351},
}
+46 -46
View File
@@ -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)
@@ -12,99 +12,99 @@ 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 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
total = total * 2
end
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_taxi', function(account)
societyAccount = account
societyAccount = account
end)
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('have_earned') .. playerMoney)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('comp_earned') .. societyMoney)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_earned') .. playerMoney)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('comp_earned') .. societyMoney)
else
else
xPlayer.addMoney(total)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_earned') .. total)
xPlayer.addMoney(total)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_earned') .. total)
end
end
end)
RegisterServerEvent('esx_taxijob:getStockItem')
AddEventHandler('esx_taxijob:getStockItem', function(itemName, count)
local xPlayer = ESX.GetPlayerFromId(source)
local xPlayer = ESX.GetPlayerFromId(source)
TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory)
TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory)
local item = inventory.getItem(itemName)
local item = inventory.getItem(itemName)
if item.count >= count then
inventory.removeItem(itemName, count)
xPlayer.addInventoryItem(itemName, count)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('quantity_invalid'))
end
if item.count >= count then
inventory.removeItem(itemName, count)
xPlayer.addInventoryItem(itemName, count)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('quantity_invalid'))
end
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_withdrawn') .. count .. ' ' .. item.label)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('have_withdrawn') .. count .. ' ' .. item.label)
end)
end)
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)
TriggerEvent('esx_addoninventory:getSharedInventory', 'society_taxi', function(inventory)
local item = inventory.getItem(itemName)
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
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)
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 = items
})
end)
end)