From ec628fb6c7af9a0e40a4356ecfca3edda853eea5 Mon Sep 17 00:00:00 2001 From: Jellyton Date: Wed, 28 Dec 2022 02:42:00 +0000 Subject: [PATCH] Add OOC color to main config file --- config.lua | 25 ++++++++++++++++--------- server/commands.lua | 9 +++------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/config.lua b/config.lua index da61617..c5a4d8a 100644 --- a/config.lua +++ b/config.lua @@ -1,19 +1,19 @@ QBConfig = {} -QBConfig.MaxPlayers = GetConvarInt('sv_maxclients', 48) -- Gets max players from config file, default 48 +QBConfig.MaxPlayers = GetConvarInt('sv_maxclients', 128) -- Gets max players from config file, default 48 QBConfig.DefaultSpawn = vector4(-1035.71, -2731.87, 12.86, 0.0) QBConfig.UpdateInterval = 5 -- how often to update player data in minutes QBConfig.StatusInterval = 5000 -- how often to check hunger/thirst status in milliseconds 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-management +QBConfig.Money.MoneyTypes = { cash = 1000, bank = 40000, shung = 0, rook = 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', 'bank', 'crypto' } -- Money that is not allowed going in minus +QBConfig.Money.PayCheckTimeOut = 45 -- The time in minutes that it will give the paycheck +QBConfig.Money.PayCheckSociety = true -- If true paycheck will come from the society account that the player is employed at, requires qb-management QBConfig.Player = {} -QBConfig.Player.HungerRate = 4.2 -- Rate at which hunger goes down. -QBConfig.Player.ThirstRate = 3.8 -- Rate at which thirst goes down. +QBConfig.Player.HungerRate = 3.0 -- Rate at which hunger goes down. +QBConfig.Player.ThirstRate = 2.8 -- Rate at which thirst goes down. QBConfig.Player.Bloodtypes = { "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-", } @@ -25,14 +25,17 @@ QBConfig.Server.Uptime = 0 -- Time the server has been up. QBConfig.Server.Whitelist = false -- Enable or disable whitelist on the server QBConfig.Server.WhitelistPermission = 'admin' -- Permission that's able to enter the server when the whitelist is on QBConfig.Server.PVP = true -- Enable or disable pvp on the server (Ability to shoot other players) -QBConfig.Server.Discord = "" -- Discord invite link +QBConfig.Server.Discord = "discord.gg/everfall" -- Discord invite link QBConfig.Server.CheckDuplicateLicense = true -- Check for duplicate rockstar license on join QBConfig.Server.Permissions = { 'god', 'admin', 'mod' } -- Add as many groups as you want here after creating them in your server.cfg +QBConfig.Commands = {} -- Command Configuration +QBConfig.Commands.OOCColor = {255, 151, 133} -- RGB color code for the OOC command + QBConfig.Notify = {} QBConfig.Notify.NotificationStyling = { - group = false, -- Allow notifications to stack with a badge instead of repeating + group = true, -- Allow notifications to stack with a badge instead of repeating position = "right", -- top-left | top-right | bottom-left | bottom-right | top | bottom | left | right | center progress = true -- Display Progress Bar } @@ -60,5 +63,9 @@ QBConfig.Notify.VariantDefinitions = { ambulance = { classes = 'ambulance', icon = 'fas fa-ambulance' + }, + panic = { + classes = 'panic', + icon = 'crisis_alert' } } diff --git a/server/commands.lua b/server/commands.lua index 641ce1f..67ff784 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -244,9 +244,6 @@ QBCore.Commands.Add('setgang', Lang:t("command.setgang.help"), { { name = Lang:t end, 'admin') -- Out of Character Chat - -local oocColor = {255, 151, 133} - QBCore.Commands.Add('ooc', Lang:t("command.ooc.help"), {}, false, function(source, args) local message = table.concat(args, ' ') local Players = QBCore.Functions.GetPlayers() @@ -255,20 +252,20 @@ QBCore.Commands.Add('ooc', Lang:t("command.ooc.help"), {}, false, function(sourc for _, v in pairs(Players) do if v == source then TriggerClientEvent('chat:addMessage', v, { - color = oocColor, + color = QBConfig.Commands.OOCColor, multiline = true, args = {'OOC | '.. GetPlayerName(source), message} }) elseif #(playerCoords - GetEntityCoords(GetPlayerPed(v))) < 20.0 then TriggerClientEvent('chat:addMessage', v, { - color = oocColor, + color = QBConfig.Commands.OOCColor, multiline = true, args = {'OOC | '.. GetPlayerName(source), message} }) elseif QBCore.Functions.HasPermission(v, 'admin') then if QBCore.Functions.IsOptin(v) then TriggerClientEvent('chat:addMessage', v, { - color = oocColor, + color = QBConfig.Commands.OOCColor, multiline = true, args = {'Proximity OOC | '.. GetPlayerName(source), message} })