yay repo cleanup

dev/tools/rpc/generate_key.py

@@ -32,7 +32,3 @@ print 'Encrypted string:', encoded
 # decode the encoded string
 decoded = DecodeAES(cipher, encoded)
 print 'Decrypted string:', decoded
-        
-
-
-

dev/tools/rpc/rpc-invasions.py

@@ -29,50 +29,50 @@ def generate_token(accessLevel):
 
 random.seed()
 while True:
-  try:
+    try:
-    res = client.ping(generate_token(700), 12345)
+        res = client.ping(generate_token(700), 12345)
-    if res != 12345:
+        if res != 12345:
-      print "Is the server accessable?\n"
+            print "Is the server accessable?\n"
-      exit
+            exit
 
-    # How many times a day is this script going to be called?
+        # How many times a day is this script going to be called?
-    ChecksPerDay = 60.0*24.0    # Once a minute
+        ChecksPerDay = 60.0*24.0    # Once a minute
-    InvasionsPerDay = 72.0      # How many invasions a day per district
+        InvasionsPerDay = 72.0      # How many invasions a day per district
-    BaseInvasionChance = InvasionsPerDay/ChecksPerDay
+        BaseInvasionChance = InvasionsPerDay/ChecksPerDay
 
-    safeHarbor = {'Wacky Falls'}
+        safeHarbor = {'Wacky Falls'}
-    superDistricts = {'Nuttyboro'}
+        superDistricts = {'Nuttyboro'}
 
 
-    while True:
+        while True:
-      shards = client.listShards(generate_token(700))
+            shards = client.listShards(generate_token(700))
-      print shards
+            print shards
-      count = 0
+            count = 0
-      for skey in shards:
+            for skey in shards:
-        shard = shards[skey]
+                shard = shards[skey]
-        if shard['invasion'] != None:
+                if shard['invasion'] != None:
-          count = count + 1
+                    count = count + 1
-      for skey in shards:
+            for skey in shards:
-        shard = shards[skey]
+                shard = shards[skey]
-        if shard['invasion'] == None:
+                if shard['invasion'] == None:
-          if shard['name'] in superDistricts:
+                    if shard['name'] in superDistricts:
-            typ = int(float(random.random()) * 4.0)
+                        typ = int(float(random.random()) * 4.0)
-            suit = int(float(random.random()) * 4.0) + 4  # Bias the cogs to be big
+                        suit = int(float(random.random()) * 4.0) + 4  # Bias the cogs to be big
-            client.startInvasion(generate_token(700), int(skey), typ, suit, 0, 0)
+                        client.startInvasion(generate_token(700), int(skey), typ, suit, 0, 0)
-            count = count + 1
+                        count = count + 1
-            print 'Calling invasion for %s with %d,%d'%(shard['name'],typ,suit)
+                        print 'Calling invasion for %s with %d,%d'%(shard['name'],typ,suit)
-      if count < 3:
+            if count < 3:
-        for skey in shards:
+                for skey in shards:
-          shard = shards[skey]
+                    shard = shards[skey]
-          if shard['invasion'] == None and not shard['name'] in safeHarbor:
+                    if shard['invasion'] == None and not shard['name'] in safeHarbor:
-            r = random.random()
+                        r = random.random()
-            if r < BaseInvasionChance and not shard['name'] in superDistricts:
+                        if r < BaseInvasionChance and not shard['name'] in superDistricts:
-              typ = int(float(random.random()) * 4.0)
+                            typ = int(float(random.random()) * 4.0)
-              suit = int(float(random.random()) * 8.0)
+                            suit = int(float(random.random()) * 8.0)
-              client.startInvasion(generate_token(700), int(skey), typ, suit, 0, 0)
+                            client.startInvasion(generate_token(700), int(skey), typ, suit, 0, 0)
-              print 'Calling invasion for %s with %d,%d'%(shard['name'],typ,suit)
+                            print 'Calling invasion for %s with %d,%d'%(shard['name'],typ,suit)
-      print "tick..(was %d)\n"%(count)
+            print "tick..(was %d)\n"%(count)
-      time.sleep(60)
+            time.sleep(60)
-  except Exception, e:
+    except Exception, e:
-    print e
+        print e
-  time.sleep(300)
+    time.sleep(300)

otp/ai/MagicWordManagerAI.py

@@ -62,15 +62,14 @@ def words():
     accessLevel = spellbook.getInvoker().getAdminAccess()
     wordString = None
     for key in spellbook.words:
-       word = spellbook.words.get(key)
+        word = spellbook.words.get(key)
-       if word.access <= accessLevel:
+        if word.access <= accessLevel:
-           if wordString is None:
+            if wordString is None:
-               wordString = key
+                wordString = key
-           else:
+            else:
-               wordString += ", ";
+                wordString += ", ";
-               wordString += key;
+                wordString += key;
     if wordString is None:
         return "You are chopped liver"
     else:
         return wordString
-            

otp/distributed/AccountAI.py

@@ -3,4 +3,3 @@ from direct.distributed.DistributedObjectAI import DistributedObjectAI
 
 class AccountAI(DistributedObjectAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("AccountAI")
-

otp/distributed/AccountUD.py

@@ -3,4 +3,3 @@ from direct.distributed.DistributedObjectUD import DistributedObjectUD
 
 class AccountUD(DistributedObjectUD):
     notify = DirectNotifyGlobal.directNotify.newCategory("AccountUD")
-

otp/distributed/DistributedDistrictUD.py

@@ -9,4 +9,3 @@ class DistributedDistrictUD(DistributedObjectUD):
 
     def setAvailable(self, todo0):
         pass
-

otp/level/DistributedInteractiveEntityAI.py

@@ -21,4 +21,3 @@ class DistributedInteractiveEntityAI(DistributedEntityAI):
 
     def setState(self, todo0, todo1):
         pass
-

toontown/ai/HalloweenHolidayDecorator.py

@@ -37,7 +37,7 @@ class HalloweenHolidayDecorator(HolidayDecorator.HolidayDecorator):
             base.cr.playGame.getPlace().loader.hood.loader and
             hasattr(base.cr.playGame.getPlace().loader.hood.loader, 'geom') and
             base.cr.playGame.getPlace().loader.hood.loader.geom):
-                return True
+            return True
         else:
             if hasattr(base.cr.playGame, 'getPlace') and base.cr.playGame.getPlace():
                 self.notify.debug('Failed Hood Check %s' % base.cr.playGame.getPlace())

toontown/battle/ParticleDefs.py

@@ -4902,5 +4902,3 @@ def bossCogFrontAttack(self):
     force0.setActive(1)
     f0.addForce(force0)
     self.addForceGroup(f0)
-
-

toontown/building/DistributedCJElevatorAI.py

