Added _gslt and _workshop snippets to encpsulate that config. Need to figure out how to deprecate cleanly, started renaming variables.All gamedata files use fn_set_game_params settings now, ready to test

gamedata/_gslt

@@ -0,0 +1,5 @@
+# Game Settings File
+# Game Server Login Token Support
+
+fn_set_game_params settings "gslt" "--EMPTY--" "Required: Game Server Login Token. GSLT is required for running a public server. More info: http://gameservermanagers.com/gslt"
+fn_set_game_params parms_plus "sv_setsteamaccount" "\${gslt}"

gamedata/_unreal

@@ -9,12 +9,12 @@ fn_import_game_settings _default
 fn_parms(){
 	parms=""
 }
-fn_set_game_params settings "systemdir" "\${filesdir}/\${game}"
+fn_set_game_params settings "systemdir" "\${filesdir}/System"
 fn_set_game_params settings "gamelogdir" "\${systemdir}/logs"
-fn_set_game_params settings "executabledir" "\${systemdir}/Binaries/Linux"
-fn_set_game_params settings "executable" "./\${game}Server"
-fn_set_game_params settings "servercfg" "GameUserSettings.ini"
-fn_set_game_params settings "servercfgdir" "\${systemdir}/Saved/Config/LinuxServer"
+fn_set_game_params settings "executabledir" "\${systemdir}"
+fn_set_game_params settings "executable" "./ucc-bin"
+fn_set_game_params settings "servercfg" "\${servicename}.ini"
+fn_set_game_params settings "servercfgdir" "\${systemdir}"
 fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
-fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini"
-
+fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/Default.ini"
+fn_set_game_params settings "compressedmapsdir" "${rootdir}/Maps-Compressed" "Compressed Maps Directory"

gamedata/_unreal2

@@ -8,11 +8,11 @@ fn_import_game_settings _default
 fn_parms(){
 	parms=""
 }
-fn_set_game_params settings "systemdir" "\${filesdir}/\${game}"
-fn_set_game_params settings "gamelogdir" "\${systemdir}/logs"
-fn_set_game_params settings "executabledir" "\${systemdir}/Binaries/Linux"
-fn_set_game_params settings "executable" "./\${game}Server"
-fn_set_game_params settings "servercfg" "GameUserSettings.ini"
-fn_set_game_params settings "servercfgdir" "\${systemdir}/Saved/Config/LinuxServer"
-fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
-fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini"
+fn_set_game_params settings "systemdir" "${filesdir}/System"
+fn_set_game_params settings "executabledir" "${systemdir}"
+fn_set_game_params settings "executable" "./ucc-bin"
+fn_set_game_params settings "servercfg" "${servicename}.ini"
+fn_set_game_params settings "servercfgdir" "${systemdir}"
+fn_set_game_params settings "servercfgfullpath" "${servercfgdir}/${servercfg}"
+fn_set_game_params settings "servercfgdefault" "${servercfgdir}/Default.ini"
+fn_set_game_params settings "compressedmapsdir" "${rootdir}/Maps-Compressed"

gamedata/_workshop

@@ -0,0 +1,9 @@
+# Game Settings File
+
+# Workshop Authentication and Settings
+fn_set_game_params parms_minus "authkey" "\${authkey}"
+fn_set_game_params parms_plus "host_workshop_collection" "\${host_workshop_collection}"
+fn_set_game_params parms_plus "workshop_start_map" "\${workshop_start_map}"
+fn_set_game_params settings "authkey" "--EMPTY--" "Optional key for Workshop Content.  See https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators - To get an authkey visit - http://steamcommunity.com/dev/apikey"
+fn_set_game_params settings "host_workshop_collection" "--EMPTY--" "Workshop Collection ID"
+fn_set_game_params settings "workshop_start_map" "--EMPTY--" "Workshop Start Map"

gamedata/arkserver

@@ -9,12 +9,15 @@ fn_parms(){
 parms="TheIsland?listen"
 }
 
-appid="376030"
-game="ShooterGame"
-gamename="ARK: Survivial Evolved"
-executabledir="${systemdir}/Binaries/Linux"
-executable="./ShooterGameServer"
-servercfgdir="${systemdir}/Saved/Config/LinuxServer"
-servercfg="GameUserSettings.ini"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/lgsm-default.ini"
+fn_set_game_params settings "appid" "376030"
+fn_set_game_params settings "game" "ShooterGame"
+fn_set_game_params settings "gamename" "ARK: Survivial Evolved"
+
+fn_set_game_params settings "systemdir" "\${filesdir}/\${game}"
+fn_set_game_params settings "gamelogdir" "\${systemdir}/logs"
+fn_set_game_params settings "executabledir" "\${systemdir}/Binaries/Linux"
+fn_set_game_params settings "executable" "./\${game}Server"
+fn_set_game_params settings "servercfg" "GameUserSettings.ini"
+fn_set_game_params settings "servercfgdir" "\${systemdir}/Saved/Config/LinuxServer"
+fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
+fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini"

