von/vq3srv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vq3srv, config.example.yml: get rid of any gamemode section, use bootstrap for that

Browse source
This commit is contained in:
Von Random 2021-02-07 18:42:54 +03:00
parent 84aa8d3dfd
commit 10009f0337
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.example.yml
View file

@ -2,10 +2,6 @@ user: quake3
cmd: /opt/ioquake3/ioq3ded.x86_64 +exec autoexec.cfg cmd: /opt/ioquake3/ioq3ded.x86_64 +exec autoexec.cfg
autoexec: /home/quake3/.q3a/baseq3/autoexec.cfg autoexec: /home/quake3/.q3a/baseq3/autoexec.cfg
gamemodes: gamemodes:
any:
vars:
fraglimit: 100
timelimit: 10
ffa: ffa:
maps: [ maps: [
q3dm2, q3dm3, q3dm4, q3dm5, q3dm6, q3dm2, q3dm3, q3dm4, q3dm5, q3dm6,

3
vq3srv
View file

@ -54,14 +54,13 @@ def main():
if args.bootstrap: if args.bootstrap:
with open(args.bootstrap, 'r') as bootstrap_file: with open(args.bootstrap, 'r') as bootstrap_file:
bvars.update(safe_load(bootstrap_file)) bvars.update(safe_load(bootstrap_file))
assert args.gamemode != 'any' and args.gamemode in cfg['gamemodes'] assert args.gamemode in cfg['gamemodes']
except FileNotFoundError as error: except FileNotFoundError as error:
exit('Config `{}` not found!'.format(error.filename)) exit('Config `{}` not found!'.format(error.filename))
except AssertionError: except AssertionError:
exit('Wrong game mode `{}` specified!'.format(args.gamemode)) exit('Wrong game mode `{}` specified!'.format(args.gamemode))
smaps = cfg['gamemodes'][args.gamemode]['maps'] smaps = cfg['gamemodes'][args.gamemode]['maps']
svars.update(cfg['gamemodes']['any']['vars'])
svars.update(cfg['gamemodes'][args.gamemode]['vars']) svars.update(cfg['gamemodes'][args.gamemode]['vars'])
if args.fraglimit: if args.fraglimit:
svars.update({'fraglimit': args.fraglimit}) svars.update({'fraglimit': args.fraglimit})