Verified mergeClasses and MreRecord.type_class

Author: Sharlikran

Mopy/Wrye Flash Debug.bat

@@ -88,8 +88,8 @@ SET PYTHON=%PYPATH%python.exe
 :FOUNDPYTHON
 ECHO Found Python at '%PYTHON%' >%OUTFILE%
 ECHO Found Python at '%PYTHON%'
-ECHO Launching Wrye Flash 30.9 in debug mode >>%OUTFILE%
-ECHO Launching Wrye Flash 30.9 in debug mode
+ECHO Launching Wrye Flash 31.0 in debug mode >>%OUTFILE%
+ECHO Launching Wrye Flash 31.0 in debug mode
 "%PYTHON%" "Wrye Flash Launcher.pyw" -d %1 %2 %3 %4 %5 %6 %7 %8 %9 >>%OUTFILE% 2>&1
 
 

Mopy/Wrye Flash.txt

@@ -38,6 +38,10 @@ Additionally, Wrye Bash comes packaged with the following programs:
 {{CONTENTS=0}}
 **All versions by Wrye team and or Valda unless otherwise noted.**
 
+=== 31.0 [1/27/2015]
+* Removed unused records
+* Normalized records with 306 and FNV when applicable
+
 === 30.9 [1/19/2015]
 * Fixed typo in MreClas for ATTR
 

Mopy/bash/bosh.py

@@ -6193,20 +6193,21 @@ class MreWthr(MelRecord):
 # MreRecord.type_class
 # MreLvsp removed
 MreRecord.type_class = dict((x.classType,x) for x in (
-    MreAchr, MreAcre, MreActi, MreAddn, MreAlch, MreAmmo, MreAnio, MreArma, MreArmo,
-    MreAspc, MreAvif, MreBook, MreBptd, MreCams, MreCell, MreClas, MreClmt,
-    MreCobj, MreCont, MreCpth, MreCrea, MreCsty, MreDebr, MreDial, MreDobj, MreDoor, MreEczn,
-    MreEfsh, MreEnch, MreExpl, MreEyes, MreFact, MreFlst, MreFurn, MreGlob, MreGmst,
-    MreGras, MreHair, MreHdpt, MreIdle, MreIdlm, MreImad, MreImgs, MreInfo, MreIngr, MreIpct,
+    MreActi, MreAddn, MreAlch, MreAmmo, MreAnio, MreArma, MreArmo, MreAspc, MreAvif, MreBook,
+    MreBptd, MreCams, MreClas, MreClmt, MreCobj, MreCont, MreCpth, MreCrea, MreCsty, MreDebr,
+    MreDobj, MreDoor, MreEczn, MreEfsh, MreEnch, MreExpl, MreEyes, MreFact, MreFlst, MreFurn,
+    MreGlob, MreGras, MreHair, MreHdpt, MreIdle, MreIdlm, MreImad, MreImgs, MreIngr, MreIpct,
     MreIpds, MreKeym, MreLgtm, MreLigh, MreLscr, MreLtex, MreLvlc, MreLvli, MreLvln, MreMesg,
-    MreMgef, MreMicn, MreMisc, MreMstt, MreMusc, MreNavm, MreNote, MreNpc, MrePack, MrePerk,
-    MrePgre, MrePmis, MreProj, MrePwat, MreQust, MreRace, MreRads, MreRefr, MreRegn, MreRgdl,
-    MreScol, MreScpt, MreSoun, MreSpel, MreStat,
-    MreTact, MreTerm, MreTree, MreTxst, MreVtyp, MreWatr, MreWeap, MreWrld, MreWthr,
+    MreMgef, MreMicn, MreMisc, MreMstt, MreMusc, MreNote, MreNpc, MrePack, MrePerk, MreProj,
+    MrePwat, MreQust, MreRace, MreRads, MreRegn, MreRgdl, MreScol, MreScpt, MreSoun, MreSpel,
+    MreStat, MreTact, MreTerm, MreTree, MreTxst, MreVtyp, MreWatr, MreWeap, MreWthr,
+    # Not Mergable
+    MreAchr, MreAcre, MreCell, MreDial, MreGmst, MreInfo, MreNavi, MreNavm, MrePgre, MrePmis,
+    MreRefr, MreWrld,
     MreTes4,
     ))
 MreRecord.simpleTypes = (set(MreRecord.type_class) -
-    set(('TES4','ACHR','ACRE','REFR','CELL','PGRD','LAND','WRLD','INFO','DIAL','PGRE','NAVM')))
+    set(('TES4','ACHR','ACRE','REFR','CELL','PGRD','PGRE','LAND','WRLD','INFO','DIAL','NAVM')))
 
 # Mod Blocks, File ------------------------------------------------------------
 #------------------------------------------------------------------------------
