Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(client): Display player's first character ped... #596

Merged
merged 10 commits into from
Dec 18, 2024
Merged

feat(client): Display player's first character ped... #596

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0a7b7a
feat(client): Display player's first character ped instead of random …
SSnowly Oct 17, 2024
5db5385
chore(client): remove 'amount' from previewPed as it is unused
SSnowly Oct 17, 2024
49b61c2
refactor(character.lua): Refactor code, remove unneeded callbacks.
SSnowly Oct 20, 2024
2c6fe48
refactor(character.lua): Refactor code
SSnowly Oct 20, 2024
78ee1a9
refactor(client): Remove unnecessary relocalization of citizenId
SSnowly Oct 20, 2024
51d795a
fix(client/character): Globalize character, amount instead of getting…
SSnowly Oct 21, 2024
f82fc05
refactor(client/character): revert changes to nationalities
solareon Dec 1, 2024
5a385b3
update(previewPed): Update previewPed to be triggered from inside fun…
SSnowly Dec 7, 2024
f4cecfc
Merge branch 'main' into main
mafewtm Dec 17, 2024
70c2025
refactor(client/character): fix issues
D4isDAVID Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions client/character.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,11 @@ local function createCharacter(cid)
end

local function chooseCharacter()
---@type PlayerEntity[], integer
local characters, amount = lib.callback.await('qbx_core:server:getCharacters')
local firstCharacterCitizenId = characters[1] and characters[1].citizenid
previewPed(firstCharacterCitizenId)

randomLocation = config.characters.locations[math.random(1, #config.characters.locations)]
SetFollowPedCamViewMode(2)
DisplayRadar(false)
Expand All @@ -379,8 +384,6 @@ local function chooseCharacter()
ShutdownLoadingScreenNui()
setupPreviewCam()

---@type PlayerEntity[], integer
local characters, amount = lib.callback.await('qbx_core:server:getCharacters')
local options = {}
for i = 1, amount do
local character = characters[i]
Expand Down Expand Up @@ -410,6 +413,7 @@ local function chooseCharacter()
local success = createCharacter(i)
if success then return end

previewPed(firstCharacterCitizenId)
lib.showContext('qbx_core_multichar_characters')
end
end
Expand Down Expand Up @@ -505,7 +509,6 @@ CreateThread(function()
if NetworkIsSessionStarted() then
pcall(function() exports.spawnmanager:setAutoSpawn(false) end)
Wait(250)
randomPed()
chooseCharacter()
break
end
Expand Down
Loading