Merge branch 'master' of https://github.com/MK-HATERS/modorganizer-basic_games

Author: MK-HATERS

games/game_stalker2heartofchornobyl.py

@@ -53,16 +53,19 @@ def __init__(self):
     def resolve_path(self, path: str) -> str:
         path = path.replace("%USERPROFILE%", os.environ.get("USERPROFILE", ""))
 
+
         if "%GAME_DOCUMENTS%" in path:
             game_docs = self.GameDocumentsDirectory.replace(
                 "%USERPROFILE%", os.environ.get("USERPROFILE", "")
             )
             path = path.replace("%GAME_DOCUMENTS%", game_docs)
 
+
         if "%GAME_PATH%" in path:
             game_path = self._gamePath if hasattr(self, "_gamePath") else ""
             path = path.replace("%GAME_PATH%", game_path)
 
+
         return path
 
     def init(self, organizer: mobase.IOrganizer) -> bool:
@@ -135,16 +138,20 @@ def mappings(self) -> List[mobase.Mapping]:
         pak_extensions = ["*.pak", "*.utoc", "*.ucas"]
         target_dir = "Content/Paks/~mods/"
 
+
         mappings = []
 
+
         for ext in pak_extensions:
             mappings.append(mobase.Mapping(ext, target_dir, False))
 
+
         source_dirs = ["Paks/", "~mods/", "Content/Paks/~mods/"]
         for source_dir in source_dirs:
             for ext in pak_extensions:
                 mappings.append(mobase.Mapping(f"{source_dir}{ext}", target_dir, False))
 
+
         return mappings
 
     def gameDirectory(self) -> QDir:
@@ -156,6 +163,7 @@ def paksDirectory(self) -> QDir:
         )
         return QDir(path)
 
+
     def paksModsDirectory(self) -> QDir:
         try:
             path = os.path.join(self.paksDirectory().absolutePath(), "~mods")
@@ -170,6 +178,7 @@ def paksModsDirectory(self) -> QDir:
             )
             return QDir(fallback)
 
+
     def logicModsDirectory(self) -> QDir:
         path = os.path.join(
             self.gameDirectory().absolutePath(),
@@ -180,6 +189,7 @@ def logicModsDirectory(self) -> QDir:
         )
         return QDir(path)
 
+
     def binariesDirectory(self) -> QDir:
         path = os.path.join(
             self.gameDirectory().absolutePath(),

games/stalker2heartofchornobyl/paks/model.py

@@ -204,7 +204,7 @@ def dropMimeData(
         before_paks_p: list[_PakInfo] = []
         moved_paks_p: list[_PakInfo] = []
         after_paks_p: list[_PakInfo] = []
-        
+
         for row, paks in sorted(self.paks.items()):
             if row < new_priority:
                 if row in source_rows:

games/stalker2heartofchornobyl/paks/widget.py

@@ -123,7 +123,7 @@ def _parse_pak_files(self):
         pak_source: dict[str, str] = {}
         existing_folders: set[int] = set()
 <<<<<<< HEAD
-        
+
 =======
 
         print(f"[PAK Debug] Starting scan of {len(mods)} mods")
@@ -150,7 +150,7 @@ def _parse_pak_files(self):
 <<<<<<< HEAD
                     except ValueError:
                         pass
-        
+
 =======
                         print(
                             f"[PAK Debug] Found existing numbered folder: {folder_num}"
@@ -230,7 +230,7 @@ def _parse_pak_files(self):
 
         sorted_paks = dict(sorted(paks.items(), key=cmp_to_key(pak_sort)))
         shaken_paks: list[str] = self._shake_paks(sorted_paks)
-        
+
 =======
                             print(
                                 f"[PAK Debug]   ✅ Added loose PAK from ~mods: {pak_name}"
@@ -263,7 +263,7 @@ def _parse_pak_files(self):
             while pak_index in existing_folders:
                 pak_index -= 1
 <<<<<<< HEAD
-            
+
 =======
 
             # If PAK is already in a numbered folder, keep its current assignment
@@ -279,7 +279,7 @@ def _parse_pak_files(self):
 
             final_paks[pak] = (pak_source[pak], pak_paths[pak][0], target_dir)
 <<<<<<< HEAD
-        
+
 =======
 
         # Convert to model format (4-tuple matching Oblivion Remastered)
@@ -291,7 +291,7 @@ def _parse_pak_files(self):
             new_data_paks[i] = (pak, source, current_path, target_path)
             i += 1
 <<<<<<< HEAD
-        
+
 =======
 
         print(f"[PAK Debug] Final PAK count: {len(new_data_paks)}")