More Normalization between FO3 and FNV

Author: Sharlikran

Mopy/bash/bapi.py

@@ -616,7 +616,7 @@ def GetDirtyMessage(self,plugin):
             clean = c_uint32()
             _CGetDirtyMessage(self._DB,_enc(plugin),byref(message),byref(clean))
             return (_uni(message.value),clean.value)
-            
+
         def DumpMinimal(self,file,overwrite):
             _CDumpMinimal(self._DB,_enc(file),overwrite)
 

Mopy/bash/bash.py

@@ -66,7 +66,7 @@ def SetUserPath(iniPath, uArg=None):
 # Backup/Restore --------------------------------------------------------------
 def cmdBackup():
     # backup settings if app version has changed or on user request
-    if not basherImported: 
+    if not basherImported:
         import basher, barb
     backup = None
     path = None
@@ -214,7 +214,7 @@ def main():
                         default=False,
                         dest='quietquit',
                         help='Close Bash after creating or restoring backup and do not display any prompts or message dialogs.')
-    parser.set_defaults(backup_images=0)                    
+    parser.set_defaults(backup_images=0)
     backupGroup.add_option('-i', '--include-changed-images',
                         action='store_const',
                         const=1,
@@ -264,7 +264,7 @@ def main():
     parser.add_option('--genHtml',
                         default=None,
                         help=optparse.SUPPRESS_HELP)
-    
+
     parser.add_option_group(pathGroup)
     parser.add_option_group(userPathGroup)
     parser.add_option_group(backupGroup)
@@ -273,9 +273,9 @@ def main():
     if len(extra) > 0:
         parser.print_help()
         return
-    
+
     bolt.deprintOn = opts.debug
-    
+
     if opts.Psyco:
         try:
             import psyco
@@ -351,7 +351,7 @@ def main():
             run = balt.askYes(None,"Warning: You are using a Python version prior to 2.5x which is totally out of date and ancient and Bash will likely not like it and may totally refuse to work. Please update to a more recent version of Python(2.6x or 2.7x is preferred). Do you still want to run Wrye Flash?", "Warning OLD Python version detected")
         if not run:
             return
-        
+
     # process backup/restore options
     quit = False # quit if either is true, but only after calling both
     quit = quit or not cmdBackup()

Mopy/bash/bass.py

@@ -26,4 +26,4 @@
 without worrying about circular imports."""
 
 language = None
-AppVersion = u"30.4"
+AppVersion = u"31.0"

Mopy/bash/bish.py

@@ -483,7 +483,6 @@ def perfTest():
     sys.exit()
     test = 0.0
     total = 0.0
-    # MreLvsp removed
     for testClasses in ['bosh.MreAchr,bosh.MreCell,bosh.MreWrld','bosh.MreAcre,bosh.MreCell,bosh.MreWrld','bosh.MreActi','bosh.MreAlch','bosh.MreAmmo','bosh.MreAnio','bosh.MreAppa','bosh.MreArmo','bosh.MreBook','bosh.MreBsgn','bosh.MreCell,bosh.MreWrld','bosh.MreClas','bosh.MreClot','bosh.MreCont','bosh.MreCrea','bosh.MreDial,bosh.MreInfo','bosh.MreDoor','bosh.MreEfsh','bosh.MreEnch','bosh.MreEyes','bosh.MreFact','bosh.MreFlor','bosh.MreFurn','bosh.MreGlob','bosh.MreGmst','bosh.MreGras','bosh.MreHair','bosh.MreIngr','bosh.MreKeym','bosh.MreLigh','bosh.MreLscr','bosh.MreLvlc','bosh.MreLvli','bosh.MreMgef','bosh.MreMisc','bosh.MreNpc','bosh.MrePack','bosh.MreQust','bosh.MreRace','bosh.MreRefr,bosh.MreCell,bosh.MreWrld','bosh.MreRoad,bosh.MreCell,bosh.MreWrld','bosh.MreScpt','bosh.MreSgst','bosh.MreSkil','bosh.MreSlgm','bosh.MreSoun','bosh.MreSpel','bosh.MreStat','bosh.MreTes4','bosh.MreTree','bosh.MreWatr','bosh.MreWeap','bosh.MreWthr']:#,'"LAND"', '"PGRD"']:
         test = Timer('testClasses = (%s,);loadFactory = bosh.LoadFactory(False,*testClasses);modInfo = bosh.modInfos[GPath("Fallout3.esm")];modFile = bosh.ModFile(modInfo,loadFactory);modFile.load(True)' % testClasses, "import bosh;from bolt import GPath").timeit(1)
         print testClasses, ":", test
@@ -670,7 +669,7 @@ def gmstIds(fileName=None):
     maxId = max(maxId,0xf12345)
     maxOld = maxId
     print 'maxId',hex(maxId)
-    #--Eid list? - if the GMST has a 00000000 eid when looking at it in the cs with nothing 
+    #--Eid list? - if the GMST has a 00000000 eid when looking at it in the cs with nothing
 	# but fallout3.esm loaded you need to add the gmst to this list, rebuild the pickle and overwrite the old one.
     for eid in ['fPlayerDeathReloadTime','iMapMarkerVisibleDistance','fVanityModeWheelMax','fChase3rdPersonZUnitsPerSecond',
                 'fAutoAimMaxDegreesMiss','iHoursToRespawnCell','fEssentialDeathTime','fJumpHeightMin','fPlayerPipBoyLightTimer',

Mopy/bash/bush.py

@@ -235,7 +235,7 @@
     r'zeta - sounds.bsa',
     r'DLCList.txt',
     ))
-    
+
 # Balo Canonical Groups -------------------------------------------------------
 baloGroups = (
     ('Root',),
@@ -303,7 +303,7 @@
 #--Dict mapping 'ignored' top types to un-ignored top types.
 topIgTypes = dict([(struct.pack('I',(struct.unpack('I',type)[0]) | 0x1000),type) for type in topTypes])
 
-recordTypes = set(topTypes + 'GRUP,TES4,ROAD,REFR,ACHR,ACRE,PGRD,LAND,INFO,PGRE,NAVM'.split(','))
+recordTypes = set(topTypes + 'GRUP,TES4,ACHR,ACRE,INFO,LAND,NAVM,PGRE,PMIS,REFR'.split(','))
 
 # Id Functions ----------------------------------------------------------------
 def getIdFunc(modName):

Mopy/bash/cint.py

@@ -2741,7 +2741,7 @@ def _ParentID(self):
         retValue = _CGetField(self._CollectionID, self._ModID, self._RecordID, 40, 0, 0, 0, 0, 0, 0, 0)
         if(retValue): return retValue
         return 0
-        
+
     @property
     def bsb(self):
         """Returns tesfile block and sub-block indices for cells in this group.
@@ -3858,11 +3858,11 @@ def create_entry(self):
 #         count = CBashGeneric_LIST(4, c_short)
 #         unused2 = CBashUINT8ARRAY_LIST(5, 2)
 #         exportattrs = copyattrs = ['level', 'listId', 'count']
-# 
+#
 #     def mergeFilter(self,modSet):
 #         """Filter out items that don't come from specified modSet."""
 #         self.entries = [entry for entry in self.entries if entry.listId[0] in modSet]
-# 
+#
 #     chanceNone = CBashGeneric(5, c_ubyte)
 #     flags = CBashGeneric(6, c_ubyte)
 #     script = CBashJunk(7) #Doesn't actually exist, but is here so that LVLC,LVLI,LVLN can be processed similarly
@@ -5283,7 +5283,6 @@ def create_sound(self):
                                         'weatherType', 'boltRed', 'boltGreen', 'boltBlue', 'sounds_list'] #'modt_p',
 
 #Helper functions
