-
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 #635 from bitpredator/dev
🎨 Run formatter
- Loading branch information
Showing
42 changed files
with
2,196 additions
and
2,289 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
20 changes: 10 additions & 10 deletions
20
server-data/resources/[bpt_addons]/bpt_streetfight/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,20 +1,20 @@ | ||
| Config = {} | ||
|
|
||
| Config.BLUEZONE = {x = -520.63, y = -1712.40, z = 19.45} | ||
| Config.REDZONE = {x = -514.79, y = -1711.49, z = 19.45} | ||
| Config.CENTER = {x = -517.61, y = -1712.04, z = 20.45} | ||
| Config.BETZONE = {x = -523.33, y = -1715.44, z = 18.32} | ||
| Config.BLUEZONE = { x = -520.63, y = -1712.40, z = 19.45 } | ||
| Config.REDZONE = { x = -514.79, y = -1711.49, z = 19.45 } | ||
| Config.CENTER = { x = -517.61, y = -1712.04, z = 20.45 } | ||
| Config.BETZONE = { x = -523.33, y = -1715.44, z = 18.32 } | ||
| Config.DISTANCE = 10 -- Distance to see fight indicators | ||
| Config.TP_DISTANCE = 6 -- Minimum distance between fight and spectators | ||
| Config.LEAVE_FIGHT_DISTANCE = 15 -- Distance to quit fight | ||
| Config.DISTANCE_INTERACTION = 2.0 -- Interaction for fighter events | ||
| Config.E_KEY = 38 -- Action key 'E' default | ||
| Config.Locale = 'en' | ||
| Config.Locale = "en" | ||
|
|
||
| Config.BLIP = { | ||
| coords = {x = -517.61, y = -1712.04, z = 20.45}, | ||
| text = _U('street_fighting'), | ||
| coords = { x = -517.61, y = -1712.04, z = 20.45 }, | ||
| text = _U("street_fighting"), | ||
| sprite = 491, | ||
| color = 1, | ||
| scale = 1.0 | ||
| } | ||
| color = 1, | ||
| scale = 1.0, | ||
| } |
38 changes: 19 additions & 19 deletions
38
server-data/resources/[bpt_addons]/bpt_streetfight/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,25 +1,25 @@ | ||
| fx_version 'adamant' | ||
| fx_version("adamant") | ||
|
|
||
| game 'gta5' | ||
| game("gta5") | ||
|
|
||
| description 'bpt_streetfight' | ||
| description("bpt_streetfight") | ||
|
|
||
| version '1.0.0' | ||
| version("1.0.0") | ||
|
|
||
| server_script { | ||
| '@es_extended/locale.lua', | ||
| 'server/server.lua', | ||
| 'locales/*.lua', | ||
| 'config.lua' | ||
| } | ||
| server_script({ | ||
| "@es_extended/locale.lua", | ||
| "server/server.lua", | ||
| "locales/*.lua", | ||
| "config.lua", | ||
| }) | ||
|
|
||
| client_script { | ||
| '@es_extended/locale.lua', | ||
| 'client/client.lua', | ||
| 'locales/*.lua', | ||
| 'config.lua' | ||
| } | ||
| client_script({ | ||
| "@es_extended/locale.lua", | ||
| "client/client.lua", | ||
| "locales/*.lua", | ||
| "config.lua", | ||
| }) | ||
|
|
||
| dependencies { | ||
| 'es_extended' | ||
| } | ||
| dependencies({ | ||
| "es_extended", | ||
| }) |
Oops, something went wrong.