Actually fix isCat complaining

This commit is contained in:
Jim Shield
2025-06-22 16:30:29 +01:00
parent 6eb2c0afa1
commit bec0c57a04
3 changed files with 15 additions and 15 deletions

View File

@@ -102,9 +102,9 @@ RegisterKeyMapping('skatejump', locale("keyMaps", "jump"), 'keyboard', 'SPACE')
RegisterCommand('skatejump', function() local Ped = PlayerPedId()
if Attached and not surfboard then
if not IsEntityInAir(skateboard.Bike) then
if isCat then
if isPedCat then
playAnim("creatures@cat@move", "idle_dwn", -1, 1)
elseif (isDog or isCoyote) then
elseif (isPedDog or isCoyote) then
--
else
playAnim("move_crouch_proto", "idle_intro", -1, 1)
@@ -120,9 +120,9 @@ RegisterCommand('skatejump', function() local Ped = PlayerPedId()
manual = true
AttachEntityToEntity(skateboard.Skate, skateboard.Bike, nil, 0.0, 0.0, -0.45, 0.0, -40.0, 90.0, false, true, true, true, 0, true)
if isCat then
if isPedCat then
AttachEntityToEntity(Ped, skateboard.Bike, 20, 0.0, -0.10, -0.82, 40.04, 0.0, 0.0, true, true, false, true, 1, true)
elseif (isDog or isCoyote) then
elseif (isPedDog or isCoyote) then
AttachEntityToEntity(Ped, skateboard.Bike, 20, 0.0, 0.0, -0.45, 40.4, 0.0, 0.0, true, true, false, true, 1, true)
else
stopAnim("move_crouch_proto", "idle_intro")
@@ -138,10 +138,10 @@ RegisterCommand('skatejump', function() local Ped = PlayerPedId()
manual = false
--Reset if changes
AttachEntityToEntity(skateboard.Skate, skateboard.Bike, nil, 0.0, 0.0, -0.60, 0.0, 0.0, 90.0, -15.0, true, true, true, 2, true)
if isCat then
if isPedCat then
AttachEntityToEntity(Ped, skateboard.Bike, 20, 0.0, 0.10, -0.78, 0.4, 0.0, 0.0, -15.0, true, true, false, true, 1, true)
playAnim("creatures@cat@move", "idle_upp", -1, 1)
elseif (isDog or isCoyote) then
elseif (isPedDog or isCoyote) then
if notSmallDog then
AttachEntityToEntity(Ped, skateboard.Bike, 20, 0.0, 0.30, -0.55, 0.4, 0.0, 0.0, -15.0, true, true, false, true, 1, true)
else
@@ -153,11 +153,11 @@ RegisterCommand('skatejump', function() local Ped = PlayerPedId()
end
SetEntityVelocity(skateboard.Bike, vel.x, vel.y, vel.z + boost)
if isCat then
if isPedCat then
stopAnim("move_crouch_proto", "idle_dwn")
playAnim("creatures@cat@move", "idle_upp", -1, 1)
elseif (isDog or isCoyote) then
elseif (isPedDog or isCoyote) then
--
else
stopAnim("move_crouch_proto", "idle_intro")

View File

@@ -4,7 +4,7 @@ onPlayerLoaded(function()
Wait(1000)
local Ped = PlayerPedId()
local pedModel = GetEntityModel(Ped)
isPedCat = (isCat() or pedModel == `ft-raccoon`) and (pedModel ~= `ft-sphynx`)
isPedCat = (isCat() == true or pedModel == `ft-raccoon`) and (pedModel ~= `ft-sphynx`)
isPedDog, notSmallDog = isDog()
if isPedDog and pedModel == `a_c_coyote` then isPedDog = false end
isCoyote = (pedModel == `ft-sphynx` or pedModel == `a_c_coyote`)

View File

@@ -1,11 +1,11 @@
function makeFakeSurfboard(Ped, remove, model) -- The animation for picking up and placing the board
lastModel = model
local prop = makeProp({ prop = model, coords = vec4(0, 0, 0, 0), false, true})
if isCat then
if isPedCat then
SetPedCanRagdoll(Ped, false)
AttachEntityToEntity(prop, Ped, GetPedBoneIndex(Ped, 31086), 0.18, -0.14, 0.0, -87.0, -100.0, 1.0, true, true, false, false, 1, true)
ClearPedTasks(Ped)
elseif isDog then
elseif isPedDog then
if notSmallDog then
SetPedCanRagdoll(Ped, false)
AttachEntityToEntity(prop, Ped, GetPedBoneIndex(Ped, 65068), 0.29, 0.02, -0.18, 0.0, 0.0, 100.0, true, true, false, false, 1, true)
@@ -136,10 +136,10 @@ RegisterNetEvent(getScript()..":Surfboard:GetOn", function() local Ped = PlayerP
SetBoatAnchor(skateboard.Bike, false)
if isCat then
if isPedCat then
AttachEntityToEntity(Ped, skateboard.Bike, 20, 0.0, 0.10, 0.78, 0.4, 0.0, 0.0, -15.0, true, true, false, true, 1, true)
playAnim("creatures@cat@move", "idle_upp", -1, 1)
elseif isDog or isCoyote then
elseif isPedDog or isCoyote then
if notSmallDog then
AttachEntityToEntity(Ped, skateboard.Bike, 20, 0.0, 0.30, 0.55, 0.4, 0.0, 0.0, -15.0, true, true, false, true, 1, true)
else
@@ -179,10 +179,10 @@ RegisterNetEvent(getScript()..":Surfboard:GetOn", function() local Ped = PlayerP
TaskVehicleTempAction(skateboard.Driver, skateboard.Bike, 6, 2000)
Attached = false
Dir = {}
if isCat then
if isPedCat then
stopAnim("creatures@cat@move", "idle_upp")
stopAnim("creatures@cat@move", "idle_dwn")
elseif (isDog or isCoyote) then
elseif (isPedDog or isCoyote) then
--
else
stopAnim("move_strafe@stealth", "idle")