gamedata/arma3server

@@ -5,19 +5,18 @@ fn_import_game_settings _realvirtuality
 fn_parms(){
 parms="-netlog -ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
 }
-
-port="2302"
-mods=""
-servermods=""
-bepath=""
-appid="233780" "For Development branch, use \"233780 -beta development\""
-gamename="ARMA 3"
-executabledir="\${filesdir}"
-executable="./arma3server"
-servercfg="\${servicename}.server.cfg"
-networkcfg="\${servicename}.network.cfg"
-servercfgdir="\${systemdir}/cfg"
-servercfgfullpath="\${servercfgdir}/\${servercfg}"
-networkcfgfullpath="\${servercfgdir}/\${networkcfg}"
-servercfgdefault="\${servercfgdir}/lgsm-default.server.cfg"
-networkcfgdefault="\${servercfgdir}/lgsm-default.network.cfg"
+fn_set_game_params settings "port" "2302"
+fn_set_game_params settings "mods" "" "Mods"
+fn_set_game_params settings "servermods" "" "Server Mods"
+fn_set_game_params settings "bepath" "" "BattleEye Path"
+fn_set_game_params settings "appid" "233780" "For Development branch, use \"233780 -beta development\""
+fn_set_game_params settings "gamename" "ARMA 3"
+fn_set_game_params settings "executabledir" "\${filesdir}"
+fn_set_game_params settings "executable" "./arma3server"
+fn_set_game_params settings "servercfg" "\${servicename}.server.cfg"
+fn_set_game_params settings "networkcfg" "\${servicename}.network.cfg" "Network Config"
+fn_set_game_params settings "servercfgdir" "\${systemdir}/cfg"
+fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
+fn_set_game_params settings "networkcfgfullpath" "\${servercfgdir}/\${networkcfg}"
+fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.server.cfg"
+fn_set_game_params settings "networkcfgdefault" "\${servercfgdir}/lgsm-default.network.cfg" "Default Network Config File"

gamedata/bb2server

@@ -7,8 +7,7 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game brainbread2 -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-game="brainvread2"
-defaultmap="bba_barracks"
-gslt=""
-appid="346330"
-gamename="BrainBread 2"
+fn_set_game_params settings "appid" "346330"
+fn_set_game_params settings "gamename" "BrainBread 2"
+fn_set_game_params settings "game" "brainvread2"
+fn_set_game_params settings "defaultmap" "bba_barracks"

gamedata/bmdmserver

@@ -5,7 +5,7 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-game="bms"
-defaultmap="dm_bounce"
-appid="346680"
-gamename="Black Mesa: Deathmatch"
+fn_set_game_params settings "appid" "346680"
+fn_set_game_params settings "game" "bms"
+fn_set_game_params settings "defaultmap" "dm_bounce"
+fn_set_game_params settings "gamename" "Black Mesa: Deathmatch"

gamedata/bsserver

@@ -6,8 +6,7 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-# Steam
-defaultmap="duel_winter"
-appid="228780"
-gamename="Blade Symphony"
-game="berimbau"
+fn_set_game_params settings "appid" "228780"
+fn_set_game_params settings "defaultmap" "duel_winter"
+fn_set_game_params settings "game" "berimbau"
+fn_set_game_params settings "gamename" "Blade Symphony"

gamedata/csczserver

