added missing trigger
updated readme
This commit is contained in:
Henric Backman
2020-05-12 05:06:30 +02:00
parent d3d07596d6
commit 79d0501458
3 changed files with 8 additions and 81 deletions
+3 -61
View File
@@ -59,69 +59,12 @@ AddEventHandler('kashactersC:SetupUI', function(Characters)
characters = Characters,
})
end)
--[[
RegisterNetEvent('kashactersC:SpawnCharacter')
AddEventHandler('kashactersC:SpawnCharacter', function(isnew)
if isnew == true then
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)
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)
SetPlayerInvincible(GetPlayerPed(-1), false);
SetEntityCollision(GetPlayerPed(-1), true, true)
SetCamActive(cam, false)
DestroyCam(cam, true)
IsChoosing = false
SetEntityVisible(GetPlayerPed(-1), true, false)
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")
--TriggerEvent('esx_ambulancejob:multicharacter', source)
end
end)
]]
RegisterNetEvent('kashactersC:SpawnCharacter')
AddEventHandler('kashactersC:SpawnCharacter', function(spawn, isnew)
SetTimecycleModifier('default')
local pos = spawn
SetTimecycleModifier('default')
SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z)
DoScreenFadeIn(500)
@@ -153,11 +96,10 @@ AddEventHandler('kashactersC:SpawnCharacter', function(spawn, isnew)
DisplayRadar(true)
TriggerEvent('esx:kashloaded')
TriggerEvent('esx_ambulancejob:multicharacter', source)
if isnew == true then
TriggerEvent('esx_identity:showRegisterIdentity')
end
end
end)
RegisterNetEvent('kashactersC:ReloadCharacters')
-19
View File
@@ -24,26 +24,7 @@ AddEventHandler('kashactersS:SetupCharacters', function()
local Characters = GetPlayerCharacters(src)
TriggerClientEvent('kashactersC:SetupUI', src, Characters)
end)
--[[
RegisterServerEvent("kashactersS:CharacterChosen")
AddEventHandler('kashactersS:CharacterChosen', function(charid, ischar)
local src = source
local isnew = true
if type(charid) == "number" and type(ischar) == "boolean" then
SetLastCharacter(src, charid)
SetCharToIdentifier(GetPlayerIdentifiers(src)[2], charid)
if ischar == true then
isnew = false
else
TriggerClientEvent('skinchanger:loadDefaultModel', src, isnew, cb)
end
TriggerClientEvent("kashactersC:SpawnCharacter", src, isnew)
else
-- Trigger Ban Event here to ban individuals trying to use SQL Injections
end
end)
]]
RegisterServerEvent("kashactersS:CharacterChosen")
AddEventHandler('kashactersS:CharacterChosen', function(charid, ischar)
local src = source
+5 -1
View File
@@ -267,13 +267,17 @@ end)
RegisterNetEvent('esx_ambulancejob:multicharacter')
AddEventHandler('esx_ambulancejob:multicharacter', function()
IsDead = false
if Config.AntiCombatLog then
while not PlayerLoaded do
Citizen.Wait(1000)
end
ESX.TriggerServerCallback('esx_ambulancejob:getDeathStatus', function(isDead)
if isDead and Config.AntiCombatLog then
ESX.ShowNotification(_U('combatlog_message'))
RemoveItemsAfterRPDeath()
end
end)
end
end)
```
### Then change this