diff --git a/client/main.lua b/client/main.lua index 9af6920..a042696 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,3 +1,5 @@ +local Config = require 'config.client' + local currentGear = { mask = 0, tank = 0, @@ -66,7 +68,7 @@ local function attachGear() currentGear.tank = CreateObject(tankModel, 1.0, 1.0, 1.0, true, true, false) local bone1 = GetPedBoneIndex(cache.ped, 24818) AttachEntityToEntity(currentGear.tank, cache.ped, bone1, -0.25, -0.25, 0.0, 180.0, 90.0, 0.0, true, true, false, false, 2, true) - + currentGear.mask = CreateObject(maskModel, 1.0, 1.0, 1.0, true, true, false) local bone2 = GetPedBoneIndex(cache.ped, 12844) AttachEntityToEntity(currentGear.mask, cache.ped, bone2, 0.0, 0.0, 0.0, 180.0, 90.0, 0.0, true, true, false, false, 2, true) diff --git a/config.lua b/config.lua deleted file mode 100644 index a6bcab2..0000000 --- a/config.lua +++ /dev/null @@ -1,5 +0,0 @@ -Config = {} -Config.OxygenLevel = 100 -- in seconds -Config.PutOnSuitTimeMs = 5000 -Config.TakeOffSuitTimeMs = 5000 -Config.RefillTankTimeMs = 5000 \ No newline at end of file diff --git a/config/client.lua b/config/client.lua new file mode 100644 index 0000000..d6109d2 --- /dev/null +++ b/config/client.lua @@ -0,0 +1,6 @@ +return { + OxygenLevel = 100, + PutOnSuitTimeMs = 5000, + TakeOffSuitTimeMs = 5000, + RefillTankTimeMs = 5000 +} \ No newline at end of file diff --git a/fxmanifest.lua b/fxmanifest.lua index 0440b2e..6e1435c 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -10,20 +10,17 @@ shared_scripts { '@qbx_core/shared/locale.lua', 'locales/en.lua', 'locales/*.lua', - 'config.lua', } modules { 'qbx_core:utils', } -server_scripts { - 'server/*', -} +server_script 'server/main.lua' -client_scripts { - 'client/*' -} +client_script 'client/main.lua' + +file 'config/client.lua' lua54 'yes' -use_experimental_fxv2_oal 'yes' +use_experimental_fxv2_oal 'yes' \ No newline at end of file