vq3srv, config.example.yml: get rid of any gamemode section, use bootstrap for that
This commit is contained in:
parent
84aa8d3dfd
commit
10009f0337
2 changed files with 1 additions and 6 deletions
|
@ -2,10 +2,6 @@ user: quake3
|
|||
cmd: /opt/ioquake3/ioq3ded.x86_64 +exec autoexec.cfg
|
||||
autoexec: /home/quake3/.q3a/baseq3/autoexec.cfg
|
||||
gamemodes:
|
||||
any:
|
||||
vars:
|
||||
fraglimit: 100
|
||||
timelimit: 10
|
||||
ffa:
|
||||
maps: [
|
||||
q3dm2, q3dm3, q3dm4, q3dm5, q3dm6,
|
||||
|
|
3
vq3srv
3
vq3srv
|
@ -54,14 +54,13 @@ def main():
|
|||
if args.bootstrap:
|
||||
with open(args.bootstrap, 'r') as 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:
|
||||
exit('Config `{}` not found!'.format(error.filename))
|
||||
except AssertionError:
|
||||
exit('Wrong game mode `{}` specified!'.format(args.gamemode))
|
||||
|
||||
smaps = cfg['gamemodes'][args.gamemode]['maps']
|
||||
svars.update(cfg['gamemodes']['any']['vars'])
|
||||
svars.update(cfg['gamemodes'][args.gamemode]['vars'])
|
||||
if args.fraglimit:
|
||||
svars.update({'fraglimit': args.fraglimit})
|
||||
|
|
Loading…
Reference in a new issue