Chopping off size occurrences - see how similar those MreDial classes are...

Author: Utumno

Mopy/bash/game/fallout3/records.py

@@ -1313,8 +1313,9 @@ def dump(self,out):
         if not self.infos: return
         # Magic number '24': size of Fallout 3's record header
         # Magic format '4sIIIII': format for Fallout 3's GRUP record
-        size = 24 + sum([24 + info.getSize() for info in self.infos])
-        out.pack('4sIIIII','GRUP',size,self.fid,7,self.infoStamp,self.infoStamp2)
+        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
+        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
+                 self.infoStamp2)
         for info in self.infos: info.dump(out)
 
     def updateMasters(self,masters):

Mopy/bash/game/falloutnv/records.py

@@ -815,8 +815,9 @@ def dump(self,out):
         if not self.infos: return
         # Magic number '24': size of Fallout New Vegas's record header
         # Magic format '4sIIIII': format for Fallout New Vegas's GRUP record
-        size = 24 + sum([24 + info.getSize() for info in self.infos])
-        out.pack('4sIIIII','GRUP',size,self.fid,7,self.infoStamp,self.infoStamp2)
+        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
+        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
+                 self.infoStamp2)
         for info in self.infos: info.dump(out)
 
     def updateMasters(self,masters):

Mopy/bash/game/oblivion/records.py

@@ -824,8 +824,8 @@ def dump(self,out):
         if not self.infos: return
         # Magic number '20': size of Oblivion's record header
         # Magic format '4sIIII': format for Oblivion's GRUP record
-        size = 20 + sum([20 + info.getSize() for info in self.infos])
-        out.pack('4sIIII','GRUP',size,self.fid,7,self.infoStamp)
+        dial_size = 20 + sum([20 + info.getSize() for info in self.infos])
+        out.pack('4sIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp)
         for info in self.infos: info.dump(out)
 
     def updateMasters(self,masters):

Mopy/bash/game/skyrim/records.py

@@ -486,7 +486,7 @@ def dumpData(self,record,out):
         if value is not None:
             if self.maxSize:
                 value = winNewLines(value.rstrip())
-                size = min(self.maxSize,len(value))
+                str_size = min(self.maxSize,len(value))
                 test,encoding_ = encode(value,returnEncoding=True)
                 extra_encoded = len(test) - self.maxSize
                 if extra_encoded > 0:
@@ -495,8 +495,8 @@ def dumpData(self,record,out):
                     while total < extra_encoded:
                         total += len(value[i].encode(encoding_))
                         i -= 1
-                    size += i + 1
-                    value = value[:size]
+                    str_size += i + 1
+                    value = value[:str_size]
                     value = encode(value,firstEncoding=encoding_)
                 else:
                     value = test
@@ -521,7 +521,7 @@ def dumpData(self,record,out):
         if value is not None:
             if self.maxSize:
                 value = winNewLines(value.rstrip())
-                size = min(self.maxSize,len(value))
+                str_size = min(self.maxSize,len(value))
                 test,encoding_ = encode(value,returnEncoding=True)
                 extra_encoded = len(test) - self.maxSize
                 if extra_encoded > 0:
@@ -530,8 +530,8 @@ def dumpData(self,record,out):
                     while total < extra_encoded:
                         total += len(value[i].encode(encoding_))
                         i -= 1
-                    size += i + 1
-                    value = value[:size]
+                    str_size += i + 1
+                    value = value[:str_size]
                     value = encode(value,firstEncoding=encoding_)
                 else:
                     value = test
@@ -907,9 +907,9 @@ def __init__(self):
             self.fragments = None
             self.aliases = None
 
-        def loadData(self,record,ins,size,readId):
+        def loadData(self, record, ins, size_, readId):
             insTell = ins.tell
-            endOfField = insTell() + size
+            endOfField = insTell() + size_
             self.scripts = []
             scriptsAppend = self.scripts.append
             Script = MelVmad.Script
@@ -2211,8 +2211,9 @@ def dump(self,out):
         if not self.infos: return
         # Magic number '24': size of Skyrim's record header
         # Magic format '4sIIIII': format for Skyrim's GRUP record
-        size = 24 + sum([24 + info.getSize() for info in self.infos])
-        out.pack('4sIIIII','GRUP',size,self.fid,7,self.infoStamp,self.infoStamp2)
+        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
+        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
+                 self.infoStamp2)
         for info in self.infos: info.dump(out)
 
     def updateMasters(self,masters):