Skip to content

Commit d68836a

Browse files
committed
Styling update
1 parent ea4b8c9 commit d68836a

File tree

11 files changed

+1090
-1413
lines changed

11 files changed

+1090
-1413
lines changed

client/main.lua

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ local randommodels = { -- models possible to load when choosing empty slot
1212
-- Main Thread
1313

1414
CreateThread(function()
15-
while true do
16-
Wait(0)
17-
if NetworkIsSessionStarted() then
18-
TriggerEvent('qb-multicharacter:client:chooseChar')
19-
return
20-
end
21-
end
15+
while true do
16+
Wait(0)
17+
if NetworkIsSessionStarted() then
18+
TriggerEvent('qb-multicharacter:client:chooseChar')
19+
return
20+
end
21+
end
2222
end)
2323

2424
-- Functions
@@ -30,7 +30,6 @@ local function loadModel(model)
3030
end
3131
end
3232

33-
3433
local function initializePedModel(model, data)
3534
CreateThread(function()
3635
if not model then
@@ -56,7 +55,7 @@ local function skyCam(bool)
5655
SetTimecycleModifier('hud_def_blur')
5756
SetTimecycleModifierStrength(1.0)
5857
FreezeEntityPosition(PlayerPedId(), false)
59-
cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", Config.CamCoords.x, Config.CamCoords.y, Config.CamCoords.z, 0.0 ,0.0, Config.CamCoords.w, 60.00, false, 0)
58+
cam = CreateCamWithParams('DEFAULT_SCRIPTED_CAMERA', Config.CamCoords.x, Config.CamCoords.y, Config.CamCoords.z, 0.0, 0.0, Config.CamCoords.w, 60.00, false, 0)
6059
SetCamActive(cam, true)
6160
RenderScriptCams(true, false, 1, true, true)
6261
else
@@ -69,7 +68,7 @@ local function skyCam(bool)
6968
end
7069

7170
local function openCharMenu(bool)
72-
QBCore.Functions.TriggerCallback("qb-multicharacter:server:GetNumberOfCharacters", function(result)
71+
QBCore.Functions.TriggerCallback('qb-multicharacter:server:GetNumberOfCharacters', function(result)
7372
local translations = {}
7473
for k in pairs(Lang.fallback and Lang.fallback.phrases or Lang.phrases) do
7574
if k:sub(0, ('ui.'):len()) then
@@ -78,7 +77,7 @@ local function openCharMenu(bool)
7877
end
7978
SetNuiFocus(bool, bool)
8079
SendNUIMessage({
81-
action = "ui",
80+
action = 'ui',
8281
customNationality = Config.customNationality,
8382
toggle = bool,
8483
nChar = result,
@@ -139,14 +138,14 @@ end)
139138
RegisterNetEvent('qb-multicharacter:client:spawnLastLocation', function(coords, cData)
140139
QBCore.Functions.TriggerCallback('apartments:GetOwnedApartment', function(result)
141140
if result then
142-
TriggerEvent("apartments:client:SetHomeBlip", result.type)
141+
TriggerEvent('apartments:client:SetHomeBlip', result.type)
143142
local ped = PlayerPedId()
144143
SetEntityCoords(ped, coords.x, coords.y, coords.z)
145144
SetEntityHeading(ped, coords.w)
146145
FreezeEntityPosition(ped, false)
147146
SetEntityVisible(ped, true)
148147
local PlayerData = QBCore.Functions.GetPlayerData()
149-
local insideMeta = PlayerData.metadata["inside"]
148+
local insideMeta = PlayerData.metadata['inside']
150149
DoScreenFadeOut(500)
151150

152151
if insideMeta.house then
@@ -183,14 +182,14 @@ RegisterNUICallback('closeUI', function(_, cb)
183182
else
184183
openCharMenu(false)
185184
end
186-
cb("ok")
185+
cb('ok')
187186
end)
188187

189188
RegisterNUICallback('disconnectButton', function(_, cb)
190189
SetEntityAsMissionEntity(charPed, true, true)
191190
DeleteEntity(charPed)
192191
TriggerServerEvent('qb-multicharacter:server:disconnect')
193-
cb("ok")
192+
cb('ok')
194193
end)
195194

196195
RegisterNUICallback('selectCharacter', function(data, cb)
@@ -200,7 +199,7 @@ RegisterNUICallback('selectCharacter', function(data, cb)
200199
openCharMenu(false)
201200
SetEntityAsMissionEntity(charPed, true, true)
202201
DeleteEntity(charPed)
203-
cb("ok")
202+
cb('ok')
204203
end)
205204

206205
RegisterNUICallback('cDataPed', function(nData, cb)
@@ -220,7 +219,7 @@ RegisterNUICallback('cDataPed', function(nData, cb)
220219
local resolved_model = Citizen.Await(temp_model)
221220
local resolved_data = Citizen.Await(temp_data)
222221

223-
cached_player_skins[cData.citizenid] = {model = resolved_model, data = resolved_data}
222+
cached_player_skins[cData.citizenid] = { model = resolved_model, data = resolved_data }
224223
end
225224

226225
local model = cached_player_skins[cData.citizenid].model
@@ -233,45 +232,45 @@ RegisterNUICallback('cDataPed', function(nData, cb)
233232
else
234233
initializePedModel()
235234
end
236-
cb("ok")
235+
cb('ok')
237236
else
238237
initializePedModel()
239-
cb("ok")
238+
cb('ok')
240239
end
241240
end)
242241

243242
RegisterNUICallback('setupCharacters', function(_, cb)
244-
QBCore.Functions.TriggerCallback("qb-multicharacter:server:setupCharacters", function(result)
245-
cached_player_skins = {}
243+
QBCore.Functions.TriggerCallback('qb-multicharacter:server:setupCharacters', function(result)
244+
cached_player_skins = {}
246245
SendNUIMessage({
247-
action = "setupCharacters",
246+
action = 'setupCharacters',
248247
characters = result
249248
})
250-
cb("ok")
249+
cb('ok')
251250
end)
252251
end)
253252

254253
RegisterNUICallback('removeBlur', function(_, cb)
255254
SetTimecycleModifier('default')
256-
cb("ok")
255+
cb('ok')
257256
end)
258257

259258
RegisterNUICallback('createNewCharacter', function(data, cb)
260259
local cData = data
261260
DoScreenFadeOut(150)
262-
if cData.gender == Lang:t("ui.male") then
261+
if cData.gender == Lang:t('ui.male') then
263262
cData.gender = 0
264-
elseif cData.gender == Lang:t("ui.female") then
263+
elseif cData.gender == Lang:t('ui.female') then
265264
cData.gender = 1
266265
end
267266
TriggerServerEvent('qb-multicharacter:server:createCharacter', cData)
268267
Wait(500)
269-
cb("ok")
268+
cb('ok')
270269
end)
271270

272271
RegisterNUICallback('removeCharacter', function(data, cb)
273272
TriggerServerEvent('qb-multicharacter:server:deleteCharacter', data.citizenid)
274273
DeletePed(charPed)
275274
TriggerEvent('qb-multicharacter:client:chooseChar')
276-
cb("ok")
275+
cb('ok')
277276
end)

config.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Config = {}
2-
Config.Interior = vector3(-814.89, 181.95, 76.85) -- Interior to load where characters are previewed
3-
Config.DefaultSpawn = vector3(-1035.71, -2731.87, 12.86) -- Default spawn coords if you have start apartments disabled
4-
Config.PedCoords = vector4(-813.97, 176.22, 76.74, -7.5) -- Create preview ped at these coordinates
5-
Config.HiddenCoords = vector4(-812.23, 182.54, 76.74, 156.5) -- Hides your actual ped while you are in selection
6-
Config.CamCoords = vector4(-813.46, 178.95, 76.85, 174.5) -- Camera coordinates for character preview screen
7-
Config.EnableDeleteButton = true -- Define if the player can delete the character or not
8-
Config.customNationality = false -- Defines if Nationality input is custom of blocked to the list of Countries
9-
Config.SkipSelection = false -- Skip the spawn selection and spawns the player at the last location
2+
Config.Interior = vector3(-763.2816, 330.0418, 199.4865) -- Interior to load where characters are previewed
3+
Config.DefaultSpawn = vector3(-1035.71, -2731.87, 12.86) -- Default spawn coords if you have start apartments disabled
4+
Config.PedCoords = vector4(-763.2816, 330.0418, 199.4865, 177.7942) -- Create preview ped at these coordinates
5+
Config.HiddenCoords = vector4(-779.0154, 326.1801, 196.0860, 91.0454) -- Hides your actual ped while you are in selection
6+
Config.CamCoords = vector4(-763.1219, 326.8112, 200, 357.0954) -- Camera coordinates for character preview screen
7+
Config.EnableDeleteButton = true -- Define if the player can delete the character or not
8+
Config.customNationality = false -- Defines if Nationality input is custom of blocked to the list of Countries
9+
Config.SkipSelection = false -- Skip the spawn selection and spawns the player at the last location
1010

11-
Config.DefaultNumberOfCharacters = 5 -- Define maximum amount of default characters (maximum 5 characters defined by default)
12-
Config.PlayersNumberOfCharacters = { -- Define maximum amount of player characters by rockstar license (you can find this license in your server's database in the player table)
13-
{ license = "license:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", numberOfChars = 2 },
14-
}
11+
Config.DefaultNumberOfCharacters = 5 -- Define maximum amount of default characters (maximum 5 characters defined by default)
12+
Config.PlayersNumberOfCharacters = { -- Define maximum amount of player characters by rockstar license (you can find this license in your server's database in the player table)
13+
{ license = 'license:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', numberOfChars = 2 },
14+
}

fxmanifest.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ files {
3030
'html/reset.css',
3131
'html/vue.js',
3232
'html/swal2.js',
33-
'html/profanity.js'
33+
'html/profanity.js',
34+
'html/translations.js',
35+
'html/validation.js',
36+
'html/app.js'
3437
}
3538

3639
dependencies {

0 commit comments

Comments
 (0)