FixRaidenBoss2 4.3.0__tar.gz → 4.3.2__tar.gz

{fixraidenboss2-4.3.0/src/FixRaidenBoss2.egg-info → fixraidenboss2-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: FixRaidenBoss2
-Version: 4.3.0
+Version: 4.3.2
 Summary: A library to help remap the mods installed on a character onto the skins of the character
 Author-email: NK <qqqqaaaapppp0000@gmail.com>, Albert Gold <AlexXianZhenYuAu@gmail.com>
 Project-URL: Homepage, https://github.com/nhok0169/Anime-Game-Remap
@@ -450,8 +450,9 @@ print("The Raiden Mod is fixed!")
 | -u, --undo | Undo the previous runs of the script |
 | -ho, --hideOriginal | Show only the mod on the remapped character and do not show the mod on the original character |
 | -l str, --log str | The folder location to log the printed out text into a seperate .txt file. If this option is not specified, then will not log the printed out text. |
-| -a, --all | Parses all *.ini files that the program encounters. This option supersedes the --types option<br><br>Note: Usually, you would also need to specify what particular mod you want to fix using the --defaultType option. Otherwise, you will be defaulted to fixing 'raiden' mods. |
-| -dt str, --defaultType str | The default mod type to use if the *.ini file belongs to some unknown mod <br> If the --all option is set to True, then this argument will be 'raiden'. <br> Otherwise, if this value is not specified, then any mods with unknown types will be skipped <br> <br> See below for the different names/aliases of the supported types of mods. |
+| -a, --all | Parses all *.ini files that the program encounters. This option supersedes the --types option<br><br>For *.ini file where a mod cannot be identified, usually, you would also need to specify what particular mod the *.ini file defaults to using the --defaultType option. <br> Otherwise, you will be defaulted to fixing 'raiden' mods. |
+| -dt str, --defaultType str | The default mod type to use if the *.ini file belongs to some unknown mod. <br> <br> - If --forceType is set to True, this option has not effect <br> - If the --all is set to True and no values are specified for this option, the default argument for this option is set to 'raiden' <br> - Otherwise, this option has not effect and any unknown mods will be skipped <br> <br> See below for the different names/aliases of the supported types of mods. |
+| -ft str, --forceType str | Forcibly assumes the mod type for all *.ini file parsed. <br> <br> This option supersedes the --types option and the --all option. <br> <br> See below for the different names/aliases of the supported types of mods. |
 | -t str, --types str | Parses *.ini files that the program encounters for only specific types of mods. If the --all option has been specified, this option has no effect. <br> By default, if this option is not specified, will parse the *.ini files for all the supported types of mods. <br> <br> Please specify the types of mods using the the mod type's name or alias, then seperate each name/alias with a comma(,) <br> &nbsp; &nbsp; &nbsp; *eg. raiden,arlecchino,ayaya* |
 | -rt str, --remappedTypes str |  From all the mods to fix, specified by the --types option, will specifically remap those mods to the mods specified by this option. <br> For a mod specified by the --types option, if none of its corresponding remapped mods are specified by this option, then the mod specified by the --types option will be remapped to all its corresponding mods. <br> <br> ------------------- <br> eg. <br> If this program was ran with the following options: <br> --types kequeen,jean <br> --remappedTypes jeanSea <br> <br> the program will do the following remap: <br> keqing --> keqingOpulent <br> Jean --> JeanSea <br> <br> Note that Jean will not remap to JeanCN <br> ------------------- <br> <br> By default, if this option is not specified, will remap all the mods specified in --types to their corresponding remapped mods. <br> <br> Please specify the types of mods using the the mod type's name or alias, then seperate each name/alias with a comma(,) <br> eg. raiden,arlecchino,ayaya <br> <br> See below for the different names/aliases of the supported types of mods. |
 

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/README.md

@@ -435,8 +435,9 @@ print("The Raiden Mod is fixed!")
 | -u, --undo | Undo the previous runs of the script |
 | -ho, --hideOriginal | Show only the mod on the remapped character and do not show the mod on the original character |
 | -l str, --log str | The folder location to log the printed out text into a seperate .txt file. If this option is not specified, then will not log the printed out text. |
-| -a, --all | Parses all *.ini files that the program encounters. This option supersedes the --types option<br><br>Note: Usually, you would also need to specify what particular mod you want to fix using the --defaultType option. Otherwise, you will be defaulted to fixing 'raiden' mods. |
-| -dt str, --defaultType str | The default mod type to use if the *.ini file belongs to some unknown mod <br> If the --all option is set to True, then this argument will be 'raiden'. <br> Otherwise, if this value is not specified, then any mods with unknown types will be skipped <br> <br> See below for the different names/aliases of the supported types of mods. |
+| -a, --all | Parses all *.ini files that the program encounters. This option supersedes the --types option<br><br>For *.ini file where a mod cannot be identified, usually, you would also need to specify what particular mod the *.ini file defaults to using the --defaultType option. <br> Otherwise, you will be defaulted to fixing 'raiden' mods. |
+| -dt str, --defaultType str | The default mod type to use if the *.ini file belongs to some unknown mod. <br> <br> - If --forceType is set to True, this option has not effect <br> - If the --all is set to True and no values are specified for this option, the default argument for this option is set to 'raiden' <br> - Otherwise, this option has not effect and any unknown mods will be skipped <br> <br> See below for the different names/aliases of the supported types of mods. |
+| -ft str, --forceType str | Forcibly assumes the mod type for all *.ini file parsed. <br> <br> This option supersedes the --types option and the --all option. <br> <br> See below for the different names/aliases of the supported types of mods. |
 | -t str, --types str | Parses *.ini files that the program encounters for only specific types of mods. If the --all option has been specified, this option has no effect. <br> By default, if this option is not specified, will parse the *.ini files for all the supported types of mods. <br> <br> Please specify the types of mods using the the mod type's name or alias, then seperate each name/alias with a comma(,) <br> &nbsp; &nbsp; &nbsp; *eg. raiden,arlecchino,ayaya* |
 | -rt str, --remappedTypes str |  From all the mods to fix, specified by the --types option, will specifically remap those mods to the mods specified by this option. <br> For a mod specified by the --types option, if none of its corresponding remapped mods are specified by this option, then the mod specified by the --types option will be remapped to all its corresponding mods. <br> <br> ------------------- <br> eg. <br> If this program was ran with the following options: <br> --types kequeen,jean <br> --remappedTypes jeanSea <br> <br> the program will do the following remap: <br> keqing --> keqingOpulent <br> Jean --> JeanSea <br> <br> Note that Jean will not remap to JeanCN <br> ------------------- <br> <br> By default, if this option is not specified, will remap all the mods specified in --types to their corresponding remapped mods. <br> <br> Please specify the types of mods using the the mod type's name or alias, then seperate each name/alias with a comma(,) <br> eg. raiden,arlecchino,ayaya <br> <br> See below for the different names/aliases of the supported types of mods. |
 

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "FixRaidenBoss2"
-version = "4.3.0"
+version = "4.3.2"
 authors = [
   {name="NK", email="qqqqaaaapppp0000@gmail.com"},
   {name="Albert Gold", email="AlexXianZhenYuAu@gmail.com"}

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/__init__.py

@@ -120,11 +120,13 @@ from .model.strategies.texEditors.pixelTransforms.TintTransform import TintTrans
 from .model.strategies.texEditors.pixelTransforms.Transparency import Transparency
 
 from .model.strategies.texEditors.texFilters.BaseTexFilter import BaseTexFilter
+from .model.strategies.texEditors.texFilters.ColourReplaceFilter import ColourReplaceFilter
 from .model.strategies.texEditors.texFilters.GammaFilter import GammaFilter
 from .model.strategies.texEditors.texFilters.HueAdjust import HueAdjust
 from .model.strategies.texEditors.texFilters.InvertAlphaFilter import InvertAlphaFilter
 from .model.strategies.texEditors.texFilters.PixelFilter import PixelFilter
 from .model.strategies.texEditors.texFilters.TexMetadataFilter import TexMetadataFilter
+from .model.strategies.texEditors.texFilters.TransparencyAdjustFilter import TransparencyAdjustFilter
 
 from .model.strategies.texEditors.BaseTexEditor import BaseTexEditor
 from .model.strategies.texEditors.TexEditor import TexEditor
@@ -201,7 +203,7 @@ __all__ = ["BufDataTypes", "BufElementTypes", "BufFormatNames", "BufDataTypeName
            "BaseIniParser", "GIMIObjParser", "GIMIParser", "IniParseBuilder",
            "BaseIniRemover", "IniRemover", "IniRemoveBuilder",
            "BasePixelTransform", "ColourReplace", "CorrectGamma", "InvertAlpha", "HighlightShadow", "TempControl", "TintTransform", "Transparency",
-           "BaseTexFilter", "GammaFilter", "HueAdjust", "InvertAlphaFilter", "PixelFilter", "TexMetadataFilter",
+           "BaseTexFilter", "ColourReplaceFilter", "GammaFilter", "HueAdjust", "InvertAlphaFilter", "PixelFilter", "TexMetadataFilter", "TransparencyAdjustFilter",
            "BaseTexEditor", "TexEditor", "TexCreator",
            "ModType",
            "IfContentPart", "IfPredPart", "IfTemplate", "IfTemplatePart",

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/constants/ImgFormats.py

@@ -36,4 +36,9 @@ class ImgFormats(Enum):
     """
     HSV (hue, saturation, value) image
     """
+
+    Bit = "1"
+    """
+    Image with a single bit channel that has values of either 0 or 1
+    """
 ##### EndScript

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/constants/Packages.py

@@ -57,6 +57,9 @@ class PackageModules(Enum):
     PIL_Image: :class:`PackageData`
         Module for PIL.Image
 
+    PIL_ImageChops: :class:`PackageData`
+        Module for PIL.ImageChops
+
     PIL_ImageEnhance: :class:`PackageData`
         Module for PIL.ImageEnhance
     """
@@ -64,5 +67,6 @@ class PackageModules(Enum):
     AhoCorasick = PackageData("ahocorasick", PackageInstall.PyAhoCorasick.value)
     OrderedSet = PackageData("ordered_set", PackageInstall.OrderedSet.value)
     PIL_Image = PackageData("PIL.Image", PackageInstall.Pillow.value)
+    PIL_ImageChops = PackageData("PIL.ImageChops", PackageInstall.Pillow.value)
     PIL_ImageEnhance = PackageData("PIL.ImageEnhance", PackageInstall.Pillow.value)
 ##### EndScript

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/controller/CommandBuilder.py

@@ -55,13 +55,22 @@ class CommandBuilder():
         self._argParser.add_argument(ShortCommandOpts.HideOriginal.value, CommandOpts.HideOriginal.value, action = 'store_true', help="Show only the mod on the remapped character and do not show the mod on the original character")
         self._argParser.add_argument(ShortCommandOpts.Log.value, CommandOpts.Log.value, action='store', type=str, help=f'The folder location to log the printed out text into a seperate {FileExt.Txt.value} file. If this option is not specified, then will not log the printed out text.')
         self._argParser.add_argument(ShortCommandOpts.All.value, CommandOpts.All.value, action='store_true', help=f"""Parses all {FileTypes.Ini.value}s that the program encounters. This option supersedes the {CommandOpts.Types.value} option
-                                     
-Note: Usually, you would also need to specify what particular mod you want to fix using the {CommandOpts.DefaultType.value} option. Otherwise, you will be defaulted to fixing 'raiden' mods.""")
-        self._argParser.add_argument(ShortCommandOpts.DefaultType.value, CommandOpts.DefaultType.value, action='store', type=str, help=f'''The default mod type to use if the {FileTypes.Ini.value} belongs to some unknown mod
-If the {CommandOpts.All.value} is set to True, then this argument will be 'raiden'.
-Otherwise, if this value is not specified, then any mods with unknown types will be skipped.
+
+For {FileTypes.Ini.value} where a mod cannot be identified, usually, you would also need to specify what particular mod the {FileTypes.Ini.value} defaults to using the {CommandOpts.DefaultType.value} option. 
+Otherwise, you will be defaulted to fixing 'raiden' mods.""")
+        self._argParser.add_argument(ShortCommandOpts.DefaultType.value, CommandOpts.DefaultType.value, action='store', type=str, help=f'''The default mod type to use if the {FileTypes.Ini.value} belongs to some unknown mod.
+
+- If {CommandOpts.ForceType.value} is set to True, this option has not effect                          
+- If the {CommandOpts.All.value} is set to True and no values are specified for this option, the default argument for this option is set to 'raiden'
+- Otherwise, this option has not effect and any unknown mods will be skipped
 
 See below for the different names/aliases of the supported types of mods.''')
+        
+        self._argParser.add_argument(ShortCommandOpts.ForceType.value, CommandOpts.ForceType.value, action='store', type=str, help=f"""Forcibly assumes the mod type for all {FileTypes.Ini.value} parsed.
+
+This option supersedes the {CommandOpts.Types.value} option and the {CommandOpts.All.value} option.
+
+See below for the different names/aliases of the supported types of mods.""")
 
         self._argParser.add_argument('-t', CommandOpts.Types.value, action='store', type=str, help=f'''Parses {FileTypes.Ini.value}s that the program encounters for only specific types of mods. If the {CommandOpts.Types.value} option has been specified, this option has no effect. 
 By default, if this option is not specified, will parse the {FileTypes.Ini.value}s for all the supported types of mods. 

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/controller/enums/CommandOpts.py

@@ -26,6 +26,7 @@ class CommandOpts(Enum):
     All = '--all'
     Types = "--types"
     FixedTypes = "--remappedTypes"
+    ForceType = "--forceType"
     Version = "--version"
     Log = "--log"
     DefaultType = "--defaultType"

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/controller/enums/ShortCommandOpts.py

@@ -26,6 +26,7 @@ class ShortCommandOpts(Enum):
     All = '-a'
     Types = "-t"
     FixedTypes = "-rt"
+    ForceType = "-ft"
     Version = "-v"
     Log = "-l"
     DefaultType = "-dt"

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/data/IniFixBuilderData.py

@@ -173,12 +173,13 @@ class IniFixBuilderFuncs():
                 ],
                 "postRegEditFilters": [
                     RegRemove(remove = {"extra": {"ps-t0", "ps-t1"}}),
-                    RegNewVals(vals = {"extra": {IniKeywords.Ib.value: "null"}, "dress": {IniKeywords.Ib.value: "null"}}),
+                    RegNewVals(vals = {"extra": {IniKeywords.Ib.value: "null"}, 
+                                       "dress": {IniKeywords.Ib.value: "null"}}),
                     RegTexEdit(textures = {"TransparentHeadDiffuse": ["ps-t0"]}),
                     RegRemap(remap = {"head": {"ps-t0": ["ps-t0", "ps-t1"], "ps-t1": ["ps-t2"]},
                                         "dress": {"ps-t0": ["ps-t0", "ps-t1"], "ps-t1": ["ps-t2"]}}),
-                    RegTexAdd(textures = {"head": {"ps-t0": ("NormMap", TexCreator(1024, 1024, colour = Colours.NormalMapBlue.value))},
-                                            "dress": {"ps-t0": ("NormMap", TexCreator(1024, 1024, colour = Colours.NormalMapBlue.value))}}, mustAdd = False)
+                    RegNewVals(vals = {"head": {"ps-t0": "null"}}),
+                    RegTexAdd(textures = {"dress": {"ps-t0": ("NormMap", TexCreator(1024, 1024, colour = Colours.NormalMapBlue.value))}}, mustAdd = False)
                 ]})
     
     @classmethod
@@ -337,7 +338,8 @@ class IniFixBuilderFuncs():
     def xiangling4_0(cls) -> Tuple[BaseIniFixer, List[Any], Dict[str, Any]]:
         return (GIMIObjMergeFixer, 
                 [{"head": ["head", "body", "dress"], "body": ["body"]}], 
-                {"preRegEditFilters": [
+                {"copyPreamble": IniComments.GIMIObjMergerPreamble.value,
+                 "preRegEditFilters": [
                     RegTexEdit({"DarkDiffuse": ["ps-t0"]}),
                     RegRemove(remove = {"head": {"ps-t2"},
                                         "body": {"ps-t2", "ps-t3"},

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/data/IniParseBuilderData.py

@@ -21,14 +21,12 @@ from ..constants.ModTypeNames import ModTypeNames
 from ..constants.TexConsts import TexMetadataNames
 from ..constants.ColourConsts import ColourConsts
 from ..model.strategies.iniParsers.BaseIniParser import BaseIniParser
-from ..model.strategies.iniParsers.IniParseBuilder import IniParseBuilder
 from ..model.strategies.iniParsers.GIMIParser import GIMIParser
 from ..model.strategies.iniParsers.GIMIObjParser import GIMIObjParser
 from ..model.strategies.texEditors.TexEditor import TexEditor
-from ..model.strategies.texEditors.texFilters.PixelFilter import PixelFilter
 from ..model.strategies.texEditors.texFilters.InvertAlphaFilter import InvertAlphaFilter
-from ..model.strategies.texEditors.pixelTransforms.Transparency import Transparency
-from ..model.strategies.texEditors.pixelTransforms.ColourReplace import ColourReplace
+from ..model.strategies.texEditors.texFilters.ColourReplaceFilter import ColourReplaceFilter
+from ..model.strategies.texEditors.texFilters.TransparencyAdjustFilter import TransparencyAdjustFilter
 from ..model.strategies.texEditors.texFilters.TexMetadataFilter import TexMetadataFilter
 from ..model.files.TextureFile import TextureFile
 from ..model.textures.Colour import Colour
@@ -58,7 +56,7 @@ class IniParseBuilderFuncs():
                 [{"head", "body", "dress"}],
                 {"texEdits": {"head": {"ps-t0": {"TransparentDiffuse": TexEditor(filters = [TexMetadataFilter(edits = {TexMetadataNames.Gamma.value: 1 / ColourConsts.StandardGamma.value}),
                                                                                             cls._ayakaEditHeadDiffuse])}},
-                              "body": {"ps-t1": {"BrightLightMap": TexEditor(filters = [PixelFilter(transforms = [Transparency(-78)])])}},
+                              "body": {"ps-t1": {"BrightLightMap": TexEditor(filters = [TransparencyAdjustFilter(-78)])}},
                               "dress": {"ps-t0": {"OpaqueDiffuse": TexEditor(filters = [cls._ayakaEditDressDiffuse,
                                                                                         TexMetadataFilter(edits = {TexMetadataNames.Gamma.value: 1 / ColourConsts.StandardGamma.value})])}}}})
 
@@ -71,8 +69,8 @@ class IniParseBuilderFuncs():
         return (GIMIObjParser, 
                 [{"head", "body"}], 
                 {"texEdits": {
-                    "head": {"ps-t0": {"YellowHeadDiffuse": TexEditor(filters = [PixelFilter(transforms = [ColourReplace(Colours.NormalMapYellow.value, coloursToReplace = {ColourRanges.NormalMapPurple1.value})])])}},
-                    "body": {"ps-t0": {"YellowBodyDiffuse": TexEditor(filters = [PixelFilter(transforms = [ColourReplace(Colours.NormalMapYellow.value)])])}},
+                    "head": {"ps-t0": {"YellowHeadDiffuse": TexEditor(filters = [ColourReplaceFilter(Colours.NormalMapYellow.value, coloursToReplace = {ColourRanges.NormalMapPurple1.value})])}},
+                    "body": {"ps-t0": {"YellowBodyDiffuse": TexEditor(filters = [ColourReplaceFilter(Colours.NormalMapYellow.value)])}},
                 }})
     
     @classmethod
@@ -81,10 +79,10 @@ class IniParseBuilderFuncs():
                 [{"head", "body", "dress", "extra"}],
                 {"texEdits": {"body": {"ps-t0": {"TransparentBodyDiffuse": TexEditor(filters = [InvertAlphaFilter()])},
                                        "ps-t1": {"OpaqueBodyDiffuse": TexEditor(filters = [TexMetadataFilter(edits = {TexMetadataNames.Gamma.value: 1}),
-                                                                                           PixelFilter(transforms = [ColourReplace(Colours.LightMapGreen.value, 
-                                                                                                                                   coloursToReplace = {ColourRange(Colour(0, 120, 110, 65), Colour(255, 140, 255, 75)),
-                                                                                                                                                       ColourRange(Colour(0, 120, 0, 65), Colour(255, 140, 200, 75)),
-                                                                                                                                                       ColourRange(Colour(0, 0, 200, 65), Colour(30, 30, 255, 75))})])])}},
+                                                                                           ColourReplaceFilter(Colours.LightMapGreen.value, 
+                                                                                                               coloursToReplace = {ColourRange(Colour(0, 120, 110, 65), Colour(255, 140, 255, 75)),
+                                                                                                                                   ColourRange(Colour(0, 120, 0, 65), Colour(255, 140, 200, 75)),
+                                                                                                                                   ColourRange(Colour(0, 0, 200, 65), Colour(30, 30, 255, 75))})])}},
                               "dress": {"ps-t1": {"TransparentyDressDiffuse": TexEditor(filters = [InvertAlphaFilter()])}}}})
     
     @classmethod
@@ -96,8 +94,8 @@ class IniParseBuilderFuncs():
         return (GIMIObjParser, 
                 [{"body", "dress"}],
                 {"texEdits": {"body": {"ps-t0": {"TransparentBodyDiffuse": TexEditor(filters = [InvertAlphaFilter(),
-                                                                                                PixelFilter(transforms = [ColourReplace(Colour(0, 0, 0, 177), 
-                                                                                                                          coloursToReplace = {ColourRange(Colour(0, 0, 0, 125), Colour(0, 0, 0, 130))})])])}},
+                                                                                                ColourReplaceFilter(Colour(0, 0, 0, 177), 
+                                                                                                                    coloursToReplace = {ColourRange(Colour(0, 0, 0, 125), Colour(0, 0, 0, 130))})])}},
                               "dress": {"ps-t0": {"TransparentDressDiffuse": TexEditor(filters = [InvertAlphaFilter()])}}}})
     
     @classmethod
@@ -168,7 +166,7 @@ class IniParseBuilderFuncs():
     def kirara4_0(cls) -> Tuple[BaseIniParser, List[Any], Dict[str, Any]]:
         return (GIMIObjParser, 
                 [{"dress"}], 
-                {"texEdits": {"dress": {"ps-t2": {"WhitenLightMap": TexEditor(filters = [PixelFilter(transforms = [ColourReplace(Colours.White.value, coloursToReplace = {ColourRanges.LightMapGreen.value}, replaceAlpha = False)])])}}}})
+                {"texEdits": {"dress": {"ps-t2": {"WhitenLightMap": TexEditor(filters = [ColourReplaceFilter(Colours.White.value, coloursToReplace = {ColourRanges.LightMapGreen.value}, replaceAlpha = False)])}}}})
     
     @classmethod
     def kiraraBoots4_8(cls) -> Tuple[BaseIniParser, List[Any], Dict[str, Any]]:
@@ -178,9 +176,9 @@ class IniParseBuilderFuncs():
     def klee4_0(cls) -> Tuple[BaseIniParser, List[Any], Dict[str, Any]]:
         return (GIMIObjParser, 
                 [{"head", "body"}], 
-                {"texEdits": {"body": {"ps-t1": {"GreenLightMap": TexEditor(filters = [PixelFilter(transforms = [ColourReplace(Colour(0, 128, 0, 177), 
-                                                                                                                               coloursToReplace = {ColourRange(Colour(0, 0, 0, 250), Colour(0, 0, 0, 255)),
-                                                                                                                                                   ColourRange(Colour(0, 0, 0, 125), Colour(0 ,0 ,0, 130))}, replaceAlpha = True)])])}}}})
+                {"texEdits": {"body": {"ps-t1": {"GreenLightMap": TexEditor(filters = [ColourReplaceFilter(Colour(0, 128, 0, 177), 
+                                                                                                            coloursToReplace = {ColourRange(Colour(0, 0, 0, 250), Colour(0, 0, 0, 255)),
+                                                                                                                                ColourRange(Colour(0, 0, 0, 125), Colour(0 ,0 ,0, 130))}, replaceAlpha = True)])}}}})
 
     @classmethod
     def kleeBlossomingStarlight4_0(cls) -> Tuple[BaseIniParser, List[Any], Dict[str, Any]]:

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/main.py

@@ -30,9 +30,10 @@ def remapMain():
     args = command.parse()
     readAllInis = args.all
     defaultType = args.defaultType
+    forcedType = args.forceType
 
     remapService = RemapService(path = args.src, keepBackups = not args.deleteBackup, fixOnly = args.fixOnly, hideOrig = args.hideOriginal,
-                                undoOnly = args.undo, readAllInis = readAllInis, types = args.types, defaultType = defaultType,
+                                undoOnly = args.undo, readAllInis = readAllInis, types = args.types, defaultType = defaultType, forcedType = forcedType,
                                 log = args.log, verbose = True, handleExceptions = True, remappedTypes = args.remappedTypes,
                                 version = args.version)
     remapService.fix()

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/model/IniSectionGraph.py

@@ -217,7 +217,7 @@ class IniSectionGraph():
 
         self.construct()
         if (self.remapNameFunc is not None):
-            self.getRemapBlendNames(newModsToFix = newModsToFix)
+            self.getRemapNames(newModsToFix = newModsToFix)
         else:
             self._remapNames = {}
 
@@ -323,7 +323,7 @@ class IniSectionGraph():
         self._runSequence = runSequence
         return self._sections
 
-    def getRemapBlendNames(self, newModsToFix: Optional[Set[str]] = None) -> Dict[str, Dict[str, str]]:
+    def getRemapNames(self, newModsToFix: Optional[Set[str]] = None) -> Dict[str, Dict[str, str]]:
         """
         Retrieves the corresponding remap names of the sections made by this fix
 

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/model/Mod.py

@@ -100,6 +100,11 @@ class Mod(Model):
 
         **Default**: ``None``
 
+    forcedType: Optional[:class:`ModType`]
+        The type of mod to forcibly assume for some .ini file :raw-html:`<br />` :raw-html:`<br />` 
+
+        **Default**: ``None``
+
     version: Optional[:class:`float`]
         The game version we want the fixed mod :raw-html:`<br />` :raw-html:`<br />`
 
@@ -128,6 +133,9 @@ class Mod(Model):
     _defaultType: Optional[:class:`ModType`]
         The type of mod to use if a mod has an unidentified type
 
+    _forcedType: Optional[:class:`ModType`]
+        The type of mod to forcibly assume for some .ini file
+
     logger: Optional[:class:`Logger`]
         The logger used to pretty print messages
 
@@ -149,7 +157,7 @@ class Mod(Model):
         The *remapFix*.dds files found for the mod
     """
     def __init__(self, path: Optional[str] = None, files: Optional[List[str]] = None, logger: Optional[Logger] = None, types: Optional[Set[ModType]] = None, 
-                 defaultType: Optional[ModType] = None, version: Optional[float] = None, remappedTypes: Optional[Set[str]] = None):
+                 forcedType: Optional[ModType] = None, defaultType: Optional[ModType] = None, version: Optional[float] = None, remappedTypes: Optional[Set[str]] = None):
         super().__init__(logger = logger)
         self.path = FileService.getPath(path)
         self.version = version
@@ -163,6 +171,7 @@ class Mod(Model):
         self._types = types
         self._remappedTypes = remappedTypes
         self._defaultType = defaultType
+        self._forcedType = forcedType
 
         self.inis = []
         self.remapBlend = []
@@ -199,7 +208,8 @@ class Mod(Model):
         iniPaths = self.inis
         self.inis = {}
         for iniPath in iniPaths:
-            iniFile = IniFile(iniPath, logger = self.logger, modTypes = self._types, defaultModType = self._defaultType, version = self.version, modsToFix = self._remappedTypes)
+            iniFile = IniFile(iniPath, logger = self.logger, modTypes = self._types, defaultModType = self._defaultType, 
+                              forcedModType = self._forcedType, version = self.version, modsToFix = self._remappedTypes)
             self.inis[iniFile.file] = iniFile
 
     @classmethod

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/model/files/IniFile.py

@@ -104,6 +104,11 @@ class IniFile(File):
 
         **Default**: ``None``
 
+    forcedModType: Optional[:class:`ModType`]
+        The type of mod to forcibly assume the .ini file to belong to :raw-html:`<br />` :raw-html:`<br />`
+
+        **Default**: ``None``
+
     version: Optional[:class:`float`]
         The game version we want the .ini file to be compatible with :raw-html:`<br />` :raw-html:`<br />`
 
@@ -137,6 +142,9 @@ class IniFile(File):
     defaultModType: Optional[:class:`ModType`]
         The type of mod to use if the .ini file has an unidentified mod type
 
+    forcedModType: Optional[:class:`ModType`]
+        The type of mod to forcibly assume the .ini file to belong to
+
     sectionIfTemplates: Dict[:class:`str`, :class:`IfTemplate`]
         All the `sections`_ in the .ini file that can be parsed into an :class:`IfTemplate`
 
@@ -207,7 +215,7 @@ class IniFile(File):
     _ifStructurePattern = re.compile(r"\s*(" + IfPredPartType.EndIf.value + "|" + IfPredPartType.Else.value +  "|" + IfPredPartType.If.value + "|" + IfPredPartType.Elif.value + ")")
 
     def __init__(self, file: Optional[str] = None, logger: Optional["Logger"] = None, txt: str = "", modTypes: Optional[Set[ModType]] = None, defaultModType: Optional[ModType] = None, 
-                 version: Optional[float] = None, modsToFix: Optional[Set[str]] = None, iniClassifier: Optional[IniClassifier] = None):
+                 forcedModType: Optional[ModType] = None, version: Optional[float] = None, modsToFix: Optional[Set[str]] = None, iniClassifier: Optional[IniClassifier] = None):
         super().__init__(logger = logger)
 
         self._filePath: Optional[FilePath] = None
@@ -231,6 +239,7 @@ class IniFile(File):
             modsToFix = set()
 
         self.defaultModType = defaultModType
+        self.forcedModType = forcedModType
         self.modTypes = modTypes
         self.modsToFix = modsToFix
         self._heading = IniBoilerPlate.DefaultHeading.value.copy()
@@ -734,15 +743,19 @@ class IniFile(File):
 
         modType = classifyStats.modType
         hasModType = modType is not None and modType in self.modTypes
+        hasForcedModType = self.forcedModType is not None
+    
+        self._isModIni = False if (self.defaultModType is None and not hasModType and self.modTypes and not hasForcedModType) else classifyStats.isMod
+        self._isFixed = classifyStats.isFixed
+
+        if (hasForcedModType):
+            modType = self.forcedModType
+            hasModType = True
 
-        if (hasModType):
-            self._setType(classifyStats.modType)
+        if (hasModType and self._isModIni):
+            self._setType(modType)
         else:
-            classifyStats.modType = None
             self._setType(None)
-    
-        self._isModIni = False if (self.defaultModType is None and not hasModType and self.modTypes) else classifyStats.isMod
-        self._isFixed = classifyStats.isFixed
 
         self._isClassified = True
         return self._isModIni

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/model/iftemplate/IfContentPart.py

@@ -13,11 +13,13 @@
 
 
 ##### ExtImports
+import copy
 from collections import defaultdict
 from typing import List, Dict, Tuple, Union, Set, Union, Callable, Any, Optional
 ##### EndExtImports
 
 ##### LocalImports
+from ...tools.Algo import Algo
 from ...tools.DictTools import DictTools
 from ...tools.ListTools import ListTools
 from ...tools.Algo import Algo
@@ -462,46 +464,41 @@ class IfContentPart(IfTemplatePart):
         occurences = defaultdict(lambda: 0)
         i = 0
         orderLen = len(self._order)
-        remappedSrc = defaultdict(lambda: [])
         keysToRemove = set()
         keysToAdd = set()
+        remappedSrc = defaultdict(lambda: [])
 
-        # "ps-t0": ["ps-t0", "ps-t1"], "ps-t1": ["ps-t2"]
-
-        # contruct the order
         while (i < orderLen):
             keyData = self._order[i]
             key = keyData[0]
-            currentKeyOccurence = keyData[1]
-            keyOccurence = occurences[key]
-
+            keyOccurence = keyData[1]
+            currentMaxOccurence = occurences[key]
+            
             # update the occurence of the key
-            if (currentKeyOccurence < keyOccurence and keyOccurence < len(self._src[key])):
-                self._order[i] = (key, keyOccurence)
-                occurences[key] += 1
-            elif (currentKeyOccurence > keyOccurence):
-                occurences[key] = currentKeyOccurence
+            if (keyOccurence < currentMaxOccurence):
+                self._order[i] = (key, currentMaxOccurence)
 
             if (key not in keyRemap):
                 i += 1
+                occurences[key] += 1
                 continue
             else:
                 keysToRemove.add(key)
-            
+
             newKeys = keyRemap[key]
             newKeysLen = len(newKeys)
+
+            keyValData = self.src[key][keyOccurence]
+            keyVal = keyValData[1]
             newKeyRefs = []
 
             # construct the remapped keys
             for j in range(newKeysLen):
                 newKey = newKeys[j]
-                newKeyOccurence = occurences[newKey]
-                newKeyRefs.append((newKey, newKeyOccurence))
 
-                oldValData = self.src[key][currentKeyOccurence]
-                oldVal = oldValData[1]
+                newKeyRefs.append((newKey, occurences[newKey]))
+                remappedSrc[newKey].append((i + j, keyVal))
 
-                remappedSrc[newKey].append((i + j, oldVal))
                 keysToAdd.add(newKey)
                 occurences[newKey] += 1
 
@@ -510,12 +507,13 @@ class IfContentPart(IfTemplatePart):
             newRefsLen = len(newKeyRefs)
             i += newRefsLen
             orderLen += (newRefsLen - 1)
-
+            
         # remove the keys that do not appear after the remap
-        keysToRemove = keysToRemove.difference(keysToAdd)
         for key in keysToRemove:
-            del self.src[key]
-                
+            if (key not in keysToAdd):
+                del self.src[key]
+
         # construct the new src
-        DictTools.update(self.src, remappedSrc, lambda key, srcVals, remappedVals: remappedVals)
+        srcValCompare = lambda srcVal, remappedVal: srcVal[0] - remappedVal[0]
+        DictTools.update(self.src, remappedSrc, lambda key, srcVals, remappedVals: remappedVals if (key in keysToRemove) else Algo.merge([srcVals, remappedVals], srcValCompare))
 ##### EndScript

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/model/strategies/iniParsers/GIMIParser.py

@@ -139,9 +139,11 @@ class GIMIParser(BaseIniParser):
     
     # _makeRemapNames(): Makes the required names used for the fix
     def _makeRemapNames(self):
-        self.blendCommandsGraph.getRemapBlendNames(self._modsToFix)
-        self.nonBlendHashIndexCommandsGraph.getRemapBlendNames(self._modsToFix)
-        self.blendResourceCommandsGraph.getRemapBlendNames(self._modsToFix)
+        self.blendCommandsGraph.getRemapNames(self._modsToFix)
+        self.positionCommandsGraph.getRemapNames(self._modsToFix)
+        self.nonBlendHashIndexCommandsGraph.getRemapNames(self._modsToFix)
+        self.blendResourceCommandsGraph.getRemapNames(self._modsToFix)
+        self.positionResourceCommandsGraph.getRemapNames(self._modsToFix)
 
     def _makeRemapModels(self, result: Dict[str, IniResourceModel], resourceGraph: IniSectionGraph, getFixedFile: Optional[Callable[[str], str]] = None):
         """
@@ -267,8 +269,8 @@ class GIMIParser(BaseIniParser):
         self.blendCommandsGraph.remapNameFunc = self._iniFile.getRemapBlendName
         self.nonBlendHashIndexCommandsGraph.remapNameFunc = self._iniFile.getRemapFixName
         self.blendResourceCommandsGraph.remapNameFunc = self._iniFile.getRemapBlendResourceName
-        self.positionCommandsGraph.remapNameFunc = self._iniFile.getRemapFixName
-        self.positionResourceCommandsGraph.remapNameFunc = self._iniFile.getRemapPositionName
+        self.positionCommandsGraph.remapNameFunc = self._iniFile.getRemapPositionName
+        self.positionResourceCommandsGraph.remapNameFunc = self._iniFile.getRemapPositionResourceName
 
         self._parseBlend()
         positionSections = self._parsePosition()

{fixraidenboss2-4.3.0 → fixraidenboss2-4.3.2}/src/FixRaidenBoss2/model/strategies/texEditors/texFilters/BaseTexFilter.py

@@ -34,7 +34,7 @@ class BaseTexFilter():
 
         .. describe:: x(texFile)
 
-            Calls :meth:`BaseTexFilter.transform` for the :class:`BaseTexFilter`, ``x``
+            Calls :meth:`transform` for the filters, ``x``
     """
 
     def __call__(self, texFile: "TextureFile"):
@@ -47,7 +47,7 @@ class BaseTexFilter():
         Parameters
         ----------
         texFile: :class:`TextureFile`
-            The texture to be editteds
+            The texture to be editted
         """
 
         pass