Skip to content

Commit

Permalink
Merge pull request #902 from bitpredator/dev
Browse files Browse the repository at this point in the history
chore: 🎨 Run formatter
  • Loading branch information
bitpredator authored Nov 27, 2024
2 parents a1acd15 + 6fa0b80 commit a15a361
Show file tree
Hide file tree
Showing 6 changed files with 326 additions and 352 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@

local playAnim = false
local phoneProp = 0
local phoneModel = Config.PhoneModel


-- Item checks to return whether or not the client has a phone or not
local function HasPhone()
return Functions[Config.Core].HasPhone()
end


-- Loads the animdict so we can execute it on the ped
local function loadAnimDict(dict)
RequestAnimDict(dict)
Expand Down
4 changes: 2 additions & 2 deletions server-data/resources/[esx_addons]/ps-dispatch/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Config.Cooldown311 = 60
Config.Enable = {}
Config.Timer = {}

Config.PoliceJob = { "police", "bcso"}
Config.PoliceJob = { "police"}

-- Enable if you only want to send alerts to onDuty officers
Config.OnDutyOnly = true

Config.PoliceAndAmbulance = { "police", "ambulance", "bcso"}
Config.PoliceAndAmbulance = { "police", "ambulance"}
Config.PhoneModel = 'patoche_props_phone1'

-- sets report chance to 100%
Expand Down
49 changes: 21 additions & 28 deletions server-data/resources/[esx_addons]/ps-dispatch/fxmanifest.lua
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
fx_version 'cerulean'
game 'gta5'
fx_version("cerulean")
game("gta5")

version '0.0'
description 'https://github.com/Project-Sloth/ps-dispatch'
version("1.0.2")
description("https://github.com/Project-Sloth/ps-dispatch")

shared_scripts {
'config.lua',
'locales/locales.lua',
}
shared_scripts({
"config.lua",
"locales/locales.lua",
})

client_scripts{
'client/cl_core.lua',
'client/cl_main.lua',
'client/cl_events.lua',
'client/cl_eventhandlers.lua',
'client/cl_extraalerts.lua',
'client/cl_commands.lua',
'client/cl_loops.lua',
}
server_script {
'server/sv_core.lua',
'server/sv_dispatchcodes.lua',
'server/sv_main.lua'
}
client_scripts({
"client/*.lua",
})

ui_page 'ui/index.html'
server_script({
"server/*.lua",
})

files {
'ui/index.html',
'ui/app.js',
'ui/style.css',
}
ui_page("ui/index.html")

files({
"ui/index.html",
"ui/app.js",
"ui/style.css",
})
Loading

0 comments on commit a15a361

Please sign in to comment.