danish

.github/workflows/lint.yml

@@ -13,11 +13,11 @@ jobs:
         with:
           capture: "junit.xml"
           args: "-t --formatter JUnit"
-          extra_libs: mysql+polyzone+qblocales
+          extra_libs: mysql+polyzone+qblocales+qbapartments
       - name: Generate Lint Report
         if: always()
         uses: mikepenz/action-junit-report@v3
         with:
           report_paths: "**/junit.xml"
           check_name: Linting Report
-          fail_on_failure: false
+          fail_on_failure: false

README.md

@@ -30,8 +30,8 @@ Added support for setting default number of characters per player per Rockstar l
 - [qb-weathersync](https://github.com/qbcore-framework/qb-weathersync) - For adjusting the weather while player is creating a character.
 
 ## Screenshots
-![Character Selection](https://i.imgur.com/EUB5X6Y.png)
-![Character Registration](https://i.imgur.com/RKxiyed.png)
+![Character Selection](https://cdn.discordapp.com/attachments/934470871333105674/1014215694394589294/unknown.png)
+![Character Registration](https://cdn.discordapp.com/attachments/934470871333105674/1014215687700488304/unknown.png)
 
 ## Features
 - Ability to create up to 5 characters and delete any character.

client/main.lua

@@ -1,5 +1,6 @@
 local cam = nil
 local charPed = nil
+local loadScreenCheckState = false
 local QBCore = exports['qb-core']:GetCoreObject()
 
 -- Main Thread
@@ -37,14 +38,26 @@ end
 
 local function openCharMenu(bool)
     QBCore.Functions.TriggerCallback("qb-multicharacter:server:GetNumberOfCharacters", function(result)
+        local translations = {}
+        for k in pairs(Lang.fallback and Lang.fallback.phrases or Lang.phrases) do
+            if k:sub(0, ('ui.'):len()) then
+                translations[k:sub(('ui.'):len() + 1)] = Lang:t(k)
+            end
+        end
         SetNuiFocus(bool, bool)
         SendNUIMessage({
             action = "ui",
+            customNationality = Config.customNationality,
             toggle = bool,
             nChar = result,
             enableDeleteButton = Config.EnableDeleteButton,
+            translations = translations
         })
         skyCam(bool)
+        if not loadScreenCheckState then
+            ShutdownLoadingScreenNui()
+            loadScreenCheckState = true
+        end
     end)
 end
 
@@ -143,7 +156,7 @@ RegisterNUICallback('cDataPed', function(nData, cb)
                         "mp_m_freemode_01",
                         "mp_f_freemode_01",
                     }
-                    model = GetHashKey(randommodels[math.random(1, #randommodels)])
+                    model = joaat(randommodels[math.random(1, #randommodels)])
                     RequestModel(model)
                     while not HasModelLoaded(model) do
                         Wait(0)
@@ -164,7 +177,7 @@ RegisterNUICallback('cDataPed', function(nData, cb)
                 "mp_m_freemode_01",
                 "mp_f_freemode_01",
             }
-            local model = GetHashKey(randommodels[math.random(1, #randommodels)])
+            local model = joaat(randommodels[math.random(1, #randommodels)])
             RequestModel(model)
             while not HasModelLoaded(model) do
                 Wait(0)
@@ -198,9 +211,9 @@ end)
 RegisterNUICallback('createNewCharacter', function(data, cb)
     local cData = data
     DoScreenFadeOut(150)
-    if cData.gender == "Male" then
+    if cData.gender == Lang:t("ui.male") then
         cData.gender = 0
-    elseif cData.gender == "Female" then
+    elseif cData.gender == Lang:t("ui.female") then
         cData.gender = 1
     end
     TriggerServerEvent('qb-multicharacter:server:createCharacter', cData)
@@ -210,6 +223,7 @@ end)
 
 RegisterNUICallback('removeCharacter', function(data, cb)
     TriggerServerEvent('qb-multicharacter:server:deleteCharacter', data.citizenid)
+    DeletePed(charPed)
     TriggerEvent('qb-multicharacter:client:chooseChar')
     cb("ok")
 end)

config.lua

@@ -1,13 +1,13 @@
 Config = {}
-Config.StartingApartment = true -- Enable/disable starting apartments (make sure to set default spawn coords)
 Config.Interior = vector3(-814.89, 181.95, 76.85) -- Interior to load where characters are previewed
 Config.DefaultSpawn = vector3(-1035.71, -2731.87, 12.86) -- Default spawn coords if you have start apartments disabled
 Config.PedCoords = vector4(-813.97, 176.22, 76.74, -7.5) -- Create preview ped at these coordinates
 Config.HiddenCoords = vector4(-812.23, 182.54, 76.74, 156.5) -- Hides your actual ped while you are in selection
 Config.CamCoords = vector4(-813.46, 178.95, 76.85, 174.5) -- Camera coordinates for character preview screen
 Config.EnableDeleteButton = true -- Define if the player can delete the character or not
+Config.customNationality = false -- Defines if Nationality input is custom of blocked to the list of Countries
 
 Config.DefaultNumberOfCharacters = 5 -- Define maximum amount of default characters (maximum 5 characters defined by default)
 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)
     { license = "license:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", numberOfChars = 2 },
-}
+}

fxmanifest.lua

@@ -2,12 +2,22 @@ fx_version 'cerulean'
 game 'gta5'
 
 description 'QB-Multicharacter'
-version '1.0.0'
+version '1.2.0'
+
+shared_scripts {
+    '@qb-core/shared/locale.lua',
+    'locales/en.lua',
+    'locales/*.lua',
+    'config.lua'
+}
+
+client_scripts {
+    'client/main.lua'
+}
 
-shared_script 'config.lua'
-client_script 'client/main.lua'
 server_scripts  {
     '@oxmysql/lib/MySQL.lua',
+    '@qb-apartments/config.lua',
     'server/main.lua'
 }
 
@@ -17,8 +27,9 @@ files {
     'html/index.html',
     'html/style.css',
     'html/reset.css',
-    'html/profanity.js',
-    'html/script.js'
+    'html/vue.js',
+    'html/swal2.js',
+    'html/profanity.js'
 }
 
 dependencies {