Skip to content

Commit 058d690

Browse files
dgibbs64dgibbs64
committed
Merge branch 'release/180313'
2 parents 8854693 + 90248bf commit 058d690

File tree

18 files changed

+144
-82
lines changed

18 files changed

+144
-82
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
ip="0.0.0.0"
1313
queryport="27015"
1414
defaultmap="KF-BioticsLab"
15+
gamemode="KFGameContent.KFGameInfo_VersusSurvival"
1516

1617
## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
1718
fn_parms(){
18-
parms="\"${defaultmap}?Game=KFGameContent.KFGameInfo_VersusSurvival?ConfigSubDir=${servicename} -QueryPort=${queryport}\""
19+
parms="\"${defaultmap}?Game=${gamemode}?ConfigSubDir=${servicename} -QueryPort=${queryport}\""
1920
}
2021

2122
#### LinuxGSM Settings ####

‎lgsm/config-default/config-lgsm/coserver/_default.cfg‎ renamed to ‎lgsm/config-default/config-lgsm/stserver/_default.cfg‎

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,18 @@
99
#### Server Settings ####
1010

1111
## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
12-
# https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
13-
# [Game Modes] gametype gamemode
14-
# Arms Race 1 0
15-
# Classic Casual 0 0
16-
# Classic Competitive 0 1
17-
# Demolition 1 1
18-
# Deathmatch 1 2
19-
gametype="0"
20-
gamemode="0"
21-
mapgroup="mg_active"
2212
ip="0.0.0.0"
23-
port="27015"
24-
clientport="27005"
25-
sourcetvport="27020"
26-
defaultmap="de_mirage"
27-
maxplayers="16"
28-
tickrate="64"
29-
30-
## Required: Game Server Login Token
31-
# GSLT is required for running a public server.
32-
# More info: https://gameservermanagers.com/gslt
33-
gslt=""
34-
35-
## Optional: Workshop Parameters
36-
# https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators
37-
# To get an authkey visit - http://steamcommunity.com/dev/apikey
38-
# authkey=""
39-
# ws_collection_id=""
40-
# ws_start_map=""
13+
port="27500"
14+
queryport="27015"
15+
worldtype="Moon"
16+
autosaveinterval=300
17+
clearinterval=60
18+
worldname="moon_save"
4119

4220
## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
21+
# Edit with care | http://hurtworld.wikia.com/wiki/Hosting_A_Server
4322
fn_parms(){
44-
parms="-game csco -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}"
23+
parms="-batchmode -nographics -autostart -gameport=${port} -updateport=${queryport} -worldtype=${worldtype} -loadworld=${worldname} -worldname=${worldname} -autosaveinterval=${autosaveinterval} -clearallinterval=${clearinterval}"
4524
}
4625

4726
#### LinuxGSM Settings ####
@@ -105,40 +84,35 @@ logdays="7"
10584

10685
## SteamCMD Settings
10786
# Server appid
108-
appid="740"
109-
appid_co="600380"
87+
appid="600760"
11088
# Steam App Branch Select
11189
# Allows to opt into the various Steam app branches. Default branch is "".
11290
# Example: "-beta latest_experimental"
11391
branch=""
11492

115-
## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
116-
steamuser="username"
117-
steampass='password'
118-
11993
## LinuxGSM Server Details
12094
# Do not edit
121-
gamename="Classic Offensive"
122-
engine="source"
95+
gamename="Stationeers"
96+
engine="unity3d"
12397

12498
#### Directories ####
12599
# Edit with care
126100

127101
## Server Specific Directories
128-
systemdir="${serverfiles}/csco"
102+
systemdir="${serverfiles}"
129103
executabledir="${serverfiles}"
130-
executable="./srcds_run"
131-
servercfg="${servicename}.cfg"
132-
servercfgdefault="server.cfg"
133-
servercfgdir="${systemdir}/cfg"
104+
executable="./rocketstation_DedicatedServer.x86_64"
105+
servercfg="default.ini"
106+
servercfgdefault="default.ini"
107+
servercfgdir="${systemdir}"
134108
servercfgfullpath="${servercfgdir}/${servercfg}"
135109

136110
## Backup Directory
137111
backupdir="${rootdir}/backups"
138112

139113
## Logging Directories
140114
logdir="${rootdir}/log"
141-
gamelogdir="${systemdir}/logs"
115+
gamelogdir="${HOME}/.config/unity3d/Rocketwerkz/Stationeers"
142116
lgsmlogdir="${logdir}/script"
143117
consolelogdir="${logdir}/console"
144118
lgsmlog="${lgsmlogdir}/${servicename}-script.log"
@@ -148,4 +122,5 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
148122

149123
## Logs Naming
150124
lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
151-
consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
125+
consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
126+

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ ip="0.0.0.0"
1313
port="7777"
1414
queryport="27015"
1515

16+
## Optional: Game Server Login Token
17+
# GSLT can be used for running a public server.
18+
# More info: https://gameservermanagers.com/gslt
19+
gslt=""
20+
1621
## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
1722
fn_parms(){
1823
parms="-log -MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -TowerServerINI=${servicename}.ini"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ sourcetvport="27020"
1616
defaultmap="zps_deadend"
1717
maxplayers="20"
1818

19+
## Optional: Game Server Login Token
20+
# GSLT can be used for running a public server.
21+
# More info: https://gameservermanagers.com/gslt
22+
gslt=""
23+
1924
## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
2025
fn_parms(){
2126
parms="-game zps -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"

‎lgsm/data/serverlist.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ rust,rustserver,Rust
5858
samp,sampserver,San Andreas Multiplayer
5959
ss3,ss3server,Serious Sam 3: BFE
6060
sb,sbserver,Starbound
61+
st,stserver,Stationeers
6162
squad,squadserver,Squad
6263
sven,svenserver,Sven Co-op
6364
tf2,tf2server,Team Fortress 2

‎lgsm/functions/check_system_requirements.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ elif [ "${gamename}" == "Minecraft" ]; then
2727
elif [ "${gamename}" == "Natural Selection 2" ]||[ "${gamename}" == "NS2: Combat" ]; then
2828
ramrequirementmb="1000"
2929
ramrequirementgb="1"
30+
elif [ "${shortname}" == "st" ]; then
31+
ramrequirementmb="1000"
32+
ramrequirementgb="1"
3033
fi
3134

3235
# If the game or engine has a minimum RAM Requirement, compare it to system's available RAM.

‎lgsm/functions/command_backup.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ fn_backup_compression(){
114114
fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress"
115115
excludedir=$(fn_backup_relpath)
116116

117-
# CHECK THAT excludedir is a valid path.
117+
# Check that excludedir is a valid path.
118118
if [ ! -d "${excludedir}" ] ; then
119-
fn_print_info_nl "Problem identifying the previous backup directory for exclusion."
120-
fn_script_log_error "Problem identifying the previous backup directory for exclusion"
119+
fn_print_fail_nl "Problem identifying the previous backup directory for exclusion."
120+
fn_script_log_fatal "Problem identifying the previous backup directory for exclusion"
121121
core_exit.sh
122122
fi
123123

@@ -195,16 +195,16 @@ fn_backup_relpath() {
195195
declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g"))
196196

197197
if [ ${#rdirtoks[@]} -eq 0 ]; then
198-
fn_print_info_nl "Problem assessing rootdir during relative path assessment"
199-
fn_script_log_error "Problem assessing rootdir during relative path assessment: ${rootdir}"
198+
fn_print_fail_nl "Problem assessing rootdir during relative path assessment"
199+
fn_script_log_fatal "Problem assessing rootdir during relative path assessment: ${rootdir}"
200200
core_exit.sh
201201
fi
202202

203203
# Populate an array of tokens initialized from the backupdir components:
204204
declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g"))
205205
if [ ${#bdirtoks[@]} -eq 0 ]; then
206-
fn_print_info_nl "Problem assessing backupdir during relative path assessment"
207-
fn_script_log_error "Problem assessing backupdir during relative path assessment: ${rootdir}"
206+
fn_print_fail_nl "Problem assessing backupdir during relative path assessment"
207+
fn_script_log_fatal "Problem assessing backupdir during relative path assessment: ${rootdir}"
208208
core_exit.sh
209209
fi
210210

‎lgsm/functions/command_monitor.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fn_monitor_tmux(){
7979
fn_print_ok_eol_nl
8080
fn_script_log_pass "Checking session: OK"
8181
# runs gsquery check on game with specific engines.
82-
local allowed_engines_array=( avalanche2.0 avalanche3.0 goldsource idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 )
82+
local allowed_engines_array=( avalanche2.0 avalanche3.0 goldsource idtech2 idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 )
8383
for allowed_engine in "${allowed_engines_array[@]}"
8484
do
8585
if [ "${allowed_engine}" == "starbound" ]; then

‎lgsm/functions/core_dl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn_fetch_file(){
115115
# if larger file shows progress bar
116116
if [ "${local_filename##*.}" == "bz2" ]||[ "${local_filename##*.}" == "gz" ]||[ "${local_filename##*.}" == "zip" ]||[ "${local_filename##*.}" == "jar" ]; then
117117
echo -ne "downloading ${local_filename}..."
118-
sleep 1
118+
sleep 0.5
119119
curlcmd=$(${curlpath} --progress-bar --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}")
120120
echo -ne "downloading ${local_filename}..."
121121
else

‎lgsm/functions/gsquery.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ def __init__(self, options, arguments):
1818
self.default_buffer_length = 1024
1919
#
2020
sourcequery=[ 'avalanche3.0','madness','quakelive','realvirtuality','refractor','source','goldsource','spark','starbound','unity3d']
21-
idtech2query=['idtech3','quake','iw3.0']
22-
idtech3query=['idtech2','iw2.0']
21+
idtech3query=['idtech3','quake','iw3.0']
22+
idtech2query=['idtech2','iw2.0']
2323
if self.option.engine in sourcequery:
2424
self.query_prompt_string = b'\xFF\xFF\xFF\xFFTSource Engine Query\0'
2525
elif self.option.engine in idtech2query:

0 commit comments

Comments
 (0)