Skip to content

Commit 7847717

Browse files
committed
adjustments to naming scheme
1 parent 5bd1936 commit 7847717

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

toontown/leveleditor/LevelEditor.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,9 +1525,9 @@ def createNewGroup(self, type = 'dna'):
15251525
print("createNewGroup")
15261526
""" Create a new DNA Node group under the active parent """
15271527
if type == 'dna':
1528-
newDNANode = DNAGroup('GROUP.' + repr(self.getGroupNum()))
1528+
newDNANode = DNAGroup('grp.' + repr(self.getGroupNum()))
15291529
else:
1530-
newDNANode = DNAVisGroup('VIS.' + repr(self.getGroupNum()))
1530+
newDNANode = DNAVisGroup('grp.' + repr(self.getGroupNum()))
15311531
# Increment group counter
15321532
self.setGroupNum(self.getGroupNum() + 1)
15331533
# Add new DNA Node group to the current parent DNA Object
@@ -1544,7 +1544,7 @@ def createNewGroup(self, type = 'dna'):
15441544
def addFlatBuilding(self, buildingType):
15451545
# Create new building
15461546
newDNAFlatBuilding = DNAFlatBuilding()
1547-
self.setRandomBuildingStyle(newDNAFlatBuilding, name = f'tb0:FLAT_DNARoot')
1547+
self.setRandomBuildingStyle(newDNAFlatBuilding, name = f'tb0:flat_DNARoot')
15481548
# Now place new building in the world
15491549
self.initDNANode(newDNAFlatBuilding)
15501550

@@ -1589,8 +1589,7 @@ def addAnimBuilding(self, animBuildingType):
15891589
# Record new anim building type
15901590
self.setCurrent('anim_building_texture', animBuildingType)
15911591
block = self.getNextLandmarkBlock()
1592-
simpleName = re.sub(r'phase_\d_models_char__', '', animBuildingType).replace('animated_building_', '').upper()
1593-
newDNAAnimBuilding = DNAAnimBuilding(f"tb{block}:ALND.{simpleName}_DNARoot")
1592+
newDNAAnimBuilding = DNAAnimBuilding(f"tb{block}:{animBuildingType}_DNARoot")
15941593
newDNAAnimBuilding.setCode(animBuildingType)
15951594
newDNAAnimBuilding.setPos(VBase3(0))
15961595
newDNAAnimBuilding.setHpr(VBase3(0))
@@ -1602,7 +1601,7 @@ def addProp(self, propType):
16021601
print("addProp %s " % propType)
16031602
# Record new prop type
16041603
self.setCurrent('prop_texture', propType)
1605-
newDNAProp = DNAProp(f"PROP.{propType.upper()}_DNARoot")
1604+
newDNAProp = DNAProp(f"prop.{propType.lower()}_DNARoot")
16061605
newDNAProp.setCode(propType)
16071606
newDNAProp.setPos(VBase3(0))
16081607
newDNAProp.setHpr(VBase3(0))
@@ -1634,7 +1633,7 @@ def addInteractiveProp(self, interactivePropType):
16341633
def addStreet(self, streetType):
16351634
# Record new street type
16361635
self.setCurrent('street_texture', streetType)
1637-
newDNAStreet = DNAStreet(f"STR.{streetType.replace('street_', '').upper()}_DNARoot")
1636+
newDNAStreet = DNAStreet(f"str.{streetType.replace('street_', '').lower()}_DNARoot")
16381637
newDNAStreet.setCode(streetType)
16391638
newDNAStreet.setPos(VBase3(0))
16401639
newDNAStreet.setHpr(VBase3(0))

0 commit comments

Comments
 (0)