Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gardens generate correctly :)

Browse source
This commit is contained in:
Zach 2015-03-12 21:12:43 -05:00
parent 3789e8eba4
commit 556db6b6b6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
toontown/estate/DistributedEstateAI.py
View file

@ -1,5 +1,7 @@
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectAI import DistributedObjectAI from direct.distributed.DistributedObjectAI import DistributedObjectAI
from direct.distributed.PyDatagramIterator import *
from direct.distributed.PyDatagram import *
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
import HouseGlobals import HouseGlobals
import time import time
@ -235,7 +237,7 @@ class DistributedEstateAI(DistributedObjectAI):
self.dawnTime = 0 self.dawnTime = 0
self.lastEpochTimestamp = 0 self.lastEpochTimestamp = 0
self.rentalTimestamp = 0 self.rentalTimestamp = 0
self.houses = [None] * 6 self.houses = [None, None, None, None, None, None]
self.rentalType = 0 self.rentalType = 0
self.rentalHandle = None self.rentalHandle = None
self.pond = None self.pond = None
@ -259,7 +261,6 @@ class DistributedEstateAI(DistributedObjectAI):
target.generateWithRequired(self.zoneId) target.generateWithRequired(self.zoneId)
self.targets.append(target) self.targets.append(target)
spot = DistributedFishingSpotAI(self.air) spot = DistributedFishingSpotAI(self.air)
spot.setPondDoId(self.pond.getDoId()) spot.setPondDoId(self.pond.getDoId())
spot.setPosHpr(49.1029, -124.805, 0.344704, 90, 0, 0) spot.setPosHpr(49.1029, -124.805, 0.344704, 90, 0, 0)
@ -292,8 +293,8 @@ class DistributedEstateAI(DistributedObjectAI):
started = garden[0] started = garden[0]
if started: if started:
self.gardenManager.handleSingleGarden(self.toons[index], garden[1:]) self.gardenManager.handleSingleGarden(self.toons[index], garden[1:])
self.placeStarterGarden(self.toons[index])
self.__pendingGardens = {} self.__pendingGardens = {}
self.placeStarterGarden(100000001) #temporary
def destroy(self): def destroy(self):
for house in self.houses: for house in self.houses:
@ -377,7 +378,7 @@ class DistributedEstateAI(DistributedObjectAI):
def getDecorData(self): def getDecorData(self):
return self.decorData return self.decorData
def setLastEpochTimeStamp(self, last): #how do I do this def setLastEpochTimeStamp(self, last):
self.lastEpochTimestamp = last self.lastEpochTimestamp = last
def d_setLastEpochTimeStamp(self, last): def d_setLastEpochTimeStamp(self, last):
@ -696,7 +697,6 @@ class DistributedEstateAI(DistributedObjectAI):
av = self.air.doId2do.get(avId) av = self.air.doId2do.get(avId)
if not av: if not av:
return return
av.b_setGardenStarted(1)
self.notify.info('placeStarterGarden %d' % avId) self.notify.info('placeStarterGarden %d' % avId)
self.gardenManager.placeGarden(avId) self.gardenManager.placeGarden(avId)
self.d_updateGarden() self.d_updateGarden()