Skip to content

Commit db692b2

Browse files
authored
fix(ti): Update config using evrima branch (#4263)
* refactor: simplify start parameters in tiserver config The start parameters in the tiserver config file have been simplified to only include the default map and port. The unnecessary queryport and eaclaunch parameters have been removed. * refactor: update default configuration and game info handling - Set `steammaster` to false in the default configuration file. - Refactor the game info script to handle changes in the game's ini file structure: - Update the key for `queueenabled` to `bQueueEnabled`. - Update the key for `rconenabled` to `bRconEnabled`. - Add support for retrieving `rconpassword`, `serverpassword`, and `serverpasswordenabled`. - Modify the message formatting in the info messages script to display queue, RCON, and query ports correctly.
1 parent d34bc29 commit db692b2

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

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/modules/info_game.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,18 +666,24 @@ fn_info_game_stn() {
666666
fn_info_game_ti() {
667667
if [ -f "${servercfgfullpath}" ]; then
668668
fn_info_game_ini "maxplayers" "MaxPlayerCount"
669-
fn_info_game_ini "queueenabled" "QueueEnabled"
669+
fn_info_game_ini "queueenabled" "bQueueEnabled"
670670
fn_info_game_ini "queueport" "QueuePort"
671-
fn_info_game_ini "rconenabled" "RconEnabled"
671+
fn_info_game_ini "rconenabled" "bRconEnabled"
672+
fn_info_game_ini "rconpassword" "RconPassword"
672673
fn_info_game_ini "rconport" "RconPort"
673674
fn_info_game_ini "servername" "ServerName"
675+
fn_info_game_ini "serverpassword" "ServerPassword"
676+
fn_info_game_ini "serverpasswordenabled" "bServerPassword"
674677
fi
675678
maxplayers="${maxplayers:-"0"}"
676679
queueenabled="${queueenabled:-"NOT SET"}"
677680
queueport="${queueport:-"0"}"
678681
rconenabled="${rconenabled:-"NOT SET"}"
682+
rconpassword="${rconpassword:-"NOT SET"}"
679683
rconport="${rconport:-"0"}"
680684
servername="${servername:-"NOT SET"}"
685+
serverpassword="${serverpassword:-"NOT SET"}"
686+
serverpasswordenabled="${serverpasswordenabled:-"NOT SET"}"
681687
}
682688

683689
# Config Type: ini

lgsm/modules/info_messages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,8 @@ fn_info_message_ti() {
15051505
{
15061506
fn_port "header"
15071507
fn_port "Game" port udp
1508-
fn_port "Query" queryport udp
1508+
fn_port "Queue" queueport tcp
1509+
fn_port "RCON" rconport tcp
15091510
} | column -s $'\t' -t
15101511
}
15111512

0 commit comments

Comments
 (0)