Merge branch 'release/v23.4.0'

HotoCocoaco · Jul 21, 2023 · c6f752b · c6f752b
2 parents ba75009 + edcd2b7
commit c6f752b
Show file tree

Hide file tree

Showing 82 changed files with 2,162 additions and 338 deletions.
diff --git a/.github/workflows/details-check.yml b/.github/workflows/details-check.yml
@@ -4,6 +4,10 @@ on:
   workflow_dispatch:
   push:
 
+concurrency:
+  group: ${{ github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   create-matrix:
     runs-on: ubuntu-latest
@@ -32,11 +36,14 @@ jobs:
       matrix: ${{ fromJSON(needs.create-matrix.outputs.matrix) }}
 
     steps:
+      - name: Download linuxgsm.sh
+        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
+
       - name: Install dependencies
         run: sudo apt-get install libxml2-utils jq
 
-      - name: Download linuxgsm.sh
-        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
+      - name: Create serverfiles directory
+        run: mkdir -p serverfiles
 
       - name: Grab server
         run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server

diff --git a/.github/workflows/detals-check-generate-matrix.sh b/.github/workflows/detals-check-generate-matrix.sh
@@ -18,7 +18,7 @@ while read -r line; do
 	echo -n "\"shortname\":" >> "shortnamearray.json"
 	echo -n "\"${shortname}\"" >> "shortnamearray.json"
 	echo -n "}," >> "shortnamearray.json"
-done < serverlist.csv
+done < <(tail -n +2 serverlist.csv)
 sed -i '$ s/.$//' "shortnamearray.json"
 echo -n "]" >> "shortnamearray.json"
 echo -n "}" >> "shortnamearray.json"

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
@@ -3,7 +3,7 @@ echo "Checking that all the game servers are listed in all csv files"
 echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
 # count the number of lines in the serverlist.csv
 cd "lgsm/data" || exit
-serverlistcount="$(wc -l < serverlist.csv)"
+serverlistcount="$(tail -n +2 serverlist.csv | wc -l)"
 echo "serverlistcount: $serverlistcount"
 # get list of all csv files starting with ubunutu debian centos
 csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$')"

diff --git a/lgsm/config-default/config-lgsm/avserver/_default.cfg b/lgsm/config-default/config-lgsm/avserver/_default.cfg
@@ -137,7 +137,7 @@ stopmode="10"
 # 3: gamedig
 # 4: gsquery
 # 5: tcp
-querymode="5"
+querymode="1"
 querytype=""
 
 ## Console type

diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg
@@ -8,9 +8,6 @@
 
 #### Game Server Settings ####
 
-## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
-javaram="2048" # -Xmx$2048M
-
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 startparameters=""
 
@@ -115,7 +112,7 @@ sleeptime="0.5"
 appid="339010"
 steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
-branch=""
+branch="unity"
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
 steammaster="false"
@@ -145,22 +142,21 @@ querytype="protocol-valve"
 
 ## Console type
 consoleverbose="yes"
-consoleinteract="no"
+consoleinteract="yes"
 
 ## Game Server Details
 # Do not edit
 gamename="Rising World"
-engine="risingworld"
-glibc="null"
+engine="unity3d"
+glibc="2.17"
 
 #### Directories ####
 # Edit with care
 
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-preexecutable="java -Xmx${javaram}M -jar"
-executable="./server.jar"
+executable="./RisingWorldServer.x64"
 servercfgdir="${systemdir}"
 servercfg="server.properties"
 servercfgdefault="server.properties"

diff --git a/lgsm/config-default/config-lgsm/tiserver/_default.cfg b/lgsm/config-default/config-lgsm/tiserver/_default.cfg
@@ -11,15 +11,10 @@
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
 port="7777"
-queryport="27015"
-# Possible maps, see: https://isle.fandom.com/wiki/The_Isle_Server_Settings_and_Configuration#Optional_Maps
-map=""
-
-# EAC start parameters
-eaclaunch="-ini:Engine:[EpicOnlineServices]:DedicatedServerClientId=xyza7891gk5PRo3J7G9puCJGFJjmEguW -ini:Engine:[EpicOnlineServices]:DedicatedServerClientSecret=pKWl6t5i9NJK8gTpVlAxzENZ65P8hYzodV8Dqe5Rlc8"
+defaultmap="/Game/TheIsle/Maps/Game/Isla_Spiro/Isla_Spiro"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${map} -MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -log ${eaclaunch}"
+startparameters="${defaultmap} -Port=${port} -log"
 
 #### LinuxGSM Settings ####
 
@@ -125,7 +120,7 @@ steamcmdforcewindows="no"
 branch="evrima"
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="true"
+steammaster="false"
 
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill
@@ -147,8 +142,8 @@ stopmode="2"
 # 3: gamedig
 # 4: gsquery
 # 5: tcp
-querymode="2"
-querytype="protocol-valve"
+querymode="1"
+querytype=""
 
 ## Console type
 consoleverbose="yes"

diff --git a/lgsm/config-default/config-lgsm/wurmserver/_default.cfg b/lgsm/config-default/config-lgsm/wurmserver/_default.cfg
@@ -8,9 +8,52 @@
 
 #### Game Server Settings ####
 
+## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
+# https://www.wurmpedia.com/index.php/Server_administration_(Wurm_Unlimited)
+
+# 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"
+
+# Used for server to server communication.
+rmiport="7221"
+rmiregport="7220"
+
+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}' queryport='${queryport}' rmiport='${rmiport}' rmiregport='${rmiregport}' servername='${servername}' serverpassword='${serverpassword}' ip='${ip}'"
 
 #### LinuxGSM Settings ####
 
@@ -157,13 +200,7 @@ 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"

diff --git a/lgsm/data/appmanifest/ahl/appmanifest_10.acf b/lgsm/data/appmanifest/ahl/appmanifest_10.acf
@@ -0,0 +1,36 @@
+"AppState"
+{
+	"appid"		"10"
+	"Universe"		"1"
+	"name"		"Counter-Strike"
+	"StateFlags"		"68"
+	"installdir"		"Half-Life"
+	"LastUpdated"		"1688984402"
+	"SizeOnDisk"		"0"
+	"StagingSize"		"0"
+	"buildid"		"0"
+	"LastOwner"		"0"
+	"UpdateResult"		"0"
+	"BytesToDownload"		"0"
+	"BytesDownloaded"		"0"
+	"BytesToStage"		"0"
+	"BytesStaged"		"0"
+	"TargetBuildID"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
+	"ScheduledAutoUpdate"		"0"
+	"InstalledDepots"
+	{
+		"11"
+		{
+			"manifest"		"4720911300072406946"
+			"size"		"292616113"
+		}
+	}
+	"UserConfig"
+	{
+	}
+	"MountedConfig"
+	{
+	}
+}
diff --git a/lgsm/data/appmanifest/ahl/appmanifest_70.acf b/lgsm/data/appmanifest/ahl/appmanifest_70.acf
@@ -0,0 +1,41 @@
+"AppState"
+{
+	"appid"		"70"
+	"Universe"		"1"
+	"name"		"Half-Life"
+	"StateFlags"		"68"
+	"installdir"		"Half-Life"
+	"LastUpdated"		"1688984404"
+	"SizeOnDisk"		"0"
+	"StagingSize"		"0"
+	"buildid"		"0"
+	"LastOwner"		"0"
+	"UpdateResult"		"0"
+	"BytesToDownload"		"0"
+	"BytesDownloaded"		"0"
+	"BytesToStage"		"0"
+	"BytesStaged"		"0"
+	"TargetBuildID"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
+	"ScheduledAutoUpdate"		"0"
+	"InstalledDepots"
+	{
+		"1"
+		{
+			"manifest"		"5928322771446233610"
+			"size"		"429833890"
+		}
+		"71"
+		{
+			"manifest"		"9183617604528345869"
+			"size"		"15302314"
+		}
+	}
+	"UserConfig"
+	{
+	}
+	"MountedConfig"
+	{
+	}
+}
diff --git a/lgsm/data/appmanifest/ahl/appmanifest_90.acf b/lgsm/data/appmanifest/ahl/appmanifest_90.acf
@@ -0,0 +1,49 @@
+"AppState"
+{
+	"appid"		"90"
+	"Universe"		"1"
+	"name"		"Half-Life Dedicated Server"
+	"StateFlags"		"4"
+	"installdir"		"Half-Life"
+	"LastUpdated"		"1688984267"
+	"SizeOnDisk"		"0"
+	"StagingSize"		"0"
+	"buildid"		"0"
+	"LastOwner"		"76561200949853436"
+	"UpdateResult"		"0"
+	"BytesToDownload"		"0"
+	"BytesDownloaded"		"0"
+	"BytesToStage"		"0"
+	"BytesStaged"		"0"
+	"TargetBuildID"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
+	"ScheduledAutoUpdate"		"0"
+	"InstalledDepots"
+	{
+		"4"
+		{
+			"manifest"		"8690279432129063737"
+			"size"		"25737094"
+		}
+		"1006"
+		{
+			"manifest"		"6912453647411644579"
+			"size"		"72573740"
+		}
+	}
+	"SharedDepots"
+	{
+		"1"		"70"
+		"11"		"10"
+		"71"		"70"
+	}
+	"UserConfig"
+	{
+		"mod"		"cstrike"
+	}
+	"MountedConfig"
+	{
+		"mod"		"cstrike"
+	}
+}
diff --git a/lgsm/data/appmanifest/bb/appmanifest_10.acf b/lgsm/data/appmanifest/bb/appmanifest_10.acf
@@ -0,0 +1,36 @@
+"AppState"
+{
+	"appid"		"10"
+	"Universe"		"1"
+	"name"		"Counter-Strike"
+	"StateFlags"		"68"
+	"installdir"		"Half-Life"
+	"LastUpdated"		"1688984405"
+	"SizeOnDisk"		"03"
+	"StagingSize"		"0"
+	"buildid"		"0"
+	"LastOwner"		"0"
+	"UpdateResult"		"0"
+	"BytesToDownload"		"0"
+	"BytesDownloaded"		"0"
+	"BytesToStage"		"0"
+	"BytesStaged"		"0"
+	"TargetBuildID"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
+	"ScheduledAutoUpdate"		"0"
+	"InstalledDepots"
+	{
+		"11"
+		{
+			"manifest"		"4720911300072406946"
+			"size"		"292616113"
+		}
+	}
+	"UserConfig"
+	{
+	}
+	"MountedConfig"
+	{
+	}
+}