Cloakroom cleanup

This commit is contained in:
ElPumpo
2020-01-22 12:20:37 +01:00
parent 950ea7e626
commit 4150f8c911
3 changed files with 280 additions and 274 deletions
+46 -72
View File
@@ -25,28 +25,24 @@ function cleanPlayer(playerPed)
ResetPedMovementClipset(playerPed, 0)
end
function setUniform(job, playerPed)
function setUniform(uniform, playerPed)
TriggerEvent('skinchanger:getSkin', function(skin)
if skin.sex == 0 then
if Config.Uniforms[job].male then
TriggerEvent('skinchanger:loadClothes', skin, Config.Uniforms[job].male)
else
ESX.ShowNotification(_U('no_outfit'))
end
local uniformObject
if job == 'bullet_wear' then
if skin.sex == 0 then
uniformObject = Config.Uniforms[uniform].male
else
uniformObject = Config.Uniforms[uniform].female
end
if uniformObject then
TriggerEvent('skinchanger:loadClothes', skin, uniformObject)
if uniform == 'bullet_wear' then
SetPedArmour(playerPed, 100)
end
else
if Config.Uniforms[job].female then
TriggerEvent('skinchanger:loadClothes', skin, Config.Uniforms[job].female)
else
ESX.ShowNotification(_U('no_outfit'))
end
if job == 'bullet_wear' then
SetPedArmour(playerPed, 100)
end
ESX.ShowNotification(_U('no_outfit'))
end
end)
end
@@ -56,31 +52,20 @@ function OpenCloakroomMenu()
local grade = PlayerData.job.grade_name
local elements = {
{ label = _U('citizen_wear'), value = 'citizen_wear' },
{ label = _U('bullet_wear'), value = 'bullet_wear' },
{ label = _U('gilet_wear'), value = 'gilet_wear' }
{label = _U('citizen_wear'), value = 'citizen_wear'},
{label = _U('bullet_wear'), uniform = 'bullet_wear'},
{label = _U('gilet_wear'), uniform = 'gilet_wear'},
{label = _U('police_wear'), uniform = grade}
}
if grade == 'recruit' then
table.insert(elements, {label = _U('police_wear'), value = 'recruit_wear'})
elseif grade == 'officer' then
table.insert(elements, {label = _U('police_wear'), value = 'officer_wear'})
elseif grade == 'sergeant' then
table.insert(elements, {label = _U('police_wear'), value = 'sergeant_wear'})
elseif grade == 'intendent' then
table.insert(elements, {label = _U('police_wear'), value = 'intendent_wear'})
elseif grade == 'lieutenant' then
table.insert(elements, {label = _U('police_wear'), value = 'lieutenant_wear'})
elseif grade == 'chef' then
table.insert(elements, {label = _U('police_wear'), value = 'chef_wear'})
elseif grade == 'boss' then
table.insert(elements, {label = _U('police_wear'), value = 'boss_wear'})
end
if Config.EnableCustomPeds then
for k,v in ipairs(Config.CustomPeds.shared) do
table.insert(elements, {label = v.label, value = 'freemode_ped', maleModel = v.maleModel, femaleModel = v.femaleModel})
end
if Config.EnableNonFreemodePeds then
table.insert(elements, {label = 'Sheriff wear', value = 'freemode_ped', maleModel = 's_m_y_sheriff_01', femaleModel = 's_f_y_sheriff_01'})
table.insert(elements, {label = 'Police wear', value = 'freemode_ped', maleModel = 's_m_y_cop_01', femaleModel = 's_f_y_cop_01'})
table.insert(elements, {label = 'Swat wear', value = 'freemode_ped', maleModel = 's_m_y_swat_01', femaleModel = 's_m_y_swat_01'})
for k,v in ipairs(Config.CustomPeds[grade]) do
table.insert(elements, {label = v.label, value = 'freemode_ped', maleModel = v.maleModel, femaleModel = v.femaleModel})
end
end
ESX.UI.Menu.CloseAll()
@@ -111,7 +96,7 @@ function OpenCloakroomMenu()
end)
end
if Config.MaxInService ~= -1 then
if Config.EnableESXService then
ESX.TriggerServerCallback('esx_service:isInService', function(isInService)
if isInService then
playerInService = false
@@ -133,8 +118,8 @@ function OpenCloakroomMenu()
end
end
if Config.MaxInService ~= -1 and data.current.value ~= 'citizen_wear' then
local serviceOk = 'waiting'
if Config.EnableESXService and data.current.value ~= 'citizen_wear' then
local awaitService
ESX.TriggerServerCallback('esx_service:isInService', function(isInService)
if not isInService then
@@ -143,7 +128,7 @@ function OpenCloakroomMenu()
if not canTakeService then
ESX.ShowNotification(_U('service_max', inServiceCount, maxInService))
else
serviceOk = true
awaitService = true
playerInService = true
local notification = {
@@ -160,36 +145,24 @@ function OpenCloakroomMenu()
end, 'police')
else
serviceOk = true
awaitService = true
end
end, 'police')
while type(serviceOk) == 'string' do
while awaitService == nil do
Citizen.Wait(5)
end
-- if we couldn't enter service don't let the player get changed
if not serviceOk then
if not awaitService then
return
end
end
if
data.current.value == 'recruit_wear' or
data.current.value == 'officer_wear' or
data.current.value == 'sergeant_wear' or
data.current.value == 'intendent_wear' or
data.current.value == 'lieutenant_wear' or
data.current.value == 'chef_wear' or
data.current.value == 'boss_wear' or
data.current.value == 'bullet_wear' or
data.current.value == 'gilet_wear'
then
setUniform(data.current.value, playerPed)
end
if data.current.value == 'freemode_ped' then
local modelHash = ''
if data.current.uniform then
setUniform(data.current.uniform, playerPed)
elseif data.current.value == 'freemode_ped' then
local modelHash
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
if skin.sex == 0 then
@@ -201,6 +174,7 @@ function OpenCloakroomMenu()
ESX.Streaming.RequestModel(modelHash, function()
SetPlayerModel(PlayerId(), modelHash)
SetModelAsNoLongerNeeded(modelHash)
SetPedDefaultComponentVariation(PlayerPedId())
TriggerEvent('esx:restoreLoadout')
end)
@@ -413,15 +387,15 @@ function StoreNearbyVehicle(playerCoords)
IsBusy = true
Citizen.CreateThread(function()
BeginTextCommandBusyString('STRING')
BeginTextCommandBusyspinnerOn('STRING')
AddTextComponentSubstringPlayerName(_U('garage_storing'))
EndTextCommandBusyString(4)
EndTextCommandBusyspinnerOn(4)
while IsBusy do
Citizen.Wait(100)
end
RemoveLoadingPrompt()
BusyspinnerOff()
end)
-- Workaround for vehicle not deleting when other players are near it.
@@ -583,16 +557,16 @@ function WaitForVehicleToLoad(modelHash)
if not HasModelLoaded(modelHash) then
RequestModel(modelHash)
BeginTextCommandBusyString('STRING')
BeginTextCommandBusyspinnerOn('STRING')
AddTextComponentSubstringPlayerName(_U('vehicleshop_awaiting_model'))
EndTextCommandBusyString(4)
EndTextCommandBusyspinnerOn(4)
while not HasModelLoaded(modelHash) do
Citizen.Wait(0)
DisableAllControlActions(0)
end
RemoveLoadingPrompt()
BusyspinnerOff()
end
end
@@ -620,7 +594,7 @@ function OpenPoliceActionsMenu()
}
if Config.EnableLicenses then
table.insert(elements, { label = _U('license_check'), value = 'license' })
table.insert(elements, {label = _U('license_check'), value = 'license'})
end
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'citizen_interaction', {
@@ -1291,7 +1265,7 @@ end)
AddEventHandler('esx_phone:cancelMessage', function(dispatchNumber)
if PlayerData.job and PlayerData.job.name == 'police' and PlayerData.job.name == dispatchNumber then
-- if esx_service is enabled
if Config.MaxInService ~= -1 and not playerInService then
if Config.EnableESXService and not playerInService then
CancelEvent()
end
end
@@ -1855,7 +1829,7 @@ AddEventHandler('esx_policejob:updateBlip', function()
blipsCops = {}
-- Enable blip?
if Config.MaxInService ~= -1 and not playerInService then
if Config.EnableESXService and not playerInService then
return
end
@@ -1898,7 +1872,7 @@ AddEventHandler('onResourceStop', function(resource)
TriggerEvent('esx_policejob:unrestrain')
TriggerEvent('esx_phone:removeSpecialContact', 'police')
if Config.MaxInService ~= -1 then
if Config.EnableESXService then
TriggerServerEvent('esx_service:disableService', 'police')
end
+233 -201
View File
@@ -2,21 +2,23 @@ Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = { x = 1.5, y = 1.5, z = 0.5 }
Config.MarkerColor = { r = 50, g = 50, b = 204 }
Config.MarkerSize = {x = 1.5, y = 1.5, z = 0.5}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableESXIdentity = false -- enable if you're using esx_identity
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableLicenses = false -- enable if you're using esx_license
Config.EnableHandcuffTimer = true -- enable handcuff timer? will unrestrain player after the time ends
Config.HandcuffTimer = 10 * 60000 -- 10 mins
Config.EnableJobBlip = false -- enable blips for colleagues, requires esx_society
Config.EnableJobBlip = false -- enable blips for cops on duty, requires esx_society
Config.EnableCustomPeds = false -- enable custom peds in cloak room? See Config.CustomPeds below to customize peds
Config.EnableESXService = false -- enable esx service?
Config.MaxInService = 5
Config.MaxInService = -1
Config.Locale = 'fr'
Config.PoliceStations = {
@@ -44,10 +46,10 @@ Config.PoliceStations = {
Spawner = vector3(454.6, -1017.4, 28.4),
InsideShop = vector3(228.5, -993.5, -99.5),
SpawnPoints = {
{ coords = vector3(438.4, -1018.3, 27.7), heading = 90.0, radius = 6.0 },
{ coords = vector3(441.0, -1024.2, 28.3), heading = 90.0, radius = 6.0 },
{ coords = vector3(453.5, -1022.2, 28.0), heading = 90.0, radius = 6.0 },
{ coords = vector3(450.9, -1016.5, 28.1), heading = 90.0, radius = 6.0 }
{coords = vector3(438.4, -1018.3, 27.7), heading = 90.0, radius = 6.0},
{coords = vector3(441.0, -1024.2, 28.3), heading = 90.0, radius = 6.0},
{coords = vector3(453.5, -1022.2, 28.0), heading = 90.0, radius = 6.0},
{coords = vector3(450.9, -1016.5, 28.1), heading = 90.0, radius = 6.0}
}
},
@@ -55,8 +57,8 @@ Config.PoliceStations = {
Spawner = vector3(473.3, -1018.8, 28.0),
InsideShop = vector3(228.5, -993.5, -99.0),
SpawnPoints = {
{ coords = vector3(475.9, -1021.6, 28.0), heading = 276.1, radius = 6.0 },
{ coords = vector3(484.1, -1023.1, 27.5), heading = 302.5, radius = 6.0 }
{coords = vector3(475.9, -1021.6, 28.0), heading = 276.1, radius = 6.0},
{coords = vector3(484.1, -1023.1, 27.5), heading = 302.5, radius = 6.0}
}
}
},
@@ -66,7 +68,7 @@ Config.PoliceStations = {
Spawner = vector3(461.1, -981.5, 43.6),
InsideShop = vector3(477.0, -1106.4, 43.0),
SpawnPoints = {
{ coords = vector3(449.5, -981.2, 43.6), heading = 92.6, radius = 10.0 }
{coords = vector3(449.5, -981.2, 43.6), heading = 92.6, radius = 10.0}
}
}
},
@@ -81,70 +83,70 @@ Config.PoliceStations = {
Config.AuthorizedWeapons = {
recruit = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 1500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 80 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 1500},
{weapon = 'WEAPON_FLASHLIGHT', price = 80}
},
officer = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_ADVANCEDRIFLE', components = { 0, 6000, 1000, 4000, 8000, nil }, price = 50000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 0 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_ADVANCEDRIFLE', components = {0, 6000, 1000, 4000, 8000, nil}, price = 50000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 500},
{weapon = 'WEAPON_FLASHLIGHT', price = 0}
},
sergeant = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_ADVANCEDRIFLE', components = { 0, 6000, 1000, 4000, 8000, nil }, price = 50000 },
{ weapon = 'WEAPON_PUMPSHOTGUN', components = { 2000, 6000, nil }, price = 70000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 0 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_ADVANCEDRIFLE', components = {0, 6000, 1000, 4000, 8000, nil}, price = 50000},
{weapon = 'WEAPON_PUMPSHOTGUN', components = {2000, 6000, nil}, price = 70000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 500},
{weapon = 'WEAPON_FLASHLIGHT', price = 0}
},
intendent = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_ADVANCEDRIFLE', components = { 0, 6000, 1000, 4000, 8000, nil }, price = 50000 },
{ weapon = 'WEAPON_PUMPSHOTGUN', components = { 2000, 6000, nil }, price = 70000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 0 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_ADVANCEDRIFLE', components = {0, 6000, 1000, 4000, 8000, nil}, price = 50000},
{weapon = 'WEAPON_PUMPSHOTGUN', components = {2000, 6000, nil}, price = 70000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 500},
{weapon = 'WEAPON_FLASHLIGHT', price = 0}
},
lieutenant = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_ADVANCEDRIFLE', components = { 0, 6000, 1000, 4000, 8000, nil }, price = 50000 },
{ weapon = 'WEAPON_PUMPSHOTGUN', components = { 2000, 6000, nil }, price = 70000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 0 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_ADVANCEDRIFLE', components = {0, 6000, 1000, 4000, 8000, nil}, price = 50000},
{weapon = 'WEAPON_PUMPSHOTGUN', components = {2000, 6000, nil}, price = 70000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 500},
{weapon = 'WEAPON_FLASHLIGHT', price = 0}
},
chef = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_ADVANCEDRIFLE', components = { 0, 6000, 1000, 4000, 8000, nil }, price = 50000 },
{ weapon = 'WEAPON_PUMPSHOTGUN', components = { 2000, 6000, nil }, price = 70000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 0 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_ADVANCEDRIFLE', components = {0, 6000, 1000, 4000, 8000, nil}, price = 50000},
{weapon = 'WEAPON_PUMPSHOTGUN', components = {2000, 6000, nil}, price = 70000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 500},
{weapon = 'WEAPON_FLASHLIGHT', price = 0}
},
boss = {
{ weapon = 'WEAPON_APPISTOL', components = { 0, 0, 1000, 4000, nil }, price = 10000 },
{ weapon = 'WEAPON_ADVANCEDRIFLE', components = { 0, 6000, 1000, 4000, 8000, nil }, price = 50000 },
{ weapon = 'WEAPON_PUMPSHOTGUN', components = { 2000, 6000, nil }, price = 70000 },
{ weapon = 'WEAPON_NIGHTSTICK', price = 0 },
{ weapon = 'WEAPON_STUNGUN', price = 500 },
{ weapon = 'WEAPON_FLASHLIGHT', price = 0 }
{weapon = 'WEAPON_APPISTOL', components = {0, 0, 1000, 4000, nil}, price = 10000},
{weapon = 'WEAPON_ADVANCEDRIFLE', components = {0, 6000, 1000, 4000, 8000, nil}, price = 50000},
{weapon = 'WEAPON_PUMPSHOTGUN', components = {2000, 6000, nil}, price = 70000},
{weapon = 'WEAPON_NIGHTSTICK', price = 0},
{weapon = 'WEAPON_STUNGUN', price = 500},
{weapon = 'WEAPON_FLASHLIGHT', price = 0}
}
}
Config.AuthorizedVehicles = {
Shared = {
{ model = 'police', label = 'Police Cruiser', price = 10000 },
{ model = 'pbus', label = 'Police Prison Bus', price = 5000 }
{model = 'police', label = 'Police Cruiser', price = 10000},
{model = 'pbus', label = 'Police Prison Bus', price = 5000}
},
recruit = {
@@ -152,12 +154,12 @@ Config.AuthorizedVehicles = {
},
officer = {
{ model = 'police3', label = 'Police Interceptor', price = 20000 }
{model = 'police3', label = 'Police Interceptor', price = 20000}
},
sergeant = {
{ model = 'policet', label = 'Police Transporter', price = 18500 },
{ model = 'policeb', label = 'Police Bike', price = 30500 }
{model = 'policet', label = 'Police Transporter', price = 18500},
{model = 'policeb', label = 'Police Bike', price = 30500}
},
intendent = {
@@ -165,8 +167,8 @@ Config.AuthorizedVehicles = {
},
lieutenant = {
{ model = 'riot', label = 'Police Riot', price = 70000 },
{ model = 'fbi2', label = 'FIB SUV', price = 60000 }
{model = 'riot', label = 'Police Riot', price = 70000},
{model = 'fbi2', label = 'FIB SUV', price = 60000}
},
chef = {
@@ -188,204 +190,234 @@ Config.AuthorizedHelicopters = {
intendent = {},
lieutenant = {
{ model = 'polmav', label = 'Police Maverick', livery = 0, price = 200000 }
{model = 'polmav', label = 'Police Maverick', livery = 0, price = 200000}
},
chef = {
{ model = 'polmav', label = 'Police Maverick', livery = 0, price = 150000 }
{model = 'polmav', label = 'Police Maverick', livery = 0, price = 150000}
},
boss = {
{ model = 'polmav', label = 'Police Maverick', livery = 0, price = 100000 }
{model = 'polmav', label = 'Police Maverick', livery = 0, price = 100000}
}
}
Config.CustomPeds = {
shared = {
{label = 'Sheriff Ped', maleModel = 's_m_y_sheriff_01', femaleModel = 's_f_y_sheriff_01'},
{label = 'Police Ped', maleModel = 's_m_y_cop_01', femaleModel = 's_f_y_cop_01'}
},
recruit = {},
officer = {},
sergeant = {},
intendent = {},
lieutenant = {},
chef = {},
boss = {
{label = 'SWAT Ped', maleModel = 's_m_y_swat_01', femaleModel = 's_m_y_swat_01'}
}
}
-- CHECK SKINCHANGER CLIENT MAIN.LUA for matching elements
Config.Uniforms = {
recruit_wear = {
recruit = {
male = {
['tshirt_1'] = 59, ['tshirt_2'] = 1,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 0, ['decals_2'] = 0,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = 46, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 59, tshirt_2 = 1,
torso_1 = 55, torso_2 = 0,
decals_1 = 0, decals_2 = 0,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = 46, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 36, ['tshirt_2'] = 1,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 0, ['decals_2'] = 0,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = 45, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 36, tshirt_2 = 1,
torso_1 = 48, torso_2 = 0,
decals_1 = 0, decals_2 = 0,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = 45, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
officer_wear = {
officer = {
male = {
['tshirt_1'] = 58, ['tshirt_2'] = 0,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 0, ['decals_2'] = 0,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 58, tshirt_2 = 0,
torso_1 = 55, torso_2 = 0,
decals_1 = 0, decals_2 = 0,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 35, ['tshirt_2'] = 0,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 0, ['decals_2'] = 0,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 35, tshirt_2 = 0,
torso_1 = 48, torso_2 = 0,
decals_1 = 0, decals_2 = 0,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
sergeant_wear = {
sergeant = {
male = {
['tshirt_1'] = 58, ['tshirt_2'] = 0,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 8, ['decals_2'] = 1,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 58, tshirt_2 = 0,
torso_1 = 55, torso_2 = 0,
decals_1 = 8, decals_2 = 1,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 35, ['tshirt_2'] = 0,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 7, ['decals_2'] = 1,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 35, tshirt_2 = 0,
torso_1 = 48, torso_2 = 0,
decals_1 = 7, decals_2 = 1,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
intendent_wear = {
intendent = {
male = {
['tshirt_1'] = 58, ['tshirt_2'] = 0,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 8, ['decals_2'] = 2,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 58, tshirt_2 = 0,
torso_1 = 55, torso_2 = 0,
decals_1 = 8, decals_2 = 2,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 35, ['tshirt_2'] = 0,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 7, ['decals_2'] = 2,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 35, tshirt_2 = 0,
torso_1 = 48, torso_2 = 0,
decals_1 = 7, decals_2 = 2,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
lieutenant_wear = { -- currently the same as intendent_wear
lieutenant = {-- currently the same as intendent
male = {
['tshirt_1'] = 58, ['tshirt_2'] = 0,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 8, ['decals_2'] = 2,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 58, tshirt_2 = 0,
torso_1 = 55, torso_2 = 0,
decals_1 = 8, decals_2 = 2,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 35, ['tshirt_2'] = 0,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 7, ['decals_2'] = 2,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 35, tshirt_2 = 0,
torso_1 = 48, torso_2 = 0,
decals_1 = 7, decals_2 = 2,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
chef_wear = {
chef = {
male = {
['tshirt_1'] = 58, ['tshirt_2'] = 0,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 8, ['decals_2'] = 3,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 58, tshirt_2 = 0,
torso_1 = 55, torso_2 = 0,
decals_1 = 8, decals_2 = 3,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 35, ['tshirt_2'] = 0,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 7, ['decals_2'] = 3,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 35, tshirt_2 = 0,
torso_1 = 48, torso_2 = 0,
decals_1 = 7, decals_2 = 3,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
boss_wear = { -- currently the same as chef_wear
boss = {-- currently the same as chef
male = {
['tshirt_1'] = 58, ['tshirt_2'] = 0,
['torso_1'] = 55, ['torso_2'] = 0,
['decals_1'] = 8, ['decals_2'] = 3,
['arms'] = 41,
['pants_1'] = 25, ['pants_2'] = 0,
['shoes_1'] = 25, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 58, tshirt_2 = 0,
torso_1 = 55, torso_2 = 0,
decals_1 = 8, decals_2 = 3,
arms = 41,
pants_1 = 25, pants_2 = 0,
shoes_1 = 25, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
},
female = {
['tshirt_1'] = 35, ['tshirt_2'] = 0,
['torso_1'] = 48, ['torso_2'] = 0,
['decals_1'] = 7, ['decals_2'] = 3,
['arms'] = 44,
['pants_1'] = 34, ['pants_2'] = 0,
['shoes_1'] = 27, ['shoes_2'] = 0,
['helmet_1'] = -1, ['helmet_2'] = 0,
['chain_1'] = 0, ['chain_2'] = 0,
['ears_1'] = 2, ['ears_2'] = 0
tshirt_1 = 35, tshirt_2 = 0,
torso_1 = 48, torso_2 = 0,
decals_1 = 7, decals_2 = 3,
arms = 44,
pants_1 = 34, pants_2 = 0,
shoes_1 = 27, shoes_2 = 0,
helmet_1 = -1, helmet_2 = 0,
chain_1 = 0, chain_2 = 0,
ears_1 = 2, ears_2 = 0
}
},
bullet_wear = {
male = {
['bproof_1'] = 11, ['bproof_2'] = 1
bproof_1 = 11, bproof_2 = 1
},
female = {
['bproof_1'] = 13, ['bproof_2'] = 1
bproof_1 = 13, bproof_2 = 1
}
},
gilet_wear = {
male = {
['tshirt_1'] = 59, ['tshirt_2'] = 1
tshirt_1 = 59, tshirt_2 = 1
},
female = {
['tshirt_1'] = 36, ['tshirt_2'] = 1
tshirt_1 = 36, tshirt_2 = 1
}
}
}
}
+1 -1
View File
@@ -2,7 +2,7 @@ ESX = nil
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
if Config.MaxInService ~= -1 then
if Config.EnableESXService then
TriggerEvent('esx_service:activateService', 'police', Config.MaxInService)
end