From 556db6b6b63aa58d77b34d0300c8f9123ebd6626 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 12 Mar 2015 21:12:43 -0500 Subject: [PATCH] gardens generate correctly :) --- toontown/estate/DistributedEstateAI.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/toontown/estate/DistributedEstateAI.py b/toontown/estate/DistributedEstateAI.py index 18231b32..5f866a9a 100644 --- a/toontown/estate/DistributedEstateAI.py +++ b/toontown/estate/DistributedEstateAI.py @@ -1,5 +1,7 @@ from direct.directnotify import DirectNotifyGlobal from direct.distributed.DistributedObjectAI import DistributedObjectAI +from direct.distributed.PyDatagramIterator import * +from direct.distributed.PyDatagram import * from toontown.toonbase import ToontownGlobals import HouseGlobals import time @@ -235,7 +237,7 @@ class DistributedEstateAI(DistributedObjectAI): self.dawnTime = 0 self.lastEpochTimestamp = 0 self.rentalTimestamp = 0 - self.houses = [None] * 6 + self.houses = [None, None, None, None, None, None] self.rentalType = 0 self.rentalHandle = None self.pond = None @@ -259,7 +261,6 @@ class DistributedEstateAI(DistributedObjectAI): target.generateWithRequired(self.zoneId) self.targets.append(target) - spot = DistributedFishingSpotAI(self.air) spot.setPondDoId(self.pond.getDoId()) spot.setPosHpr(49.1029, -124.805, 0.344704, 90, 0, 0) @@ -292,8 +293,8 @@ class DistributedEstateAI(DistributedObjectAI): started = garden[0] if started: self.gardenManager.handleSingleGarden(self.toons[index], garden[1:]) + self.placeStarterGarden(self.toons[index]) self.__pendingGardens = {} - self.placeStarterGarden(100000001) #temporary def destroy(self): for house in self.houses: @@ -377,7 +378,7 @@ class DistributedEstateAI(DistributedObjectAI): def getDecorData(self): return self.decorData - def setLastEpochTimeStamp(self, last): #how do I do this + def setLastEpochTimeStamp(self, last): self.lastEpochTimestamp = last def d_setLastEpochTimeStamp(self, last): @@ -696,7 +697,6 @@ class DistributedEstateAI(DistributedObjectAI): av = self.air.doId2do.get(avId) if not av: return - av.b_setGardenStarted(1) self.notify.info('placeStarterGarden %d' % avId) self.gardenManager.placeGarden(avId) self.d_updateGarden()