From 59fd237d21b3a9bdf866bf4e421a2a11312ab514 Mon Sep 17 00:00:00 2001 From: Kasey FItton Date: Fri, 8 Nov 2024 05:03:24 +0000 Subject: [PATCH] refactor(es_extended): move config into common --- .../es_extended/common/config/adjustments.lua | 45 +++++++++++++++++++ .../{ => common/config}/config.lua | 45 ------------------- .../config/logs.lua} | 0 .../config/weapons.lua} | 0 [core]/es_extended/fxmanifest.lua | 8 ++-- 5 files changed, 50 insertions(+), 48 deletions(-) create mode 100644 [core]/es_extended/common/config/adjustments.lua rename [core]/es_extended/{ => common/config}/config.lua (55%) rename [core]/es_extended/{config.logs.lua => common/config/logs.lua} (100%) rename [core]/es_extended/{config.weapons.lua => common/config/weapons.lua} (100%) diff --git a/[core]/es_extended/common/config/adjustments.lua b/[core]/es_extended/common/config/adjustments.lua new file mode 100644 index 00000000..cf5b8584 --- /dev/null +++ b/[core]/es_extended/common/config/adjustments.lua @@ -0,0 +1,45 @@ +Config.DisableHealthRegeneration = false -- Player will no longer regenerate health +Config.DisableVehicleRewards = false -- Disables Player Receiving weapons from vehicles +Config.DisableNPCDrops = false -- stops NPCs from dropping weapons on death +Config.DisableDispatchServices = true -- Disable Dispatch services +Config.DisableScenarios = true -- Disable Scenarios +Config.DisableWeaponWheel = false -- Disables default weapon wheel +Config.DisableAimAssist = false -- disables AIM assist (mainly on controllers) +Config.DisableVehicleSeatShuff = false -- Disables vehicle seat shuff +Config.DisableDisplayAmmo = false -- Disable ammunition display + +Config.RemoveHudComponents = { + [1] = false, --WANTED_STARS, + [2] = false, --WEAPON_ICON + [3] = false, --CASH + [4] = false, --MP_CASH + [5] = false, --MP_MESSAGE + [6] = true, --VEHICLE_NAME + [7] = true, -- AREA_NAME + [8] = true, -- VEHICLE_CLASS + [9] = true, --STREET_NAME + [10] = false, --HELP_TEXT + [11] = false, --FLOATING_HELP_TEXT_1 + [12] = false, --FLOATING_HELP_TEXT_2 + [13] = false, --CASH_CHANGE + [14] = false, --RETICLE + [15] = false, --SUBTITLE_TEXT + [16] = false, --RADIO_STATIONS + [17] = false, --SAVING_GAME, + [18] = false, --GAME_STREAM + [19] = false, --WEAPON_WHEEL + [20] = false, --WEAPON_WHEEL_STATS + [21] = false, --HUD_COMPONENTS + [22] = false, --HUD_WEAPONS +} + +-- Pattern string format +--1 will lead to a random number from 0-9. +--A will lead to a random letter from A-Z. +-- . will lead to a random letter or number, with a 50% probability of being either. +--^1 will lead to a literal 1 being emitted. +--^A will lead to a literal A being emitted. +--Any other character will lead to said character being emitted. +-- A string shorter than 8 characters will be padded on the right. +Config.CustomAIPlates = "........" -- Custom plates for AI vehicles + diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/common/config/config.lua similarity index 55% rename from [core]/es_extended/config.lua rename to [core]/es_extended/common/config/config.lua index 138e298f..94020196 100644 --- a/[core]/es_extended/config.lua +++ b/[core]/es_extended/common/config/config.lua @@ -54,50 +54,5 @@ Config.DistanceGive = 4.0 -- Max distance when giving items, weapons etc. Config.AdminLogging = false -- Logs the usage of certain commands by those with group.admin ace permissions (default is false) -Config.DisableHealthRegeneration = false -- Player will no longer regenerate health -Config.DisableVehicleRewards = false -- Disables Player Receiving weapons from vehicles -Config.DisableNPCDrops = false -- stops NPCs from dropping weapons on death -Config.DisableDispatchServices = true -- Disable Dispatch services -Config.DisableScenarios = true -- Disable Scenarios -Config.DisableWeaponWheel = false -- Disables default weapon wheel -Config.DisableAimAssist = false -- disables AIM assist (mainly on controllers) -Config.DisableVehicleSeatShuff = false -- Disables vehicle seat shuff -Config.DisableDisplayAmmo = false -- Disable ammunition display -Config.RemoveHudComponents = { - [1] = false, --WANTED_STARS, - [2] = false, --WEAPON_ICON - [3] = false, --CASH - [4] = false, --MP_CASH - [5] = false, --MP_MESSAGE - [6] = true, --VEHICLE_NAME - [7] = true, -- AREA_NAME - [8] = true, -- VEHICLE_CLASS - [9] = true, --STREET_NAME - [10] = false, --HELP_TEXT - [11] = false, --FLOATING_HELP_TEXT_1 - [12] = false, --FLOATING_HELP_TEXT_2 - [13] = false, --CASH_CHANGE - [14] = false, --RETICLE - [15] = false, --SUBTITLE_TEXT - [16] = false, --RADIO_STATIONS - [17] = false, --SAVING_GAME, - [18] = false, --GAME_STREAM - [19] = false, --WEAPON_WHEEL - [20] = false, --WEAPON_WHEEL_STATS - [21] = false, --HUD_COMPONENTS - [22] = false, --HUD_WEAPONS -} - -Config.SpawnVehMaxUpgrades = true -- admin vehicles spawn with max vehicle settings -Config.CustomAIPlates = "........" -- Custom plates for AI vehicles --- Pattern string format ---1 will lead to a random number from 0-9. ---A will lead to a random letter from A-Z. --- . will lead to a random letter or number, with a 50% probability of being either. ---^1 will lead to a literal 1 being emitted. ---^A will lead to a literal A being emitted. ---Any other character will lead to said character being emitted. --- A string shorter than 8 characters will be padded on the right. - -- Do NOT change the following unless you know what you are doing Config.EnableDefaultInventory = not Config.CustomInventory -- Display the default Inventory ( F2 ) diff --git a/[core]/es_extended/config.logs.lua b/[core]/es_extended/common/config/logs.lua similarity index 100% rename from [core]/es_extended/config.logs.lua rename to [core]/es_extended/common/config/logs.lua diff --git a/[core]/es_extended/config.weapons.lua b/[core]/es_extended/common/config/weapons.lua similarity index 100% rename from [core]/es_extended/config.weapons.lua rename to [core]/es_extended/common/config/weapons.lua diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index 06d54716..642c764d 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -9,8 +9,9 @@ shared_scripts { 'locale.lua', 'locales/*.lua', - 'config.lua', - 'config.weapons.lua', + 'common/config/config.lua', + 'common/config/weapons.lua', + 'common/config/adjustments.lua', 'common/main.lua', 'common/functions.lua', @@ -19,7 +20,8 @@ shared_scripts { server_scripts { '@oxmysql/lib/MySQL.lua', - 'config.logs.lua', + 'common/config/logs.lua', + 'server/common.lua', 'server/modules/callback.lua', 'server/classes/player.lua',