@@ -20205,15 +20206,14 @@ class PatchFile(ModFile):
     #--Class
     # removed MreLvsp
     mergeClasses = (
-        MreActi, MreAddn, MreAlch, MreAmmo, MreAnio, MreArma, MreArmo, MreAspc, MreAvif,
-        MreBook, MreBptd, MreCams, MreClas, MreClmt, MreCobj, MreCont, MreCpth,
-        MreCrea, MreCsty, MreDebr, MreDobj, MreDoor, MreEczn, MreEfsh, MreEnch, MreExpl, MreEyes,
-        MreFact, MreFlst, MreFurn, MreGlob, MreGras, MreHair, MreHdpt, MreIdle, MreIdlm,
-        MreImad, MreImgs, MreIngr, MreIpct, MreIpds, MreKeym, MreLgtm, MreLigh, MreLscr, MreLtex,
-        MreLvlc, MreLvli, MreLvln, MreMesg, MreMgef, MreMicn, MreMisc, MreMstt, MreMusc, MreNote,
-        MreNpc, MrePack, MrePerk, MreProj, MrePwat, MreQust, MreRace, MreRads, MreRegn, MreRgdl,
-        MreScol, MreScpt, MreSoun, MreSpel, MreStat, MreTact,
-        MreTerm, MreTree, MreTxst, MreVtyp, MreWatr, MreWeap, MreWthr,
+        MreActi, MreAddn, MreAlch, MreAmmo, MreAnio, MreArma, MreArmo, MreAspc, MreAvif, MreBook,
+        MreBptd, MreCams, MreClas, MreClmt, MreCobj, MreCont, MreCpth, MreCrea, MreCsty, MreDebr,
+        MreDobj, MreDoor, MreEczn, MreEfsh, MreEnch, MreExpl, MreEyes, MreFact, MreFlst, MreFurn,
+        MreGlob, MreGras, MreHair, MreHdpt, MreIdle, MreIdlm, MreImad, MreImgs, MreIngr, MreIpct,
+        MreIpds, MreKeym, MreLgtm, MreLigh, MreLscr, MreLtex, MreLvlc, MreLvli, MreLvln, MreMesg,
+        MreMgef, MreMicn, MreMisc, MreMstt, MreMusc, MreNote, MreNpc, MrePack, MrePerk, MreProj,
+        MrePwat, MreQust, MreRace, MreRads, MreRegn, MreRgdl, MreScol, MreScpt, MreSoun, MreSpel,
+        MreStat, MreTact, MreTerm, MreTree, MreTxst, MreVtyp, MreWatr, MreWeap, MreWthr,
         )
 
     @staticmethod

Mopy/bash_default.ini

@@ -1,9 +1,9 @@
-;#   ____            _       _       _    ____     ___       ___
-;#  |  _ \          | |     (_)     (_)  |___ \   / _ \     / _ \
-;#  | |_) | __ _ ___| |__    _ _ __  _     __) | | | | |   ( (_) |
-;#  |  _ < / _` / __| '_ \  | | '_ \| |   |__ <  | | | |    \__, |
-;#  | |_) | (_| \__ \ | | |_| | | | | |   ___) | | |_| | _    / /
-;#  |____/ \__,_|___/_| |_(_)_|_| |_|_|  |____/   \___/ (_)  /_/
+;#   ____            _       _       _    ____    __      ___
+;#  |  _ \          | |     (_)     (_)  |___ \  /_ |    / _ \
+;#  | |_) | __ _ ___| |__    _ _ __  _     __) |  | |   | | | |
+;#  |  _ < / _` / __| '_ \  | | '_ \| |   |__ <   | |   | | | |
+;#  | |_) | (_| \__ \ | | |_| | | | | |   ___) |  | | _ | |_| |
+;#  |____/ \__,_|___/_| |_(_)_|_| |_|_|  |____/   |_|(_) \___/
 
 ;The Default Font for the ASCII Art Headers is Lucida Console, Regular, 10 (Notepad)