@@ -7,4 +7,3 @@ class DistributedCJElevatorAI(DistributedBossElevatorAI.DistributedBossElevatorA
         DistributedBossElevatorAI.DistributedBossElevatorAI.__init__(self, air, bldg, zone, antiShuffle=antiShuffle, minLaff=minLaff)
         self.type = ELEVATOR_CJ
         self.countdownTime = ElevatorData[self.type]['countdown']
-

toontown/building/DistributedToonHallInterior.py

@@ -95,7 +95,7 @@ class DistributedToonHallInterior(DistributedToonInterior):
 
     def stopSillyMeter(self):
         if hasattr(self, 'phase') and hasattr(self, 'exitPhase%s' % self.phase):
-                getattr(self, 'exitPhase%s' % self.phase)()
+            getattr(self, 'exitPhase%s' % self.phase)()
 
     def enterPhase0(self):
         self.animSeq = Parallel(ActorInterval(self.sillyMeter, 'arrowTube', partName='arrow', duration=604800, constrainedLoop=1, startFrame=1, endFrame=30), Sequence(Func(self.phase1Sfx.play), Func(self.audio3d.attachSoundToObject, self.phase1Sfx, self.sillyMeter)))

toontown/catalog/CatalogHouseItem.py

@@ -69,4 +69,3 @@ class CatalogHouseItem(CatalogItem.CatalogItem):
 
 def getAllHouses():
     return [CatalogHouseItem(i) for i in xrange(6)]
-    

toontown/catalog/CatalogManagerAI.py

@@ -25,4 +25,3 @@ class CatalogManagerAI(DistributedObjectAI):
         av.b_setCatalog(monthlyCatalog, weeklyCatalog, backCatalog)
         av.b_setCatalogSchedule(newWeek, int((time.time() + 604800)/60))
         av.b_setCatalogNotify(ToontownGlobals.NewItems, av.mailboxNotify)
-

toontown/catalog/CatalogSurfaceItem.py

@@ -32,4 +32,3 @@ class CatalogSurfaceItem(CatalogAtticItem.CatalogAtticItem):
 
     def getDeliveryTime(self):
         return 1
- 

toontown/coghq/DistributedSellbotHQDoorAI.py

@@ -6,4 +6,3 @@ class DistributedSellbotHQDoorAI(DistributedCogHQDoorAI):
 
     def informPlayer(self, todo0):
         pass
-

toontown/coghq/LaserGameAvoid.py

@@ -79,5 +79,3 @@ class LaserGameAvoid(LaserGameBase.LaserGameBase):
             self.funcSendGrid()
 
         return Task.done
-
-

toontown/coghq/LaserGameBase.py

@@ -65,5 +65,3 @@ class LaserGameBase:
 
     def checkForWin(self):
         return 0
-
-

toontown/coghq/LaserGameMineSweeper.py

@@ -167,5 +167,3 @@ class LaserGameMineSweeper(LaserGameBase.LaserGameBase):
 
 
         return sum
-
-

toontown/coghq/LaserGameRoll.py

@@ -73,5 +73,3 @@ class LaserGameRoll(LaserGameBase.LaserGameBase):
             return 0
         else:
             return 1
-
-

toontown/coghq/LawOfficeLayout.py

@@ -41,5 +41,3 @@ class LawOfficeLayout:
 
     def getFloorIds(self):
         return self.floorIds
-
-

toontown/distributed/DistributedTimerAI.py

@@ -15,4 +15,3 @@ class DistributedTimerAI(DistributedObjectAI):
 
     def getStartTime(self):
         return self.startTime
-

toontown/estate/DistributedClosetAI.py

@@ -126,8 +126,8 @@ class DistributedClosetAI(DistributedFurnitureItemAI):
         if not finished:
             testDna.makeFromNetString(dnaString)
             if not self.__checkValidDNAChange(av, testDna):
-                    self.air.writeServerEvent('suspicious', avId, 'Tried to change their DNA temporarily!')
+                self.air.writeServerEvent('suspicious', avId, 'Tried to change their DNA temporarily!')
-                    return
+                return
             self.sendUpdate('setCustomerDNA', [avId, dnaString])
             return
         elif finished == 1:
@@ -159,12 +159,12 @@ class DistributedClosetAI(DistributedFurnitureItemAI):
                     self.customerDNA.botTex = testDna.botTex
                     self.customerDNA.botTexColor = testDna.botTexColor
                     if self.customerDNA.torso != testDna.torso:
-                            if self.customerDNA.gender == 'm':
+                        if self.customerDNA.gender == 'm':
-                                self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
+                            self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
-                                return
+                            return
-                            elif self.customerDNA.torso[0] != testDna.torso[0]:
+                        elif self.customerDNA.torso[0] != testDna.torso[0]:
-                                self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
+                            self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
-                                return
+                            return
                     self.customerDNA.torso = testDna.torso
                 else:
                     self.air.writeServerEvent('suspicious', avId, 'Tried to set their shorts to a pair they don\'t own!')

toontown/estate/DistributedPhoneAI.py

@@ -61,11 +61,11 @@ class DistributedPhoneAI(DistributedFurnitureItemAI):
         av.b_setCatalogNotify(ToontownGlobals.NoItems, av.mailboxNotify)
 
     def __gotHouse(self, dclass, fields):
-            if dclass != self.air.dclassesByName['DistributedHouseAI']:
+        if dclass != self.air.dclassesByName['DistributedHouseAI']:
-                return
+            return
 
-            numItems = len(CatalogItemList(fields['setInteriorItems'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setAtticItems'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setAtticWallpaper'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setAtticWindows'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setInteriorWallpaper'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setInteriorWindows'][0], store=CatalogItem.Customization))
+        numItems = len(CatalogItemList(fields['setInteriorItems'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setAtticItems'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setAtticWallpaper'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setAtticWindows'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setInteriorWallpaper'][0], store=CatalogItem.Customization)) + len(CatalogItemList(fields['setInteriorWindows'][0], store=CatalogItem.Customization))
-            self.sendUpdateToAvatarId(fields['setAvatarId'][0], 'setLimits', [numItems])
+        self.sendUpdateToAvatarId(fields['setAvatarId'][0], 'setLimits', [numItems])
 
     def avatarExit(self):
         avId = self.air.getAvatarIdFromSender()
@@ -129,7 +129,7 @@ class DistributedPhoneAI(DistributedFurnitureItemAI):
 
             resp = item.recordPurchase(av, optional)
             if resp < 0:
-                    av.addMoney(price)
+                av.addMoney(price)
 
             self.sendUpdateToAvatarId(avId, 'requestPurchaseResponse', [context, resp])
             taskMgr.doMethodLater(0.2, self.sendUpdateToAvatarId, 'purchaseItemComplete-%d' % self.getDoId(), extraArgs=[avId, 'purchaseItemComplete', []])

toontown/estate/GardenDropGame.py

@@ -425,7 +425,7 @@ class GardenDropGame:
 
     def __run(self, Task):
         if self.lastTime == None:
-             self.lastTime = globalClock.getRealTime()
+            self.lastTime = globalClock.getRealTime()
 
         timeDelta = 0.0265
         self.lastTime = globalClock.getRealTime()

toontown/estate/TrunkGUI.py

@@ -254,17 +254,17 @@ class TrunkGUI(StateData.StateData):
         self.shoesChoice = 0
 
         if (self.toon.hat[0] != 0 or self.toon.hat[1] != 0 or self.toon.hat[2] != 0):
-              self.hatChoice = 1
+            self.hatChoice = 1
-              self.hats.append((self.toon.hat[0], self.toon.hat[1], self.toon.hat[2]))
+            self.hats.append((self.toon.hat[0], self.toon.hat[1], self.toon.hat[2]))
         if (self.toon.glasses[0] != 0 or self.toon.glasses[1] != 0 or self.toon.glasses[2] != 0):
-              self.glassesChoice = 1
+            self.glassesChoice = 1
-              self.glasses.append((self.toon.glasses[0], self.toon.glasses[1], self.toon.glasses[2]))
+            self.glasses.append((self.toon.glasses[0], self.toon.glasses[1], self.toon.glasses[2]))
         if (self.toon.backpack[0] != 0 or self.toon.backpack[1] != 0 or self.toon.backpack[2] != 0):
-              self.backpackChoice = 1
+            self.backpackChoice = 1
-              self.backpacks.append((self.toon.backpack[0], self.toon.backpack[1], self.toon.backpack[2]))
+            self.backpacks.append((self.toon.backpack[0], self.toon.backpack[1], self.toon.backpack[2]))
         if (self.toon.shoes[0] != 0 or self.toon.shoes[1] != 0 or self.toon.shoes[2] != 0):
-              self.shoesChoice = 1
+            self.shoesChoice = 1
-              self.shoes.append((self.toon.shoes[0], self.toon.shoes[1], self.toon.shoes[2]))
+            self.shoes.append((self.toon.shoes[0], self.toon.shoes[1], self.toon.shoes[2]))
 
         i = 0
         while i < len(self.hatList):

toontown/parties/DistributedPartyAI.py

@@ -152,4 +152,3 @@ class DistributedPartyAI(DistributedObjectAI):
             print 'REMOVE FROM PARTTY!'
             self.air.globalPartyMgr.d_toonLeftParty(self.info.get('partyId', 0), avId)
             self.avIdsAtParty.remove(avId)
-

toontown/parties/DistributedPartyActivityAI.py

@@ -78,4 +78,3 @@ class DistributedPartyActivityAI(DistributedObjectAI):
 
     def showJellybeanReward(self, todo0, todo1, todo2):
         pass
-

toontown/parties/DistributedPartyCannonActivityAI.py

@@ -67,4 +67,3 @@ class DistributedPartyCannonActivityAI(DistributedPartyActivityAI):
 
     def updateToonTrajectoryStartVel(self, todo0, todo1, todo2, todo3):
         pass
-

toontown/parties/DistributedPartyCogActivityAI.py

@@ -18,4 +18,3 @@ class DistributedPartyCogActivityAI(DistributedPartyTeamActivityAI):
 
     def setHighScore(self, todo0, todo1):
         pass
-

toontown/parties/DistributedPartyDance20ActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyDanceActivityBaseAI import DistributedPart
 
 class DistributedPartyDance20ActivityAI(DistributedPartyDanceActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyDance20ActivityAI")
-

toontown/parties/DistributedPartyDanceActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyDanceActivityBaseAI import DistributedPart
 
 class DistributedPartyDanceActivityAI(DistributedPartyDanceActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyDanceActivityAI")
-

toontown/parties/DistributedPartyJukebox40ActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyJukeboxActivityBaseAI import DistributedPa
 
 class DistributedPartyJukebox40ActivityAI(DistributedPartyJukeboxActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyJukebox40ActivityAI")
-

toontown/parties/DistributedPartyJukeboxActivityAI.py

@@ -8,4 +8,3 @@ class DistributedPartyJukeboxActivityAI(DistributedPartyJukeboxActivityBaseAI):
     def __init__(self, air, parent, activityTuple):
         DistributedPartyJukeboxActivityBaseAI.__init__(self, air, parent, activityTuple)
         self.music = PartyGlobals.PhaseToMusicData
-

toontown/parties/DistributedPartyTeamActivityAI.py

@@ -33,4 +33,3 @@ class DistributedPartyTeamActivityAI(DistributedPartyActivityAI):
 
     def switchTeamRequestDenied(self, todo0):
         pass
-

toontown/parties/DistributedPartyTrampolineActivityAI.py

@@ -140,6 +140,3 @@ class DistributedPartyTrampolineActivityAI(DistributedPartyActivityAI, FSM):
             self.air.writeServerEvent('suspicious',avId,'Toon tried to verify rules for someone else!')
             return
         self.demand('Active')
-        
-
-

toontown/parties/DistributedPartyTugOfWarActivityAI.py

@@ -18,4 +18,3 @@ class DistributedPartyTugOfWarActivityAI(DistributedPartyTeamActivityAI):
 
     def updateToonPositions(self, todo0):
         pass
-

toontown/parties/DistributedPartyValentineDance20ActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyDanceActivityBaseAI import DistributedPart
 
 class DistributedPartyValentineDance20ActivityAI(DistributedPartyDanceActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyValentineDance20ActivityAI")
-

toontown/parties/DistributedPartyValentineDanceActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyDanceActivityBaseAI import DistributedPart
 
 class DistributedPartyValentineDanceActivityAI(DistributedPartyDanceActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyValentineDanceActivityAI")
-

toontown/parties/DistributedPartyValentineJukebox40ActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyJukeboxActivityBaseAI import DistributedPa
 
 class DistributedPartyValentineJukebox40ActivityAI(DistributedPartyJukeboxActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyValentineJukebox40ActivityAI")
-

toontown/parties/DistributedPartyValentineJukeboxActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyJukeboxActivityBaseAI import DistributedPa
 
 class DistributedPartyValentineJukeboxActivityAI(DistributedPartyJukeboxActivityBaseAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyValentineJukeboxActivityAI")
-

toontown/parties/DistributedPartyValentineTrampolineActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyTrampolineActivityAI import DistributedPar
 
 class DistributedPartyValentineTrampolineActivityAI(DistributedPartyTrampolineActivityAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyValentineTrampolineActivityAI")
-

toontown/parties/DistributedPartyVictoryTrampolineActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyTrampolineActivityAI import DistributedPar
 
 class DistributedPartyVictoryTrampolineActivityAI(DistributedPartyTrampolineActivityAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyVictoryTrampolineActivityAI")
-

toontown/parties/DistributedPartyWinterCatchActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyCatchActivityAI import DistributedPartyCat
 
 class DistributedPartyWinterCatchActivityAI(DistributedPartyCatchActivityAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyWinterCatchActivityAI")
-

toontown/parties/DistributedPartyWinterCogActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyCogActivityAI import DistributedPartyCogAc
 
 class DistributedPartyWinterCogActivityAI(DistributedPartyCogActivityAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyWinterCogActivityAI")
-

toontown/parties/DistributedPartyWinterTrampolineActivityAI.py

@@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyTrampolineActivityAI import DistributedPar
 
 class DistributedPartyWinterTrampolineActivityAI(DistributedPartyTrampolineActivityAI):
     notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyWinterTrampolineActivityAI")
-

toontown/racing/DistributedGagAI.py

@@ -46,4 +46,3 @@ class DistributedGagAI(DistributedObjectAI):
 
     def hitSomebody(self, avId, timestamp):
         self.requestDelete()
-

toontown/racing/DistributedProjectileAI.py

@@ -21,4 +21,3 @@ class DistributedProjectileAI(DistributedObjectAI):
 
     def hitSomebody(self, todo0, todo1):
         pass
-

toontown/racing/DistributedRacePadAI.py

@@ -169,4 +169,3 @@ class DistributedRacePadAI(DistributedKartPadAI, FSM):
     def b_setTrackInfo(self, trackInfo):
         self.setTrackInfo(trackInfo)
         self.d_setTrackInfo(trackInfo)
-

toontown/racing/DistributedViewPadAI.py

@@ -24,4 +24,3 @@ class DistributedViewPadAI(DistributedKartPadAI):
 
     def updateTimer(self):
         self.b_setLastEntered(globalClockDelta.getRealNetworkTime())
-

toontown/safezone/DistributedCheckersAI.py

@@ -670,6 +670,3 @@ class DistributedCheckersAI(DistributedNodeAI):
                     return False
             else:
                 return False
-        
-
-

toontown/safezone/DistributedChineseCheckersAI.py

@@ -690,5 +690,3 @@ class DistributedChineseCheckersAI(DistributedNodeAI):
         self.board.squareList[120].setState(0)
         self.board.squareList[104].setState(1)
         self.sendGameState([])
-
-

toontown/safezone/DistributedFindFourAI.py

@@ -634,5 +634,3 @@ class DistributedFindFourAI(DistributedNodeAI):
             return False
 
         return False
-
-

toontown/safezone/DistributedPicnicTableAI.py

@@ -341,4 +341,3 @@ class DistributedPicnicTableAI(DistributedNodeAI):
 
     def getTableIndex(self):
         return self._tableIndex
-        

toontown/safezone/MMPlayground.py

@@ -20,5 +20,3 @@ class MMPlayground(Playground.Playground):
 
     def exitOnPiano(self):
         base.localAvatar.b_setParent(ToontownGlobals.SPRender)
-    
-

toontown/safezone/TTSafeZoneLoader.py

@@ -22,4 +22,3 @@ class TTSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
     def unload(self):
         SafeZoneLoader.SafeZoneLoader.unload(self)
         del self.birdSound
-

toontown/shtiker/DeleteManagerAI.py

@@ -6,4 +6,3 @@ class DeleteManagerAI(DistributedObjectAI):
 
     def setInventory(self, todo0):
         pass
-

toontown/suit/DistributedGridGoonAI.py

@@ -6,4 +6,3 @@ class DistributedGridGoonAI(DistributedGoonAI):
 
     def setPathPts(self, todo0, todo1, todo2, todo3, todo4, todo5):
         pass
-

toontown/suit/DistributedLawbotBossAI.py

@@ -700,7 +700,7 @@ class DistributedLawbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FSM
             possibleSummonType = ['building', 'invasion', 'cogdo', 'v2invasion']
             #typeWeights = ['single'] * 70 + ['building'] * 27 + ['invasion'] * 3
             if not foundOne:
-                 for i in xrange(5):
+                for i in xrange(5):
                     randomCogLevel = random.choice(possibleCogLevel)
                     randomSummonType = random.choice(possibleSummonType)
                     randomDeptIndex = random.choice(possibleDeptIndex)

toontown/suit/SuitGlobals.py

@@ -51,4 +51,3 @@ suitProperties = {'f': (4.0 / cSize, SuitDNA.corpPolyColor, ['flunky', 'glasses'
                   'm': (5.75 / aSize, SuitDNA.salesPolyColor, ['twoface'], 'mingler.jpg', 7.61),
                   'mh': (7.0 / aSize, SuitDNA.salesPolyColor, ['yesman'], '', 8.95),
                   }
-

toontown/toon/DistributedSmartNPCAI.py

@@ -74,4 +74,3 @@ class DistributedSmartNPCAI(DistributedNPCToonBaseAI):
     def response(self, response, sendTo):
         self.sendUpdate('respond', [self.npcId, response, sendTo])
         self.restartTask()
-        

toontown/toon/GroupInvitee.py

@@ -23,9 +23,9 @@ class GroupInvitee(ToonHeadDialog.ToonHeadDialog):
         self.avDNA = toon.getStyle()
         self.party = party
         if merger:
-          text = TTLocalizer.BoardingInviteeMergeMessage % self.avName
+            text = TTLocalizer.BoardingInviteeMergeMessage % self.avName
         else:
-          text = TTLocalizer.BoardingInviteeMessage % self.avName
+            text = TTLocalizer.BoardingInviteeMessage % self.avName
         style = TTDialog.TwoChoice
         buttonTextList = [OTPLocalizer.FriendInviteeOK, OTPLocalizer.FriendInviteeNo]
         command = self.__handleButton

toontown/toon/ToonDNA.py

@@ -1689,13 +1689,13 @@ if mergeMATTailor:
                 TailorCollections[MAKE_A_TOON][GIRL_BOTTOMS].append(girlBottoms)
         for boyShorts in TailorCollections[tailors][BOY_SHORTS]:
             if boyShorts not in TailorCollections[MAKE_A_TOON][BOY_SHORTS]:
-                 TailorCollections[MAKE_A_TOON][BOY_SHORTS].append(boyShorts)
+                TailorCollections[MAKE_A_TOON][BOY_SHORTS].append(boyShorts)
         for girlShirts in TailorCollections[tailors][GIRL_SHIRTS]:
             if girlShirts not in TailorCollections[MAKE_A_TOON][GIRL_SHIRTS]:
-                 TailorCollections[MAKE_A_TOON][GIRL_SHIRTS].append(girlShirts)
+                TailorCollections[MAKE_A_TOON][GIRL_SHIRTS].append(girlShirts)
         for boyShirts in TailorCollections[tailors][BOY_SHIRTS]:
             if boyShirts not in TailorCollections[MAKE_A_TOON][BOY_SHIRTS]:
-                 TailorCollections[MAKE_A_TOON][BOY_SHIRTS].append(boyShirts)
+                TailorCollections[MAKE_A_TOON][BOY_SHIRTS].append(boyShirts)
 
 for style in TailorCollections[MAKE_A_TOON][BOY_SHORTS]:
     index = BottomStyles[style][0]

toontown/toonbase/TTLocalizerEnglish.py

@@ -8437,8 +8437,8 @@ id = 0
 
 for dictionary in [BoyPetNames, GirlPetNames, NeutralPetNames]:
     for name in dictionary:
-       PetNameDictionary[id] = name
+        PetNameDictionary[id] = name
-       id += 1
+        id += 1
 
 def getPetName(uniqueID):
     try:

toontown/town/DDStreet.py

@@ -9,4 +9,3 @@ class DDStreet(Street.Street):
     def exit(self):
         Street.Street.exit(self)
         self.loader.hood.setNoFog()
-

toontown/town/DDTownLoader.py

@@ -20,4 +20,3 @@ class DDTownLoader(TownLoader.TownLoader):
     def unload(self):
         TownLoader.TownLoader.unload(self)
         Suit.unloadSuits(2)
-

toontown/town/DGTownLoader.py

@@ -20,4 +20,3 @@ class DGTownLoader(TownLoader.TownLoader):
     def unload(self):
         TownLoader.TownLoader.unload(self)
         Suit.unloadSuits(3)
-

toontown/town/DLTownLoader.py

@@ -20,4 +20,3 @@ class DLTownLoader(TownLoader.TownLoader):
     def unload(self):
         TownLoader.TownLoader.unload(self)
         Suit.unloadSuits(3)
-

toontown/town/MMTownLoader.py

@@ -20,4 +20,3 @@ class MMTownLoader(TownLoader.TownLoader):
     def unload(self):
         TownLoader.TownLoader.unload(self)
         Suit.unloadSuits(2)
-

toontown/town/TTTownLoader.py

@@ -20,4 +20,3 @@ class TTTownLoader(TownLoader.TownLoader):
     def unload(self):
         TownLoader.TownLoader.unload(self)
         Suit.unloadSuits(1)
-

toontown/uberdog/DistributedPartyManagerUD.py

@@ -128,4 +128,3 @@ class DistributedPartyManagerUD(DistributedObjectUD):
 
     def mwResponseUdToAllAi(self, todo0, todo1, todo2, todo3):
         pass
-