diff --git a/toontown/estate/DistributedEstateAI.py b/toontown/estate/DistributedEstateAI.py index 213a080c..cf36b456 100644 --- a/toontown/estate/DistributedEstateAI.py +++ b/toontown/estate/DistributedEstateAI.py @@ -110,7 +110,7 @@ class Garden: box.setPos(x, y, 0) box.setH(h) box.setOwnerIndex(houseIndex) - box.generate()#WithRequired(estateMgr.zoneId) + box.generateWithRequired(estateMgr.zoneId) self.objects.append(box) plots = GardenGlobals.estatePlots[houseIndex] @@ -127,7 +127,7 @@ class Garden: tree.setWaterLevel(waterLevel) tree.setGrowthLevel(growthLevel) tree.calculate(nextGrowth, nextLevelDecrease) - tree.generate()#WithRequired(estateMgr.zoneId) + tree.generateWithRequired(estateMgr.zoneId) self.trees.append(tree) class GardenManager: diff --git a/toontown/estate/DistributedGagTreeAI.py b/toontown/estate/DistributedGagTreeAI.py index c6679489..1873bcaf 100644 --- a/toontown/estate/DistributedGagTreeAI.py +++ b/toontown/estate/DistributedGagTreeAI.py @@ -1,33 +1,12 @@ from direct.directnotify import DirectNotifyGlobal from toontown.estate.DistributedPlantBaseAI import DistributedPlantBaseAI -import GardenGlobals class DistributedGagTreeAI(DistributedPlantBaseAI): notify = DirectNotifyGlobal.directNotify.newCategory("DistributedGagTreeAI") - def __init__(self, air): - DistributedPlantBaseAI.__init__(self, air) - self.setTypeIndex(GardenGlobals.GAG_TREE_TYPE) - self.wilted = 0 - - def setWilted(self, wilted): - self.wilted = wilted - - def d_setWilted(self, wilted): - self.sendUpdate("setWilted", [wilted]) - - def b_setWilted(self, wilted): - self.setWilted(wilted) - self.d_setWilted(wilted) - - def getWilted(self): - return self.wilted - - def calculate(self, nextGrowth, nextLevelDecrease): - now = time.time() - while nextLevelDecrease < now: - nextLevelDecrease += 3893475798397 # to do - self.b_setWaterLevel(max(-1, self.waterLevel - 1)) + def setWilted(self, todo0): + pass def requestHarvest(self): pass +