Skip to content

Commit 7b71d5f

Browse files
UtumnoInfernio
authored andcommitted
APatchMerger.__init__ must run first
Turns out that my PBash_gui_patchers were: <type 'list'>: [ <bash.basher.gui_patchers.ActorImporter object at 0x0A4E54D0, bash.basher.gui_patchers.AlchemicalCatalogs object at 0x0A4E55F0, bash.basher.gui_patchers.AliasesPatcher object at 0x0A4FE570, bash.basher.gui_patchers.AssortedTweaker object at 0x0A4FE550, bash.basher.gui_patchers.CellImporter object at 0x0A4FE590, bash.basher.gui_patchers.ClothesTweaker object at 0x0A4FE5B0, bash.basher.gui_patchers.CoblExhaustion object at 0x0A4FE530, bash.basher.gui_patchers.ContentsChecker object at 0x0A4FE5D0, bash.basher.gui_patchers.DeathItemPatcher object at 0x0A4FE5F0, bash.basher.gui_patchers.GmstTweaker object at 0x0A4FE610, bash.basher.gui_patchers.GraphicsPatcher object at 0x0A4FE630, bash.basher.gui_patchers.ImportActorsSpells object at 0x0A4FE650, bash.basher.gui_patchers.ImportFactions object at 0x0A4FE670, bash.basher.gui_patchers.ImportInventory object at 0x0A4FE690, bash.basher.gui_patchers.ImportRelations object at 0x0A4FE6B0, bash.basher.gui_patchers.ImportScripts object at 0x0A4FE6D0, bash.basher.gui_patchers.KFFZPatcher object at 0x0A4FE6F0, bash.basher.gui_patchers.ListsMerger object at 0x0A4FE710, bash.basher.gui_patchers.MFactMarker object at 0x0A4FE730, bash.basher.gui_patchers.NamesPatcher object at 0x0A4FE750, bash.basher.gui_patchers.NamesTweaker object at 0x0A4FE770, bash.basher.gui_patchers.NPCAIPackagePatcher object at 0x0A4FE790, bash.basher.gui_patchers.NpcFacePatcher object at 0x0A4FE7B0, bash.basher.gui_patchers.PatchMerger object at 0x0A4FE7D0, bash.basher.gui_patchers.RacePatcher object at 0x0A4FE7F0, bash.basher.gui_patchers.RoadImporter object at 0x0A4FE810, bash.basher.gui_patchers.SEWorldEnforcer object at 0x0A4FE830, bash.basher.gui_patchers.SoundPatcher object at 0x0A4FE850, bash.basher.gui_patchers.SpellsPatcher object at 0x0A4FE870, bash.basher.gui_patchers.StatsPatcher object at 0x0A4FE890, bash.basher.gui_patchers.TextImporter object at 0x0A4FE8B0, bash.basher.gui_patchers.TweakActors object at 0x0A4FE8D0, bash.basher.gui_patchers.UpdateReferences object at 0x0A4FE8F0>] Note that PatchMerger __init__ runs after patcher.patchers.importers._AImportInventory.__init__ which uses mergeSet and after patcher.patchers.importers.ImportInventory.__init__ which uses allSet - both are set in PatchMerger
1 parent 13f99e1 commit 7b71d5f

7 files changed

Lines changed: 39 additions & 38 deletions

File tree

Mopy/bash/game/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,12 @@ class esp(object):
260260
allTags = set()
261261

262262
# Patcher available when building a Bashed Patch (referenced by class name)
263+
# PatchMerger must come first if enabled, see
264+
# patcher.base.APatchMerger.__init__
263265
patchers = ()
264266

265267
# CBash patchers available when building a Bashed Patch
266-
CBash_patchers = ()
268+
CBash_patchers = () # CBash_PatchMerger must come first if enabled!
267269

268270
# Magic Info
269271
weaponTypes = ()

