Skip to content

Commit d645a9d

Browse files
committed
VR Games: inf-461-patchers and inf-records-refactoring changes
Fixes a startup crash and adds all patcher updates to Skyrim VR. Imports PACK for Skyrim VR.
1 parent 58dac11 commit d645a9d

3 files changed

Lines changed: 30 additions & 23 deletions

File tree

Mopy/bash/game/fallout4vr/patcher/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@
2828

2929
gameSpecificPatchers = {}
3030
gameSpecificListPatchers = {}
31+
game_specific_import_patchers = {}

Mopy/bash/game/skyrimvr/__init__.py

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ class SkyrimVRGameInfo(SkyrimSEGameInfo):
5858

5959
allTags = SkyrimSEGameInfo.allTags | {u'NoMerge'}
6060
patchers = (
61-
u'CellImporter', u'GmstTweaker', u'GraphicsPatcher',
62-
u'ImportInventory', u'ListsMerger', u'PatchMerger', u'SoundPatcher',
63-
u'StatsPatcher', u'NamesPatcher',
61+
u'ActorImporter', u'CellImporter', u'ContentsChecker',
62+
u'DeathItemPatcher', u'DestructiblePatcher', u'GmstTweaker',
63+
u'GraphicsPatcher', u'ImportActorsSpells', u'ImportInventory',
64+
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',
6468
)
6569

6670
class se(SkyrimSEGameInfo.se):
@@ -73,10 +77,10 @@ class se(SkyrimSEGameInfo.se):
7377

7478
@classmethod
7579
def init(cls):
80+
# Copy-pasted from Skyrim SE
7681
cls._dynamic_import_modules(__name__)
7782
# First import from skyrimse.records file
78-
from .records import MreWthr, MreMato, MreLtex, MreWatr, MreWeap, \
79-
MreStat, MreAmmo, MreVoli, MreLens
83+
from .records import MreVoli, MreLens
8084
# then import rest of records from skyrim.records
8185
from ..skyrim.records import MreAact, MreAchr, MreActi, MreAddn, \
8286
MreAlch, MreAnio, MreAppa, MreArma, MreArmo, MreArto, MreAspc, \
@@ -89,10 +93,12 @@ def init(cls):
8993
MreInfo, MreIngr, MreIpct, MreIpds, MreKeym, MreKywd, MreLcrt, \
9094
MreLctn, MreLgtm, MreLigh, MreLscr, MreLvli, MreLvln, MreLvsp, \
9195
MreMatt, MreMesg, MreMgef, MreMisc, MreMovt, MreMstt, MreMusc, \
92-
MreMust, MreNpc, MreOtft, MreProj, MreQust, MreRegn, MreRela, \
93-
MreRevb, MreRfct, MreScrl, MreShou, MreSlgm, MreSmbn, MreSmen, \
94-
MreSmqn, MreSnct, MreSndr, MreSopm, MreSoun, MreSpel, MreSpgd, \
95-
MreTact, MreTree, MreTxst, MreVtyp, MreWoop, MreWrld
96+
MreMust, MreNpc, MreOtft, MrePerk, MreProj, MreQust, MreRegn, \
97+
MreRela, MreRevb, MreRfct, MreScrl, MreShou, MreSlgm, MreSmbn, \
98+
MreSmen, MreSmqn, MreSnct, MreSndr, MreSopm, MreSoun, MreSpel, \
99+
MreSpgd, MreTact, MreTree, MreTxst, MreVtyp, MreWoop, MreWrld, \
100+
MrePack, MreAmmo, MreLtex, MreMato, MreStat, MreWatr, MreWeap, \
101+
MreWthr
96102
cls.mergeClasses = (
97103
# MreAchr, MreDial, MreInfo, MreFact,
98104
MreAact, MreActi, MreAddn, MreAlch, MreAmmo, MreAnio, MreAppa,
@@ -105,13 +111,12 @@ def init(cls):
105111
MreImgs, MreIngr, MreIpct, MreIpds, MreKeym, MreKywd, MreLcrt,
106112
MreLctn, MreLgtm, MreLigh, MreLscr, MreLtex, MreLvli, MreLvln,
107113
MreLvsp, MreMato, MreMatt, MreMesg, MreMgef, MreMisc, MreMovt,
108-
MreMstt, MreMusc, MreMust, MreNpc, MreOtft, MreProj, MreRegn,
109-
MreRela, MreRevb, MreRfct, MreScrl, MreShou, MreSlgm, MreSmbn,
110-
MreSmen, MreSmqn, MreSnct, MreSndr, MreSopm, MreSoun, MreSpel,
111-
MreSpgd, MreStat, MreTact, MreTree, MreTxst, MreVtyp, MreWatr,
112-
MreWeap, MreWoop, MreWthr, MreVoli, MreLens,
113-
####### for debug
114-
MreQust,
114+
MreMstt, MreMusc, MreMust, MreNpc, MreOtft, MrePerk, MreProj,
115+
MreRegn, MreRela, MreRevb, MreRfct, MreScrl, MreShou, MreSlgm,
116+
MreSmbn, MreSmen, MreSmqn, MreSnct, MreSndr, MreSopm, MreSoun,
117+
MreSpel, MreSpgd, MreStat, MreTact, MreTree, MreTxst, MreVtyp,
118+
MreWatr, MreWeap, MreWoop, MreWthr, MreVoli, MreLens, MreQust,
119+
MrePack,
115120
)
116121
# Setting RecordHeader class variables --------------------------------
117122
brec.RecordHeader.topTypes = [
@@ -148,13 +153,13 @@ def init(cls):
148153
MreIpds, MreKeym, MreKywd, MreLcrt, MreLctn, MreLgtm, MreLigh,
149154
MreLscr, MreLtex, MreLvli, MreLvln, MreLvsp, MreMato, MreMatt,
150155
MreMesg, MreMgef, MreMisc, MreMovt, MreMstt, MreMusc, MreMust,
151-
MreNpc, MreOtft, MreProj, MreRegn, MreRela, MreRevb, MreRfct,
152-
MreScrl, MreShou, MreSlgm, MreSmbn, MreSmen, MreSmqn, MreSnct,
153-
MreSndr, MreSopm, MreSoun, MreSpel, MreSpgd, MreStat, MreTact,
154-
MreTree, MreTxst, MreVtyp, MreWatr, MreWeap, MreWoop, MreWthr,
155-
MreCell, MreWrld, MreVoli, MreLens, # MreNavm, MreNavi
156-
####### for debug
157-
MreQust, MreHeader,
156+
MreNpc, MreOtft, MrePerk, MreProj, MreRegn, MreRela, MreRevb,
157+
MreRfct, MreScrl, MreShou, MreSlgm, MreSmbn, MreSmen, MreSmqn,
158+
MreSnct, MreSndr, MreSopm, MreSoun, MreSpel, MreSpgd, MreStat,
159+
MreTact, MreTree, MreTxst, MreVtyp, MreWatr, MreWeap, MreWoop,
160+
MreWthr, MreCell, MreWrld, MreVoli, MreLens, MreQust, MreHeader,
161+
MrePack,
162+
# MreNavm, MreNavi
158163
))
159164
brec.MreRecord.simpleTypes = (
160165
set(brec.MreRecord.type_class) - {'TES4', 'ACHR', 'CELL', 'DIAL',

Mopy/bash/game/skyrimvr/patcher/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@
2828

2929
gameSpecificPatchers = {}
3030
gameSpecificListPatchers = {}
31+
game_specific_import_patchers = {}

0 commit comments

Comments
 (0)