diff options
author | Von Random <von@mechanus.net> | 2021-02-07 18:42:54 +0300 |
---|---|---|
committer | Von Random <von@mechanus.net> | 2021-02-07 18:42:54 +0300 |
commit | 10009f0337059af46115d527294ded340b702392 (patch) | |
tree | e779491cf12eb1f36ac39a6234055a78cc096ac1 | |
parent | 84aa8d3dfd805a389be7fb83606895cc8edb571b (diff) |
vq3srv, config.example.yml: get rid of any gamemode section, use bootstrap for that
-rw-r--r-- | config.example.yml | 4 | ||||
-rwxr-xr-x | vq3srv | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/config.example.yml b/config.example.yml index b245bf3..5a1f3a3 100644 --- a/config.example.yml +++ b/config.example.yml @@ -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, @@ -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}) |