Mopy/bash/game/fallout3/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ class esp(GameInfo.esp):
144144
# NamesTweaker, NPCAIPackagePatcher, NpcFacePatcher, PatchMerger, RacePatcher,
145145
# RoadImporter, SoundPatcher, StatsPatcher, UpdateReferences,
146146
#--Patcher available when building a Bashed Patch (referenced by class name)
147-
patchers = (
147+
patchers = (u'PatchMerger', # PatchMerger must come first !
148148
u'ActorImporter', u'AliasesPatcher', u'CellImporter',
149149
u'ContentsChecker', u'DeathItemPatcher', u'DestructiblePatcher',
150150
u'FidListsMerger', u'GmstTweaker', u'GraphicsPatcher',
151151
u'ImportActorsSpells', u'ImportFactions', u'ImportInventory',
152152
u'ImportScripts', u'KFFZPatcher', u'ListsMerger', u'NamesPatcher',
153153
u'NPCAIPackagePatcher', u'NpcFacePatcher', u'ObjectBoundsImporter',
154-
u'PatchMerger', u'SoundPatcher', u'SpellsPatcher', u'StatsPatcher',
155-
u'TextImporter', u'TweakActors',
154+
u'SoundPatcher', u'SpellsPatcher', u'StatsPatcher', u'TextImporter',
155+
u'TweakActors',
156156
)
157157

158158
weaponTypes = (

Mopy/bash/game/fallout4/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class esp(GameInfo.esp):
128128
u'Deactivate', u'Delev', u'Filter', u'ObjectBounds', u'Relev',
129129
}
130130

131-
patchers = (
131+
patchers = ( # PatchMerger must come first if enabled!
132132
u'ListsMerger', u'ObjectBoundsImporter',
133133
)
134134

Mopy/bash/game/oblivion/__init__.py

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,32 +146,33 @@ class esp(GameInfo.esp):
146146
u'Voice-F', u'Voice-M',
147147
}
148148

149-
patchers = (
150-
'ActorImporter', 'AlchemicalCatalogs', 'AliasesPatcher',
151-
'AssortedTweaker', 'CellImporter', 'ClothesTweaker', 'CoblExhaustion',
152-
'ContentsChecker', 'DeathItemPatcher', 'GmstTweaker',
153-
'GraphicsPatcher', 'ImportActorsSpells', 'ImportFactions',
154-
'ImportInventory', 'ImportRelations', 'ImportScripts', 'KFFZPatcher',
155-
'ListsMerger', 'MFactMarker', 'NamesPatcher', 'NamesTweaker',
156-
'NPCAIPackagePatcher', 'NpcFacePatcher', 'PatchMerger', 'RacePatcher',
157-
'RoadImporter', 'SEWorldEnforcer', 'SoundPatcher', 'SpellsPatcher',
158-
'StatsPatcher', 'TextImporter', 'TweakActors', 'UpdateReferences',
149+
patchers = (u'PatchMerger', # PatchMerger must come first !
150+
u'ActorImporter', u'AlchemicalCatalogs', u'AliasesPatcher',
151+
u'AssortedTweaker', u'CellImporter', u'ClothesTweaker', u'CoblExhaustion',
152+
u'ContentsChecker', u'DeathItemPatcher', u'GmstTweaker',
153+
u'GraphicsPatcher', u'ImportActorsSpells', u'ImportFactions',
154+
u'ImportInventory', u'ImportRelations', u'ImportScripts', u'KFFZPatcher',
155+
u'ListsMerger', u'MFactMarker', u'NamesPatcher', u'NamesTweaker',
156+
u'NPCAIPackagePatcher', u'NpcFacePatcher', u'RacePatcher',
157+
u'RoadImporter', u'SEWorldEnforcer', u'SoundPatcher', u'SpellsPatcher',
158+
u'StatsPatcher', u'TextImporter', u'TweakActors', u'UpdateReferences',
159159
)
160160

161-
CBash_patchers = (
162-
'CBash_ActorImporter', 'CBash_AlchemicalCatalogs',
163-
'CBash_AliasesPatcher', 'CBash_AssortedTweaker', 'CBash_CellImporter',
164-
'CBash_ClothesTweaker', 'CBash_CoblExhaustion',
165-
'CBash_ContentsChecker', 'CBash_DeathItemPatcher', 'CBash_GmstTweaker',
166-
'CBash_GraphicsPatcher', 'CBash_ImportActorsSpells',
167-
'CBash_ImportFactions', 'CBash_ImportInventory',
168-
'CBash_ImportRelations', 'CBash_ImportScripts', 'CBash_KFFZPatcher',
169-
'CBash_ListsMerger', 'CBash_MFactMarker', 'CBash_NamesPatcher',
170-
'CBash_NamesTweaker', 'CBash_NPCAIPackagePatcher',
171-
'CBash_NpcFacePatcher', 'CBash_PatchMerger', 'CBash_RacePatcher',
172-
'CBash_RoadImporter', 'CBash_SEWorldEnforcer', 'CBash_SoundPatcher',
173-
'CBash_SpellsPatcher', 'CBash_StatsPatcher', 'CBash_TweakActors',
174-
'CBash_UpdateReferences',
161+
CBash_patchers = (u'CBash_PatchMerger', # PatchMerger must come first !
162+
u'CBash_ActorImporter', u'CBash_AlchemicalCatalogs',
163+
u'CBash_AliasesPatcher', u'CBash_AssortedTweaker',
164+
u'CBash_CellImporter', u'CBash_ClothesTweaker',
165+
u'CBash_CoblExhaustion', u'CBash_ContentsChecker',
166+
u'CBash_DeathItemPatcher', u'CBash_GmstTweaker',
167+
u'CBash_GraphicsPatcher', u'CBash_ImportActorsSpells',
168+
u'CBash_ImportFactions', u'CBash_ImportInventory',
169+
u'CBash_ImportRelations', u'CBash_ImportScripts', u'CBash_KFFZPatcher',
170+
u'CBash_ListsMerger', u'CBash_MFactMarker', u'CBash_NamesPatcher',
171+
u'CBash_NamesTweaker', u'CBash_NPCAIPackagePatcher',
172+
u'CBash_NpcFacePatcher', u'CBash_RacePatcher', u'CBash_RoadImporter',
173+
u'CBash_SEWorldEnforcer', u'CBash_SoundPatcher',
174+
u'CBash_SpellsPatcher', u'CBash_StatsPatcher', u'CBash_TweakActors',
175+
u'CBash_UpdateReferences',
175176
)
176177

177178
weaponTypes = (

Mopy/bash/game/skyrim/__init__.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,13 @@ class esp(GameInfo.esp):
154154
u'Sound', u'SpellStats', u'Stats', u'Text',
155155
}
156156

157-
patchers = (
157+
patchers = (u'PatchMerger', # PatchMerger must come first !
158158
u'ActorImporter', u'CellImporter', u'ContentsChecker',
159159
u'DeathItemPatcher', u'DestructiblePatcher', u'GmstTweaker',
160160
u'GraphicsPatcher', u'ImportActorsSpells', u'ImportInventory',
161161
u'KeywordsImporter', u'ListsMerger', u'NamesPatcher',
162-
u'NPCAIPackagePatcher', u'ObjectBoundsImporter', u'PatchMerger',
163-
u'SoundPatcher', u'SpellsPatcher', u'StatsPatcher', u'TextImporter',
164-
u'TweakActors',
162+
u'NPCAIPackagePatcher', u'ObjectBoundsImporter', u'SoundPatcher',
163+
u'SpellsPatcher', u'StatsPatcher', u'TextImporter', u'TweakActors',
165164
)
166165

167166
weaponTypes = (

Mopy/bash/game/skyrimse/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class SkyrimSEGameInfo(SkyrimGameInfo):
5959

6060
allTags = SkyrimGameInfo.allTags - {u'MustBeActiveIfImported', u'NoMerge',}
6161

62-
patchers = (
62+
patchers = ( # PatchMerger must come first if enabled!
6363
u'ActorImporter', u'CellImporter', u'ContentsChecker',
6464
u'DeathItemPatcher', u'DestructiblePatcher', u'GmstTweaker',
6565
u'GraphicsPatcher', u'ImportActorsSpells', u'ImportInventory',

Mopy/bash/game/skyrimvr/__init__.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,13 @@ class SkyrimVRGameInfo(SkyrimSEGameInfo):
5757
check_esl = False
5858

5959
allTags = SkyrimSEGameInfo.allTags | {u'NoMerge'}
60-
patchers = (
60+
patchers = (u'PatchMerger', # PatchMerger must come first !
6161
u'ActorImporter', u'CellImporter', u'ContentsChecker',
6262
u'DeathItemPatcher', u'DestructiblePatcher', u'GmstTweaker',
6363
u'GraphicsPatcher', u'ImportActorsSpells', u'ImportInventory',
6464
u'KeywordsImporter', u'ListsMerger', u'NamesPatcher',
65-
u'NPCAIPackagePatcher', u'ObjectBoundsImporter', u'PatchMerger',
66-
u'SoundPatcher', u'SpellsPatcher', u'StatsPatcher', u'TextImporter',
67-
u'TweakActors',
65+
u'NPCAIPackagePatcher', u'ObjectBoundsImporter', u'SoundPatcher',
66+
u'SpellsPatcher', u'StatsPatcher', u'TextImporter', u'TweakActors',
6867
)
6968

7069
class se(SkyrimSEGameInfo.se):

0 commit comments

Comments
 (0)