Allow customization of taglist loading

Needed for the VR games since they use the same taglist as the game they are based off. Also took this opportunity to get rid of the usage of 'Skyrim Special Edition' in favor of 'SkyrimSE' in the taglist directory.
wrye-bash · Aug 29, 2019 · 3542194 · 3542194 · Infernio · Aug 29, 2019
1 parent d47172d
commit 3542194
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 2 deletions.
diff --git a/...tches/Skyrim Special Edition/taglist.yaml → Mopy/Bash Patches/SkyrimSE/taglist.yaml b/...tches/Skyrim Special Edition/taglist.yaml → Mopy/Bash Patches/SkyrimSE/taglist.yaml
diff --git a/Mopy/bash/game/__init__.py b/Mopy/bash/game/__init__.py
@@ -55,6 +55,9 @@ class GameInfo(object):
     # The pickle file for this game.  Holds encoded GMST IDs from the big list
     # below
     pklfile = ur'bash\db\*GAMENAME*_ids.pkl'
+    # The directory containing the masterlist for this game, relative to
+    # 'Mopy/Bash Patches'
+    masterlist_dir = u''
     # Registry keys to read to find the install location
     # These are relative to:
     #  HKLM\Software

diff --git a/Mopy/bash/game/fallout3/__init__.py b/Mopy/bash/game/fallout3/__init__.py
@@ -37,6 +37,7 @@ class Fallout3GameInfo(GameInfo):
     masterFiles = [u'Fallout3.esm']
     iniFiles = [u'Fallout.ini', u'FalloutPrefs.ini']
     pklfile = ur'bash\db\Fallout3_ids.pkl'
+    masterlist_dir = u'Fallout3'
     regInstallKeys = (u'Bethesda Softworks\\Fallout3',u'Installed Path')
     nexusUrl = u'https://www.nexusmods.com/fallout3/'
     nexusName = u'Fallout 3 Nexus'

diff --git a/Mopy/bash/game/fallout4/__init__.py b/Mopy/bash/game/fallout4/__init__.py
@@ -37,6 +37,7 @@ class Fallout4GameInfo(GameInfo):
     masterFiles = [u'Fallout4.esm']
     iniFiles = [u'Fallout4.ini', u'Fallout4Prefs.ini', u'Fallout4Custom.ini', ]
     pklfile = ur'bash\db\Fallout4_ids.pkl'
+    masterlist_dir = u'Fallout4'
     regInstallKeys = (u'Bethesda Softworks\\Fallout4', u'Installed Path')
     nexusUrl = u'https://www.nexusmods.com/fallout4/'
     nexusName = u'Fallout 4 Nexus'

diff --git a/Mopy/bash/game/falloutnv/__init__.py b/Mopy/bash/game/falloutnv/__init__.py
@@ -37,6 +37,7 @@ class FalloutNVGameInfo(Fallout3GameInfo):
     masterFiles = [u'FalloutNV.esm']
     iniFiles = [u'Fallout.ini', u'FalloutPrefs.ini']
     pklfile = ur'bash\db\FalloutNV_ids.pkl'
+    masterlist_dir = u'FalloutNV'
     regInstallKeys = (u'Bethesda Softworks\\FalloutNV',u'Installed Path')
     nexusUrl = u'https://www.nexusmods.com/newvegas/'
     nexusName = u'New Vegas Nexus'

diff --git a/Mopy/bash/game/oblivion/__init__.py b/Mopy/bash/game/oblivion/__init__.py
@@ -38,6 +38,7 @@ class OblivionGameInfo(GameInfo):
     masterFiles = [u'Oblivion.esm', u'Nehrim.esm']
     iniFiles = [u'Oblivion.ini']
     pklfile = ur'bash\db\Oblivion_ids.pkl'
+    masterlist_dir = u'Oblivion'
     regInstallKeys = (u'Bethesda Softworks\\Oblivion', u'Installed Path')
     nexusUrl = u'https://www.nexusmods.com/oblivion/'
     nexusName = u'TES Nexus'

diff --git a/Mopy/bash/game/skyrim/__init__.py b/Mopy/bash/game/skyrim/__init__.py
@@ -38,7 +38,8 @@ class SkyrimGameInfo(GameInfo):
     launch_exe = u'TESV.exe'
     masterFiles = [u'Skyrim.esm', u'Update.esm']
     iniFiles = [u'Skyrim.ini', u'SkyrimPrefs.ini']
-    pklfile = r'bash\db\Skyrim_ids.pkl'
+    pklfile = ur'bash\db\Skyrim_ids.pkl'
+    masterlist_dir = u'Skyrim'
     regInstallKeys = (u'Bethesda Softworks\\Skyrim', u'Installed Path')
     nexusUrl = u'https://www.nexusmods.com/skyrim/'
     nexusName = u'Skyrim Nexus'

diff --git a/Mopy/bash/game/skyrimse/__init__.py b/Mopy/bash/game/skyrimse/__init__.py
@@ -35,6 +35,7 @@ class SkyrimSEGameInfo(SkyrimGameInfo):
     defaultIniFile = u'Skyrim_Default.ini'
     game_detect_file = [u'SkyrimSE.exe']
     launch_exe = u'SkyrimSE.exe'
+    masterlist_dir = u'SkyrimSE'
     regInstallKeys = (
         u'Bethesda Softworks\\Skyrim Special Edition',
         u'Installed Path'

diff --git a/Mopy/bash/initialization.py b/Mopy/bash/initialization.py
@@ -131,7 +131,8 @@ def init_dirs(bashIni_, personal, localAppData, game_info):
         raise BoltError(u'init_dirs: Mopy dirs uninitialized')
     #--Oblivion (Application) Directories
     dirs['app'] = game_info.gamePath
-    dirs['defaultPatches'] = dirs['mopy'].join(u'Bash Patches', game_info.fsName)
+    dirs['defaultPatches'] = dirs['mopy'].join(u'Bash Patches',
+                                               game_info.masterlist_dir)
 
     #  Personal
     personal = getPersonalPath(bashIni_, personal)