Updated rtv vmz support, changed behaviour when mod cant be fixed

TsunaMoo · TsunaMoo · commit 0fb689714614 · 2026-04-22T18:34:33.000+02:00
diff --git a/games/game_cassettebeasts.py b/games/game_cassettebeasts.py
@@ -46,7 +46,6 @@ def dataLooksValid(
 
     def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
         GameDataPath = getattr(self.organizer.managedGame(), "GameDataPath", "") + "/"
-        treefixed = 0
         for branch in filetree:
             mod_name = filetree.name()
             if mod_name == "":
@@ -62,18 +61,13 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                     os.path.join(mod_path, branch.name()),
                     os.path.join(mod_path, GameDataPath, branch.name()),
                 )
-                treefixed = 1
             else:
                 if isinstance(branch, mobase.IFileTree):
                     for e in branch:
                         if e.suffix().casefold() == "pck":
                             filetree.move(e, GameDataPath, mobase.IFileTree.MERGE)
-                            treefixed = 1
                 elif branch.suffix().casefold() == "pck":
                     filetree.move(branch, GameDataPath, mobase.IFileTree.MERGE)
-                    treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_crimeboss.py b/games/game_crimeboss.py
@@ -236,8 +236,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                         case _:
                             pass
                 treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_emuvr.py b/games/game_emuvr.py
@@ -27,7 +27,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
         GameDataUGCMods = (
             getattr(self.organizer.managedGame(), "GameDataUGCMods", "") + "/"
         )
-        treefixed = 0
         for branch in filetree:
             mod_name = filetree.name()
             if mod_name == "":
@@ -43,18 +42,13 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                     os.path.join(mod_path, branch.name()),
                     os.path.join(mod_path, GameDataUGCMods, branch.name()),
                 )
-                treefixed = 1
             else:
                 if isinstance(branch, mobase.IFileTree):
                     for e in branch:
                         if e.isFile() and e.suffix().casefold() == "ugc":
                             filetree.move(e, GameDataUGCMods, mobase.IFileTree.MERGE)
-                            treefixed = 1
                 elif branch.suffix().casefold() == "ugc":
                     filetree.move(branch, GameDataUGCMods, mobase.IFileTree.MERGE)
-                    treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_hitman3.py b/games/game_hitman3.py
@@ -112,8 +112,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                     )
                     if treefixed == 1:
                         self.needsNameFix = True
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_noita.py b/games/game_noita.py
@@ -82,8 +82,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
         if self.fileExistsInNextSubDir(filetree, "mod.xml"):
             filetree.move(filetree[0], GameModsPath + "/", mobase.IFileTree.MERGE)
             treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_ovkwalkingdead.py b/games/game_ovkwalkingdead.py
@@ -202,8 +202,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                         case _:
                             pass
                 treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_pacificdrive.py b/games/game_pacificdrive.py
@@ -202,8 +202,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                         case _:
                             pass
                 treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_payday1.py b/games/game_payday1.py
@@ -211,24 +211,11 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                             mobase.IFileTree.MERGE,
                         )
                         treefixed = 1
-            if treefixed == 0:
-                if len(filetree) == 1:
-                    filetree.move(
-                        firsttreelayer, "assets/mod_overrides/", mobase.IFileTree.MERGE
-                    )
-                    treefixed = 1
-                else:
-                    for e in filetree:
-                        if e.path("/").count("/") == 0:
-                            filetree.move(
-                                e,
-                                "assets/mod_overrides/FOLDERNAME/",
-                                mobase.IFileTree.MERGE,
-                            )
-                            treefixed = 1
-                            self.needsNameFix = True
-        if treefixed == 0:
-            return None
+            if treefixed == 0 and len(filetree) == 1:
+                filetree.move(
+                    firsttreelayer, "assets/mod_overrides/", mobase.IFileTree.MERGE
+                )
+                treefixed = 1
         return filetree
 
 
diff --git a/games/game_payday2.py b/games/game_payday2.py
@@ -212,24 +212,11 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                             mobase.IFileTree.MERGE,
                         )
                         treefixed = 1
