Merge pull request #37 from TheEnderek0/dev/game_mounting

Fix issues with mounting mounts.kv

docs/source/changelog.rst

@@ -12,6 +12,7 @@ Version (dev)
 * Avoid escaping `/` and `?`, these are unambiguous.
 * Add :py:attr:`ValueTypes.EXT_SOUNDSCAPE <srctools.fgd.ValueTypes.EXT_SOUNDSCAPE>`.
 * Support exporting FGDs with unevaulated string bases.
+* Fix some options being incorrectly handled in Strata game mounts definitions.
 
 -------------
 Version 2.4.1

src/srctools/game.py

@@ -133,6 +133,8 @@ def vpk_patch(p: Path) -> Path:
             required = mount.bool("required", False)
             # Selects if we want to mount the "mod_folder" key as a folder or omit
             mountmoddir = mount.bool("mountmoddir", True)
+            if not mount.bool("enabled", True):  # Undocumented keyval
+                continue
 
             try:
                 app_info = find_app(appid)
@@ -145,8 +147,12 @@ def vpk_patch(p: Path) -> Path:
                 continue
 
             for child in mount:
-                if child.name in ("head", "required", "mountmoddir"):
-                    continue  # Ignore
+                # Ignore specified keys above
+                if child.name in ("head", "required", "enabled", "mountmoddir"):
+                    continue
+                # Ignore any other leaf KVs.
+                if not child.has_children():
+                    continue
 
                 # Else we're working with a mod folder
                 this_path = app_info.path / child.real_name