From 5512d400ebf959fd515e9811192abf5a4330f6a4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 00:58:14 +0100 Subject: [PATCH 01/18] remove config check for hurtworld --- functions/fn_details | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions/fn_details b/functions/fn_details index b270ba5f4..b25edca43 100644 --- a/functions/fn_details +++ b/functions/fn_details @@ -719,6 +719,9 @@ fn_details_statusbottom } if [ ! -e "${servercfgfullpath}" ]; then + if [ "${gamename}" == "Hurtworld"]; then + echo "No config file" + else echo "" fn_printwarnnl "\e[0;31mCONFIGURATION FILE MISSING!\e[0m" echo "${servercfgfullpath}" From 8bebb32766b0ba877faf17f993627f8d3b990ad4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 01:00:51 +0100 Subject: [PATCH 02/18] Update fn_details --- functions/fn_details | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/functions/fn_details b/functions/fn_details index b25edca43..d07d701cc 100644 --- a/functions/fn_details +++ b/functions/fn_details @@ -720,19 +720,20 @@ fn_details_statusbottom if [ ! -e "${servercfgfullpath}" ]; then if [ "${gamename}" == "Hurtworld"]; then - echo "No config file" + echo "No config file set or required" else - echo "" - fn_printwarnnl "\e[0;31mCONFIGURATION FILE MISSING!\e[0m" - echo "${servercfgfullpath}" - echo "Some details cannot be displayed" - echo -en ".\r" - sleep 1 - echo -en "..\r" - sleep 1 - echo -en "...\r" - sleep 1 - echo -en " \r" + echo "" + fn_printwarnnl "\e[0;31mCONFIGURATION FILE MISSING!\e[0m" + echo "${servercfgfullpath}" + echo "Some details cannot be displayed" + echo -en ".\r" + sleep 1 + echo -en "..\r" + sleep 1 + echo -en "...\r" + sleep 1 + echo -en " \r" + fi fi fn_details_glibc From d3cb2761af232b42fe811ea3f8cdbcbefcc90537 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 01:05:26 +0100 Subject: [PATCH 03/18] Update fn_details --- functions/fn_details | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_details b/functions/fn_details index d07d701cc..66d2cfbdd 100644 --- a/functions/fn_details +++ b/functions/fn_details @@ -719,7 +719,7 @@ fn_details_statusbottom } if [ ! -e "${servercfgfullpath}" ]; then - if [ "${gamename}" == "Hurtworld"]; then + if [ "${gamename}" == "Hurtworld" ]; then echo "No config file set or required" else echo "" From 12ebddc1cc3cb265b73012fd405582c414f42542 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 01:10:10 +0100 Subject: [PATCH 04/18] missing $ on maxplayers --- functions/fn_details_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_details_config b/functions/fn_details_config index 6fccda497..f0be53cf8 100644 --- a/functions/fn_details_config +++ b/functions/fn_details_config @@ -608,7 +608,7 @@ elif [ "${gamename}" == "Hurtworld" ]; then # slots if [ -n "${maxplayers}" ]; then - slots="{maxplayers}" + slots="${maxplayers}" else slots="NOT SET" fi From e976f9b0e574babcddd8a0e19d17322239f7e3fe Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 01:16:28 +0100 Subject: [PATCH 05/18] simplifying hurtworld checking --- functions/fn_details | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/functions/fn_details b/functions/fn_details index 66d2cfbdd..c85c96559 100644 --- a/functions/fn_details +++ b/functions/fn_details @@ -719,9 +719,7 @@ fn_details_statusbottom } if [ ! -e "${servercfgfullpath}" ]; then - if [ "${gamename}" == "Hurtworld" ]; then - echo "No config file set or required" - else + if [ "${gamename}" != "Hurtworld" ]; then echo "" fn_printwarnnl "\e[0;31mCONFIGURATION FILE MISSING!\e[0m" echo "${servercfgfullpath}" From 65c3158d7d1586f1ba434f40399602f2756bf17d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:19:55 +0100 Subject: [PATCH 06/18] Update fn_install_gsquery --- functions/fn_install_gsquery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_install_gsquery b/functions/fn_install_gsquery index 5b7db65ea..fe6ee2cef 100644 --- a/functions/fn_install_gsquery +++ b/functions/fn_install_gsquery @@ -11,7 +11,7 @@ wget -N /dev/null "http://gameservermanagers.com/dl/gsquery.py" 2>&1 | grep -F " chmod +x gsquery.py } -if [ "${engine}" == "avalanche" ]||[ "${engine}" == "goldsource" ]||[ "${engine}" == "realvirtuality" ]||[ "${engine}" == "source" ]||[ "${engine}" == "spark" ]||[ "${engine}" == "unity3d" ]||[ "${engine}" == "hwunity3d" ]||[ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then +if [ "${engine}" == "avalanche" ]||[ "${engine}" == "goldsource" ]||[ "${engine}" == "realvirtuality" ]||[ "${engine}" == "source" ]||[ "${engine}" == "spark" ]||[ "${engine}" == "unity3d" ]||[ "${gamename}" == "Hurtworld" ]||[ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then echo "" echo "GameServerQuery" echo "============================" From 7cb95400c3003d042a4605610065801145c61a42 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:21:01 +0100 Subject: [PATCH 07/18] changed engine hwunity3d to gamename Hurtworld changed engine hwunity3d to gamename Hurtworld --- functions/fn_install_gsquery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_install_gsquery b/functions/fn_install_gsquery index fe6ee2cef..16b1534ee 100644 --- a/functions/fn_install_gsquery +++ b/functions/fn_install_gsquery @@ -2,7 +2,7 @@ # LGSM fn_install_gsquery function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="061115" +lgsm_version="221215" fn_dlgsquery(){ cd "${rootdir}" From f8d94fa91507b9306afacdfb60d50b50862c4a4b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:27:22 +0100 Subject: [PATCH 08/18] Don't create config for hurtworld --- functions/fn_install_config | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/functions/fn_install_config b/functions/fn_install_config index 2a0311634..dcd0811de 100644 --- a/functions/fn_install_config +++ b/functions/fn_install_config @@ -5,9 +5,11 @@ lgsm_version="201215" fn_defaultconfig(){ -echo "creating ${servercfg} config file." -cp -v "${servercfgdefault}" "${servercfgfullpath}" -sleep 1 +if [ "${gamename}" != "Hurtworld" ]; then + echo "creating ${servercfg} config file." + cp -v "${servercfgdefault}" "${servercfgfullpath}" + sleep 1 +fi } fn_userinputconfig(){ From 152aee400f25c4623a7ce001d74604dab882cb22 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:28:15 +0100 Subject: [PATCH 09/18] engine set to unity3d --- Hurtworld/hwserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 46ddc27ad..8b92753c3 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -57,7 +57,7 @@ appid="405100" # Server Details servicename="hurtworld-server" gamename="Hurtworld" -engine="hwunity3d" +engine="unity3d" # Directories rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" From 1cdef4ad59144a6ebc418f0ed02dc76aee3242bc Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:40:44 +0100 Subject: [PATCH 10/18] Actually don't create config for hurtworld --- functions/fn_install_config | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/functions/fn_install_config b/functions/fn_install_config index dcd0811de..9ad27b52a 100644 --- a/functions/fn_install_config +++ b/functions/fn_install_config @@ -5,11 +5,9 @@ lgsm_version="201215" fn_defaultconfig(){ -if [ "${gamename}" != "Hurtworld" ]; then echo "creating ${servercfg} config file." cp -v "${servercfgdefault}" "${servercfgfullpath}" sleep 1 -fi } fn_userinputconfig(){ @@ -156,9 +154,12 @@ echo "" echo "Creating Configs" echo "=================================" sleep 1 -mkdir -pv "${servercfgdir}" -cd "${servercfgdir}" -githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}" +if [ "${gamename}" != "Hurtworld" ]; then + mkdir -pv "${servercfgdir}" + cd "${servercfgdir}" + githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}" +fi + if [ "${gamename}" == "7 Days To Die" ]; then fn_defaultconfig elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then From 5ac2e4309980e0df36d5b55b620c487ff572f522 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:43:45 +0100 Subject: [PATCH 11/18] better placement for not creating HW config --- functions/fn_install_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_install_config b/functions/fn_install_config index 9ad27b52a..d91557360 100644 --- a/functions/fn_install_config +++ b/functions/fn_install_config @@ -151,10 +151,10 @@ echo "" } echo "" +if [ "${gamename}" != "Hurtworld" ]; then echo "Creating Configs" echo "=================================" sleep 1 -if [ "${gamename}" != "Hurtworld" ]; then mkdir -pv "${servercfgdir}" cd "${servercfgdir}" githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}" From 112bab51b74b2255f8f7e811559e5bfa64985103 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:49:37 +0100 Subject: [PATCH 12/18] reverting, removing hwunity3d --- GameServerQuery/gsquery.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/GameServerQuery/gsquery.py b/GameServerQuery/gsquery.py index 70eb08951..a1380a5a7 100644 --- a/GameServerQuery/gsquery.py +++ b/GameServerQuery/gsquery.py @@ -27,8 +27,6 @@ class GameServer: self.query_prompt_string = '\xFF\xFF\xFF\xFFTSource Engine Query\0' if self.option.engine == 'unity3d': self.query_prompt_string = '\xFF\xFF\xFF\xFFTSource Engine Query\0' - if self.option.engine == 'hwunity3d': - self.query_prompt_string = '\xFF\xFF\xFF\xFFTSource Engine Query\0' elif self.option.engine == 'unreal': self.query_prompt_string = '\x5C\x69\x6E\x66\x6F\x5C' elif self.option.engine == 'unreal2': @@ -103,7 +101,7 @@ if __name__ == '__main__': action = 'store', dest = 'engine', default = False, - help = 'Engine type: avalanche, goldsource, realvirtuality, spark, source, unity3d, hwunity3d, unreal, unreal2.' + help = 'Engine type: avalanche, goldsource, realvirtuality, spark, source, unity3d, unreal, unreal2.' ) parser.add_option( '-v', '--verbose', From 22c8d2357d8defa687060d46af8dbc3f43b30c1b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:53:06 +0100 Subject: [PATCH 13/18] updated message for gameworld to non critical form --- functions/fn_details_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/fn_details_config b/functions/fn_details_config index f0be53cf8..dfab6de64 100644 --- a/functions/fn_details_config +++ b/functions/fn_details_config @@ -617,7 +617,7 @@ elif [ "${gamename}" == "Hurtworld" ]; then if [ -n "${map}" ]; then gameworld="${map}" else - gameworld="\e[0;31mUNAVAILABLE\e[0m" + gameworld="NO MAP SET" fi # port From b4a40ecef4a3ef8bd73bc7d4e0bbe5bab1eb1ba0 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 02:59:15 +0100 Subject: [PATCH 14/18] support for hurtworld 7 Days To Die now monitors through gamename, as well as the new Hurtworld --- functions/fn_monitor_query | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/functions/fn_monitor_query b/functions/fn_monitor_query index b75c6dba6..3bfb5077f 100644 --- a/functions/fn_monitor_query +++ b/functions/fn_monitor_query @@ -17,9 +17,12 @@ if [ -f "${rootdir}/gsquery.py" ]; then elif [ "${engine}" == "realvirtuality" ]; then queryport=$(grep -s steamqueryport= "${servercfgfullpath}"|grep -v //|tr -d '\r'|tr -cd '[:digit:]') port=${queryport} - elif [ "${engine}" == "unity3d" ]; then + elif [ "${gamename}" == "7 Days To Die" ]; then gameport=$(grep ServerPort "${servercfgfullpath}"|tr -cd '[:digit:]') port=$((${gameport} + 1)) + elif [ "${gamename}" == "Hurtworld" ]; then + gameport="${port}" + port="${queryport}" fi fn_printinfo "Detected gsquery.py" fn_scriptlog "Detected gsquery.py" From de99b7ee8fc8c69964ea62764171104d96af3c8d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 03:12:18 +0100 Subject: [PATCH 15/18] Renamed unity3d to sdtd and check gamename instead --- functions/fn_details | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/fn_details b/functions/fn_details index c85c96559..30313d4e4 100644 --- a/functions/fn_details +++ b/functions/fn_details @@ -554,7 +554,7 @@ echo -e "" fn_details_statusbottom } -fn_details_unity3d(){ +fn_details_sdtd(){ fn_check_ip fn_parms fn_details_config @@ -756,14 +756,14 @@ elif [ "${engine}" == "teeworlds" ]; then fn_details_teeworlds elif [ "${engine}" == "terraria" ]; then fn_details_terraria -elif [ "${engine}" == "unity3d" ]; then - fn_details_unity3d elif [ "${engine}" == "unreal" ] || [ "${engine}" == "unreal2" ]; then fn_details_unreal elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then fn_details_ark elif [ "${gamename}" == "Hurtworld" ]; then fn_details_hurtworld +elif [ "${gamename}" == "7 Days To Die" ]; then + fn_details_sdtd elif [ "${gamename}" == "Teamspeak 3" ]; then fn_details_teamspeak3 else From 310aba93f2628516c19b2493f790e852c92cd412 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 03:48:35 +0100 Subject: [PATCH 16/18] x64 mode, addadmins, more settings categories --- Hurtworld/hwserver | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 8b92753c3..6a01aabfb 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -23,23 +23,31 @@ email="email@example.com" steamuser="anonymous" steampass="" -# Start Variables +# Server settings servername="Hurtworld LGSM Server" ip="0.0.0.0" port="12871" queryport="12881" maxplayers="20" -map="" -creativemode="0" #Free Build (0 is off) -updateonstart="off" +map="" #Optional +creativemode="0" #Free Build -# Maintenance Variables -loadsave="" +# Adding first admins +# Syntax : addadmin STEAMID64; addadmin STEAMID64-bis +# Example : addadmin="addadmin 012345678901234567; addadmin 987654321098765432" +addadmin="" + +# Maintenance settings logfile="gamelog.txt" +loadsave="" + +# EXPERIMENTAL ! Use at your own risk +# Setting this to 1 runs the server with the x64 bits exectutable +x64mode="0" # http://hurtworld.wikia.com/wiki/Hosting_A_Server fn_parms(){ -parms="-batchmode -nographics -exec \"host ${port} ${map} ${save};queryport ${queryport};maxplayers ${maxplayers};servername ${servername};creativemode ${creativemode}\" -logfile \"${logfile}\" " +parms="-batchmode -nographics -exec \"host ${port} ${map} ${save};queryport ${queryport};maxplayers ${maxplayers};servername ${servername};creativemode ${creativemode};${addadmin}\" -logfile \"${logfile}\" " } #### Advanced Variables #### @@ -66,7 +74,11 @@ lockselfname=".${servicename}.lock" filesdir="${rootdir}/serverfiles" systemdir="${filesdir}" executabledir="${filesdir}" -executable="./Hurtworld.x86" +if [ "${x64mode}" == "1" ]; then + executable="./Hurtworld.x86_64" +else + executable="./Hurtworld.x86" +fi backupdir="${rootdir}/backups" # Logging From df7fe2944211cbbe080663675ae0c5f778c5305d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 04:13:07 +0100 Subject: [PATCH 17/18] renamed addadmins to admins, save to loadsave, changed comments --- Hurtworld/hwserver | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 6a01aabfb..433e05619 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -31,23 +31,21 @@ queryport="12881" maxplayers="20" map="" #Optional creativemode="0" #Free Build +logfile="gamelog.txt" -# Adding first admins -# Syntax : addadmin STEAMID64; addadmin STEAMID64-bis -# Example : addadmin="addadmin 012345678901234567; addadmin 987654321098765432" -addadmin="" +# Adding admins using STEAMID64 +# Example : admins="addadmin 012345678901234567; addadmin 987654321098765432" +admins="" -# Maintenance settings -logfile="gamelog.txt" +# Advanced +# Rollback server state (remove after start command) loadsave="" - -# EXPERIMENTAL ! Use at your own risk -# Setting this to 1 runs the server with the x64 bits exectutable +# Use unstable 64 bit server executable (O/1) x64mode="0" # http://hurtworld.wikia.com/wiki/Hosting_A_Server fn_parms(){ -parms="-batchmode -nographics -exec \"host ${port} ${map} ${save};queryport ${queryport};maxplayers ${maxplayers};servername ${servername};creativemode ${creativemode};${addadmin}\" -logfile \"${logfile}\" " +parms="-batchmode -nographics -exec \"host ${port} ${map} ${loadsave};queryport ${queryport};maxplayers ${maxplayers};servername ${servername};creativemode ${creativemode};${admins}\" -logfile \"${logfile}\" " } #### Advanced Variables #### From a45936d8ff8b5317218808431f0c97eb157e0415 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 22 Dec 2015 04:16:59 +0100 Subject: [PATCH 18/18] removing quotes from a comment --- Hurtworld/hwserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 433e05619..e74f5648a 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -34,7 +34,7 @@ creativemode="0" #Free Build logfile="gamelog.txt" # Adding admins using STEAMID64 -# Example : admins="addadmin 012345678901234567; addadmin 987654321098765432" +# Example : addadmin 012345678901234567; addadmin 987654321098765432 admins="" # Advanced