Cleanup toontown/estate

toontown/estate/DistributedAnimatedStatuaryAI.py

@@ -3,4 +3,3 @@ from toontown.estate.DistributedStatuaryAI import DistributedStatuaryAI
 
 class DistributedAnimatedStatuaryAI(DistributedStatuaryAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedAnimatedStatuaryAI")
-

toontown/estate/DistributedCannonAI.py

@@ -16,22 +16,22 @@ class DistributedCannonAI(DistributedObjectAI):
         self.bumperPos = ToontownGlobals.PinballCannonBumperInitialPos
         self.active = 0
         self.avId = 0
-        
+
     def setEstateId(self, estateId):
         self.estateId = estateId
-        
+
     def getEstateId(self):
         return self.estateId
 
     def setTargetId(self, targetId):
         self.targetId = targetId
-        
+
     def getTargetId(self):
         return self.targetId
 
     def setPosHpr(self, x, y, z, h, p, r):
         self.posHpr = (x, y, z, h, p, r)
-    
+
     def getPosHpr(self):
         return self.posHpr
 
@@ -44,12 +44,11 @@ class DistributedCannonAI(DistributedObjectAI):
         av = self.air.doId2do.get(avId)
         if not av:
             return
-            
+
         if not self.avId:
             self.avId = avId
             self.d_setMovie(CannonGlobals.CANNON_MOVIE_LOAD)
             self.acceptOnce(self.air.getAvatarExitEvent(avId), self.__handleUnexpectedExit, extraArgs=[avId])
-            
         else:
             self.air.writeServerEvent('suspicious', avId, 'DistributedCannonAI.requestEnter cannon already occupied')
             self.notify.warning('requestEnter() - cannon already occupied')
@@ -83,7 +82,7 @@ class DistributedCannonAI(DistributedObjectAI):
 
         fireTime = CannonGameGlobals.FUSE_TIME
         self.sendUpdate('setCannonWillFire', [avId, fireTime, zRot, angle, globalClockDelta.getRealNetworkTime()])
-            
+
     def setFired(self):
         pass
 

toontown/estate/DistributedChangingStatuaryAI.py

@@ -6,4 +6,3 @@ class DistributedChangingStatuaryAI(DistributedStatuaryAI):
 
     def setGrowthLevel(self, todo0):
         pass
-

toontown/estate/DistributedEstateAI.py

@@ -25,28 +25,24 @@ class DistributedEstateAI(DistributedObjectAI):
         self.lastEpochTimestamp = 0
         self.rentalTimestamp = 0
         self.houses = [None] * 6
-        
         self.pond = None
         self.spots = []
-        
         self.targets = []
-
         self.owner = None
-        
+
     def generate(self):
         DistributedObjectAI.generate(self)
-        
+
         self.pond = DistributedFishingPondAI(simbase.air)
         self.pond.setArea(ToontownGlobals.MyEstate)
         self.pond.generateWithRequired(self.zoneId)
-            
+
         for i in xrange(FishingTargetGlobals.getNumTargets(ToontownGlobals.MyEstate)):
             target = DistributedFishingTargetAI(self.air)
             target.setPondDoId(self.pond.getDoId())
             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)
@@ -73,7 +69,6 @@ class DistributedEstateAI(DistributedObjectAI):
 
         self.createTreasurePlanner()
 
-
     def destroy(self):
         for house in self.houses:
             if house:
@@ -96,13 +91,13 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def setClientReady(self):
         self.sendUpdate('setEstateReady', [])
-        
+
     def setClosestHouse(self, todo0):
         pass
 
     def setTreasureIds(self, todo0):
         pass
-        
+
     def createTreasurePlanner(self):
         treasureType, healAmount, spawnPoints, spawnRate, maxTreasures = TreasureGlobals.SafeZoneTreasureSpawns[ToontownGlobals.MyEstate]
         self.treasurePlanner = SZTreasurePlannerAI(self.zoneId, treasureType, healAmount, spawnPoints, spawnRate, maxTreasures)
@@ -117,14 +112,14 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def setDawnTime(self, dawnTime):
         self.dawnTime = dawnTime
-        
+
     def d_setDawnTime(self, dawnTime):
         self.sendUpdate('setDawnTime', [dawnTime])
-        
+
     def b_setDawnTime(self, dawnTime):
         self.setDawnTime(dawnTime)
         self.d_setDawnTime(dawnTime)
-        
+
     def getDawnTime(self):
         return self.dawnTime
 
@@ -133,59 +128,59 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def setDecorData(self, decorData):
         self.decorData = decorData
-        
+
     def d_setDecorData(self, decorData):
         self.sendUpdate('setDecorData', [decorData])
-        
+
     def b_setDecorData(self, decorData):
         self.setDecorData(decorData)
         self.d_setDecorData(decorData)
-        
+
     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):
         self.sendUpdate('setLastEpochTimeStamp', [last])
-        
+
     def b_setLastEpochTimeStamp(self, last):
         self.setLastEpochTimeStamp(last)
         self.d_setLastEpochTimeStamp(last)
-        
+
     def getLastEpochTimeStamp(self):
         return self.lastEpochTimestamp
 
     def setRentalTimeStamp(self, rental):
         self.rentalTimestamp = rental
-        
+
     def d_setRentalTimeStamp(self, rental):
         self.sendUpdate('setRentalTimeStamp', [rental])
-        
+
     def b_setRentalTimeStamp(self, rental):
         self.setRentalTimeStamp(self, rental)
         self.b_setRentalTimeStamp(self, rental)
-        
+
     def getRentalTimeStamp(self):
         return self.rentalTimestamp
 
     def setRentalType(self, todo0):
         pass
-        
+
     def getRentalType(self):
         return 0
 
     def setSlot0ToonId(self, id):
         self.toons[0] = id
-        
+
     def d_setSlot0ToonId(self, id):
         self.sendUpdate('setSlot0ToonId', [id])
-        
+
     def b_setSlot0ToonId(self, id):
         self.setSlot0ToonId(id)
         self.d_setSlot0ToonId(id)
-        
+
     def getSlot0ToonId(self):
         return self.toons[0]
 
@@ -194,37 +189,37 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def d_setSlot0Items(self, items):
         self.sendUpdate('setSlot5Items', [items])
-        
+
     def b_setSlot0Items(self, items):
         self.setSlot0Items(items)
         self.d_setSlot0Items(items)
-        
+
     def getSlot0Items(self):
         return self.items[0]
-        
+
     def setSlot1ToonId(self, id):
         self.toons[1] = id
 
     def d_setSlot1ToonId(self, id):
         self.sendUpdate('setSlot1ToonId', [id])
-        
+
     def b_setSlot1ToonId(self, id):
         self.setSlot1ToonId(id)
         self.d_setSlot1ToonId(id)
-        
+
     def getSlot1ToonId(self):
         return self.toons[1]
-        
+
     def setSlot1Items(self, items):
         self.items[1] = items
-        
+
     def d_setSlot1Items(self, items):
         self.sendUpdate('setSlot2Items', [items])
-        
+
     def b_setSlot1Items(self, items):
         self.setSlot2Items(items)
         self.d_setSlot2Items(items)
-        
+
     def getSlot1Items(self):
         return self.items[1]
 
@@ -233,11 +228,11 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def d_setSlot2ToonId(self, id):
         self.sendUpdate('setSlot2ToonId', [id])
-        
+
     def b_setSlot2ToonId(self, id):
         self.setSlot2ToonId(id)
         self.d_setSlot2ToonId(id)
-        
+
     def getSlot2ToonId(self):
         return self.toons[2]
 
@@ -246,90 +241,89 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def d_setSlot2Items(self, items):
         self.sendUpdate('setSlot2Items', [items])
-        
+
     def b_setSlot2Items(self, items):
         self.setSlot2Items(items)
         self.d_setSlot2Items(items)
-        
+
     def getSlot2Items(self):
         return self.items[2]
 
     def setSlot3ToonId(self, id):
         self.toons[3] = id
-        
+
     def d_setSlot3ToonId(self, id):
         self.sendUpdate('setSlot3ToonId', [id])
-        
+
     def b_setSlot3ToonId(self, id):
         self.setSlot3ToonId(id)
         self.d_setSlot3ToonId(id)
-        
+
     def getSlot3ToonId(self):
         return self.toons[3]
 
     def setSlot3Items(self, items):
         self.items[3] = items
-        
+
     def d_setSlot3Items(self, items):
         self.sendUpdate('setSlot3Items', [items])
-        
+
     def b_setSlot3Items(self, items):
         self.setSlot3Items(items)
         self.d_setSlot3Items(items)
-        
+
     def getSlot3Items(self):
         return self.items[3]
 
     def setSlot4ToonId(self, id):
         self.toons[4] = id
-        
+
     def d_setSlot4ToonId(self, id):
         self.sendUpdate('setSlot4ToonId', [id])
-        
+
     def b_setSlot5ToonId(self, id):
         self.setSlot4ToonId(id)
         self.d_setSlot4ToonId(id)
-        
+
     def getSlot4ToonId(self):
         return self.toons[4]
 
-
     def setSlot4Items(self, items):
         self.items[4] = items
-        
+
     def d_setSlot4Items(self, items):
         self.sendUpdate('setSlot4Items', [items])
-        
+
     def b_setSlot4Items(self, items):
         self.setSlot4Items(items)
         self.d_setSlot4Items(items)
-        
+
     def getSlot4Items(self):
         return self.items[4]
 
     def setSlot5ToonId(self, id):
         self.toons[5] = id
-        
+
     def d_setSlot5ToonId(self, id):
         self.sendUpdate('setSlot5ToonId', [id])
-        
+
     def b_setSlot5ToonId(self, id):
         self.setSlot5ToonId(id)
         self.d_setSlot5ToonId(id)
-        
+
     def getSlot5ToonId(self):
         return self.toons[5]
 
     def setSlot5Items(self, items):
         self.items[5] = items
-        
+
     def d_setSlot5Items(self, items):
         self.sendUpdate('setSlot5Items', [items])
-        
+
     def b_setSlot5Items(self, items):
         self.setSlot5Items(items)
         self.d_setSlot5Items(items)
-        
+
     def getSlot5Items(self):
         return self.items[5]
 
@@ -338,14 +332,14 @@ class DistributedEstateAI(DistributedObjectAI):
             if i >= 6:
                 return
             self.toons[i] = idList[i]
-        
+
     def d_setIdList(self, idList):
         self.sendUpdate('setIdList', [idList])
-    
+
     def b_setIdList(self, idList):
         self.setIdList(idList)
         self.d_setIdLst(idList)
-        
+
     def completeFlowerSale(self, todo0):
         pass
 
@@ -354,14 +348,14 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def setClouds(self, clouds):
         self.cloudType = clouds
-        
+
     def d_setClouds(self, clouds):
         self.sendUpdate('setClouds', [clouds])
-        
+
     def b_setClouds(self, clouds):
         self.setClouds(clouds)
         self.d_setClouds(clouds)
-        
+
     def getClouds(self):
         return self.cloudType
 

toontown/estate/DistributedFireworksCannonAI.py

@@ -18,4 +18,3 @@ class DistributedFireworksCannonAI(DistributedFireworkShowAI):
 
     def setPosition(self, todo0, todo1, todo2):
         pass
-

toontown/estate/DistributedFlowerAI.py

@@ -9,4 +9,3 @@ class DistributedFlowerAI(DistributedPlantBaseAI):
 
     def setVariety(self, todo0):
         pass
-

toontown/estate/DistributedFurnitureItemAI.py

@@ -65,4 +65,4 @@ class DistributedFurnitureItemAI(DistributedSmoothNodeAI):
             return
 
         self.do_deleted = True
-        DistributedSmoothNodeAI.delete(self)
+        DistributedSmoothNodeAI.delete(self)

toontown/estate/DistributedFurnitureManagerAI.py

@@ -416,7 +416,6 @@ class DistributedFurnitureManagerAI(DistributedObjectAI):
     def recoverDeletedItem(self, blob, index):
         pass
 
-
     def handleMessage(self, func, response, *args):
         context = args[-1]
         args = args[:-1]
@@ -565,7 +564,6 @@ def fillAttic():
             fm.saveToHouse()
     return "everything has been moved to the attic"
 
-
 @magicWord(category=CATEGORY_PROGRAMMER, types=[])
 def emptyHouse():
     """

toontown/estate/DistributedGagTreeAI.py

@@ -9,4 +9,3 @@ class DistributedGagTreeAI(DistributedPlantBaseAI):
 
     def requestHarvest(self):
         pass
-

toontown/estate/DistributedGardenAI.py

@@ -6,4 +6,3 @@ class DistributedGardenAI(DistributedObjectAI):
 
     def sendNewProp(self, todo0, todo1, todo2, todo3):
         pass
-

toontown/estate/DistributedGardenBoxAI.py

@@ -6,4 +6,3 @@ class DistributedGardenBoxAI(DistributedLawnDecorAI):
 
     def setTypeIndex(self, todo0):
         pass
-

toontown/estate/DistributedGardenPlotAI.py

@@ -18,4 +18,3 @@ class DistributedGardenPlotAI(DistributedLawnDecorAI):
 
     def plantNothing(self, todo0):
         pass
-

toontown/estate/DistributedHouseAI.py

@@ -63,7 +63,6 @@ class DistributedHouseAI(DistributedObjectAI):
 
         self.sendUpdate('setHouseReady', [])
 
-
     def delete(self):
         self.door.requestDelete()
         self.interiorDoor.requestDelete()
@@ -305,4 +304,4 @@ class DistributedHouseAI(DistributedObjectAI):
         self.interior.furnitureManager.saveToHouse()
         self.atticWallpaper.append(item)
         self.d_setAtticWallpaper(self.atticWallpaper.getBlob())
-        self.interior.furnitureManager.loadFromHouse()
+        self.interior.furnitureManager.loadFromHouse()

toontown/estate/DistributedHouseDoorAI.py

@@ -3,4 +3,3 @@ from toontown.building.DistributedDoorAI import DistributedDoorAI
 
 class DistributedHouseDoorAI(DistributedDoorAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedHouseDoorAI")
-

toontown/estate/DistributedLawnDecorAI.py

@@ -30,4 +30,3 @@ class DistributedLawnDecorAI(DistributedNodeAI):
 
     def interactionDenied(self, todo0):
         pass
-

toontown/estate/DistributedMailboxAI.py

@@ -120,4 +120,4 @@ class DistributedMailboxAI(DistributedObjectAI):
         pass # TODO
 
     def markInviteReadButNotReplied(self, todo0):
-        pass # TODO
+        pass # TODO

toontown/estate/DistributedPhoneAI.py

@@ -113,22 +113,18 @@ class DistributedPhoneAI(DistributedFurnitureItemAI):
                 ep = list(item.getEmblemPrices())
                 if len(ep) != 2:
                     return []
-                
                 if all(ep):
                     ep[payMethod] = 0
-                    
             else:
                 ep = item.getEmblemPrices()
-                
             return ep
-            
+
         def charge():
             ep = _getEmblemPrices()
             if ep:
                 av.subtractEmblems(ep)
-                
             av.takeMoney(item.getPrice(priceType))
-        
+
         if item.getDeliveryTime():
             if len(av.onOrder) > 5:
                 self.sendUpdateToAvatarId(avId, 'requestPurchaseResponse', [context, ToontownGlobals.P_OnOrderListFull])

toontown/estate/DistributedPlantBaseAI.py

@@ -18,4 +18,3 @@ class DistributedPlantBaseAI(DistributedLawnDecorAI):
 
     def waterPlantDone(self):
         pass
-

toontown/estate/DistributedStatuaryAI.py

@@ -12,4 +12,3 @@ class DistributedStatuaryAI(DistributedLawnDecorAI):
 
     def setGrowthLevel(self, todo0):
         pass
-

toontown/estate/DistributedTargetAI.py

@@ -10,23 +10,23 @@ class DistributedTargetAI(DistributedObjectAI):
         self.enabled = 0
         self.highscore = 0
         self.scoreDict = {}
-        
+
         self.__newGame()
-    
+
     def announceGenerate(self):
         DistributedObjectAI.announceGenerate(self)
         taskMgr.doMethodLater(10, self.__startNewGame, self.taskName('newGame'))
-        
+
     def __newGame(self):
         self.power = 1
         self.time = CannonGlobals.CANNON_TIMEOUT
-        
+
     def getPosition(self):
         return (0, 0, 40)
-        
+
     def getState(self):
         return self.enabled, 2**self.power, self.time
-        
+
     def d_updateState(self):
         self.sendUpdate("setState", self.getState())
 
@@ -40,28 +40,28 @@ class DistributedTargetAI(DistributedObjectAI):
             taskMgr.remove(self.taskName('gameover'))
             taskMgr.doMethodLater(self.time, self.__gameOver, self.taskName('gameover'))
             self.d_updateState()
-            
+
     def __gameOver(self, task):
         self.enabled = 0
         self.time = 0
         self.d_updateState()
         taskMgr.doMethodLater(10, self.__startNewGame, self.taskName('newGame'))
-        
+
         for avId in self.scoreDict:
             av = self.air.doId2do.get(avId)
             if av:
                 if av.zoneId == self.zoneId:
                     av.toonUp(2 ** self.power)
-        
+
         return task.done
-        
+
     def __startNewGame(self, task):
         self.enabled = 1
         self.__newGame()
         self.d_updateState()
         taskMgr.doMethodLater(self.time, self.__gameOver, self.taskName('gameover'))
         return task.done
-            
+
     def setBonus(self, bonus):
         pass
 
@@ -69,7 +69,7 @@ class DistributedTargetAI(DistributedObjectAI):
         av = self.air.doId2do.get(avId)
         if not av:
             return
-            
+
         S = score * bonus
         self.scoreDict[avId] = S
         if S > self.highscore:
@@ -83,4 +83,3 @@ class DistributedTargetAI(DistributedObjectAI):
     def delete(self):
         taskMgr.remove(self.taskName('newGame'))
         taskMgr.remove(self.taskName('gameover'))
-

toontown/estate/DistributedToonStatuaryAI.py

@@ -6,4 +6,3 @@ class DistributedToonStatuaryAI(DistributedStatuaryAI):
 
     def setOptional(self, todo0):
         pass
-

toontown/estate/EstateManagerAI.py

@@ -100,7 +100,7 @@ class LoadHouseFSM(FSM):
     def enterOff(self):
         self.done = True
         self.callback(self.house)
-        
+
 class LoadPetFSM(FSM):
     def __init__(self, mgr, estate, toon, callback):
         FSM.__init__(self, 'LoadPetFSM')
@@ -109,7 +109,6 @@ class LoadPetFSM(FSM):
         self.toon = toon
         self.callback = callback
         self.pet = None
-
         self.done = False
 
     def start(self):
@@ -117,7 +116,6 @@ class LoadPetFSM(FSM):
         if not self.petId in self.mgr.air.doId2do:
             self.mgr.air.sendActivate(self.petId, self.mgr.air.districtId, self.estate.zoneId)
             self.acceptOnce('generate-%d' % self.petId, self.__generated)
-            
         else:
             self.__generated(self.mgr.air.doId2do[self.petId])
 
@@ -129,7 +127,7 @@ class LoadPetFSM(FSM):
     def enterOff(self):
         self.done = True
         self.callback(self.pet)
-        
+
 class LoadEstateFSM(FSM):
     def __init__(self, mgr, callback):
         FSM.__init__(self, 'LoadEstateFSM')
@@ -232,7 +230,7 @@ class LoadEstateFSM(FSM):
     def __gotEstate(self, estate):
         self.estate = estate
         self.estate.pets = []
-        
+
         self.estate.toons = self.toonIds
         self.estate.updateToons()
 
@@ -261,7 +259,7 @@ class LoadEstateFSM(FSM):
         # A houseFSM just finished! Let's see if all of them are done:
         if all(houseFSM.done for houseFSM in self.houseFSMs):
             self.demand('LoadPets')
-            
+
     def enterLoadPets(self):
         self.petFSMs = []
         for houseIndex in range(6):
@@ -272,17 +270,17 @@ class LoadEstateFSM(FSM):
                 fsm.start()
             else:
                 continue
-        
+
         if not self.petFSMs:
             self.demand('Finished')
-            
+
     def __petDone(self, pet):
         if self.state != 'LoadPets':
             pet.requestDelete()
             return
 
         if all(petFSM.done for petFSM in self.petFSMs):
-            self.demand('Finished')            
+            self.demand('Finished')
 
     def enterFinished(self):
         self.callback(True)
@@ -457,6 +455,6 @@ class EstateManagerAI(DistributedObjectAI):
 
     def _lookupEstate(self, toon):
         return self.toon2estate.get(toon)
-        
+
     def getOwnerFromZone(self, avId):
-        return False
+        return False