support Map patches in code, call Actor::Finalize after reading all

MapLibs/actor.py

@@ -475,6 +475,10 @@ def Finalize(self, mult_coords):# TODO: more checks in finalize
         for i in self.IterProps('Location', 'BasePos', 'SavedPos', 'OldLocation'):
             self.lines[i] = self.ProcLoc(self.lines[i], mult_coords)
 
+        self._Finalize(mult_coords)
+
+    def _Finalize(self, mult_coords):
+        pass
 
     def GetLoc(self, line:str) -> tuple:
         match = loc.match(line)
@@ -585,7 +589,6 @@ def _Read(self, file, mult_coords:tuple|None):
                 self.props[prop.group(2)] = len(self.lines)
             self.lines.append(line)
             if stripped == 'End Actor':
-                self.Finalize(mult_coords)
                 return
             line:str = file.readline()
 
@@ -597,8 +600,8 @@ def ReadBrush(self, line:str, file, mult_coords) -> str:
 
 
 class OldBrush(Actor): # well this was a big waste of time? lol
-    def Finalize(self, mult_coords):# TODO: more checks in finalize
-        super().Finalize(mult_coords)
+    def _Finalize(self, mult_coords):# TODO: more checks in finalize
+        super()._Finalize(mult_coords)
         if type(self) == OldBrush:
             self.MirrorVerts(mult_coords)
 
@@ -744,8 +747,8 @@ def ReadPolygon(self, line:str, file, mult_coords) -> None:
 
 
 class Brush(OldBrush):
-    def Finalize(self, mult_coords):
-        super().Finalize(mult_coords)
+    def _Finalize(self, mult_coords):
+        super()._Finalize(mult_coords)
 
         # check if this is a portal
         for p in self.polylist:
@@ -788,17 +791,17 @@ def FixScale(self, line:str, mult_coords) -> str:
 
 
 class Mover(Brush):
-    def Finalize(self, mult_coords):
-        super().Finalize(mult_coords)
+    def _Finalize(self, mult_coords):
+        super()._Finalize(mult_coords)
 
         for (prop, i) in self.props.items():
             if prop.startswith('KeyPos('):
                 self.lines[i] = self.ProcLoc(self.lines[i], mult_coords) # idk if this needs to be ProcLoc or ProcLocRot, will need to find an example
 
 
 class DeusExLevelInfo(Actor):
-    def Finalize(self, mult_coords):
-        super().Finalize(mult_coords)
+    def _Read(self, file, mult_coords:tuple|None):
+        super()._Read(file, mult_coords)
         i = self.GetPropIdx('MapName')
         if i and self.parent:
             match = prop_regex.match(self.lines[i])

MapLibs/t3d.py

@@ -27,6 +27,19 @@ def Read(self, filepath:Path):
         with open(filepath, 'r') as file:
             self._Read(file)
 
+        self.before_finalize()
+        for a in self.actors:
+            a.Finalize(self.mult_coords)
+        self.after_finalize()
+
+
+    def before_finalize(self):
+        pass # can check self.name and manipulate the self.actornames dictionary
+
+    def after_finalize(self):
+        pass
+
+
     def _Read(self, file):
         line = file.readline().strip()
         assert line == 'Begin Map'

runtests.py

@@ -137,6 +137,7 @@ def test_read_brush(self):
         actor:Brush = CreateActor(None, brushfile.readline())
         self.assertEqual(actor.classname, 'Brush')
         actor.Read(brushfile, None)
+        actor.Finalize(None)
 
         self.assertEqual(actor.lines[0], 'Begin Actor Class=Brush Name=Brush49')
         self.assertEqual(actor.lines[1], '    Begin Brush Name=Model14')
@@ -157,6 +158,7 @@ def test_read_actor(self):
         self.assertEqual(actor.classname, 'Jock')
         self.assertFalse(isinstance(actor, Brush))
         actor.Read(actorfile, None)
+        actor.Finalize(None)
 
         self.assertEqual(actorfile.readline(), 'Begin Actor Class=AmbientSound Name=AmbientSound0')