From 1c0e73d6d9cf81051e8b861bb611c1142d669763 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Mon, 4 Apr 2022 14:23:43 +0200 Subject: [PATCH 01/12] PlayerData.job.isleo --- server/player.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/player.lua b/server/player.lua index 542cf15..5a84ee5 100644 --- a/server/player.lua +++ b/server/player.lua @@ -113,6 +113,7 @@ function QBCore.Player.CheckPlayerData(source, PlayerData) PlayerData.job.name = PlayerData.job.name or 'unemployed' PlayerData.job.label = PlayerData.job.label or 'Civilian' PlayerData.job.payment = PlayerData.job.payment or 10 + PlayerData.job.isleo = PlayerData.job.isleo or false if QBCore.Shared.ForceJobDefaultDutyAtLogin or PlayerData.job.onduty == nil then PlayerData.job.onduty = QBCore.Shared.Jobs[PlayerData.job.name].defaultDuty end @@ -167,6 +168,7 @@ function QBCore.Player.CreatePlayer(PlayerData) self.PlayerData.job.name = job self.PlayerData.job.label = QBCore.Shared.Jobs[job].label self.PlayerData.job.onduty = QBCore.Shared.Jobs[job].defaultDuty + self.PlayerData.job.isleo = QBCore.Shared.Jobs[job].isleo or false if QBCore.Shared.Jobs[job].grades[grade] then local jobgrade = QBCore.Shared.Jobs[job].grades[grade] self.PlayerData.job.grade = {} From c8c406df9f7204cf34c1596907e0eaf1482bd690 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Mon, 4 Apr 2022 14:24:18 +0200 Subject: [PATCH 02/12] PlayerData.job.isleo --- shared/jobs.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/jobs.lua b/shared/jobs.lua index 8960e67..bbe8922 100644 --- a/shared/jobs.lua +++ b/shared/jobs.lua @@ -14,6 +14,7 @@ QBShared.Jobs = { }, ['police'] = { label = 'Law Enforcement', + isleo = true, defaultDuty = true, offDutyPay = false, grades = { @@ -279,4 +280,4 @@ QBShared.Jobs = { }, }, }, -} \ No newline at end of file +} From 56473b484365e5be313294c34ce2611b83c64675 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:24:11 +0200 Subject: [PATCH 03/12] Update server/player.lua Co-authored-by: ItsANoBrainer --- server/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/player.lua b/server/player.lua index 5a84ee5..39932e2 100644 --- a/server/player.lua +++ b/server/player.lua @@ -113,7 +113,7 @@ function QBCore.Player.CheckPlayerData(source, PlayerData) PlayerData.job.name = PlayerData.job.name or 'unemployed' PlayerData.job.label = PlayerData.job.label or 'Civilian' PlayerData.job.payment = PlayerData.job.payment or 10 - PlayerData.job.isleo = PlayerData.job.isleo or false + PlayerData.job.type = PlayerData.job.type or 'none' if QBCore.Shared.ForceJobDefaultDutyAtLogin or PlayerData.job.onduty == nil then PlayerData.job.onduty = QBCore.Shared.Jobs[PlayerData.job.name].defaultDuty end From 43b107fd4ccf122b6920410039d0513efd7a3166 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:24:15 +0200 Subject: [PATCH 04/12] Update server/player.lua Co-authored-by: ItsANoBrainer --- server/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/player.lua b/server/player.lua index 39932e2..bbf0751 100644 --- a/server/player.lua +++ b/server/player.lua @@ -168,7 +168,7 @@ function QBCore.Player.CreatePlayer(PlayerData) self.PlayerData.job.name = job self.PlayerData.job.label = QBCore.Shared.Jobs[job].label self.PlayerData.job.onduty = QBCore.Shared.Jobs[job].defaultDuty - self.PlayerData.job.isleo = QBCore.Shared.Jobs[job].isleo or false + self.PlayerData.job.type = QBCore.Shared.Jobs[job].type or 'none' if QBCore.Shared.Jobs[job].grades[grade] then local jobgrade = QBCore.Shared.Jobs[job].grades[grade] self.PlayerData.job.grade = {} From 8685a55f26d94948518ecafb393aa7af031a7b4a Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:24:20 +0200 Subject: [PATCH 05/12] Update shared/jobs.lua Co-authored-by: ItsANoBrainer --- shared/jobs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/jobs.lua b/shared/jobs.lua index bbe8922..a1da2bb 100644 --- a/shared/jobs.lua +++ b/shared/jobs.lua @@ -14,7 +14,7 @@ QBShared.Jobs = { }, ['police'] = { label = 'Law Enforcement', - isleo = true, + type = "leo", defaultDuty = true, offDutyPay = false, grades = { From f30f1f298e78beb670a4909b6cb6e9a59dd946bd Mon Sep 17 00:00:00 2001 From: Dolbajoba <83533764+Getpwnedbydolbajoba@users.noreply.github.com> Date: Sat, 23 Apr 2022 12:28:18 +0300 Subject: [PATCH 06/12] Estonian translation. --- locale/ee.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 locale/ee.lua diff --git a/locale/ee.lua b/locale/ee.lua new file mode 100644 index 0000000..8bd5da0 --- /dev/null +++ b/locale/ee.lua @@ -0,0 +1,31 @@ +local Translations = { + error = { + not_online = 'Mängija pole serveris!', + wrong_format = 'Vale formaat.', + missing_args = 'Kõiki argumente pole sisestatud (x, y, z)', + missing_args2 = 'Kõik argumendid tuleb täita!', + no_access = 'Sellele käsule pole juurdepääsu!', + company_too_poor = 'Teie tööandja on pankrotis.', + item_not_exist = 'Sellist asja ei eksisteeri', + too_heavy = 'Inventuur on liiga täis', + duplicate_license = 'Leiti Rockstari litsentsi duplikaat', + no_valid_license = 'Kehtivat Rockstari litsentsi ei leitud', + not_whitelisted = 'Te\'pole serveri Allowlistis!' + }, + success = {}, + info = { + received_paycheck = 'Saite oma töötasu kätte $%{value}', + job_info = 'Töökoht: %{value} | Auaste: %{value2} | Tööl: %{value3}', + gang_info = 'Gang: %{value} | Auaste: %{value2}', + on_duty = 'Alustasite enda tööpäeva!', + off_duty = 'Lõpetasite enda tööpäeva!', + checking_ban = 'Tere %s. Me kontrollime, kas olete keelustatud.', + join_server = 'Tere tulemast %s serverisse {Server Name}.', + checking_whitelisted = 'Tere %s. Kontrollime teie Allowlisti olemasolu.' + } +} + +Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true +}) From ad57a480b34367dc6fd4a7e155582ddc888d40ff Mon Sep 17 00:00:00 2001 From: Joel <34402846+Qwerty1Verified@users.noreply.github.com> Date: Sat, 23 Apr 2022 21:35:09 +0100 Subject: [PATCH 07/12] fix(clearinv): Player id definition Fixes playerid from becoming "true" instead of the ID or source --- server/commands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/commands.lua b/server/commands.lua index 125a1ea..5328add 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -208,7 +208,7 @@ end, 'admin') -- Inventory (should be in qb-inventory?) QBCore.Commands.Add('clearinv', 'Clear Players Inventory (Admin Only)', { { name = 'id', help = 'Player ID' } }, false, function(source, args) - local playerId = args[1] and args[1] ~= '' or source + local playerId = args[1] ~= '' and args[1] or source local Player = QBCore.Functions.GetPlayer(tonumber(playerId)) if Player then Player.Functions.ClearInventory() From 7250e37e44063c00b5eb7ffe8b8b5b1e4793d7d0 Mon Sep 17 00:00:00 2001 From: Pierre Grassin Date: Sun, 24 Apr 2022 18:02:40 +0200 Subject: [PATCH 08/12] Update config.lua change qb-boss to qb-management in comment --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 43de9d5..6941fe4 100644 --- a/config.lua +++ b/config.lua @@ -9,7 +9,7 @@ QBConfig.Money = {} QBConfig.Money.MoneyTypes = {['cash'] = 500, ['bank'] = 5000, ['crypto'] = 0} -- ['type'] = startamount - Add or remove money types for your server (for ex. ['blackmoney'] = 0), remember once added it will not be removed from the database! QBConfig.Money.DontAllowMinus = {'cash', 'crypto'} -- Money that is not allowed going in minus QBConfig.Money.PayCheckTimeOut = 10 -- The time in minutes that it will give the paycheck -QBConfig.Money.PayCheckSociety = false -- If true paycheck will come from the society account that the player is employed at, requires qb-bossmenu +QBConfig.Money.PayCheckSociety = false -- If true paycheck will come from the society account that the player is employed at, requires qb-management QBConfig.Player = {} QBConfig.Player.MaxWeight = 120000 -- Max weight a player can carry (currently 120kg, written in grams) From ad410edd23ca9fd57e67d3e26ff45fb41a1155de Mon Sep 17 00:00:00 2001 From: JackBro <33984760+JackBro2022@users.noreply.github.com> Date: Tue, 26 Apr 2022 00:17:22 +1000 Subject: [PATCH 09/12] Better support for 4k screens --- html/css/drawtext.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/html/css/drawtext.css b/html/css/drawtext.css index 489e967..d4769a6 100644 --- a/html/css/drawtext.css +++ b/html/css/drawtext.css @@ -25,6 +25,20 @@ box-shadow: 0rem 0rem 0.1rem 0.05rem #000000; } +@media (width: 3840px) and (height: 2160px) { + #drawtext-container { + display: none; + width: 100%; + height: 100%; + overflow: hidden; + padding: 0; + margin: 0; + font-family: "Poppins", sans-serif !important; + font-weight: 300; + font-size: 1.5vh; + } +} + .text.pressed { background: var(--active-bg); } From 11c42be08e3c8a5d9ec0c54330bc449b3fc0c52e Mon Sep 17 00:00:00 2001 From: JackBro <33984760+JackBro2022@users.noreply.github.com> Date: Tue, 26 Apr 2022 18:35:40 +1000 Subject: [PATCH 10/12] Additional fixes to 4K scaling --- html/css/style.css | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/html/css/style.css b/html/css/style.css index 4581314..5842d7a 100644 --- a/html/css/style.css +++ b/html/css/style.css @@ -2,6 +2,49 @@ html::-webkit-scrollbar { display: none; } +@media (width: 3840px) and (height: 2160px) { + .success { + background-color: rgba(23, 23, 23, 90%); + border-radius: 10px; + box-shadow: 0rem 0rem 0.1rem 0.05rem #000000; + border-left: 0.5rem solid #20bb44; + font-size: 1.5vh; + } + + .primary { + background-color: rgba(23, 23, 23, 90%); + border-radius: 10px; + box-shadow: 0rem 0rem 0.1rem 0.05rem #000000; + border-left: 5px solid #1c75d2; + font-size: 1.5vh; + } + + .error { + background-color: rgba(23, 23, 23, 90%); + border-radius: 10px; + box-shadow: 0rem 0rem 0.1rem 0.05rem #000000; + border-left: 5px solid #c10114; + font-size: 1.5vh; + } + + .police { + background-color: rgba(23, 23, 23, 90%); + border-radius: 10px; + box-shadow: 0rem 0rem 0.1rem 0.05rem #000000; + border-left: 5px solid #2197f2; + font-size: 1.5vh; + } + + .ambulance { + background-color: rgba(23, 23, 23, 90%); + border-radius: 10px; + box-shadow: 0rem 0rem 0.1rem 0.05rem #000000; + border-left: 5px solid #f44236; + font-size: 1.5vh; + } + +} + .success { background-color: rgba(23, 23, 23, 90%); border-radius: 10px; From 3c7f28f0b4e86b28f13b3d0185637ab046a56e49 Mon Sep 17 00:00:00 2001 From: QBLes Date: Mon, 6 Jun 2022 17:49:25 +1000 Subject: [PATCH 11/12] Updated to Events.lua To allow backwards compatibility, this update Broke many scripts. --- server/events.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/server/events.lua b/server/events.lua index 266dfa5..2ca330c 100644 --- a/server/events.lua +++ b/server/events.lua @@ -205,6 +205,7 @@ end) QBCore.Functions.CreateCallback('QBCore:HasItem', function(source, cb, items, amount) local retval = false + if items == nil then return cb(true) end local Player = QBCore.Functions.GetPlayer(source) if not Player then return cb(false) end local isTable = type(items) == 'table' From 88d31270bf89c8b2c2888e31df63a1518950d8e1 Mon Sep 17 00:00:00 2001 From: uShifty <51722240+uShifty@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:05:24 -0700 Subject: [PATCH 12/12] fix: Phone number generation Due to merging the 2 sets of random generated numbers it makes the variable PhoneNumber a string when it should be a number value. I noticed this bug when the framework function QBCore.Functions.GetPlayerByPhone was not working as intended. --- server/player.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/player.lua b/server/player.lua index d14ca34..8f1d92c 100644 --- a/server/player.lua +++ b/server/player.lua @@ -56,7 +56,7 @@ function QBCore.Player.CheckPlayerData(source, PlayerData) PlayerData.charinfo.gender = PlayerData.charinfo.gender or 0 PlayerData.charinfo.backstory = PlayerData.charinfo.backstory or 'placeholder backstory' PlayerData.charinfo.nationality = PlayerData.charinfo.nationality or 'USA' - PlayerData.charinfo.phone = PlayerData.charinfo.phone or QBCore.Functions.CreatePhoneNumber() + PlayerData.charinfo.phone = tonumber(PlayerData.charinfo.phone) or QBCore.Functions.CreatePhoneNumber() PlayerData.charinfo.account = PlayerData.charinfo.account or QBCore.Functions.CreateAccountNumber() -- Metadata PlayerData.metadata = PlayerData.metadata or {} @@ -634,7 +634,7 @@ function QBCore.Functions.CreatePhoneNumber() local UniqueFound = false local PhoneNumber = nil while not UniqueFound do - PhoneNumber = math.random(100,999) .. math.random(1000000,9999999) + PhoneNumber = tonumber(math.random(100,999) .. math.random(1000000,9999999)) local query = '%' .. PhoneNumber .. '%' local result = MySQL.prepare.await('SELECT COUNT(*) as count FROM players WHERE charinfo LIKE ?', { query }) if result == 0 then