From 95ea4f06ef276f156ca474ba90628c93fc71777b Mon Sep 17 00:00:00 2001 From: Fredrik Vold Date: Sun, 10 Nov 2019 19:12:25 +0100 Subject: [PATCH] Reshuffled a little for cleaner release Also, disabled verbosity and added a VERSION. The command now states the version rather than the dumb "Yes?" --- __resource.lua | 8 ++++---- cropstate.lua => lib/cropstate.lua | 0 debug.lua => lib/debug.lua | 0 growth.lua => lib/growth.lua | 0 octree.lua => lib/octree.lua | 0 locales/en-US.lua | 2 +- locales/sv-SE.lua | 2 +- sv_uteknark.lua | 9 +++------ 8 files changed, 9 insertions(+), 12 deletions(-) rename cropstate.lua => lib/cropstate.lua (100%) rename debug.lua => lib/debug.lua (100%) rename growth.lua => lib/growth.lua (100%) rename octree.lua => lib/octree.lua (100%) diff --git a/__resource.lua b/__resource.lua index 4a4c20f..4ba28dc 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,12 +7,12 @@ shared_scripts { '@es_extended/locale.lua', 'locales/*.lua', 'config.lua', - 'octree.lua', - 'growth.lua', - 'cropstate.lua', + 'lib/octree.lua', + 'lib/growth.lua', + 'lib/cropstate.lua', } client_scripts { - 'debug.lua', + 'lib/debug.lua', 'cl_uteknark.lua', } server_scripts { diff --git a/cropstate.lua b/lib/cropstate.lua similarity index 100% rename from cropstate.lua rename to lib/cropstate.lua diff --git a/debug.lua b/lib/debug.lua similarity index 100% rename from debug.lua rename to lib/debug.lua diff --git a/growth.lua b/lib/growth.lua similarity index 100% rename from growth.lua rename to lib/growth.lua diff --git a/octree.lua b/lib/octree.lua similarity index 100% rename from octree.lua rename to lib/octree.lua diff --git a/locales/en-US.lua b/locales/en-US.lua index 8e6c66b..85a3dc1 100644 --- a/locales/en-US.lua +++ b/locales/en-US.lua @@ -20,7 +20,7 @@ Locales['en-US'] = { growth_yield = 'Harvest', command_invalid = 'Invalid directive: %s', - command_empty = 'Yes?', + command_empty = 'Version %s', interact_text = 'Plant interaction', interact_tended = 'Plant tended', diff --git a/locales/sv-SE.lua b/locales/sv-SE.lua index 0eea634..4012d89 100644 --- a/locales/sv-SE.lua +++ b/locales/sv-SE.lua @@ -20,7 +20,7 @@ Locales['sv-SE'] = { growth_yield = 'Skörda', command_invalid = 'Ogiltigt direktiv: %s', - command_empty = 'Ja?', + command_empty = 'Versjon %s', interact_text = 'Växtinteraktion', interact_tended = 'Växt vårdad', diff --git a/sv_uteknark.lua b/sv_uteknark.lua index a0d6e37..6ecbf24 100644 --- a/sv_uteknark.lua +++ b/sv_uteknark.lua @@ -2,10 +2,11 @@ local ESX = nil local ESXTries = 60 local oneSyncEnabled = GetConvar('onesync_enabled', false) local octree = pOctree(vector3(0,1500,0),vector3(12000,12000,2000)) -- Covers the whole damn map! -local VERBOSE = true +local VERBOSE = false local lastPlant = {} local tickTimes = {} local tickPlantCount = 0 +local VERSION = '1.0.0' AddEventHandler('playerDropped',function(why) lastPlant[source] = nil @@ -397,10 +398,6 @@ RegisterCommand('uteknark', function(source, args, raw) inChat(source,_U('command_invalid', directive)) end else - if source == 0 then - log('Uteknark at your service!') - else - inChat(source, _U('command_empty')) - end + inChat(source, _U('command_empty', VERSION)) end end,true) \ No newline at end of file