diff --git a/toontown/building/DistributedBuilding.py b/toontown/building/DistributedBuilding.py index f954efe4..f9d0a49d 100755 --- a/toontown/building/DistributedBuilding.py +++ b/toontown/building/DistributedBuilding.py @@ -458,13 +458,13 @@ class DistributedBuilding(DistributedObject.DistributedObject): backgroundNP = loader.loadModel('phase_5/models/modules/suit_sign') backgroundNP.reparentTo(signOrigin) backgroundNP.setPosHprScale(0.0, 0.0, textHeight * 0.8 / zScale, 0.0, 0.0, 0.0, 8.0, 8.0, 8.0 * zScale) - backgroundNP.node().setEffect(DecalEffect.make()) signTextNodePath = backgroundNP.attachNewNode(textNode.generate()) signTextNodePath.setPosHprScale(0.0, 0.0, -0.21 + textHeight * 0.1 / zScale, 0.0, 0.0, 0.0, 0.1, 0.1, 0.1 / zScale) signTextNodePath.setColor(1.0, 1.0, 1.0, 1.0) frontNP = suitBuildingNP.find('**/*_front/+GeomNode;+s') backgroundNP.wrtReparentTo(frontNP) frontNP.node().setEffect(DecalEffect.make()) + signTextNodePath.setAttrib(DepthOffsetAttrib.make(1)) suitBuildingNP.setName('sb' + str(self.block) + ':_landmark__DNARoot') suitBuildingNP.setPosHprScale(nodePath, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0) suitBuildingNP.flattenMedium() diff --git a/toontown/estate/DistributedHouse.py b/toontown/estate/DistributedHouse.py index 2ba6f396..6a8d2b54 100755 --- a/toontown/estate/DistributedHouse.py +++ b/toontown/estate/DistributedHouse.py @@ -115,7 +115,7 @@ class DistributedHouse(DistributedObject.DistributedObject): self.randomGenerator.seed(self.doId) houseColor = HouseGlobals.stairWood color = Vec4(houseColor[0], houseColor[1], houseColor[2], 1) - setupDoor(doorNP, door_origin, door_origin, self.dnaStore, str(self.doId), color) + setupDoor(doorNP, door_origin, door_origin, self.dnaStore, str(self.colorIndex), color) self.__setupNamePlate() self.__setupFloorMat() self.__setupNametag()