starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 02:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvmenets to freemode peds, #154

Browse Source
This commit is contained in:
ElPumpo
2018-07-28 15:42:04 +02:00
parent 5926584595
commit 42c0b81cec
10 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+37 -25
View File
@@ -97,6 +97,7 @@ end
function OpenCloakroomMenu()
local playerPed = PlayerPedId()
local grade = PlayerData.job.grade_name
local elements = {
{ label = _U('citizen_wear'), value = 'citizen_wear' },
@@ -104,26 +105,26 @@ function OpenCloakroomMenu()
{ label = _U('gilet_wear'), value = 'gilet_wear' }
}
if PlayerData.job.grade_name == 'recruit' then
if grade == 'recruit' then
table.insert(elements, {label = _U('police_wear'), value = 'recruit_wear'})
elseif PlayerData.job.grade_name == 'officer' then
elseif grade == 'officer' then
table.insert(elements, {label = _U('police_wear'), value = 'officer_wear'})
elseif PlayerData.job.grade_name == 'sergeant' then
elseif grade == 'sergeant' then
table.insert(elements, {label = _U('police_wear'), value = 'sergeant_wear'})
elseif PlayerData.job.grade_name == 'intendent' then
elseif grade == 'intendent' then
table.insert(elements, {label = _U('police_wear'), value = 'intendent_wear'})
elseif PlayerData.job.grade_name == 'lieutenant' then
elseif grade == 'lieutenant' then
table.insert(elements, {label = _U('police_wear'), value = 'lieutenant_wear'})
elseif PlayerData.job.grade_name == 'chef' then
elseif grade == 'chef' then
table.insert(elements, {label = _U('police_wear'), value = 'chef_wear'})
elseif PlayerData.job.grade_name == 'boss' then
elseif grade == 'boss' then
table.insert(elements, {label = _U('police_wear'), value = 'boss_wear'})
end
if Config.EnableNonFreemodePeds then
table.insert(elements, {label = _U('sheriff_wear'), value = 'freemode_ped', maleModel = 's_m_y_sheriff_01', femaleModel = 's_f_y_sheriff_01'})
table.insert(elements, {label = _U('lieutenant_wear'), value = 'freemode_ped', maleModel = 's_m_y_swat_01', femaleModel = 's_m_y_swat_01'})
table.insert(elements, {label = _U('commandant_wear'), value = 'freemode_ped', maleModel = 's_m_y_swat_01', femaleModel = 's_m_y_swat_01'})
if Config.EnableFreemodePeds 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'})
end
ESX.UI.Menu.CloseAll()
@@ -138,9 +139,21 @@ function OpenCloakroomMenu()
cleanPlayer(playerPed)
if data.current.value == 'citizen_wear' then
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
TriggerEvent('skinchanger:loadSkin', skin)
end)
if Config.EnableFreemodePeds then
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
local isMale = skin.sex == 0
TriggerEvent('skinchanger:loadDefaultModel', isMale, function()
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
TriggerEvent('skinchanger:loadSkin', skin)
end)
end)
end)
end
if Config.MaxInService ~= -1 then
@@ -165,7 +178,6 @@ function OpenCloakroomMenu()
end, 'police')
end
menu.close()
end
if Config.MaxInService ~= -1 and data.current.value ~= 'citizen_wear' then
@@ -225,24 +237,24 @@ function OpenCloakroomMenu()
end
if data.current.value == 'freemode_ped' then
local model = nil
local modelHash = ''
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
if skin.sex == 0 then
model = GetHashKey(data.current.maleModel)
modelHash = GetHashKey(data.current.maleModel)
else
model = GetHashKey(data.current.femaleModel)
modelHash = GetHashKey(data.current.femaleModel)
end
ESX.Streaming.RequestModel(modelHash, function()
SetPlayerModel(PlayerId(), modelHash)
SetModelAsNoLongerNeeded(modelHash)
end)
end)
ESX.Streaming.RequestModel(model)
SetPlayerModel(PlayerId(), model)
SetModelAsNoLongerNeeded(model)
end
CurrentAction = 'menu_cloakroom'
CurrentActionMsg = _U('open_cloackroom')
CurrentActionData = {}
end, function(data, menu)
menu.close()
config.lua
+3 -3
View File
@@ -7,10 +7,10 @@ Config.MarkerColor = { r = 50, g = 50, b = 204 }
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableESXIdentity = false -- enable if you're using esx_identity
Config.EnableFreemodePeds = true -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.EnableLicenses = false -- only turn this on if you are using esx_license
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
locales/br.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['br'] = {
['cloakroom'] = 'Vestiário',
['citizen_wear'] = 'Roupa casual',
['police_wear'] = 'Uniforme da Polícia',
['sheriff_wear'] = 'sheriff Outfit',
['lieutenant_wear'] = 'Swatt outfit',
['gilet_wear'] = 'orange reflective jacket',
['bullet_wear'] = 'bulletproof vest',
['no_outfit'] = 'there\'s no uniform that fits you!',
locales/de.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['de'] = {
['cloakroom'] = 'Garderobe',
['citizen_wear'] = 'Zivilkleidung',
['police_wear'] = 'Arbeitskleidung',
['sheriff_wear'] = 'sheriff Outfit',
['lieutenant_wear'] = 'Swatt outfit ',
['gilet_wear'] = 'orange reflective jacket',
['bullet_wear'] = 'bulletproof vest',
['no_outfit'] = 'there\'s no uniform that fits you!',
locales/en.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['en'] = {
['cloakroom'] = 'locker room',
['citizen_wear'] = 'civilian Outfit',
['police_wear'] = 'police Outfit',
['sheriff_wear'] = 'sheriff Outfit',
['lieutenant_wear'] = 'swat outfit',
['gilet_wear'] = 'orange reflective jacket',
['bullet_wear'] = 'bulletproof vest',
['no_outfit'] = 'there\'s no uniform that fits you!',
locales/es.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['es'] = {
['cloakroom'] = 'Taquilla',
['citizen_wear'] = 'Ropa civil',
['police_wear'] = 'Ropa CNP',
['sheriff_wear'] = 'Ropa Oficial',
['lieutenant_wear'] = 'Ropa Teniente',
['gilet_wear'] = 'orange reflective jacket',
['bullet_wear'] = 'bulletproof vest',
['no_outfit'] = 'there\'s no uniform that fits you!',
locales/fi.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['fi'] = {
['cloakroom'] = 'vaatelokero',
['citizen_wear'] = 'siviiliasu',
['police_wear'] = 'poliisiasu',
['sheriff_wear'] = 'sheriffiasu',
['lieutenant_wear'] = 'swattiasu',
['gilet_wear'] = 'huomioliivi',
['bullet_wear'] = 'luotiliivi',
['no_outfit'] = 'täällä ei ole sinulle sopivaa asua',
locales/fr.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['fr'] = {
['cloakroom'] = 'vestiaire',
['citizen_wear'] = 'tenue Civil',
['police_wear'] = 'tenue Policier',
['sheriff_wear'] = 'tenue sheriff',
['lieutenant_wear'] = 'tenue Swatt',
['gilet_wear'] = 'gilet orange',
['bullet_wear'] = 'gilet pare-balles',
['no_outfit'] = 'il n\'y a pas d\'uniforme à votre taille...',
locales/pl.lua
-3
View File
@@ -3,9 +3,6 @@ Locales['pl'] = {
['cloakroom'] = 'szatnia',
['citizen_wear'] = 'ubranie Cywilne',
['police_wear'] = 'mundur',
['sheriff_wear'] = 'mundur Szeryfa',
['lieutenant_wear'] = 'mundur Porucznika',
['commandant_wear'] = 'mundur Komendanta',
['gilet_wear'] = 'kamizelka odblaskowa',
['bullet_wear'] = 'kamizelka kuloodporna',
['no_outfit'] = 'brak ubrania',
locales/sv.lua
-2
View File
@@ -3,8 +3,6 @@ Locales['sv'] = {
['cloakroom'] = 'omklädningsrum',
['citizen_wear'] = 'civila kläder',
['police_wear'] = 'polisuniform',
['sheriff_wear'] = 'inspektöruniform',
['lieutenant_wear'] = 'insatsstyrka',
['gilet_wear'] = 'reflektiv väst',
['bullet_wear'] = 'skottsäker väst',
['no_outfit'] = 'det finns ingen uniform som passar dig!',