From 2b7524e6f243049be7f8aed264638f31ab115c52 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 18 Jan 2026 16:45:39 -0500 Subject: ModSlots loose ends Signed-off-by: Andrew Opalach --- ModSlots/ModSlots.py | 10 +++++++--- ModSlots/cmd.txt | 2 +- ModSlots/slots.example.txt | 17 +++++++++++++++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ModSlots/ModSlots.py b/ModSlots/ModSlots.py index 78e7224..a478a08 100755 --- a/ModSlots/ModSlots.py +++ b/ModSlots/ModSlots.py @@ -94,8 +94,12 @@ class Mod(): continue self.files.append(file.filename) elif ext == 'rar': + if not SEVEN_ZIP_SUPPORT: + raise Exception("Use of .rar archive without required package (unrardll).") self.type = ArchiveType.RAR elif ext == '7z': + if not SEVEN_ZIP_SUPPORT: + raise Exception("Use of .7z archive without required package (py7zr).") self.type = ArchiveType.SEVEN_ZIP self.obj = SevenZipFile(path, 'r') for file in self.obj.list(): @@ -106,11 +110,11 @@ class Mod(): self.overrides = {} self.map = {} - def sub_override_name(self, name, slinger): + def sub_override_name(self, name, is_slinger): if name[0] == '[': name = name[1:-1] if name in ArmorIDs.keys(): - name = ArmorIDs[name][1 if slinger else 0][2:] + name = ArmorIDs[name][1 if is_slinger else 0][2:] else: return None return name @@ -159,7 +163,7 @@ class Mod(): if len(target.split('/')[-1].split('.')) == 1: print(f'Warning: Possible non-direct path as a direct override: {target}') targets.append(target) - elif not has_global_override: + elif not has_global_override: # Could switch to else. targets.append(base) # Substitute armor names, like '[Anja]', with their IDs. for i, target in enumerate(targets): diff --git a/ModSlots/cmd.txt b/ModSlots/cmd.txt index 5d823ff..b8dce44 100644 --- a/ModSlots/cmd.txt +++ b/ModSlots/cmd.txt @@ -1 +1 @@ -./ModSlots.py Write slots.txt /mnt/hdd/mods/mhw /mnt/ssd/SteamLibrary/steamapps/common/Monster\ Hunter\ World +./ModSlots.py Write slots.example.txt /mnt/hdd/mods/mhw /mnt/ssd/SteamLibrary/steamapps/common/Monster\ Hunter\ World diff --git a/ModSlots/slots.example.txt b/ModSlots/slots.example.txt index 6e3ff2c..6e5608c 100644 --- a/ModSlots/slots.example.txt +++ b/ModSlots/slots.example.txt @@ -61,6 +61,10 @@ [Chainmail] -;2023 Halloween Costume.zip ->[Vespoid] +#;2023 Halloween Costume.zip +#>[Vespoid] ;Sera.zip # The uncensored files will be used with this order. @@ -96,3 +100,12 @@ ;DOA6 Tamaki Bikini.zip >[Vespoid+] + +;Dragon Leotard.zip +>[Jagras] + +#;Venus Nine.zip +#>[Fulgur Anja+] + +;Stellar Scorpion.zip +>[High Metal] -- cgit v1.2.3-101-g0448