Simplify node names for compression

Author: drewc5131

toontown/leveleditor/LevelEditor.py

@@ -2,6 +2,7 @@
 import glob
 import json
 import os
+import re
 import random
 from datetime import datetime
 from tkinter.filedialog import *
@@ -701,8 +702,8 @@ def toggleSuitBuildingPreviews(self):
             suitNames = ['Lawbot', 'Bossbot', 'Sellbot', 'Cashbot']
 
             if base.server == TOONTOWN_CORPORATE_CLASH:
-               suitBuildings.append(DNASTORE.findNode("suit_landmark_g1"))
-               suitNames.append('Boardbot')
+                suitBuildings.append(DNASTORE.findNode("suit_landmark_g1"))
+                suitNames.append('Boardbot')
 
             # temporary fix for duplicate sb's
             sb = []
@@ -1524,9 +1525,9 @@ def createNewGroup(self, type = 'dna'):
         print("createNewGroup")
         """ Create a new DNA Node group under the active parent """
         if type == 'dna':
-            newDNANode = DNAGroup('group_' + repr(self.getGroupNum()))
+            newDNANode = DNAGroup('GROUP.' + repr(self.getGroupNum()))
         else:
-            newDNANode = DNAVisGroup('VisGroup_' + repr(self.getGroupNum()))
+            newDNANode = DNAVisGroup('VIS.' + repr(self.getGroupNum()))
             # Increment group counter
         self.setGroupNum(self.getGroupNum() + 1)
         # Add new DNA Node group to the current parent DNA Object
@@ -1543,8 +1544,7 @@ def createNewGroup(self, type = 'dna'):
     def addFlatBuilding(self, buildingType):
         # Create new building
         newDNAFlatBuilding = DNAFlatBuilding()
-        self.setRandomBuildingStyle(newDNAFlatBuilding,
-                                    name = 'tb0:' + buildingType + '_DNARoot')
+        self.setRandomBuildingStyle(newDNAFlatBuilding, name = f'tb0:FLAT_DNARoot')
         # Now place new building in the world
         self.initDNANode(newDNAFlatBuilding)
 
@@ -1558,7 +1558,7 @@ def addLandmark(self, landmarkType, specialType, title = ''):
         block = self.getNextLandmarkBlock()
         print(landmarkType)
         newDNALandmarkBuilding = DNALandmarkBuilding(
-                'tb' + block + ':' + landmarkType + '_DNARoot')
+                f"tb{block}:{landmarkType}_DNARoot")
         newDNALandmarkBuilding.setCode(landmarkType)
         newDNALandmarkBuilding.setTitle(title)
         newDNALandmarkBuilding.setBuildingType(specialType)
@@ -1585,8 +1585,8 @@ def addAnimBuilding(self, animBuildingType):
         # Record new anim building type
         self.setCurrent('anim_building_texture', animBuildingType)
         block = self.getNextLandmarkBlock()
-        newDNAAnimBuilding = DNAAnimBuilding(
-                'tb' + block + ':' + animBuildingType + '_DNARoot')
+        simpleName = re.sub(r'phase_\d_models_char__', '', animBuildingType).replace('animated_building_', '').upper()
+        newDNAAnimBuilding = DNAAnimBuilding(f"tb{block}:ALND.{simpleName}_DNARoot")
         newDNAAnimBuilding.setCode(animBuildingType)
         newDNAAnimBuilding.setPos(VBase3(0))
         newDNAAnimBuilding.setHpr(VBase3(0))
@@ -1598,7 +1598,7 @@ def addProp(self, propType):
         print("addProp %s " % propType)
         # Record new prop type
         self.setCurrent('prop_texture', propType)
-        newDNAProp = DNAProp(propType + '_DNARoot')
+        newDNAProp = DNAProp(f"PROP.{propType.upper()}_DNARoot")
         newDNAProp.setCode(propType)
         newDNAProp.setPos(VBase3(0))
         newDNAProp.setHpr(VBase3(0))
@@ -1609,7 +1609,8 @@ def addAnimProp(self, animPropType):
         print("addAnimProp %s " % animPropType)
         # Record new anim prop type
         self.setCurrent('anim_prop_texture', animPropType)
-        newDNAAnimProp = DNAAnimProp(animPropType + '_DNARoot')
+        simpleName = re.sub(r'phase_\d_models_char__', '', animPropType).replace('animated_prop_', '').upper()
+        newDNAAnimProp = DNAAnimProp(f"ANIM.{simpleName}_DNARoot")
         newDNAAnimProp.setCode(animPropType)
         newDNAAnimProp.setPos(VBase3(0))
         newDNAAnimProp.setHpr(VBase3(0))
@@ -1620,7 +1621,8 @@ def addInteractiveProp(self, interactivePropType):
         print("addInteractiveProp %s " % interactivePropType)
         # Record new interactive prop type
         self.setCurrent('interactive_prop_texture', interactivePropType)
-        newDNAInteractiveProp = DNAInteractiveProp(interactivePropType + '_DNARoot')
+        simpleName = re.sub(r'phase_\d_models_char__', '', interactivePropType).replace('interactive_prop_', '').upper()
+        newDNAInteractiveProp = DNAInteractiveProp(f"INTR.{simpleName}_DNARoot")
         newDNAInteractiveProp.setCode(interactivePropType)
         newDNAInteractiveProp.setPos(VBase3(0))
         newDNAInteractiveProp.setHpr(VBase3(0))
@@ -1630,7 +1632,7 @@ def addInteractiveProp(self, interactivePropType):
     def addStreet(self, streetType):
         # Record new street type
         self.setCurrent('street_texture', streetType)
-        newDNAStreet = DNAStreet(streetType + '_DNARoot')
+        newDNAStreet = DNAStreet(f"STR.{streetType.replace('street_', '').upper()}_DNARoot")
         newDNAStreet.setCode(streetType)
         newDNAStreet.setPos(VBase3(0))
         newDNAStreet.setHpr(VBase3(0))
@@ -3109,7 +3111,9 @@ async def renderMap(self):
             txt = OnscreenText(parent = aspect2d, pos = (0, 0), style = 3,
                                font = ToontownGlobals.getSignFont(),
                                wordwrap = 36,
-                               text = "Unable to resize screen. Render aborted.\nEnsure engine window is not maximized, as that prevents resizing\n\nPress SPACE to acknowledge.",
+                               text = "Unable to resize screen. Render aborted.\n"
+                                      "Ensure engine window is not maximized, as that prevents resizing\n\n"
+                                      "Press SPACE to acknowledge.",
                                scale = 0.1, bg = (0, 0, 0, .4), fg = (1, 0, 0, 1))
 
             # Destroy the message when the user hits space

ttle.py

@@ -130,7 +130,7 @@ def __init__(self):
             loop.run_until_complete(self.__checkUpdates())
 
         self.__addCullBins()
-        
+
         self.__registerShaders()
 
         # Now we actually start the editor