From 114234ce112ac4c38d7bb99508d5b4f3ec2d7c90 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 12 Jul 2023 17:00:49 +0100
Subject: [PATCH] refactor: update default configuration for Wurm server

- Updated the default configuration file for Wurm server.
- Added predefined parameters for game mode, home kingdom, admin password, epic settings, home server, login server, max players, server name, IP address, and ports.
- Modified start parameters to include the new predefined parameters.
- Removed unnecessary lines related to glibc version and sourcing the server config file.
- Updated backup directory path.
---
 .../config-lgsm/wurmserver/_default.cfg       | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
index 754fc5922..e07b9950b 100644
--- a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
@@ -8,9 +8,47 @@
 
 #### Game Server Settings ####
 
+## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
+# Game mode (Creative|Adventure)
+gamemode="Creative"
+
+# The kingdom the server belongs to.
+# If you're using the Adventure base, use 1, 2, or 3.
+# If you're using Creative, use 4.
+# Kingdom numbers:
+#  0 - No kingdom
+#  1 - Jen-Kellon
+#  2 - Mol-Rehan
+#  3 - Horde of the Summoned
+#  4 - Freedom
+homekingdom="4"
+
+
+# Unlocks the admin commands from within the game, that can be used to change
+# the gameplay settings of the server, such as skill gain rate and field growth time.
+adminpassword="ADMINPASSWORD"
+
+# If true the server will follow the rules from the Epic servers in Wurm Online.
+# For instance it will use the skill curve.
+epicsettings="false"
+
+# If the server is a home server (belongs to a single kingdom).
+homeserver="true"
+
+# Defaults to true, should only be set to false if the server is intended to be
+# connected with another server that is going to act as a loginserver.
+loginserver="true"
+
+maxplayers="200"
+servername="LinuxGSM"
+serverpassword=""
+ip="0.0.0.0"
+port="3724"
+queryport="27016"
+
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 # Parameters are edited in the game server config file.
-startparameters="ADMINPWD=\"$ADMINPWD\" EPICSETTINGS=\"$EPICSETTINGS\" EXTERNALPORT=\"$EXTERNALPORT\" HOMESERVER=\"$HOMESERVER\" HOMEKINGDOM=\"$HOMEKINGDOM\" LOGINSERVER=\"$LOGINSERVER\" MAXPLAYERS=\"$MAXPLAYERS\" QUERYPORT=\"$QUERYPORT\" SERVERNAME=\"$SERVERNAME\" SERVERPASSWORD=\"$SERVERPASSWORD\" START=\"$START\" IP=\"$IP\""
+startparameters="start=${gamemode} adminpwd=${adminpassword} epicsettings=${epicsettings} externalport=${port} homeserver=${homeserver} homekingdom=${homekingdom} loginserver=${loginserver} maxplayers=${maxplayers} queryprort=${queryport} servername=${servername} serverpassword=${serverpassword} start=${start} ip=${ip}"
 
 #### LinuxGSM Settings ####
 
@@ -157,13 +195,11 @@ glibc="2.14"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${systemdir}"
-preexecutable="xvfb-run"
 executable="./WurmServerLauncher"
 servercfgdir="${systemdir}"
 servercfg="${selfname}.cfg"
 servercfgdefault="server.cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
-source "${servercfgfullpath}"
 
 ## Backup Directory
 backupdir="${lgsmdir}/backup"