-# removed 'LVSP'
 validTypes = set(['GMST','GLOB','CLAS','FACT','HAIR','EYES','RACE',
                   'SOUN','SKIL','MGEF','SCPT','LTEX','ENCH','SPEL',
                   'BSGN','ACTI','APPA','ARMO','BOOK','CLOT','CONT',
@@ -5292,9 +5291,8 @@ def create_sound(self):
                   'SLGM','KEYM','ALCH','SBSP','SGST','LVLI','WTHR',
                   'CLMT','REGN','WRLD','CELL','ACHR','ACRE','REFR',
                   'PGRD','LAND','ROAD','DIAL','INFO','QUST','IDLE',
-                  'PACK','CSTY','LSCR','ANIO','WATR','EFSH'])
+                  'PACK','CSTY','LSCR','LVSP','ANIO','WATR','EFSH'])
 
-# removed 'LVSP'
 aggregateTypes = set(['GMST','GLOB','CLAS','FACT','HAIR','EYES','RACE',
                   'SOUN','SKIL','MGEF','SCPT','LTEX','ENCH','SPEL',
                   'BSGN','ACTI','APPA','ARMO','BOOK','CLOT','CONT',
@@ -5303,7 +5301,7 @@ def create_sound(self):
                   'SLGM','KEYM','ALCH','SBSP','SGST','LVLI','WTHR',
                   'CLMT','REGN','WRLD','CELLS','ACHRS','ACRES','REFRS',
                   'PGRDS','LANDS','ROADS','DIAL','INFOS','QUST','IDLE',
-                  'PACK','CSTY','LSCR','ANIO','WATR','EFSH'])
+                  'PACK','CSTY','LSCR','LVSP','ANIO','WATR','EFSH'])
 
 pickupables = set(['APPA','ARMO','BOOK','CLOT','INGR','LIGH','MISC',
                    'WEAP','AMMO','SLGM','KEYM','ALCH','SGST'])
@@ -5413,7 +5411,6 @@ def CleanMasters2(self):
                         if not formId: continue
                         if formId[0] != self.GName:
                             masters.add(formId[0])
-                # removed 'LVSP'
                 if type in ('LVLI','LVLC','LVLN'):
                     for entry in record.entries:
                         formMaster = entry.listId[0]
@@ -5890,7 +5887,6 @@ def ROADS(self):
         return roads
 
     @property
-    # removed 'LVSP'
     def tops(self):
         return dict((("GMST", self.GMST),("GLOB", self.GLOB),("CLAS", self.CLAS),("FACT", self.FACT),
                      ("HAIR", self.HAIR),("EYES", self.EYES),("RACE", self.RACE),("SOUN", self.SOUN),
@@ -5908,7 +5904,6 @@ def tops(self):
                      ("ANIO", self.ANIO),("WATR", self.WATR),("EFSH", self.EFSH)))
 
     @property
-    # removed 'LVSP'
     def aggregates(self):
         return dict((("GMST", self.GMST),("GLOB", self.GLOB),("CLAS", self.CLAS),("FACT", self.FACT),
                      ("HAIR", self.HAIR),("EYES", self.EYES),("RACE", self.RACE),("SOUN", self.SOUN),