From 58050567ca6cecbf3d0faabd1539caacde906e8c Mon Sep 17 00:00:00 2001 From: AlmTech Date: Wed, 11 Sep 2019 20:52:56 +0200 Subject: [PATCH] Restructured the file structure --- gamemode/cl_init.lua | 1 - gamemode/{ => engine}/core/client/cl_config_vars.lua | 0 gamemode/{ => engine}/core/client/cl_fonts.lua | 0 gamemode/{ => engine}/core/client/cl_hud.lua | 0 .../{ => engine}/core/server/sv_player_character.lua | 6 ++++-- gamemode/{ => engine}/core/server/sv_player_damage.lua | 0 gamemode/{ => engine}/core/server/sv_player_init.lua | 0 .../{ => engine}/core/server/sv_player_spawning.lua | 0 gamemode/{ => engine}/core/server/sv_player_voice.lua | 0 gamemode/{core => engine}/sh_debug.lua | 0 gamemode/init.lua | 4 ++-- gamemode/settings/sv_settings.lua | 10 ++++++++++ gamemode/shared.lua | 4 +++- 13 files changed, 19 insertions(+), 6 deletions(-) rename gamemode/{ => engine}/core/client/cl_config_vars.lua (100%) rename gamemode/{ => engine}/core/client/cl_fonts.lua (100%) rename gamemode/{ => engine}/core/client/cl_hud.lua (100%) rename gamemode/{ => engine}/core/server/sv_player_character.lua (89%) rename gamemode/{ => engine}/core/server/sv_player_damage.lua (100%) rename gamemode/{ => engine}/core/server/sv_player_init.lua (100%) rename gamemode/{ => engine}/core/server/sv_player_spawning.lua (100%) rename gamemode/{ => engine}/core/server/sv_player_voice.lua (100%) rename gamemode/{core => engine}/sh_debug.lua (100%) diff --git a/gamemode/cl_init.lua b/gamemode/cl_init.lua index d194772..7f604a5 100644 --- a/gamemode/cl_init.lua +++ b/gamemode/cl_init.lua @@ -15,7 +15,6 @@ if CLIENT then function Quantum.Client.Load() local fol = GM.FolderName .. "/gamemode/core/" - -- Shared files local shFiles = file.Find( fol .. "/sh_*.lua", "LUA" ) for _, file in pairs( shFiles ) do diff --git a/gamemode/core/client/cl_config_vars.lua b/gamemode/engine/core/client/cl_config_vars.lua similarity index 100% rename from gamemode/core/client/cl_config_vars.lua rename to gamemode/engine/core/client/cl_config_vars.lua diff --git a/gamemode/core/client/cl_fonts.lua b/gamemode/engine/core/client/cl_fonts.lua similarity index 100% rename from gamemode/core/client/cl_fonts.lua rename to gamemode/engine/core/client/cl_fonts.lua diff --git a/gamemode/core/client/cl_hud.lua b/gamemode/engine/core/client/cl_hud.lua similarity index 100% rename from gamemode/core/client/cl_hud.lua rename to gamemode/engine/core/client/cl_hud.lua diff --git a/gamemode/core/server/sv_player_character.lua b/gamemode/engine/core/server/sv_player_character.lua similarity index 89% rename from gamemode/core/server/sv_player_character.lua rename to gamemode/engine/core/server/sv_player_character.lua index e305954..a19a31d 100644 --- a/gamemode/core/server/sv_player_character.lua +++ b/gamemode/engine/core/server/sv_player_character.lua @@ -22,6 +22,8 @@ function Quantum.Server.Char.CreateCharTable( args ) combat = 0, science = 0 }, + licenses = args.licenses || {}, + titles = args.titles || {} } end @@ -37,8 +39,8 @@ end function Quantum.Server.Char.Remove( pl, index ) local id = pl:SteamID() .. ":" .. index - if( Quantum.Server.Char.Players[id] ~= nil ) then - Quantum.Server.Char.Players[id] = nil + if( Quantum.Server.Char.Players[ id ] ~= nil ) then + Quantum.Server.Char.Players[ id ] = nil Quantum.Debug( "Removed character (" .. id .. ")" ) end end diff --git a/gamemode/core/server/sv_player_damage.lua b/gamemode/engine/core/server/sv_player_damage.lua similarity index 100% rename from gamemode/core/server/sv_player_damage.lua rename to gamemode/engine/core/server/sv_player_damage.lua diff --git a/gamemode/core/server/sv_player_init.lua b/gamemode/engine/core/server/sv_player_init.lua similarity index 100% rename from gamemode/core/server/sv_player_init.lua rename to gamemode/engine/core/server/sv_player_init.lua diff --git a/gamemode/core/server/sv_player_spawning.lua b/gamemode/engine/core/server/sv_player_spawning.lua similarity index 100% rename from gamemode/core/server/sv_player_spawning.lua rename to gamemode/engine/core/server/sv_player_spawning.lua diff --git a/gamemode/core/server/sv_player_voice.lua b/gamemode/engine/core/server/sv_player_voice.lua similarity index 100% rename from gamemode/core/server/sv_player_voice.lua rename to gamemode/engine/core/server/sv_player_voice.lua diff --git a/gamemode/core/sh_debug.lua b/gamemode/engine/sh_debug.lua similarity index 100% rename from gamemode/core/sh_debug.lua rename to gamemode/engine/sh_debug.lua diff --git a/gamemode/init.lua b/gamemode/init.lua index 1109f07..d8a4075 100644 --- a/gamemode/init.lua +++ b/gamemode/init.lua @@ -6,6 +6,7 @@ -- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/ if SERVER then + AddCSLuaFile( "engine/sh_debug.lua" ) AddCSLuaFile( "cl_init.lua" ) AddCSLuaFile( "shared.lua" ) @@ -15,9 +16,8 @@ if SERVER then include( "settings/sv_settings.lua" ) -- include the settings -- Add all core files - function Quantum.Server.Load() - local fol = GM.FolderName .. "/gamemode/core/" + local fol = GM.FolderName .. "/gamemode/engine/core/" -- Shared files local shFiles = file.Find( fol .. "/sh_*.lua", "LUA" ) diff --git a/gamemode/settings/sv_settings.lua b/gamemode/settings/sv_settings.lua index 6cdd4ea..39b7dee 100644 --- a/gamemode/settings/sv_settings.lua +++ b/gamemode/settings/sv_settings.lua @@ -9,6 +9,8 @@ Quantum.Server.Settings.VoiceChatRange = 400 +Quantum.Server.Settings.StarterMoney = 0 + Quantum.Server.Settings.MaxJobLevel = 250 Quantum.Server.Settings.MaxJobSlots = 2 Quantum.Server.Settings.MaxSkillLevel = 100 @@ -22,6 +24,14 @@ Quantum.Server.Settings.SpawnLocations = { } +Quantum.Server.Settings.Licenses = { + Driving = { title = "Driving License", desc = "This permits you to operate and pilot any motorized vehicle in a public area.", cost = 1000 } +} + +Quantum.Server.Settings.Titles = { + dev = "Developer," +} + Quantum.Server.Settings.DamageScale = { -- The scale of the damage for each hitgroup [HITGROUP_HEAD] = 10, [HITGROUP_CHEST] = 4, diff --git a/gamemode/shared.lua b/gamemode/shared.lua index bf290ad..0d3c0f5 100644 --- a/gamemode/shared.lua +++ b/gamemode/shared.lua @@ -10,4 +10,6 @@ GM.Author = "AlmTech" GM.Email = "elias@almtech.se" GM.Website = "N/A" -Quantum = {} \ No newline at end of file +Quantum = {} + +include( "engine/sh_debug.lua" ) -- add the debug functions and stuff \ No newline at end of file