-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #629 from bitpredator/dev
🎨 Run formatter
- Loading branch information
Showing
13 changed files
with
185 additions
and
184 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 33 additions & 28 deletions
61
server-data/resources/[bpt_addons]/bpt_ammujob/config.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,54 @@ | ||
| Config = {} | ||
| Config.DrawDistance = 10.0 -- How close do you need to be for the markers to be drawn (in GTA units). | ||
| Config.MaxInService = -1 -- How much people can be in service at once? | ||
| Config.EnablePlayerManagement = true -- Enable society managing. | ||
| Config = {} | ||
| Config.DrawDistance = 10.0 -- How close do you need to be for the markers to be drawn (in GTA units). | ||
| Config.MaxInService = -1 -- How much people can be in service at once? | ||
| Config.EnablePlayerManagement = true -- Enable society managing. | ||
| Config.EnableSocietyOwnedVehicles = false | ||
| Config.Locale = 'en' | ||
| Config.OxInventory = ESX.GetConfig().OxInventory | ||
| Config.Locale = "en" | ||
| Config.OxInventory = ESX.GetConfig().OxInventory | ||
|
|
||
| Config.AuthorizedVehicles = { | ||
| {model = 'rumpo', label = 'Rumpo'} | ||
| { model = "rumpo", label = "Rumpo" }, | ||
| } | ||
|
|
||
| Config.Zones = { | ||
|
|
||
| VehicleSpawner = { | ||
| Pos = {x = 821.340637, y = -2146.417480, z = 28.706909}, | ||
| Size = {x = 1.0, y = 1.0, z = 1.0}, | ||
| Color = {r = 145, g = 30, b = 30}, | ||
| Type = 36, Rotate = true | ||
| Pos = { x = 821.340637, y = -2146.417480, z = 28.706909 }, | ||
| Size = { x = 1.0, y = 1.0, z = 1.0 }, | ||
| Color = { r = 145, g = 30, b = 30 }, | ||
| Type = 36, | ||
| Rotate = true, | ||
| }, | ||
|
|
||
| VehicleSpawnPoint = { | ||
| Pos = {x = 822.540649, y = -2134.575928, z = 29.279907}, | ||
| Size = {x = 1.5, y = 1.5, z = 1.0}, | ||
| Type = -1, Rotate = false, | ||
| Heading = 225.0 | ||
| Pos = { x = 822.540649, y = -2134.575928, z = 29.279907 }, | ||
| Size = { x = 1.5, y = 1.5, z = 1.0 }, | ||
| Type = -1, | ||
| Rotate = false, | ||
| Heading = 225.0, | ||
| }, | ||
|
|
||
| VehicleDeleter = { | ||
| Pos = {x = 822.540649, y = -2134.575928, z = 28.279907}, | ||
| Size = {x = 3.0, y = 3.0, z = 0.25}, | ||
| Color = {r = 255, g = 0, b = 0}, | ||
| Type = 1, Rotate = false | ||
| Pos = { x = 822.540649, y = -2134.575928, z = 28.279907 }, | ||
| Size = { x = 3.0, y = 3.0, z = 0.25 }, | ||
| Color = { r = 255, g = 0, b = 0 }, | ||
| Type = 1, | ||
| Rotate = false, | ||
| }, | ||
|
|
||
| AmmuActions = { | ||
| Pos = {x = 812.479126, y = -2159.182373, z = 29.616821}, | ||
| Size = {x = 0.5, y = 0.5, z = 0.5}, | ||
| Color = {r = 204, g = 204, b = 0}, | ||
| Type = 20, Rotate = true | ||
| Pos = { x = 812.479126, y = -2159.182373, z = 29.616821 }, | ||
| Size = { x = 0.5, y = 0.5, z = 0.5 }, | ||
| Color = { r = 204, g = 204, b = 0 }, | ||
| Type = 20, | ||
| Rotate = true, | ||
| }, | ||
|
|
||
| Cloakroom = { | ||
| Pos = {x = 810.065918, y = -2162.439453, z = 29.616821}, | ||
| Size = {x = 0.5, y = 0.5, z = 0.5}, | ||
| Color = {r = 204, g = 204, b = 0}, | ||
| Type = 21, Rotate = true | ||
| } | ||
| Pos = { x = 810.065918, y = -2162.439453, z = 29.616821 }, | ||
| Size = { x = 0.5, y = 0.5, z = 0.5 }, | ||
| Color = { r = 204, g = 204, b = 0 }, | ||
| Type = 21, | ||
| Rotate = true, | ||
| }, | ||
| } |
41 changes: 20 additions & 21 deletions
41
server-data/resources/[bpt_addons]/bpt_ammujob/fxmanifest.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,25 @@ | ||
| fx_version 'adamant' | ||
| fx_version("adamant") | ||
| game("gta5") | ||
|
|
||
| game 'gta5' | ||
| description("bpt_ammunation job") | ||
| author("bitpredator") | ||
| lua54("yes") | ||
| version("1.0.0") | ||
|
|
||
| description 'bpt_ammunation job' | ||
| author 'bitpredator' | ||
| lua54 'yes' | ||
| version '1.0.0' | ||
| shared_script("@es_extended/imports.lua") | ||
|
|
||
| shared_script '@es_extended/imports.lua' | ||
| client_scripts({ | ||
| "@es_extended/locale.lua", | ||
| "locales/*.lua", | ||
| "config.lua", | ||
| "client/main.lua", | ||
| }) | ||
|
|
||
| client_scripts { | ||
| '@es_extended/locale.lua', | ||
| 'locales/*.lua', | ||
| 'config.lua', | ||
| 'client/main.lua' | ||
| } | ||
| server_scripts({ | ||
| "@es_extended/locale.lua", | ||
| "locales/*.lua", | ||
| "config.lua", | ||
| "server/main.lua", | ||
| }) | ||
|
|
||
| server_scripts { | ||
| '@es_extended/locale.lua', | ||
| 'locales/*.lua', | ||
| 'config.lua', | ||
| 'server/main.lua' | ||
| } | ||
|
|
||
| dependency 'es_extended' | ||
| dependency("es_extended") |
66 changes: 33 additions & 33 deletions
66
server-data/resources/[bpt_addons]/bpt_ammujob/locales/en.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| Locales['en'] = { | ||
| -- cloakroom | ||
| ['cloakroom_menu'] = 'cloakroom', | ||
| ['cloakroom_prompt'] = 'press [E] to access the cloakroom.', | ||
| ['wear_citizen'] = 'civilian clothing', | ||
| ['wear_work'] = 'work clothes', | ||
| -- Inventory | ||
| ['deposit_stock'] = 'Deposit stock', | ||
| ['take_stock'] = 'Take stock', | ||
| ['have_deposited'] = 'Have deposited', | ||
| ['quantity_invalid'] = 'Quantity invelid', | ||
| -- garage | ||
| ['spawner_prompt'] = 'press [E] to access the garage.', | ||
| ["vehicle_spawned"] = "vehicle spawned successfully!", | ||
| ['store_veh'] = 'press [E] to deposit the vehicle', | ||
| ['spawn_veh'] = 'spawn vehicle', | ||
| ['spawnpoint_blocked'] = 'vehicle blocks the spawnpoint!', | ||
| ['only_ammu'] = 'you can only deposit company vehicles.', | ||
| ['empty_garage'] = 'no vehicles in the garage!', | ||
| ['taking_service'] = 'Take service: Gunsmith', | ||
| ['full_service'] = 'complete service: ', | ||
| ['amount_invalid'] = 'invalid amount', | ||
| ['press_to_open'] = 'press [E] to access the menu', | ||
| ['billing'] = 'billing', | ||
| ['billing_sent'] = 'the invoice has been posted!', | ||
| ['invoice_amount'] = 'invoice amount', | ||
| ['no_players_near'] = 'no players nearby', | ||
| ['boss_actions'] = 'Boss actions', | ||
| ['blip_ammu'] = 'Armory.', | ||
| ['ammu'] = 'ammu', | ||
| -- billing | ||
| ['bill_amount'] = "Amount to bill..", | ||
| ['confirm'] = "Confirm" | ||
| Locales["en"] = { | ||
| -- cloakroom | ||
| ["cloakroom_menu"] = "cloakroom", | ||
| ["cloakroom_prompt"] = "press [E] to access the cloakroom.", | ||
| ["wear_citizen"] = "civilian clothing", | ||
| ["wear_work"] = "work clothes", | ||
| -- Inventory | ||
| ["deposit_stock"] = "Deposit stock", | ||
| ["take_stock"] = "Take stock", | ||
| ["have_deposited"] = "Have deposited", | ||
| ["quantity_invalid"] = "Quantity invelid", | ||
| -- garage | ||
| ["spawner_prompt"] = "press [E] to access the garage.", | ||
| ["vehicle_spawned"] = "vehicle spawned successfully!", | ||
| ["store_veh"] = "press [E] to deposit the vehicle", | ||
| ["spawn_veh"] = "spawn vehicle", | ||
| ["spawnpoint_blocked"] = "vehicle blocks the spawnpoint!", | ||
| ["only_ammu"] = "you can only deposit company vehicles.", | ||
| ["empty_garage"] = "no vehicles in the garage!", | ||
| ["taking_service"] = "Take service: Gunsmith", | ||
| ["full_service"] = "complete service: ", | ||
| ["amount_invalid"] = "invalid amount", | ||
| ["press_to_open"] = "press [E] to access the menu", | ||
| ["billing"] = "billing", | ||
| ["billing_sent"] = "the invoice has been posted!", | ||
| ["invoice_amount"] = "invoice amount", | ||
| ["no_players_near"] = "no players nearby", | ||
| ["boss_actions"] = "Boss actions", | ||
| ["blip_ammu"] = "Armory.", | ||
| ["ammu"] = "ammu", | ||
| -- billing | ||
| ["bill_amount"] = "Amount to bill..", | ||
| ["confirm"] = "Confirm", | ||
| } |
66 changes: 33 additions & 33 deletions
66
server-data/resources/[bpt_addons]/bpt_ammujob/locales/it.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| Locales['it'] = { | ||
| -- cloakroom | ||
| ['cloakroom_menu'] = 'guardaroba', | ||
| ['cloakroom_prompt'] = 'premi [E] per accedere al guardaroba.', | ||
| ['wear_citizen'] = 'abbigliamento civile', | ||
| ['wear_work'] = 'abiti da lavoro', | ||
| -- Inventory | ||
| ['deposit_stock'] = 'Depositare', | ||
| ['take_stock'] = 'Prendi', | ||
| ['have_deposited'] = 'Hai depositato', | ||
| ['quantity_invalid'] = 'Qunatità non valida', | ||
| -- garage | ||
| ['spawner_prompt'] = 'premi [E] per accedere al garage.', | ||
| ["vehicle_spawned"] = "veicolo generato con successo!", | ||
| ['store_veh'] = 'premi [E] per depositare il veicolo', | ||
| ['spawn_veh'] = 'genera veicolo', | ||
| ['spawnpoint_blocked'] = 'un veicolo blocca lo spawnpoint!', | ||
| ['only_ammu'] = 'puoi depositare solo veicoli aziendali.', | ||
| ['empty_garage'] = 'nessun veicolo nel garage!', | ||
| ['taking_service'] = 'prendi servizio: Armaiolo', | ||
| ['full_service'] = 'servizio completo: ', | ||
| ['amount_invalid'] = 'importo non valido', | ||
| ['press_to_open'] = 'premi [E] per accedere al menu', | ||
| ['billing'] = 'fattura', | ||
| ['billing_sent'] = 'la fattura è stata registrata!', | ||
| ['invoice_amount'] = 'importo fattura', | ||
| ['no_players_near'] = 'nessun giocatore nelle vicinanze', | ||
| ['boss_actions'] = 'Azioni del capo', | ||
| ['blip_ammu'] = 'Armeria.', | ||
| ['ammu'] = 'ammu', | ||
| -- billing | ||
| ['bill_amount'] = "importo della fattura", | ||
| ['confirm'] = "Conferma" | ||
| Locales["it"] = { | ||
| -- cloakroom | ||
| ["cloakroom_menu"] = "guardaroba", | ||
| ["cloakroom_prompt"] = "premi [E] per accedere al guardaroba.", | ||
| ["wear_citizen"] = "abbigliamento civile", | ||
| ["wear_work"] = "abiti da lavoro", | ||
| -- Inventory | ||
| ["deposit_stock"] = "Depositare", | ||
| ["take_stock"] = "Prendi", | ||
| ["have_deposited"] = "Hai depositato", | ||
| ["quantity_invalid"] = "Qunatità non valida", | ||
| -- garage | ||
| ["spawner_prompt"] = "premi [E] per accedere al garage.", | ||
| ["vehicle_spawned"] = "veicolo generato con successo!", | ||
| ["store_veh"] = "premi [E] per depositare il veicolo", | ||
| ["spawn_veh"] = "genera veicolo", | ||
| ["spawnpoint_blocked"] = "un veicolo blocca lo spawnpoint!", | ||
| ["only_ammu"] = "puoi depositare solo veicoli aziendali.", | ||
| ["empty_garage"] = "nessun veicolo nel garage!", | ||
| ["taking_service"] = "prendi servizio: Armaiolo", | ||
| ["full_service"] = "servizio completo: ", | ||
| ["amount_invalid"] = "importo non valido", | ||
| ["press_to_open"] = "premi [E] per accedere al menu", | ||
| ["billing"] = "fattura", | ||
| ["billing_sent"] = "la fattura è stata registrata!", | ||
| ["invoice_amount"] = "importo fattura", | ||
| ["no_players_near"] = "nessun giocatore nelle vicinanze", | ||
| ["boss_actions"] = "Azioni del capo", | ||
| ["blip_ammu"] = "Armeria.", | ||
| ["ammu"] = "ammu", | ||
| -- billing | ||
| ["bill_amount"] = "importo della fattura", | ||
| ["confirm"] = "Conferma", | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.