Skip to content

Commit c1f2a45

Browse files
dgibbs64dgibbs64
authored
Merge pull request #2392 from Frisasky/mohaa
feat(newserver): Medal of Honor: Allied Assault
2 parents d600b99 + 2c454e5 commit c1f2a45

File tree

8 files changed

+180
-0
lines changed

8 files changed

+180
-0
lines changed

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

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
##################################
2+
######## Default Settings ########
3+
##################################
4+
# DO NOT EDIT WILL BE OVERWRITTEN!
5+
# Copy settings from here and use them in either
6+
# common.cfg - applies settings to every instance
7+
# [instance].cfg - applies settings to a specific instance
8+
9+
#### Server Settings ####
10+
11+
## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
12+
ip="0.0.0.0"
13+
port="12203"
14+
defaultmap="dm/mohdm1"
15+
16+
## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
17+
fn_parms(){
18+
parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set fs_outputpath ${gamelogdir} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}"
19+
}
20+
21+
#### LinuxGSM Settings ####
22+
23+
## Notification Alerts
24+
# (on|off)
25+
26+
# Display IP | https://docs.linuxgsm.com/alerts#display-ip
27+
displayip=""
28+
29+
# More info | https://docs.linuxgsm.com/alerts#more-info
30+
postalert="off"
31+
postdays="7"
32+
posttarget="https://hastebin.com"
33+
34+
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
35+
discordalert="off"
36+
discordwebhook="webhook"
37+
38+
# Email Alerts | https://docs.linuxgsm.com/alerts/email
39+
emailalert="off"
40+
email="[email protected]"
41+
emailfrom=""
42+
43+
# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
44+
iftttalert="off"
45+
ifttttoken="accesstoken"
46+
iftttevent="linuxgsm_alert"
47+
48+
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
49+
mailgunalert="off"
50+
mailguntoken="accesstoken"
51+
mailgundomain="example.com"
52+
mailgunemailfrom="[email protected]"
53+
mailgunemail="[email protected]"
54+
55+
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
56+
pushbulletalert="off"
57+
pushbullettoken="accesstoken"
58+
channeltag=""
59+
60+
# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
61+
pushoveralert="off"
62+
pushovertoken="accesstoken"
63+
64+
# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
65+
# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring".
66+
# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need
67+
# any custom string in curl - simple ignore this parameter.
68+
telegramalert="off"
69+
telegramtoken="accesstoken"
70+
telegramchatid=""
71+
curlcustomstring=""
72+
73+
## Backup | https://docs.linuxgsm.com/commands/backup
74+
maxbackups="4"
75+
maxbackupdays="30"
76+
stoponbackup="on"
77+
78+
## Logging | https://docs.linuxgsm.com/features/logging
79+
consolelogging="on"
80+
logdays="7"
81+
82+
## Monitor | https://docs.linuxgsm.com/commands/monitor
83+
# Query delay time
84+
querydelay="1"
85+
86+
#### LinuxGSM Advanced Settings ####
87+
88+
# ANSI Colors
89+
ansi="on"
90+
91+
# Message Display Time
92+
sleeptime="0.5"
93+
94+
## LinuxGSM Server Details
95+
# Do not edit
96+
gamename="Medal of Honor: Allied Assault"
97+
engine="idtech3"
98+
glibc="2.3"
99+
100+
#### Directories ####
101+
# Edit with care
102+
103+
## Server Specific Directories
104+
systemdir="${serverfiles}/main"
105+
executabledir="${serverfiles}"
106+
executable="./mohaa_lnxded"
107+
servercfg="${servicename}.cfg"
108+
servercfgdefault="server.cfg"
109+
servercfgdir="${serverfiles}"
110+
servercfgfullpath="${serverfiles}/${servercfg}"
111+
112+
## Backup Directory
113+
backupdir="${lgsmdir}/backup"
114+
115+
## Logging Directories
116+
logdir="${rootdir}/log"
117+
gamelogdir="${serverfiles}/Logs"
118+
lgsmlogdir="${logdir}/script"
119+
consolelogdir="${logdir}/console"
120+
lgsmlog="${lgsmlogdir}/${servicename}-script.log"
121+
consolelog="${consolelogdir}/${servicename}-console.log"
122+
alertlog="${lgsmlogdir}/${servicename}-alert.log"
123+
postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
124+
125+
## Logs Naming
126+
lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
127+
consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

‎lgsm/data/serverlist.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ l4d,l4dserver,Left 4 Dead
5050
l4d2,l4d2server,Left 4 Dead 2
5151
mc,mcserver,Minecraft
5252
mh,mhserver,MORDHAU
53+
mohaa,mohaaserver,Medal of Honor: Allied Assault
5354
mta,mtaserver,Multi Theft Auto
5455
mumble,mumbleserver,Mumble
5556
nd,ndserver,Nuclear Dawn

