From 44e3f894cc8932bb156ba2aba69a9f88ec6fdcac Mon Sep 17 00:00:00 2001 From: Henric Backman Date: Thu, 30 Apr 2020 00:37:06 +0200 Subject: [PATCH] update old SpawnCharacter commented away as i updated it to suit my own setup change display in main-container css if u dont have a way to trigger "kashactersS:SetupCharacters" and "kashactersC:SetupCharacters" --- esx_kashacters/client/main.lua | 124 +++++++++++++++++++++---------- esx_kashacters/html/css/main.css | 2 +- esx_kashacters/server/main.lua | 15 ++++ 3 files changed, 101 insertions(+), 40 deletions(-) diff --git a/esx_kashacters/client/main.lua b/esx_kashacters/client/main.lua index ee6e9941..1654145b 100644 --- a/esx_kashacters/client/main.lua +++ b/esx_kashacters/client/main.lua @@ -61,56 +61,102 @@ end) RegisterNetEvent('kashactersC:SpawnCharacter') AddEventHandler('kashactersC:SpawnCharacter', function(isnew) if isnew == true then - SetTimecycleModifier('default') + SetTimecycleModifier('default') + + local pos = { x = -1044.73, y = -2749.13, z = 21.3634 } -- DEFAULT SPAWN POSITION + RequestCollisionAtCoord(pos.x, pos.y, pos.z) + SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z) + DoScreenFadeIn(500) - local pos = { x = -1044.73, y = -2749.13, z = 21.3634 } -- DEFAULT SPAWN POSITION - RequestCollisionAtCoord(pos.x, pos.y, pos.z) - SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z) - DoScreenFadeIn(500) + Citizen.Wait(500) - Citizen.Wait(500) + cam2 = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", -1355.93,-1487.78,520.75, 300.00,0.00,0.00, 100.00, false, 0) + PointCamAtCoord(cam2, pos.x,pos.y,pos.z+200) + SetCamActiveWithInterp(cam2, cam, 900, true, true) - cam2 = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", -1355.93,-1487.78,520.75, 300.00,0.00,0.00, 100.00, false, 0) - PointCamAtCoord(cam2, pos.x,pos.y,pos.z+200) - SetCamActiveWithInterp(cam2, cam, 900, true, true) + Citizen.Wait(900) + cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", pos.x,pos.y,pos.z+200, 300.00,0.00,0.00, 100.00, false, 0) + PointCamAtCoord(cam, pos.x,pos.y,pos.z+2) + SetCamActiveWithInterp(cam, cam2, 3700, true, true) - Citizen.Wait(900) - cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", pos.x,pos.y,pos.z+200, 300.00,0.00,0.00, 100.00, false, 0) - PointCamAtCoord(cam, pos.x,pos.y,pos.z+2) - SetCamActiveWithInterp(cam, cam2, 3700, true, true) + Citizen.Wait(3700) - Citizen.Wait(3700) + PlaySoundFrontend(-1, "Zoom_Out", "DLC_HEIST_PLANNING_BOARD_SOUNDS", 1) + RenderScriptCams(false, true, 500, true, true) + PlaySoundFrontend(-1, "CAR_BIKE_WHOOSH", "MP_LOBBY_SOUNDS", 1) + FreezeEntityPosition(GetPlayerPed(-1), false) + Citizen.Wait(500) + SetPlayerInvincible(GetPlayerPed(-1), false); + SetEntityCollision(GetPlayerPed(-1), true, true) + SetCamActive(cam, false) + DestroyCam(cam, true) + IsChoosing = false - PlaySoundFrontend(-1, "Zoom_Out", "DLC_HEIST_PLANNING_BOARD_SOUNDS", 1) - RenderScriptCams(false, true, 500, true, true) - PlaySoundFrontend(-1, "CAR_BIKE_WHOOSH", "MP_LOBBY_SOUNDS", 1) - FreezeEntityPosition(GetPlayerPed(-1), false) - Citizen.Wait(500) - SetPlayerInvincible(GetPlayerPed(-1), false); - SetEntityCollision(GetPlayerPed(-1), true, true) - SetCamActive(cam, false) - DestroyCam(cam, true) - IsChoosing = false + SetEntityVisible(GetPlayerPed(-1), true, false) - SetEntityVisible(GetPlayerPed(-1), true, false) - - TriggerEvent('esx:kashloaded') + TriggerEvent('esx:kashloaded') TriggerEvent('esx_identity:showRegisterIdentity') - else - SetTimecycleModifier('default') - DoScreenFadeIn(500) - Citizen.Wait(500) - RenderScriptCams(false, true, 500, true, true) - SetCamActive(cam, false) - DestroyCam(cam, true) - IsChoosing = false - DisplayHud(true) - DisplayRadar(true) - TriggerEvent('esx:kashloaded') - TriggerEvent("madrp-spawn") + else + SetTimecycleModifier('default') + DoScreenFadeIn(500) + Citizen.Wait(500) + RenderScriptCams(false, true, 500, true, true) + SetCamActive(cam, false) + DestroyCam(cam, true) + IsChoosing = false + DisplayHud(true) + DisplayRadar(true) + TriggerEvent('esx:kashloaded') + TriggerEvent("madrp-spawn") + --TriggerEvent('esx_ambulancejob:multicharacter', source) end end) +--[[ +RegisterNetEvent('kashactersC:SpawnCharacter') +AddEventHandler('kashactersC:SpawnCharacter', function(spawn, isnew) + SetTimecycleModifier('default') + + local pos = spawn + + SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z) + DoScreenFadeIn(500) + + Citizen.Wait(500) + + cam2 = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", -1355.93,-1487.78,520.75, 300.00,0.00,0.00, 100.00, false, 0) + PointCamAtCoord(cam2, pos.x,pos.y,pos.z+200) + SetCamActiveWithInterp(cam2, cam, 900, true, true) + + Citizen.Wait(900) + + cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", pos.x,pos.y,pos.z+200, 300.00,0.00,0.00, 100.00, false, 0) + PointCamAtCoord(cam, pos.x,pos.y,pos.z+2) + SetCamActiveWithInterp(cam, cam2, 3700, true, true) + + Citizen.Wait(3700) + + PlaySoundFrontend(-1, "Zoom_Out", "DLC_HEIST_PLANNING_BOARD_SOUNDS", 1) + RenderScriptCams(false, true, 500, true, true) + PlaySoundFrontend(-1, "CAR_BIKE_WHOOSH", "MP_LOBBY_SOUNDS", 1) + FreezeEntityPosition(GetPlayerPed(-1), false) + + Citizen.Wait(500) + + SetCamActive(cam, false) + DestroyCam(cam, true) + IsChoosing = false + DisplayHud(true) + DisplayRadar(true) + + TriggerEvent('esx:kashloaded') + + if isnew == true then + TriggerEvent('esx_identity:showRegisterIdentity') + end + +end) +]]-- RegisterNetEvent('kashactersC:ReloadCharacters') AddEventHandler('kashactersC:ReloadCharacters', function() TriggerServerEvent("kashactersS:SetupCharacters") diff --git a/esx_kashacters/html/css/main.css b/esx_kashacters/html/css/main.css index bd89e616..4f81e978 100644 --- a/esx_kashacters/html/css/main.css +++ b/esx_kashacters/html/css/main.css @@ -47,7 +47,7 @@ p { } .main-container { - display:flex; + display:none; width: 100%; position: relative; top: 0%; diff --git a/esx_kashacters/server/main.lua b/esx_kashacters/server/main.lua index 7937c3cd..5602f5ce 100644 --- a/esx_kashacters/server/main.lua +++ b/esx_kashacters/server/main.lua @@ -35,13 +35,18 @@ end) RegisterServerEvent("kashactersS:CharacterChosen") AddEventHandler('kashactersS:CharacterChosen', function(charid, ischar) local src = source +-- local spawn = {} local isnew = true SetLastCharacter(src, tonumber(charid)) SetCharToIdentifier(GetPlayerIdentifiers(src)[2], tonumber(charid)) if ischar == "true" then isnew = false + --spawn = GetSpawnPos(src) + --TriggerClientEvent("kashactersC:SpawnCharacter", src, spawn) else TriggerClientEvent('skinchanger:loadDefaultModel', src, true, cb) + --TriggerEvent('esx_identity:showRegisterIdentity') + --TriggerClientEvent("kashactersC:SpawnCharacter", src, spawn) end TriggerClientEvent("kashactersC:SpawnCharacter", src, isnew) end) @@ -69,6 +74,11 @@ function GetPlayerCharacters(source) else Chars[i].job_grade = charJobgrade[1].label end + if Chars[i].sex == "m" then + Chars[i].sex = "Male" + else + Chars[i].sex = "Female" + end end return Chars end @@ -105,6 +115,11 @@ function DeleteCharacter(identifier, charid) end end +--function GetSpawnPos(source) +-- local SpawnPos = MySQLAsyncExecute("SELECT `position` FROM `users` WHERE `identifier` = '"..GetPlayerIdentifiers(source)[2].."'") +-- return json.decode(SpawnPos[1].position) +--end + function GetIdentifierWithoutLicense(Identifier) return string.gsub(Identifier, "license", "") end