yrriban/doomcc
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: yrriban:3fc029bf958552afd32e7982703a32eb95b28521
Branches Tags
yrriban:trunk
..
compare: yrriban:c89fde220c141fcdcee7c3b574c24334f1dab092
Branches Tags
yrriban:trunk

No commits in common. "3fc029bf958552afd32e7982703a32eb95b28521" and "c89fde220c141fcdcee7c3b574c24334f1dab092" have entirely different histories.
3fc029bf95 ... c89fde220c

3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dcc/doom_base.py
View file

@ -49,14 +49,6 @@ class Wad(dcc.config.Base):
iwad = self.iwads.joinpath(f.read().strip() + ".WAD") iwad = self.iwads.joinpath(f.read().strip() + ".WAD")
return iwad return iwad
def load_order(self):
wads = self._config.get("load_order")
if wads is None:
wads = sorted(self.pwad_path.glob('*.wad', case_sensitive=False))
else:
wads = [self.pwad_path.joinpath(wad) for wad in wads]
return wads
class WadMap(Wad): class WadMap(Wad):
def get_parser(self, prog_name): def get_parser(self, prog_name):
@ -83,7 +75,7 @@ class WadMap(Wad):
def dsda_preamble(self): def dsda_preamble(self):
args = ["-iwad", self.iwad_path] args = ["-iwad", self.iwad_path]
wads = self.load_order() wads = sorted(self.pwad_path.glob('*.wad', case_sensitive=False))
if len(wads) > 0: if len(wads) > 0:
args = args + ["-file"] + wads args = args + ["-file"] + wads
@ -91,7 +83,7 @@ class WadMap(Wad):
if len(dehs) > 0: if len(dehs) > 0:
args = args + ["-deh"] + dehs args = args + ["-deh"] + dehs
args = args + ["-complevel", str(self.complevel())] args = args + ["-complevel", self.complevel()]
args = args + ["-skill", "4"] args = args + ["-skill", "4"]
args = args + ["-warp", self.map] args = args + ["-warp", self.map]
return args return args

2
dcc/eureka.py
View file

@ -15,7 +15,7 @@ class Eureka(dcc.doom_base.WadMap):
if parsed_args.main is not None: if parsed_args.main is not None:
mw = pwadpath.joinpath(parsed_args.main) mw = pwadpath.joinpath(parsed_args.main)
else: else:
mw = self.load_order()[0] mw = sorted(list(pwadpath.glob('*.wad', case_sensitive=False)))[0]
complevel = self.complevel() complevel = self.complevel()
port = "vanilla" port = "vanilla"

4
dcc/text.py
View file

@ -33,9 +33,9 @@ class Text(dcc.doom_base.WadMap):
def take_action(self, parsed_args): def take_action(self, parsed_args):
text = None text = None
map_names = self._config.get("map_names") map_names = self._config["map_names"]
if map_names is not None: if map_names is not None:
text = map_names.get(f"map{parsed_args.map}") text = map_names[f"map{parsed_args.map}"]
if text is None: if text is None:
text = sys.stdin.read().rstrip() text = sys.stdin.read().rstrip()
if not parsed_args.nomap: if not parsed_args.nomap: