diff --git a/toontown/estate/DistributedEstateAI.py b/toontown/estate/DistributedEstateAI.py index f4f8176e..dfaf0f25 100755 --- a/toontown/estate/DistributedEstateAI.py +++ b/toontown/estate/DistributedEstateAI.py @@ -673,7 +673,16 @@ class DistributedEstateAI(DistributedObjectAI): def rentItem(self, rentType, duration): self.b_setRentalTimeStamp(time.time() + duration * 60) self.b_setRentalType(rentType) - + + def updateToons(self): + self.d_setSlot0ToonId(self.toons[0]) + self.d_setSlot1ToonId(self.toons[1]) + self.d_setSlot2ToonId(self.toons[2]) + self.d_setSlot3ToonId(self.toons[3]) + self.d_setSlot4ToonId(self.toons[4]) + self.d_setSlot5ToonId(self.toons[5]) + self.sendUpdate('setIdList', [self.toons]) + def setSlot0ToonId(self, id): self.toons[0] = id diff --git a/toontown/estate/DistributedGardenPlotAI.py b/toontown/estate/DistributedGardenPlotAI.py index 9f0ff7f1..648f9b38 100755 --- a/toontown/estate/DistributedGardenPlotAI.py +++ b/toontown/estate/DistributedGardenPlotAI.py @@ -232,12 +232,6 @@ def satanFlowerAll(species=49, variety=0): i += 1 - def troll(task): - channel = invoker.GetPuppetConnectionChannel(invoker.doId) - av.air.sendSysMsg('OMG YOU SOLD YOUR SOUL NOOOOOOOOOOOOOOOOOOOO', channel) - return task.done - - taskMgr.doMethodLater(6.66, troll, 'satan-troll') return '%d disgusting flowers planted' % i @magicWord(category=CATEGORY_PROGRAMMER) diff --git a/toontown/estate/EstateManagerAI.py b/toontown/estate/EstateManagerAI.py index 0347c903..709aa872 100755 --- a/toontown/estate/EstateManagerAI.py +++ b/toontown/estate/EstateManagerAI.py @@ -239,7 +239,7 @@ class LoadEstateFSM(FSM): estate.pets = [] self.estate.toons = self.toonIds - #self.estate.updateToons() + self.estate.updateToons() # Gotcha! Now we need to load houses: self.demand('LoadHouses')