Skip to content

Commit c6f752b

Browse files
dgibbs64dgibbs64
committed
Merge branch 'release/v23.4.0'
2 parents ba75009 + edcd2b7 commit c6f752b

File tree

82 files changed

+2162
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2162
-338
lines changed

‎.github/workflows/details-check.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
workflow_dispatch:
55
push:
66

7+
concurrency:
8+
group: ${{ github.ref_name }}
9+
cancel-in-progress: true
10+
711
jobs:
812
create-matrix:
913
runs-on: ubuntu-latest
@@ -32,11 +36,14 @@ jobs:
3236
matrix: ${{ fromJSON(needs.create-matrix.outputs.matrix) }}
3337

3438
steps:
39+
- name: Download linuxgsm.sh
40+
run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
41+
3542
- name: Install dependencies
3643
run: sudo apt-get install libxml2-utils jq
3744

38-
- name: Download linuxgsm.sh
39-
run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
45+
- name: Create serverfiles directory
46+
run: mkdir -p serverfiles
4047

4148
- name: Grab server
4249
run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server

‎.github/workflows/detals-check-generate-matrix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ while read -r line; do
1818
echo -n "\"shortname\":" >> "shortnamearray.json"
1919
echo -n "\"${shortname}\"" >> "shortnamearray.json"
2020
echo -n "}," >> "shortnamearray.json"
21-
done < serverlist.csv
21+
done < <(tail -n +2 serverlist.csv)
2222
sed -i '$ s/.$//' "shortnamearray.json"
2323
echo -n "]" >> "shortnamearray.json"
2424
echo -n "}" >> "shortnamearray.json"

‎.github/workflows/serverlist-validate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ echo "Checking that all the game servers are listed in all csv files"
33
echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
44
# count the number of lines in the serverlist.csv
55
cd "lgsm/data" || exit
6-
serverlistcount="$(wc -l < serverlist.csv)"
6+
serverlistcount="$(tail -n +2 serverlist.csv | wc -l)"
77
echo "serverlistcount: $serverlistcount"
88
# get list of all csv files starting with ubunutu debian centos
99
csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$')"

‎lgsm/config-default/config-lgsm/avserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ stopmode="10"
137137
# 3: gamedig
138138
# 4: gsquery
139139
# 5: tcp
140-
querymode="5"
140+
querymode="1"
141141
querytype=""
142142

143143
## Console type

‎lgsm/config-default/config-lgsm/rwserver/_default.cfg

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
#### Game Server Settings ####
1010

11-
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
12-
javaram="2048" # -Xmx$2048M
13-
1411
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
1512
startparameters=""
1613

@@ -115,7 +112,7 @@ sleeptime="0.5"
115112
appid="339010"
116113
steamcmdforcewindows="no"
117114
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
118-
branch=""
115+
branch="unity"
119116
betapassword=""
120117
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
121118
steammaster="false"
@@ -145,22 +142,21 @@ querytype="protocol-valve"
145142

146143
## Console type
147144
consoleverbose="yes"
148-
consoleinteract="no"
145+
consoleinteract="yes"
149146

150147
## Game Server Details
151148
# Do not edit
152149
gamename="Rising World"
153-
engine="risingworld"
154-
glibc="null"
150+
engine="unity3d"
151+
glibc="2.17"
155152

156153
#### Directories ####
157154
# Edit with care
158155

159156
## Game Server Directories
160157
systemdir="${serverfiles}"
161158
executabledir="${serverfiles}"
162-
preexecutable="java -Xmx${javaram}M -jar"
163-
executable="./server.jar"
159+
executable="./RisingWorldServer.x64"
164160
servercfgdir="${systemdir}"
165161
servercfg="server.properties"
166162
servercfgdefault="server.properties"

