From 94c1b92776efccef5e7196f90c58816c9b4493da Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 7 Mar 2015 18:31:55 -0600 Subject: [PATCH] gardening stuff --- toontown/catalog/CatalogGenerator.py | 2 +- toontown/estate/DistributedHouseDoor.py | 3 +++ toontown/estate/EstateManagerAI.py | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/toontown/catalog/CatalogGenerator.py b/toontown/catalog/CatalogGenerator.py index e8298940..e4a3b688 100644 --- a/toontown/catalog/CatalogGenerator.py +++ b/toontown/catalog/CatalogGenerator.py @@ -512,7 +512,7 @@ MonthlySchedule = ((7, CatalogGardenItem(104, 1), CatalogToonStatueItem(105, endPoseIndex=108), #CatalogRentalItem(1, 2880, 1000), # TODO - #CatalogGardenStarterItem(), # TODO + CatalogGardenStarterItem(), # TODO CatalogNametagItem(100), CatalogNametagItem(0), CatalogClothingItem(1608, 0, 0), diff --git a/toontown/estate/DistributedHouseDoor.py b/toontown/estate/DistributedHouseDoor.py index 28233614..9507e32c 100644 --- a/toontown/estate/DistributedHouseDoor.py +++ b/toontown/estate/DistributedHouseDoor.py @@ -12,6 +12,7 @@ from toontown.hood import ZoneUtil from toontown.suit import Suit from toontown.building import FADoorCodes from toontown.building import DoorTypes +from toontown.estate.DistributedHouse import DistributedHouse class DistributedHouseDoor(DistributedDoor.DistributedDoor): @@ -36,6 +37,8 @@ class DistributedHouseDoor(DistributedDoor.DistributedDoor): DistributedObject.DistributedObject.announceGenerate(self) if self.doorType == DoorTypes.EXT_STANDARD: house = base.cr.doId2do.get(self.houseId) + if not isinstance(house, DistributedHouse): + self.notify.error('tried to use {0} as house'.format(house.__class__.__name__)) if house and house.house_loaded: self.__gotRelatedHouse() else: diff --git a/toontown/estate/EstateManagerAI.py b/toontown/estate/EstateManagerAI.py index b682f3e4..da5a4a01 100644 --- a/toontown/estate/EstateManagerAI.py +++ b/toontown/estate/EstateManagerAI.py @@ -403,4 +403,5 @@ class EstateManagerAI(DistributedObjectAI): pass def _lookupEstate(self, toon): + print(self.toon2estate) return self.toon2estate.get(toon)