‎lgsm/functions/check_deps.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,9 @@ fn_deps_build_debian(){
400400
else
401401
array_deps_required+=( openjdk-8-jre-headless )
402402
fi
403+
# Medal of Honor: Allied Assault
404+
elif [ "${shortname}" == "mohaa" ]; then
405+
array_deps_required+=( libstdc++5:i386 )
403406
# Project Zomboid
404407
elif [ "${shortname}" == "pz" ]; then
405408
if [ -n "$(java -version 2>&1 | grep "version")" ]; then

‎lgsm/functions/info_config.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,26 @@ fn_info_config_minecraft(){
386386
fi
387387
}
388388

389+
fn_info_config_mohaa(){
390+
if [ ! -f "${servercfgfullpath}" ]; then
391+
rconpassword="${unavailable}"
392+
servername="${unavailable}"
393+
serverpassword="${unavailable}"
394+
maxplayers="${zero}"
395+
else
396+
rconpassword=$(grep "rconpassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/seta rconpassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
397+
servername=$(grep "sv_hostname" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/seta sv_hostname//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
398+
serverpassword=$(grep "g_password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/seta g_password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
399+
maxplayers=$(grep "sv_maxclients" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]')
400+
401+
# Not Set
402+
rconpassword=${rconpassword:-"NOT SET"}
403+
servername=${servername:-"NOT SET"}
404+
serverpassword=${serverpassword:-"NOT SET"}
405+
maxplayers=${maxplayers:-"0"}
406+
fi
407+
}
408+
389409
#Post Scriptum: The bloody Seventh
390410
fn_info_config_pstbs(){
391411
if [ ! -f "${servercfgfullpath}" ]; then
@@ -1290,6 +1310,9 @@ elif [ "${shortname}" == "jc3" ]; then
12901310
# Killing Floor 2
12911311
elif [ "${shortname}" == "kf2" ]; then
12921312
fn_info_config_kf2
1313+
# Medal of Honor: Allied Assault
1314+
elif [ "${shortname}" == "mohaa" ]; then
1315+
fn_info_config_mohaa
12931316
# QuakeWorld
12941317
elif [ "${shortname}" == "qw" ]; then
12951318
fn_info_config_quakeworld

‎lgsm/functions/info_messages.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,15 @@ fn_info_message_minecraft(){
811811
} | column -s $'\t' -t
812812
}
813813

814+
fn_info_message_mohaa(){
815+
echo -e "netstat -atunp | grep mohaa_lnxded"
816+
echo -e ""
817+
{
818+
echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
819+
echo -e "> Game\tINBOUND\t${port}\tudp"
820+
} | column -s $'\t' -t
821+
}
822+
814823
fn_info_message_mumble(){
815824
echo -e "netstat -atunp | grep murmur"
816825
echo -e ""
@@ -1363,6 +1372,8 @@ fn_info_message_select_engine(){
13631372
fn_info_message_towerunite
13641373
elif [ "${shortname}" == "unt" ]; then
13651374
fn_info_message_unturned
1375+
elif [ "${shortname}" == "mohaa" ]; then
1376+
fn_info_message_mohaa
13661377
elif [ "${shortname}" == "mh" ]; then
13671378
fn_info_message_mordhau
13681379
elif [ "${shortname}" == "mta" ]; then

‎lgsm/functions/info_parms.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ fn_info_parms_mordhau(){
8383
beaconport=${beaconport:-"0"}
8484
}
8585

86+
fn_info_parms_mohaa(){
87+
port=${port:-"0"}
88+
defaultmap=${defaultmap:-"NOT SET"}
89+
}
90+
8691
fn_info_parms_projectzomboid(){
8792
adminpassword=${adminpassword:-"NOT SET"}
8893
}
@@ -234,6 +239,8 @@ elif [ "${shortname}" == "inss" ]; then
234239
fn_info_parms_inss
235240
elif [ "${shortname}" == "kf2" ]; then
236241
fn_info_parms_kf2
242+
elif [ "${shortname}" == "mohaa" ]; then
243+
fn_info_parms_mohaa
237244
# Project Zomboid
238245
elif [ "${shortname}" == "pz" ]; then
239246
fn_info_parms_projectzomboid

‎lgsm/functions/install_config.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,12 @@ elif [ "${shortname}" == "mc" ]; then
440440
fn_fetch_default_config
441441
fn_default_config_remote
442442
fn_set_config_vars
443+
elif [ "${shortname}" == "mohaa" ]; then
444+
gamedirname="MedalOfHonorAlliedAssault"
445+
array_configs+=( server.cfg )
446+
fn_fetch_default_config
447+
fn_default_config_remote
448+
fn_set_config_vars
443449
elif [ "${shortname}" == "mh" ]; then
444450
gamedirname="Mordhau"
445451
fn_check_cfgdir

‎lgsm/functions/install_server_files.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ fn_install_server_files(){
2929
remote_fileurl="https://files.linuxgsm.com/WolfensteinEnemyTerritory/etlegacy-v2.75-i386-et-260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.75-i386-et-260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="92d7d4c26e0a295daed78cef623eeabb"
3030
elif [ "${shortname}" == "ges" ]; then
3131
remote_fileurl="https://files.linuxgsm.com/GoldenEyeSource/GoldenEye_Source_v5.0.6_full_server.tar.bz2"; local_filedir="${tmpdir}"; local_filename="GoldenEye_Source_v5.0.6_full_server.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="c45c16293096706e8b5e2cd64a6f2931"
32+
elif [ "${shortname}" == "mohaa" ]; then
33+
remote_fileurl="https://files.linuxgsm.com/MedalofHonorAlliedAssault/MOH_REVIVAL_V2.tar.bz2"; local_filedir="${tmpdir}"; local_filename="MOH_REVIVAL_V2.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0ed3b7a5a917447df07a8ea662381aed"
3234
elif [ "${shortname}" == "ns" ]; then
3335
remote_fileurl="https://files.linuxgsm.com/NaturalSelection/ns_dedicated_server_v32.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ns_dedicated_server_v32.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="499cf63324b76925ada6baf5f2eacd67"
3436
elif [ "${shortname}" == "q2" ]; then

0 commit comments

Comments
 (0)