‎lgsm/config-default/config-lgsm/tiserver/_default.cfg

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,10 @@
1111
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1212
ip="0.0.0.0"
1313
port="7777"
14-
queryport="27015"
15-
# Possible maps, see: https://isle.fandom.com/wiki/The_Isle_Server_Settings_and_Configuration#Optional_Maps
16-
map=""
17-
18-
# EAC start parameters
19-
eaclaunch="-ini:Engine:[EpicOnlineServices]:DedicatedServerClientId=xyza7891gk5PRo3J7G9puCJGFJjmEguW -ini:Engine:[EpicOnlineServices]:DedicatedServerClientSecret=pKWl6t5i9NJK8gTpVlAxzENZ65P8hYzodV8Dqe5Rlc8"
14+
defaultmap="/Game/TheIsle/Maps/Game/Isla_Spiro/Isla_Spiro"
2015

2116
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
22-
startparameters="${map} -MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -log ${eaclaunch}"
17+
startparameters="${defaultmap} -Port=${port} -log"
2318

2419
#### LinuxGSM Settings ####
2520

@@ -125,7 +120,7 @@ steamcmdforcewindows="no"
125120
branch="evrima"
126121
betapassword=""
127122
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
128-
steammaster="true"
123+
steammaster="false"
129124

130125
## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
131126
# 1: tmux kill
@@ -147,8 +142,8 @@ stopmode="2"
147142
# 3: gamedig
148143
# 4: gsquery
149144
# 5: tcp
150-
querymode="2"
151-
querytype="protocol-valve"
145+
querymode="1"
146+
querytype=""
152147

153148
## Console type
154149
consoleverbose="yes"

‎lgsm/config-default/config-lgsm/wurmserver/_default.cfg

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,52 @@
88

99
#### Game Server Settings ####
1010

11+
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
12+
# https://www.wurmpedia.com/index.php/Server_administration_(Wurm_Unlimited)
13+
14+
# Game mode (Creative|Adventure)
15+
gamemode="Creative"
16+
17+
# The kingdom the server belongs to.
18+
# If you're using the Adventure base, use 1, 2, or 3.
19+
# If you're using Creative, use 4.
20+
# Kingdom numbers:
21+
# 0 - No kingdom
22+
# 1 - Jen-Kellon
23+
# 2 - Mol-Rehan
24+
# 3 - Horde of the Summoned
25+
# 4 - Freedom
26+
homekingdom="4"
27+
28+
# Unlocks the admin commands from within the game, that can be used to change
29+
# the gameplay settings of the server, such as skill gain rate and field growth time.
30+
adminpassword="ADMINPASSWORD"
31+
32+
# If true the server will follow the rules from the Epic servers in Wurm Online.
33+
# For instance it will use the skill curve.
34+
epicsettings="false"
35+
36+
# If the server is a home server (belongs to a single kingdom).
37+
homeserver="true"
38+
39+
# Defaults to true, should only be set to false if the server is intended to be
40+
# connected with another server that is going to act as a loginserver.
41+
loginserver="true"
42+
43+
# Used for server to server communication.
44+
rmiport="7221"
45+
rmiregport="7220"
46+
47+
maxplayers="200"
48+
servername="LinuxGSM"
49+
serverpassword=""
50+
ip="0.0.0.0"
51+
port="3724"
52+
queryport="27016"
53+
1154
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
1255
# Parameters are edited in the game server config file.
13-
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\""
56+
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}'"
1457

1558
#### LinuxGSM Settings ####
1659

@@ -157,13 +200,7 @@ glibc="2.14"
157200
## Game Server Directories
158201
systemdir="${serverfiles}"
159202
executabledir="${systemdir}"
160-
preexecutable="xvfb-run"
161203
executable="./WurmServerLauncher"
162-
servercfgdir="${systemdir}"
163-
servercfg="${selfname}.cfg"
164-
servercfgdefault="server.cfg"
165-
servercfgfullpath="${servercfgdir}/${servercfg}"
166-
source "${servercfgfullpath}"
167204

168205
## Backup Directory
169206
backupdir="${lgsmdir}/backup"

