dcc/doom_base.py

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

dcc/eureka.py

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

dcc/text.py

@@ -33,9 +33,9 @@ class Text(dcc.doom_base.WadMap):
 
     def take_action(self, parsed_args):
         text = None
-        map_names = self._config.get("map_names")
+        map_names = self._config["map_names"]
         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:
             text = sys.stdin.read().rstrip()
         if not parsed_args.nomap: