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

Merge branch 'esx-framework:main' into main

Browse Source
This commit is contained in:
bitpredator
2022-09-06 09:13:41 +02:00
committed by GitHub
parent 6520a8b11e 1ded3628bf
commit 0121eed3ea
5 changed files with 159 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/functions.lua
+3 -4
View File
@@ -158,7 +158,6 @@ ESX.HashString = function(str)
end
if GetResourceState("esx_context") ~= "missing" then
function ESX.OpenContext(...)
exports["esx_context"]:Open(...)
end
@@ -172,15 +171,15 @@ if GetResourceState("esx_context") ~= "missing" then
end
else
function ESX.OpenContext()
print("[ERROR] ESX Context Not Found")
print("[ERROR] Tried to open context menu, but esx_context is missing!")
end
function ESX.PreviewContext()
print("[ERROR] ESX Context Not Found")
print("[ERROR] Tried to preview context menu, but esx_context is missing!")
end
function ESX.CloseContext()
print("[ERROR] ESX Context Not Found")
print("[ERROR] Tried to close context menu, but esx_context is missing!")
end
end
[esx]/esx_identity/client/main.lua
+11
View File
@@ -8,6 +8,17 @@ RegisterNetEvent('esx_identity:alreadyRegistered', function()
TriggerEvent('esx_skin:playerRegistered')
end)
RegisterNetEvent('esx_identity:setPlayerData', function(data)
SetTimeout(1, function()
ESX.SetPlayerData("name", ('%s %s'):format(data.firstName, data.lastName))
ESX.SetPlayerData('firstName', data.firstName)
ESX.SetPlayerData('lastName', data.lastName)
ESX.SetPlayerData('dateofbirth', data.dateOfBirth)
ESX.SetPlayerData('sex', data.sex)
ESX.SetPlayerData('height', data.height)
end)
end)
AddEventHandler('esx:loadingScreenOff', function()
loadingScreenFinished = true
end)
[esx]/esx_identity/server/main.lua
+11 -7
View File
@@ -10,7 +10,6 @@ local function deleteIdentity(xPlayer)
xPlayer.set('dateofbirth', nil)
xPlayer.set('sex', nil)
xPlayer.set('height', nil)
deleteIdentityFromDatabase(xPlayer)
end
end
@@ -281,7 +280,6 @@ if Config.UseDeferrals then
xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
xPlayer.set('sex', currentIdentity.sex)
xPlayer.set('height', currentIdentity.height)
if currentIdentity.saveToDatabase then
saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
end
@@ -289,7 +287,6 @@ if Config.UseDeferrals then
Wait(0)
alreadyRegistered[xPlayer.identifier] = true
TriggerClientEvent('esx_identity:alreadyRegistered', xPlayer.source)
playerIdentity[xPlayer.identifier] = nil
else
xPlayer.kick(_('missing_identity'))
@@ -332,7 +329,7 @@ else
xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
xPlayer.set('sex', currentIdentity.sex)
xPlayer.set('height', currentIdentity.height)
TriggerClientEvent('esx_identity:setPlayerData', xPlayer.source, currentIdentity)
if currentIdentity.saveToDatabase then
saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
end
@@ -405,7 +402,7 @@ else
xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
xPlayer.set('sex', currentIdentity.sex)
xPlayer.set('height', currentIdentity.height)
TriggerClientEvent('esx_identity:setPlayerData', xPlayer.source, currentIdentity)
if currentIdentity.saveToDatabase then
saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
end
@@ -452,10 +449,10 @@ else
xPlayer.set('dateofbirth', currentIdentity.dateOfBirth)
xPlayer.set('sex', currentIdentity.sex)
xPlayer.set('height', currentIdentity.height)
TriggerClientEvent('esx_identity:setPlayerData', xPlayer.source, currentIdentity)
saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
alreadyRegistered[xPlayer.identifier] = true
playerIdentity[xPlayer.identifier] = nil
cb(true)
else
xPlayer.showNotification(_U('invalid_height_format'), "error")
@@ -494,9 +491,16 @@ else
data.firstname = formattedFirstName
data.lastname = formattedLastName
data.dateofbirth = formattedDate
if checkHeightFormat(data.height) then
local Identity= {
firstName = formattedFirstName,
lastName = formattedLastName,
dateOfBirth = formattedDate,
sex = data.sex,
height = data.height
}
TriggerEvent('esx_identity:completedRegistration', source, data)
TriggerClientEvent('esx_identity:setPlayerData', source, Identity)
cb(true)
else
TriggerClientEvent("esx:showNotification", source, _U('invalid_height_format'), "error")
[esx]/esx_multicharacter/client/main.lua
+6 -3
View File
@@ -273,7 +273,7 @@ if ESX.GetConfig().Multichar then
if isNew or not skin or #skin == 1 then
local finished = false
local sex = skin.sex or 0
if sex == 0 then model = mp_m_freemode_01 else model = mp_f_freemode_01 end
local model = sex == 0 and mp_m_freemode_01 or mp_f_freemode_01
RequestModel(model)
while not HasModelLoaded(model) do
RequestModel(model)
@@ -281,8 +281,11 @@ if ESX.GetConfig().Multichar then
end
SetPlayerModel(PlayerId(), model)
SetModelAsNoLongerNeeded(model)
skin = Config.Default
skin.sex = sex
while not ESX.PlayerData.sex do
Wait(0)
end
skin = Config.Default[ESX.PlayerData.sex]
skin.sex = ESX.PlayerData.sex == "m" and 0 or 1
TriggerEvent('skinchanger:loadSkin', skin, function()
playerPed = PlayerPedId()
SetPedAoBlobRendering(playerPed, true)
[esx]/esx_multicharacter/config.lua
+128 -29
View File
@@ -26,20 +26,21 @@ else
-- Default appearance for new characters
Config.Default = {
mom = 21,
dad = 0,
face_md_weight = 50,
skin_md_weight = 50,
nose_1 = 0,
nose_2 = 0,
nose_3 = 0,
nose_4 = 0,
nose_5 = 0,
["m"] = {
mom = 43,
dad = 29,
face_md_weight = 61,
skin_md_weight = 27,
nose_1 = -5,
nose_2 = 6,
nose_3 = 5,
nose_4 = 8,
nose_5 = 10,
nose_6 = 0,
cheeks_1 = 0,
cheeks_2 = 0,
cheeks_3 = 0,
lip_thickness = 0,
cheeks_1 = 2,
cheeks_2 = -10,
cheeks_3 = 6,
lip_thickness = -2,
jaw_1 = 0,
jaw_2 = 0,
chin_1 = 0,
@@ -47,28 +48,28 @@ else
chin_13 = 0,
chin_4 = 0,
neck_thickness = 0,
hair_1 = 0,
hair_1 = 76,
hair_2 = 0,
hair_color_1 = 0,
hair_color_2 = 0,
tshirt_1 = 0,
tshirt_2 = 0,
torso_1 = 0,
torso_2 = 0,
hair_color_1 = 61,
hair_color_2 = 29,
tshirt_1 = 4,
tshirt_2 = 2,
torso_1 = 23,
torso_2 = 2,
decals_1 = 0,
decals_2 = 0,
arms = 0,
arms = 1,
arms_2 = 0,
pants_1 = 0,
pants_2 = 0,
shoes_1 = 0,
shoes_2 = 0,
pants_1 = 28,
pants_2 = 3,
shoes_1 = 70,
shoes_2 = 2,
mask_1 = 0,
mask_2 = 0,
bproof_1 = 0,
bproof_2 = 0,
chain_1 = 0,
chain_2 = 0,
chain_1 = 22,
chain_2 = 2,
helmet_1 = -1,
helmet_2 = 0,
glasses_1 = 0,
@@ -117,9 +118,107 @@ else
sun_2 = 0,
moles_1 = 0,
moles_2 = 0,
beard_1 = 0,
beard_2 = 0,
beard_1 = 11,
beard_2 = 10,
beard_3 = 0,
beard_4 = 0
},
["f"] = {
mom = 28,
dad = 6,
face_md_weight = 63,
skin_md_weight = 60,
nose_1 = -10,
nose_2 = 4,
nose_3 = 5,
nose_4 = 0,
nose_5 = 0,
nose_6 = 0,
cheeks_1 = 0,
cheeks_2 = 0,
cheeks_3 = 0,
lip_thickness = 0,
jaw_1 = 0,
jaw_2 = 0,
chin_1 = -10,
chin_2 = 10,
chin_13 = -10,
chin_4 = 0,
neck_thickness = -5,
hair_1 = 43,
hair_2 = 0,
hair_color_1 = 29,
hair_color_2 = 35,
tshirt_1 = 111,
tshirt_2 = 5,
torso_1 = 25,
torso_2 = 2,
decals_1 = 0,
decals_2 = 0,
arms = 3,
arms_2 = 0,
pants_1 = 12,
pants_2 = 2,
shoes_1 = 20,
shoes_2 = 10,
mask_1 = 0,
mask_2 = 0,
bproof_1 = 0,
bproof_2 = 0,
chain_1 = 85,
chain_2 = 0,
helmet_1 = -1,
helmet_2 = 0,
glasses_1 = 33,
glasses_2 = 12,
watches_1 = -1,
watches_2 = 0,
bracelets_1 = -1,
bracelets_2 = 0,
bags_1 = 0,
bags_2 = 0,
eye_color = 8,
eye_squint = -6,
eyebrows_2 = 7,
eyebrows_1 = 32,
eyebrows_3 = 52,
eyebrows_4 = 9,
eyebrows_5 = -5,
eyebrows_6 = -8,
makeup_1 = 0,
makeup_2 = 0,
makeup_3 = 0,
makeup_4 = 0,
lipstick_1 = 0,
lipstick_2 = 0,
lipstick_3 = 0,
lipstick_4 = 0,
ears_1 = -1,
ears_2 = 0,
chest_1 = 0,
chest_2 = 0,
chest_3 = 0,
bodyb_1 = -1,
bodyb_2 = 0,
bodyb_3 = -1,
bodyb_4 = 0,
age_1 = 0,
age_2 = 0,
blemishes_1 = 0,
blemishes_2 = 0,
blush_1 = 0,
blush_2 = 0,
blush_3 = 0,
complexion_1 = 0,
complexion_2 = 0,
sun_1 = 0,
sun_2 = 0,
moles_1 = 12,
moles_2 = 8,
beard_1 = 0,
beard_2 = 0,
beard_3 = 0,
beard_4 = 0
}
}
end