‎lgsm/data/appmanifest/ahl/appmanifest_10.acf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
"AppState"
2+
{
3+
"appid" "10"
4+
"Universe" "1"
5+
"name" "Counter-Strike"
6+
"StateFlags" "68"
7+
"installdir" "Half-Life"
8+
"LastUpdated" "1688984402"
9+
"SizeOnDisk" "0"
10+
"StagingSize" "0"
11+
"buildid" "0"
12+
"LastOwner" "0"
13+
"UpdateResult" "0"
14+
"BytesToDownload" "0"
15+
"BytesDownloaded" "0"
16+
"BytesToStage" "0"
17+
"BytesStaged" "0"
18+
"TargetBuildID" "0"
19+
"AutoUpdateBehavior" "0"
20+
"AllowOtherDownloadsWhileRunning" "0"
21+
"ScheduledAutoUpdate" "0"
22+
"InstalledDepots"
23+
{
24+
"11"
25+
{
26+
"manifest" "4720911300072406946"
27+
"size" "292616113"
28+
}
29+
}
30+
"UserConfig"
31+
{
32+
}
33+
"MountedConfig"
34+
{
35+
}
36+
}

‎lgsm/data/appmanifest/ahl/appmanifest_70.acf

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
"AppState"
2+
{
3+
"appid" "70"
4+
"Universe" "1"
5+
"name" "Half-Life"
6+
"StateFlags" "68"
7+
"installdir" "Half-Life"
8+
"LastUpdated" "1688984404"
9+
"SizeOnDisk" "0"
10+
"StagingSize" "0"
11+
"buildid" "0"
12+
"LastOwner" "0"
13+
"UpdateResult" "0"
14+
"BytesToDownload" "0"
15+
"BytesDownloaded" "0"
16+
"BytesToStage" "0"
17+
"BytesStaged" "0"
18+
"TargetBuildID" "0"
19+
"AutoUpdateBehavior" "0"
20+
"AllowOtherDownloadsWhileRunning" "0"
21+
"ScheduledAutoUpdate" "0"
22+
"InstalledDepots"
23+
{
24+
"1"
25+
{
26+
"manifest" "5928322771446233610"
27+
"size" "429833890"
28+
}
29+
"71"
30+
{
31+
"manifest" "9183617604528345869"
32+
"size" "15302314"
33+
}
34+
}
35+
"UserConfig"
36+
{
37+
}
38+
"MountedConfig"
39+
{
40+
}
41+
}

‎lgsm/data/appmanifest/ahl/appmanifest_90.acf

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
"AppState"
2+
{
3+
"appid" "90"
4+
"Universe" "1"
5+
"name" "Half-Life Dedicated Server"
6+
"StateFlags" "4"
7+
"installdir" "Half-Life"
8+
"LastUpdated" "1688984267"
9+
"SizeOnDisk" "0"
10+
"StagingSize" "0"
11+
"buildid" "0"
12+
"LastOwner" "76561200949853436"
13+
"UpdateResult" "0"
14+
"BytesToDownload" "0"
15+
"BytesDownloaded" "0"
16+
"BytesToStage" "0"
17+
"BytesStaged" "0"
18+
"TargetBuildID" "0"
19+
"AutoUpdateBehavior" "0"
20+
"AllowOtherDownloadsWhileRunning" "0"
21+
"ScheduledAutoUpdate" "0"
22+
"InstalledDepots"
23+
{
24+
"4"
25+
{
26+
"manifest" "8690279432129063737"
27+
"size" "25737094"
28+
}
29+
"1006"
30+
{
31+
"manifest" "6912453647411644579"
32+
"size" "72573740"
33+
}
34+
}
35+
"SharedDepots"
36+
{
37+
"1" "70"
38+
"11" "10"
39+
"71" "70"
40+
}
41+
"UserConfig"
42+
{
43+
"mod" "cstrike"
44+
}
45+
"MountedConfig"
46+
{
47+
"mod" "cstrike"
48+
}
49+
}

0 commit comments

Comments
 (0)