diff --git a/config/release/dev.prc b/config/release/dev.prc index 1edcfa76..11a7c24d 100644 --- a/config/release/dev.prc +++ b/config/release/dev.prc @@ -29,6 +29,7 @@ want-game-tables #t want-find-four #t want-chinese-checkers #t want-checkers #t +want-house-types #t # Chat: want-whitelist #f diff --git a/toontown/catalog/CatalogHouseItem.py b/toontown/catalog/CatalogHouseItem.py index 2dbd8bb6..fe1d3faa 100644 --- a/toontown/catalog/CatalogHouseItem.py +++ b/toontown/catalog/CatalogHouseItem.py @@ -40,6 +40,9 @@ class CatalogHouseItem(CatalogItem.CatalogItem): def getName(self): return TTLocalizer.HouseNames[self.houseId] + + def getDeliveryTime(self): + return 0 def getEmblemPrices(self): return HouseGlobals.HouseEmblemPrices[self.houseId] @@ -66,4 +69,4 @@ class CatalogHouseItem(CatalogItem.CatalogItem): def getAllHouses(): return [CatalogHouseItem(i) for i in xrange(6)] - \ No newline at end of file + diff --git a/toontown/catalog/CatalogScreen.py b/toontown/catalog/CatalogScreen.py index 1c40f137..cf5d9f45 100644 --- a/toontown/catalog/CatalogScreen.py +++ b/toontown/catalog/CatalogScreen.py @@ -644,7 +644,7 @@ class CatalogScreen(DirectFrame): if item.loyaltyRequirement() != 0: self.loyaltyPanelList.append(CatalogItemPanel.CatalogItemPanel(parent=hidden, item=item, type=CatalogItem.CatalogTypeLoyalty, parentCatalogScreen=self)) elif item.getEmblemPrices(): - self.emblemPanelList.append(CatalogItemPanel.CatalogItemPanel(parent=hidden, item=item, type=CatalogItem.CatalogTypeBackOrder, parentCatalogScreen=self)) + self.emblemPanelList.append(CatalogItemPanel.CatalogItemPanel(parent=hidden, item=item, type=CatalogItem.CatalogTypeBackorder, parentCatalogScreen=self)) else: self.backPanelList.append(CatalogItemPanel.CatalogItemPanel(parent=hidden, item=item, type=CatalogItem.CatalogTypeBackorder, parentCatalogScreen=self)) diff --git a/toontown/toon/LocalToon.py b/toontown/toon/LocalToon.py index c2c1e2d3..baee8074 100644 --- a/toontown/toon/LocalToon.py +++ b/toontown/toon/LocalToon.py @@ -162,6 +162,7 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): self.oldPos = None self.questMap = None self.prevToonIdx = 0 + self.houseType = 0 def setDNA(self, dna): base.localAvatarStyle = dna