@@ -4,9 +4,7 @@ fn_import_game_settings _goldsource
 fn_parms(){
 parms="-game czero -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
-
-# Steam
-appid="90"
-defaultmap="de_dust2"
-game="czero"
-gamename="Counter Strike: Condition Zero"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "de_dust2"
+fn_set_game_params settings "game" "czero"
+fn_set_game_params settings "gamename" "Counter Strike: Condition Zero"

gamedata/csgoserver

@@ -4,6 +4,8 @@
 
 # Import SRCDS
 fn_import_game_settings _source
+fn_import_game_settings _gslt
+fn_import_game_settings _workshop
 
 # Override some server settings
 fn_set_game_params settings "appid" "740"
@@ -14,21 +16,12 @@ fn_set_game_params settings "gamename" "Counter Strike: Global Offensive"
 fn_set_game_params settings "mapgroup" "random_classic" "Map Group. See https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server"
 fn_set_game_params settings "gametype" "0" "Game Type. Set to: Arms Race 1 Classic Casual 0 Classic Competitive 0 Demolition 1 Deathmatch 1"
 fn_set_game_params settings "gamemode" "0" "Game Mode. Set to: Arms Race 0 Classic Casual 0 Classic Competitive 1 Demolition 1 Deathmatch 2"
-fn_set_game_params settings "gslt" "--EMPTY--" "Required: Game Server Login Token. GSLT is required for running a public server. More info: http://gameservermanagers.com/gslt"
-fn_set_game_params settings "authkey" "--EMPTY--" "Optional key for Workshop Content.  See https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators - To get an authkey visit - http://steamcommunity.com/dev/apikey"
-fn_set_game_params settings "ws_collection_id" "--EMPTY--" "Workshop Collection ID"
-fn_set_game_params settings "ws_start_map" "--EMPTY--" "Workshop Start Map"
-
 
 # The parms that start with - go first
 fn_set_game_params parms_minus "usercon" "--EMPTY--"
 fn_set_game_params parms_minus "maxplayers_override" "\${maxplayers}"
-fn_set_game_params parms_minus "authkey" "\${authkey}"
 
 # Then the parms that start with +
-fn_set_game_params parms_plus "sv_setsteamaccount" "\${gslt}"
 fn_set_game_params parms_plus "mapgroup" "\${mapgroup}"
 fn_set_game_params parms_plus "game_mode" "\${gamemode}"
 fn_set_game_params parms_plus "game_type" "\${gametype}"
-fn_set_game_params parms_plus "host_workshop_collection" "\${ws_collection_id}"
-fn_set_game_params parms_plus "workshop_start_map" "\${ws_start_map}"

gamedata/csserver

@@ -8,7 +8,7 @@ fn_parms(){
 parms="-game cstrike -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 # Steam
-appid="90"
-defaultmap="de_dust2"
-game="cstrike"
-gamename="Counter Strike 1.6"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "de_dust2"
+fn_set_game_params settings "game" "cstrike"
+fn_set_game_params settings "gamename" "Counter Strike 1.6"

gamedata/dabserver

@@ -6,9 +6,9 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-defaultmap="da_rooftops"
-maxplayers="10"
-appid="317800"
-gamename="Double Action: Boogaloo"
-game="dab"
-executable="./dabds.sh"
+fn_set_game_params settings "appid" "317800"
+fn_set_game_params settings "defaultmap" "da_rooftops"
+fn_set_game_params settings "executable" "./dabds.sh"
+fn_set_game_params settings "game" "dab"
+fn_set_game_params settings "gamename" "Double Action: Boogaloo"
+fn_set_game_params settings "maxplayers" "10"

gamedata/dmcserver

@@ -8,7 +8,7 @@ parms="-game dmc -strictportbind +ip ${ip} -port ${port} +clientport ${clientpor
 }
 
 # Steam
-appid="90"
-game="dmc"
-defaultmap="dcdm5"
-gamename="Deathmatch Classic"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "dcdm5"
+fn_set_game_params settings "game" "dmc"
+fn_set_game_params settings "gamename" "Deathmatch Classic"

gamedata/dodserver

@@ -6,8 +6,7 @@ fn_import_game_settings _goldsource
 fn_parms(){
 parms="-game dod -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
-# Steam
-appid="90"
-game="dod"
-defaultmap="dod_Anzio"
-gamename="Day of Defeat"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "dod_Anzio"
+fn_set_game_params settings "game" "dod"
+fn_set_game_params settings "gamename" "Day of Defeat"

gamedata/dodsserver

@@ -6,7 +6,7 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="232290"
-defaultmap="dod_Anzio"
-gamename="Day of Defeat: Source"
-game="dod"
+fn_set_game_params settings "appid" "232290"
+fn_set_game_params settings "defaultmap" "dod_Anzio"
+fn_set_game_params settings "game" "dod"
+fn_set_game_params settings "gamename" "Day of Defeat: Source"

gamedata/dstserver

@@ -6,6 +6,6 @@ fn_import_game_settings _dontstarve
 fn_parms(){
 parms=""
 }
-appid="343050"
-gamename="Don't Starve Together"
-game="dontstarve"
+fn_set_game_params settings "appid" "343050"
+fn_set_game_params settings "game" "dontstarve"
+fn_set_game_params settings "gamename" "Don't Starve Together"

gamedata/fofserver

@@ -6,8 +6,7 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game fof -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="295230"
-gamename="Fistful of Frags"
-defaultmap="fof_depot"
-engine="source"
-game="fof"
+fn_set_game_params settings "appid" "295230"
+fn_set_game_params settings "defaultmap" "fof_depot"
+fn_set_game_params settings "game" "fof"
+fn_set_game_params settings "gamename" "Fistful of Frags"

gamedata/gesserver

@@ -7,7 +7,7 @@ fn_parms(){
 parms="-game gesource -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
 
-appid="310"
-defaultmap="ge_archives"
-gamename="GoldenEye: Source"
-game="gesource"
+fn_set_game_params settings "appid" "310"
+fn_set_game_params settings "defaultmap" "ge_archives"
+fn_set_game_params settings "game" "gesource"
+fn_set_game_params settings "gamename" "GoldenEye: Source"

gamedata/gmodserver

@@ -4,6 +4,8 @@
 
 # Import SRCDS
 fn_import_game_settings _source
+fn_import_game_settings _gslt
+fn_import_game_settings _workshop
 
 # Override some server settings
 fn_set_game_params settings "appid" "4020"
@@ -12,15 +14,7 @@ fn_set_game_params settings "game" "garrysmod"
 fn_set_game_params settings "mapcyclefile" "--UNSET--"
 fn_set_game_params settings "gamename" "Garry's Mod"
 fn_set_game_params settings "gamemode" "sandbox" "Game Mode."
-fn_set_game_params settings "gslt" "--EMPTY--" "Required: Game Server Login Token. GSLT is required for running a public server. More info: http://gameservermanagers.com/gslt"
-fn_set_game_params settings "workshopauth" "--EMPTY--" "Optional key for Workshop Content. Workshop Variables - http://wiki.garrysmod.com/page/Workshop_for_Dedicated_Servers"
-fn_set_game_params settings "workshopcollectionid" "--EMPTY--" "Workshop Collection ID"
 
-# The parms that start with - go first
-fn_set_game_params parms_minus "authkey" "\${workshopauth}"
-
-# Then the parms that start with +
-fn_set_game_params parms_plus "sv_setsteamaccount" "\${gslt}"
+# Add the command line parameters
 fn_set_game_params parms_plus "mapgroup" "\${mapgroup}"
 fn_set_game_params parms_plus "gamemode" "\${gamemode}"
-fn_set_game_params parms_plus "host_workshop_collection" "\${"workshopcollectionid"}"

gamedata/hl2dmserver

@@ -6,7 +6,7 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game hl2mp -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="232370"
-defaultmap="dm_lockdown"
-gamename="Half Life 2: Deathmatch"
-game="hl2mp"
+fn_set_game_params settings "appid" "232370"
+fn_set_game_params settings "defaultmap" "dm_lockdown"
+fn_set_game_params settings "game" "hl2mp"
+fn_set_game_params settings "gamename" "Half Life 2: Deathmatch"

gamedata/hldmserver

@@ -7,7 +7,7 @@ fn_parms(){
 parms="-game valve -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
 
-appid="90"
-gamename="Half Life: Deathmatch"
-defaultmap="crossfire"
-game="valve"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "crossfire"
+fn_set_game_params settings "game" "valve"
+fn_set_game_params settings "gamename" "Half Life: Deathmatch"

gamedata/hldmsserver

@@ -7,7 +7,8 @@ fn_parms(){
 parms="-game hl1mp -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
 # Steam
-appid="255470"
-gamename="Half-Life Deathmatch: Source"
-defaultmap="crossfire"
-game="hl1mp"
+fn_set_game_params settings "appid" "255470"
+fn_set_game_params settings "defaultmap" "crossfire"
+fn_set_game_params settings "game" "hl1mp"
+fn_set_game_params settings "gamename" "Half-Life Deathmatch: Source"
+

gamedata/hwserver

@@ -8,24 +8,24 @@ fn_parms(){
 parms="-batchmode -nographics -exec \"host ${port} ${map} ${loadsave};queryport ${queryport};maxplayers ${maxplayers};servername ${servername};creativemode ${creativemode};${admins}\" -logfile \"${logfile}\" "
 }
 
-servername="Hurtworld LGSM Server"
-appid="405100"
-gamename="Hurtworld"
-port="12871"
-queryport="12881"
-maxplayers="20"
-map="" "Optional"
-creativemode="0" "Free Build"
-logfile="gamelog.txt"
-admins="" "Adding admins using STEAMID64. Example : addadmin 012345678901234567; addadmin 987654321098765432"
+fn_set_game_params settings "servername" "Hurtworld LGSM Server"
+fn_set_game_params settings "appid" "405100"
+fn_set_game_params settings "gamename" "Hurtworld"
+fn_set_game_params settings "port" "12871"
+fn_set_game_params settings "queryport" "12881" "Query Port"
+fn_set_game_params settings "maxplayers" "20"
+fn_set_game_params settings "map" "--EMPTY--" "Optional"
+fn_set_game_params settings "creativemode" "0" "Free Build"
+fn_set_game_params settings "logfile" "gamelog.txt"
+fn_set_game_params settings "admins" "--EMPTY--" "Adding admins using STEAMID64. Example : addadmin 012345678901234567; addadmin 987654321098765432"
 
-loadsave="" "Rollback server state (remove after start command)"
-x64mode="0" "Use unstable 64 bit server executable (O/1)"
-filesdir="${rootdir}/serverfiles"
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+fn_set_game_params settings "loadsave" "--EMPTY--" "Rollback server state (remove after start command)"
+fn_set_game_params settings "x64mode" "0" "Use unstable 64 bit server executable (O/1)"
+fn_set_game_params settings "filesdir" "${rootdir}/serverfiles"
+fn_set_game_params settings "systemdir" "${filesdir}"
+fn_set_game_params settings "executabledir" "${filesdir}"
 if [ "${x64mode}" == "1" ]; then
-	executable="./Hurtworld.x86_64"
+	fn_set_game_params settings "executable" "./Hurtworld.x86_64"
 else
-	executable="./Hurtworld.x86"
+	fn_set_game_params settings "executable" "./Hurtworld.x86"
 fi

gamedata/jc2server

@@ -6,5 +6,5 @@ fn_parms(){
 parms=""
 }
 
-appid="261140"
-gamename="Just Cause 2"
+fn_set_game_params settings "appid" "261140"
+fn_set_game_params settings "gamename" "Just Cause 2"

gamedata/kfserver

@@ -10,19 +10,6 @@ parms="server ${defaultmap}?game=KFmod.KFGameType?VACSecured=true -nohomedir ini
 #parms="server ${defaultmap}?Game=KFStoryGame.KFStoryGame?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}"
 }
 
-appid="215360"
-gamename="Killing Floor"
-defaultmap="KF-BioticsLab.rom"
-
-
-
-
-systemdir="${filesdir}/System"
-executabledir="${systemdir}"
-executable="./ucc-bin"
-servercfg="${servicename}.ini"
-servercfgdir="${systemdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/Default.ini"
-compressedmapsdir="${rootdir}/Maps-Compressed"
-
+fn_set_game_params settings "appid" "215360"
+fn_set_game_params settings "defaultmap" "KF-BioticsLab.rom"
+fn_set_game_params settings "gamename" "Killing Floor"

gamedata/l4d2server

@@ -6,8 +6,8 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game left4dead2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="222860"
-gamename="Left 4 Dead 2"
-defaultmap="c5m1_waterfront"
-maxplayers="8"
-game="left4dead2"
+fn_set_game_params settings "appid" "222860"
+fn_set_game_params settings "defaultmap" "c5m1_waterfront"
+fn_set_game_params settings "game" "left4dead2"
+fn_set_game_params settings "gamename" "Left 4 Dead 2"
+fn_set_game_params settings "maxplayers" "8"

gamedata/l4dserver

@@ -7,8 +7,8 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -tickrate ${tickrate} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
-appid="222840"
-gamename="Left 4 Dead"
-defaultmap="l4d_hospital01_apartment"
-maxplayers="8"
-game="left4dead"
+fn_set_game_params settings "appid" "222840"
+fn_set_game_params settings "defaultmap" "l4d_hospital01_apartment"
+fn_set_game_params settings "game" "left4dead"
+fn_set_game_params settings "gamename" "Left 4 Dead"
+fn_set_game_params settings "maxplayers" "8"

gamedata/nmrihserver

@@ -6,8 +6,8 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="317670"
-gamename="No More Room in Hell"
-defaultmap="nmo_broadway"
-maxplayers="8"
-game="nmrih"
+fn_set_game_params settings "appid" "317670"
+fn_set_game_params settings "defaultmap" "nmo_broadway"
+fn_set_game_params settings "game" "nmrih"
+fn_set_game_params settings "gamename" "No More Room in Hell"
+fn_set_game_params settings "maxplayers" "8"

gamedata/ns2cserver

@@ -6,17 +6,17 @@ fn_parms(){
 parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${rootdir}/${configpath}\" -modstorage \"${rootdir}/${modstorage}\" -mods \"${mods}\""
 }
 
-defaultmap="co_core"
-maxplayers="24"
-servername="NS2C Server"
-webadminuser="admin"
-webadminpass="admin"
-webadminport="8080"
-configpath="server1"
-modstorage="server1/Workshop"
-mods=""
-password=""
-appid="313900"
-gamename="NS2: Combat"
-executabledir="${filesdir}/ia32"
-executable="./ns2combatserver_linux32"
+fn_set_game_params settings "appid" "313900"
+fn_set_game_params settings "configpath" "server1"
+fn_set_game_params settings "defaultmap" "co_core"
+fn_set_game_params settings "executable" "./ns2combatserver_linux32"
+fn_set_game_params settings "executabledir" "\${filesdir}/ia32"
+fn_set_game_params settings "gamename" "NS2: Combat"
+fn_set_game_params settings "maxplayers" "24"
+fn_set_game_params settings "mods" "--EMPTY--"
+fn_set_game_params settings "modstorage" "server1/Workshop"
+fn_set_game_params settings "password" "-EMPTY--"
+fn_set_game_params settings "servername" "NS2C Server"
+fn_set_game_params settings "webadminuser" "admin"
+fn_set_game_params settings "webadminpass" "admin"
+fn_set_game_params settings "webadminport" "8080"

gamedata/ns2server

@@ -7,18 +7,18 @@ fn_parms(){
 parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${rootdir}/${configpath}\" -modstorage \"${rootdir}/${modstorage}\" -mods \"${mods}\""
 }
 
-defaultmap="ns2_summit"
-maxplayers="24"
-servername="NS2 Server"
-webadminuser="admin"
-webadminpass="admin"
-webadminport="8080"
-configpath="server1"
-modstorage="server1/Workshop"
-mods=""
-password=""
-appid="4940"
-gamename="Natural Selection 2"
-systemdir="${filesdir}"
-executabledir="${filesdir}"
-executable="./server_linux32"
+fn_set_game_params settings "defaultmap" "ns2_summit"
+fn_set_game_params settings "maxplayers" "24"
+fn_set_game_params settings "servername" "NS2 Server"
+fn_set_game_params settings "webadminuser" "admin"
+fn_set_game_params settings "webadminpass" "admin"
+fn_set_game_params settings "webadminport" "8080"
+fn_set_game_params settings "configpath" "server1"
+fn_set_game_params settings "modstorage" "server1/Workshop"
+fn_set_game_params settings "mods" ""
+fn_set_game_params settings "password" ""
+fn_set_game_params settings "appid" "4940"
+fn_set_game_params settings "gamename" "Natural Selection 2"
+fn_set_game_params settings "systemdir" "${filesdir}"
+fn_set_game_params settings "executabledir" "${filesdir}"
+fn_set_game_params settings "executable" "./server_linux32"

gamedata/opforserver

@@ -6,9 +6,8 @@ fn_import_game_settings _goldsource
 fn_parms(){
 parms="-game gearbox -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
-appid="90"
-appidmod="gearbox"
-gamename="Half-Life: Opposing Force"
-defaultmap="op4_bootcamp"
-maxplayers="16"
-game="gearbox"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "op4_bootcamp"
+fn_set_game_params settings "game" "gearbox"
+fn_set_game_params settings "gamename" "Half-Life: Opposing Force"
+fn_set_game_params settings "maxplayers" "16"

gamedata/pvkiiserver

@@ -5,8 +5,8 @@ fn_import_game_settings _source
 fn_parms(){
 parms="-game pvkii -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="17575"
-gamename="Pirates, Vikings, and Knights II"
-defaultmap="bt_island"
-maxplayers="24"
-game="pvkii"
+fn_set_game_params settings "appid" "17575"
+fn_set_game_params settings "gamename" "Pirates, Vikings, and Knights II"
+fn_set_game_params settings "defaultmap" "bt_island"
+fn_set_game_params settings "maxplayers" "24"
+fn_set_game_params settings "game" "pvkii"

gamedata/pzserver

@@ -6,12 +6,12 @@ fn_import_game_settings _projectzomboid
 fn_parms(){
 parms=""
 }
-appid="380870"
-gamename="Project Zomboid"
+fn_set_game_params settings "appid" "380870"
+fn_set_game_params settings "gamename" "Project Zomboid"
 
-systemdir="\${filesdir}"
-executabledir="\${filesdir}"
-executable="./start-server.sh"
-servercfg="servertest.ini"
-servercfgdir="\${HOME}/Zomboid/Server"
-servercfgfullpath="\${servercfgdir}/\${servercfg}"
+fn_set_game_params settings "systemdir" "\${filesdir}"
+fn_set_game_params settings "executabledir" "\${filesdir}"
+fn_set_game_params settings "executable" "./start-server.sh"
+fn_set_game_params settings "servercfg" "servertest.ini"
+fn_set_game_params settings "servercfgdir" "\${HOME}/Zomboid/Server"
+fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"

gamedata/ricochetserver

@@ -5,8 +5,8 @@ fn_import_game_settings _goldsource
 fn_parms(){
 parms="-game ricochet -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
-appid="90"
-defaultmap="rc_arena"
-maxplayers="16"
-gamename="Ricochet"
-game="ricochet"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "defaultmap" "rc_arena"
+fn_set_game_params settings "maxplayers" "16"
+fn_set_game_params settings "gamename" "Ricochet"
+fn_set_game_params settings "game" "ricochet"

gamedata/roserver

@@ -6,15 +6,10 @@ fn_parms(){
 parms="server ${defaultmap}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}"
 }
 
-gamename="Red Orchestra: Ostfront 41-45"
-appid="223250"
-defaultmap="RO-Arad.rom"
+fn_set_game_params settings "gamename" "Red Orchestra: Ostfront 41-45"
+fn_set_game_params settings "appid" "223250"
+fn_set_game_params settings "defaultmap" "RO-Arad.rom"
 
-systemdir="\${filesdir}/system"
-executabledir="\${systemdir}"
-executable="./ucc-bin"
-servercfg="\${servicename}.ini"
-servercfgdir="\${systemdir}"
-servercfgfullpath="\${servercfgdir}/\${servercfg}"
-servercfgdefault="\${servercfgdir}/default.ini"
-compressedmapsdir="\${rootdir}/Maps-Compressed"
+# Lower Case wtf?
+fn_set_game_params settings "systemdir" "${filesdir}/system"
+fn_set_game_params settings "servercfgdefault" "${servercfgdir}/default.ini"

gamedata/sbserver

@@ -5,11 +5,11 @@ fn_import_game_settings _starbound
 fn_parms(){
 parms=""
 }
-appid="211820"
-gamename="Starbound"
-game="starbound"
-executabledir="${filesdir}/linux64"
-executable="./starbound_server"
-servercfg="sbboot.config"
-servercfgdir="${executabledir}"
-gamelogdir="${filesdir}/giraffe_storage"
+fn_set_game_params settings "appid" "211820"
+fn_set_game_params settings "gamename" "Starbound"
+fn_set_game_params settings "game" "starbound"
+fn_set_game_params settings "executabledir" "${filesdir}/linux64"
+fn_set_game_params settings "executable" "./starbound_server"
+fn_set_game_params settings "servercfg" "sbboot.config"
+fn_set_game_params settings "servercfgdir" "${executabledir}"
+fn_set_game_params settings "gamelogdir" "${filesdir}/giraffe_storage"

gamedata/sdtdserver

@@ -7,12 +7,12 @@ fn_parms(){
 parms="-configfile=${servercfgfullpath} -dedicated"
 }
 
-appid="294420"
-gamename="7 Days To Die"
-executable="./startserver.sh"
-servercfg="${servicename}.xml"
-servercfgdir="${filesdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/serverconfig.xml"
+fn_set_game_params settings "appid" "294420"
+fn_set_game_params settings "gamename" "7 Days To Die"
+fn_set_game_params settings "executable" "./startserver.sh"
+fn_set_game_params settings "servercfg" "${servicename}.xml"
+fn_set_game_params settings "servercfgdir" "${filesdir}"
+fn_set_game_params settings "servercfgfullpath" "${servercfgdir}/${servercfg}"
+fn_set_game_params settings "servercfgdefault" "${servercfgdir}/serverconfig.xml"
 
 

gamedata/ss3sserver

@@ -7,12 +7,12 @@ fn_parms(){
 parms="+ip ${ip} +logfile ${gamelog} +exec ${servercfgfullpath}"
 }
 
-appid="41080"
-gamename="Serious Sam 3: BFE"
-systemdir="\${filesdir}/Bin"
-executable="./runSam3_DedicatedServer.sh"
-executabledir="\${systemdir}"
-servercfg="\${servicename}.ini"
-servercfgdir="\${filesdir}/Content/SeriousSam3/Config"
-servercfgfullpath="\${servercfgdir}/\${servercfg}"
-servercfgdefault="\${servercfgdir}/lgsm-default.ini"
+fn_set_game_params settings "appid" "41080"
+fn_set_game_params settings "gamename" "Serious Sam 3: BFE"
+fn_set_game_params settings "systemdir" "\${filesdir}/Bin"
+fn_set_game_params settings "executable" "./runSam3_DedicatedServer.sh"
+fn_set_game_params settings "executabledir" "\${systemdir}"
+fn_set_game_params settings "servercfg" "\${servicename}.ini"
+fn_set_game_params settings "servercfgdir" "\${filesdir}/Content/SeriousSam3/Config"
+fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
+fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini"

gamedata/terrariaserver

@@ -5,13 +5,13 @@ fn_import_game_settings _terarria
 fn_parms(){
 parms="-config ${servercfgfullpath}"
 }
-appid="105600"
-gamename="Terraria"
-game="terraria"
-executabledir="\${filesdir}"
-executable="./TerrariaServer"
-servercfg="\${servicename}.txt"
-servercfgdir="\${filesdir}"
-servercfgfullpath="\${servercfgdir}/\${servercfg}"
-servercfgdefault="\${servercfgdir}/lgsm-default.txt"
-gamelogdir="" "Terraria Doesn't Have a Server Log"
+fn_set_game_params settings "appid" "105600"
+fn_set_game_params settings "gamename" "Terraria"
+fn_set_game_params settings "game" "terraria"
+fn_set_game_params settings "executabledir" "\${filesdir}"
+fn_set_game_params settings "executable" "./TerrariaServer"
+fn_set_game_params settings "servercfg" "\${servicename}.txt"
+fn_set_game_params settings "servercfgdir" "\${filesdir}"
+fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
+fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.txt"
+fn_set_game_params settings "gamelogdir" "" "Terraria Doesn't Have a Server Log"

gamedata/tests_jc2server.sh

@@ -6,7 +6,7 @@ fn_parms(){
 parms=""
 }
 
-appid="261140"
-servicename="jc2-server"
-gamename="Just Cause 2"
+fn_set_game_params settings "appid" "261140"
+fn_set_game_params settings "servicename" "jc2-server"
+fn_set_game_params settings "gamename" "Just Cause 2"
 

gamedata/tf2server

@@ -1,14 +1,14 @@
 # Game Settings File
 # Import Engine
 fn_import_game_settings _source
+fn_import_game_settings _gslt
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game tf -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
-appid="232250"
-gamename="Team Fortress 2"
-defaultmap="cp_badlands"
-maxplayers="16"
-gslt=""
-game="tf"
+fn_set_game_params settings "appid" "232250"
+fn_set_game_params settings "gamename" "Team Fortress 2"
+fn_set_game_params settings "defaultmap" "cp_badlands"
+fn_set_game_params settings "maxplayers" "16"
+fn_set_game_params settings "game" "tf"

gamedata/tfcserver

@@ -6,10 +6,8 @@ fn_import_game_settings _goldsource
 fn_parms(){
 parms="-game tfc -strictportbind _ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }
-# Steam
-appid="90"
-appidmos="tfc"
-gamename="Team Fortress Classic"
-defaultmap="dustbowl"
-maxplayers="16"
-game="tfc"
+fn_set_game_params settings "appid" "90"
+fn_set_game_params settings "gamename" "Team Fortress Classic"
+fn_set_game_params settings "defaultmap" "dustbowl"
+fn_set_game_params settings "maxplayers" "16"
+fn_set_game_params settings "game" "tfc"

gamedata/twserver

@@ -6,13 +6,13 @@ fn_parms(){
 parms="-f ${servercfgfullpath}"
 }
 
-appid="380840"
-gamename="Teeworlds"
-game="teeworlds"
-systemdir="${filesdir}"
-executabledir="${filesdir}"
-executable="./teeworlds_srv"
-servercfg="${servicename}.cfg"
-servercfgdir="${filesdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/lgsm-default.cfg"
+fn_set_game_params settings "appid" "380840"
+fn_set_game_params settings "gamename" "Teeworlds"
+fn_set_game_params settings "game" "teeworlds"
+fn_set_game_params settings "systemdir" "\${filesdir}"
+fn_set_game_params settings "executabledir" "\${filesdir}"
+fn_set_game_params settings "executable" "./teeworlds_srv"
+fn_set_game_params settings "servercfg" "\${servicename}.cfg"
+fn_set_game_params settings "servercfgdir" "\${filesdir}"
+fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
+fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.cfg"

gamedata/ut2k4server

@@ -2,16 +2,11 @@
 # Import Engine
 fn_import_game_settings _unreal2
 
-defaultmap="DM-Rankin"
 fn_parms(){
 parms="server ${defaultmap}?game=XGame.xDeathMatch -nohomedir ini=${servercfg} log=${gamelog}"
 }
-gamename="Unreal Tournament 2004"
-systemdir="${filesdir}/System"
-executabledir="${systemdir}"
-executable="./ucc-bin"
-servercfg="${servicename}.ini"
-servercfgdir="${systemdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/UT2004.ini"
-compressedmapsdir="${rootdir}/Maps-Compressed"
+fn_set_game_params settings "gamename" "Unreal Tournament 2004"
+fn_set_game_params settings "defaultmap" "DM-Rankin"
+
+# Why isn't this Default?
+fn_set_game_params settings "servercfgdefault" "${servercfgdir}/UT2004.ini"

gamedata/ut99server

@@ -5,13 +5,6 @@ fn_import_game_settings _unreal
 fn_parms(){
 parms="server ${defaultmap}.unr ini=${servercfgfullpath}"
 }
-gamename="Unreal Tournament 99"
-defaultmap="DM-Deck16]["
-systemdir="${filesdir}/System"
-executabledir="${systemdir}"
-executable="./ucc-bin"
-servercfg="${servicename}.ini"
-servercfgdir="${systemdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/Default.ini"
-compressedmapsdir="${rootdir}/Maps-Compressed"
+fn_set_game_params settings "gamename" "Unreal Tournament 99"
+fn_set_game_params settings "defaultmap" "DM-Deck16]["
+