Opener and File Read Work

Settings.txt

@@ -9,6 +9,12 @@ UZDoom
 300minvr.wad
 --name=300 Minutes of /vr/
 --description=4chan's /vr/ board gives us a megawad of solid bangers!
+valve.wad
+--name=Valiant: Vaccinated Edition
+--description=Valiant! Without the custom enemies or weapons!
+sigil.wad
+--name=SIGIL
+--description=The Icon of Sin Himself, John Romero returns! Episode 5 of DOOM!
 [Gameplay]
 PVT_STONE_V12_5.wad
 --name=Pvt.Stone

doomstarter.py

@@ -15,40 +15,45 @@ def menuPrinter(list):
         print(str(i) + ": " + list[i])
 
 
-def mapSettingsRead():
+def mapSettingsRead(mainDict):
     tempDict = {}
+    counter = 0
     for i in range(len(mapsSettings)):
-        tempName = "map" + str(i)
+        tempName = "map" + str(counter).zfill(2)
         print("Examining " + mapsSettings[i])
 
         if (mapsSettings[i][:2] != "--"):
             if len(tempDict) != 0:
                 settingsDict["maps"].update({tempName: tempDict})
+                tempDict = {}
+                counter = counter + 1
             tempDict["filename"] = mapsSettings[i]
         else:
             temp = mapsSettings[i][2:].split("=")
             tempDict.update({temp[0]: temp[1]})
 
     if len(tempDict) != 0:
-        settingsDict["maps"].update({tempName: tempDict})
+        mainDict["maps"].update({tempName: tempDict})
+
+    return mainDict
 
 
 # Dynamic Introduction!
 print("So it looks like you wanna play some fuckin\' DOOM!")
-
 print("Checking current directories...")
 # On Start: Check if necessary folders are there
 # ./gameplay/, ./maps/, ./misc/
-if (os.path.isdir('gameplay') == False):
+# If not, end the program to allow user to add WAD files.
+if not (os.path.isdir('gameplay') and os.path.isdir('maps') and os.path.isdir('misc')):
     print("Making Gameplay folder...")
     os.mkdir('gameplay')
-if (os.path.isdir('maps') == False):
     print("Making Maps folder...")
     os.mkdir('maps')
-if (os.path.isdir('misc') == False):
     print("Making Misc Folder...")
     os.mkdir('misc')
 
+    print("Folders Created! Now go forth and fill them! Return when you are ready to DOOM!")
+else:
     # Load Config File
     settings = ((open("Settings.txt")).read()).splitlines()
 
@@ -118,7 +123,7 @@ print(os.listdir("./maps/"))
 
     # Read information from the settings file
     print("Adding maps to the main dict...")
-mapSettingsRead()
+    settingsDict = mapSettingsRead(settingsDict)
 
     print("Listing everything in Gameplay...")
     print(os.listdir("./gameplay/"))