From b3912b98cbc09220411f86a5fe744f7cbaf3bb6f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 12 May 2023 21:49:30 +0100 Subject: [PATCH] update roserver --- lgsm/modules/info_game.sh | 76 +++++++++++++---------------------- lgsm/modules/info_messages.sh | 16 ++++---- 2 files changed, 36 insertions(+), 56 deletions(-) diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index f89cab0d0..c0184fcde 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -448,13 +448,10 @@ fn_info_game_kf() { queryportgs="${queryportgs:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steammasterport="${steammasterport:-"0"}" steammasterport="28852" - steamport="${steamport:-"0"}" - steamport="20560" + steamworksport="20560" webadminenabled="${webadminenabled:-"NOT SET"}" webadminpass="${adminpassword}" - webadminpass="${webadminpass:-"NOT SET"}" webadminuser="${webadminuser:-"NOT SET"}" } @@ -1576,51 +1573,34 @@ fn_info_game_qw() { } fn_info_game_ro() { - # Config - if [ ! -f "${servercfgfullpath}" ]; then - servername="${unavailable}" - serverpassword="${unavailable}" - adminpassword="${unavailable}" - port="${zero}" - queryport="${zero}" - steamport="${zero}" - steammasterport="${zero}" - lanport="${zero}" - httpport="${zero}" - webadminenabled="${unavailable}" - webadminuser="${unavailable}" - webadminpass="${unavailable}" - else - servername=$(sed -nr 's/^ServerName=(.*)$/\1/p' "${servercfgfullpath}" | tr -d '=\";,:' | sed 's/\r$//') - serverpassword=$(sed -nr 's/^GamePassword=(.*)$/\1/p' "${servercfgfullpath}" | tr -d '=\";,:' | sed 's/\r$//') - adminpassword=$(sed -nr 's/^AdminPassword=(.*)$/\1/p' "${servercfgfullpath}" | tr -d '=\";,:' | sed 's/\r$//') - port=$(sed -nr 's/^Port=(.*)$/\1/p' "${servercfgfullpath}" | tr -cd '[:digit:]') - queryport=$((port + 1)) - steamport="20610" - steammasterport="28902" - lanport=$(grep "LANServerPort=" "${servercfgfullpath}" | tr -cd '[:digit:]') - httpport=$(sed -nr 's/^ListenPort=(.*)$/\1/p' "${servercfgfullpath}" | tr -cd '[:digit:]') - webadminenabled=$(sed -nr 's/^bEnabled=(.*)$/\1/p' "${servercfgfullpath}" | tr -d '=\";,:' | sed 's/\r$//') - webadminuser=$(sed -nr 's/^AdminName=(.*)$/\1/p' "${servercfgfullpath}" | tr -d '=\";,:' | sed 's/\r$//') - webadminpass="${adminpassword}" - - # Not set - servername=${servername:-"NOT SET"} - serverpassword=${serverpassword:-"NOT SET"} - adminpassword=${adminpassword:-"NOT SET"} - port=${port:-"0"} - queryport=${queryport:-"0"} - steamport=${steamport:-"0"} - steammasterport=${steammasterport:-"0"} - lanport=${lanport:-"0"} - httpport=${httpport:-"0"} - webadminenabled=${webadminenabled:-"NOT SET"} - webadminuser=${webadminuser:-"NOT SET"} - webadminpass=${webadminpass:-"NOT SET"} + if [ -f "${servercfgfullpath}" ]; then + fn_info_game_ini "adminpassword" "AdminPassword" + fn_info_game_ini "httpport" "ListenPort" + fn_info_game_ini "lanport" "LANServerPort" + fn_info_game_ini "maxplayers" "MaxPlayers" + fn_info_game_ini "port" "Port" + fn_info_game_ini "queryportgs" "QueryPort" + fn_info_game_ini "servername" "ServerName" + fn_info_game_ini "serverpassword" "GamePassword" + fn_info_game_ini "webadminenabled" "bEnabled" + fn_info_game_ini "webadminpass" "WebAdminPassword" + fn_info_game_ini "webadminuser" "AdminName" fi - - # Parameters - defaultmap=${defaultmap:-"NOT SET"} + adminpassword="${adminpassword:-"NOT SET"}" + defaultmap="${defaultmap:-"NOT SET"}" + httpport="${httpport:-"0"}" + lanport="${lanport:-"0"}" + maxplayers="${maxplayers:-"0"}" + port="${port:-"0"}" + queryport="$((port + 1))" + queryportgs="${queryportgs:-"0"}" + servername="${servername:-"NOT SET"}" + serverpassword="${serverpassword:-"NOT SET"}" + steamport="20610" + steammasterport="28902" + webadminenabled="${webadminenabled:-"NOT SET"}" + webadminpass="${adminpassword}" + webadminuser="${webadminuser:-"NOT SET"}" } # Config Type: QuakeC diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 4dbbdcd96..491ea6356 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -803,7 +803,7 @@ fn_info_message_arma3() { fn_port "Game" port udp fn_port "Voice" voiceport udp fn_port "Query" queryport udp - fn_port "Steam Master" steammasterport udp + fn_port "Steam Master Server" steammasterport udp fn_port "Voice (unused)" voiceunusedport udp fn_port "BattleEye" battleeyeport udp } | column -s $'\t' -t @@ -823,7 +823,7 @@ fn_info_message_av() { fn_port "header" fn_port "Game" port udp fn_port "Query" queryport udp - fn_port "Steam Master" steammasterport udp + fn_port "Steam Master Server" steammasterport udp fn_port "Steam Query" steamqueryport udp fn_port "RCON" rconport tcp } | column -s $'\t' -t @@ -962,7 +962,7 @@ fn_info_message_dayz() { fn_port "header" fn_port "Game" port udp fn_port "Query Steam" queryport udp - fn_port "Steam Master" steammasterport udp + fn_port "Steam Master Server" steammasterport udp fn_port "BattleEye" battleeyeport udp } | column -s $'\t' -t } @@ -981,7 +981,7 @@ fn_info_message_dst() { fn_port "Game: Server" port udp fn_port "Game: Master" masterport udp fn_port "Steam: Auth" steamauthport udp - fn_port "Steam: Master" steammasterport udp + fn_port "Steam Master Server" steammasterport udp } | column -s $'\t' -t } @@ -1078,8 +1078,8 @@ fn_info_message_kf() { fn_port "Query (GameSpy)" queryportgs udp fn_port "Web Admin" webadminport tcp fn_port "LAN" lanport udp - fn_port "Steam" steamport udp - fn_port "Steam Master" steammasterport udp + fn_port "Steamworks P2P" steamworksport udp + fn_port "Steam Master Server" steammasterport udp } | column -s $'\t' -t echo -e "" echo -e "${lightgreen}${servername} Web Admin${default}" @@ -1270,8 +1270,8 @@ fn_info_message_ro() { fn_port "Query" queryport udp fn_port "Web Admin" webadminport tcp fn_port "LAN" lanport udp - fn_port "Steam" steamport udp - fn_port "Steam Master" steammasterport udp + fn_port "Steamworks P2P" steamworksport udp + fn_port "Steam Master Server" steammasterport udp } | column -s $'\t' -t echo -e "" echo -e "${lightgreen}${servername} Web Admin${default}"