Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gardening stuff

Browse source
This commit is contained in:
Zach 2015-03-07 18:31:55 -06:00
parent fd9c3c945b
commit 94c1b92776
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/catalog/CatalogGenerator.py
View file

@ -512,7 +512,7 @@ MonthlySchedule = ((7,
CatalogGardenItem(104, 1), CatalogGardenItem(104, 1),
CatalogToonStatueItem(105, endPoseIndex=108), CatalogToonStatueItem(105, endPoseIndex=108),
#CatalogRentalItem(1, 2880, 1000), # TODO #CatalogRentalItem(1, 2880, 1000), # TODO
#CatalogGardenStarterItem(), # TODO CatalogGardenStarterItem(), # TODO
CatalogNametagItem(100), CatalogNametagItem(100),
CatalogNametagItem(0), CatalogNametagItem(0),
CatalogClothingItem(1608, 0, 0), CatalogClothingItem(1608, 0, 0),

3
toontown/estate/DistributedHouseDoor.py
View file

@ -12,6 +12,7 @@ from toontown.hood import ZoneUtil
from toontown.suit import Suit from toontown.suit import Suit
from toontown.building import FADoorCodes from toontown.building import FADoorCodes
from toontown.building import DoorTypes from toontown.building import DoorTypes
from toontown.estate.DistributedHouse import DistributedHouse
class DistributedHouseDoor(DistributedDoor.DistributedDoor): class DistributedHouseDoor(DistributedDoor.DistributedDoor):
@ -36,6 +37,8 @@ class DistributedHouseDoor(DistributedDoor.DistributedDoor):
DistributedObject.DistributedObject.announceGenerate(self) DistributedObject.DistributedObject.announceGenerate(self)
if self.doorType == DoorTypes.EXT_STANDARD: if self.doorType == DoorTypes.EXT_STANDARD:
house = base.cr.doId2do.get(self.houseId) 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: if house and house.house_loaded:
self.__gotRelatedHouse() self.__gotRelatedHouse()
else: else:

1
toontown/estate/EstateManagerAI.py
View file

@ -403,4 +403,5 @@ class EstateManagerAI(DistributedObjectAI):
pass pass
def _lookupEstate(self, toon): def _lookupEstate(self, toon):
print(self.toon2estate)
return self.toon2estate.get(toon) return self.toon2estate.get(toon)