-            if treefixed == 0:
-                if len(filetree) == 1:
-                    filetree.move(
-                        firsttreelayer, "assets/mod_overrides/", mobase.IFileTree.MERGE
-                    )
-                    treefixed = 1
-                else:
-                    for e in filetree:
-                        if e.path("/").count("/") == 0:
-                            filetree.move(
-                                e,
-                                "assets/mod_overrides/FOLDERNAME/",
-                                mobase.IFileTree.MERGE,
-                            )
-                            treefixed = 1
-                            self.needsNameFix = True
-        if treefixed == 0:
-            return None
+            if treefixed == 0 and len(filetree) == 1:
+                filetree.move(
+                    firsttreelayer, "assets/mod_overrides/", mobase.IFileTree.MERGE
+                )
+                treefixed = 1
         return filetree
 
 
diff --git a/games/game_payday3.py b/games/game_payday3.py
@@ -203,8 +203,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                         case _:
                             pass
                 treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_roadtovostok.py b/games/game_roadtovostok.py
@@ -27,7 +27,7 @@ def dataLooksValid(
 
     def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
         GameModsPath = getattr(self.organizer.managedGame(), "GameModsPath", "") + "/"
-        treefixed = 0
+        allowedUnzippedExt = ["zip", "vmz"]
 
         for branch in filetree:
             mod_name = filetree.name()
@@ -37,17 +37,13 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
             if (
                 not filetree.createOrphanTree("OrphanTree")
                 and os.path.exists(mod_path)
-                and branch.suffix().casefold() == "zip"
+                and branch.suffix().casefold() in allowedUnzippedExt
             ):
                 os.makedirs(os.path.join(mod_path, GameModsPath), exist_ok=True)
                 shutil.move(
                     os.path.join(mod_path, branch.name()),
                     os.path.join(mod_path, GameModsPath, branch.name()),
                 )
-                treefixed = 1
-
-        if treefixed == 0:
-            return None
         return filetree
 
 
@@ -56,14 +52,12 @@ class RoadToVostokGame(BasicGame):
     Author = "modworkshop"
     Version = "1"
     GameName = "Road to Vostok"
-    GameShortName = "road-to-vostok"
+    GameShortName = "roadtovostok"
     GameSteamId = 1963610
     GameBinary = "RTV.exe"
     GameDataPath = "%GAME_PATH%"
     GameModsPath = "mods"
-    GameDocumentsDirectory = (
-        "%USERPROFILE%/AppData/Local/Godot/app_userdata/Road to Vostok"
-    )
+    GameDocumentsDirectory = "%USERPROFILE%/AppData/Roaming/Road to Vostok"
     GameSaveExtension = "tres"
 
     def init(self, organizer: mobase.IOrganizer) -> bool:
@@ -75,11 +69,7 @@ def init(self, organizer: mobase.IOrganizer) -> bool:
     def executables(self):
         return [
             mobase.ExecutableInfo(
-                "Road to Vostok (Use Injector)",
-                QFileInfo(self.gameDirectory().absoluteFilePath(self.binaryName())),
-            ).withArgument("--main-pack Injector.pck"),
-            mobase.ExecutableInfo(
-                "Road to Vostok (No Mods)",
+                "Road to Vostok",
                 QFileInfo(self.gameDirectory().absoluteFilePath(self.binaryName())),
             ),
         ]
diff --git a/games/game_silenthill2remake.py b/games/game_silenthill2remake.py
@@ -202,8 +202,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                         case _:
                             pass
                 treefixed = 1
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_titanfall2.py b/games/game_titanfall2.py
@@ -196,8 +196,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
                                 )
                                 treefixed = 1
                                 self.needsNameFix = True
-        if treefixed == 0:
-            return None
         return filetree
 
 
diff --git a/games/game_zuma_deluxe.py b/games/game_zuma_deluxe.py
@@ -187,8 +187,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree | None:
             if isinstance(branch, mobase.IFileTree):
                 if len(branch) == 0:
                     filetree.remove(branch)
-        if treefixed == 0:
-            return None
         return filetree
 
 

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,6 @@ def fix(self, filetree: mobase.IFileTree) -> mobase.IFileTree \| None:`
`112`	`112`	`)`
`113`	`113`	`if treefixed == 1:`
`114`	`114`	`self.needsNameFix = True`
`115`		`- if treefixed == 0:`
`116`		`- return None`
`117`	`115`	`return filetree`
`118`	`116`
`119`	`117`