yay repo cleanup

2025-01-09 17:53:50 +00:00 · 2015-07-05 19:59:25 -04:00 · 2015-07-05 19:59:25 -04:00 · ad09d429fb
commit ad09d429fb
parent 3f55a00f0e
368 changed files with 1156 additions and 1231 deletions
--- a/dev/tools/rpc/generate_key.py
+++ b/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
-        
-
-
-
--- a/otp/ai/MagicWordManagerAI.py
+++ b/otp/ai/MagicWordManagerAI.py
@ -73,4 +73,3 @@ def words():
        return "You are chopped liver"
    else:
        return wordString
-            
--- a/otp/distributed/AccountAI.py
+++ b/otp/distributed/AccountAI.py
@ -3,4 +3,3 @@ from direct.distributed.DistributedObjectAI import DistributedObjectAI

 class AccountAI(DistributedObjectAI):
    notify = DirectNotifyGlobal.directNotify.newCategory("AccountAI")
-
--- a/otp/distributed/AccountUD.py
+++ b/otp/distributed/AccountUD.py
@ -3,4 +3,3 @@ from direct.distributed.DistributedObjectUD import DistributedObjectUD

 class AccountUD(DistributedObjectUD):
    notify = DirectNotifyGlobal.directNotify.newCategory("AccountUD")
-
--- a/otp/distributed/DistributedDistrictUD.py
+++ b/otp/distributed/DistributedDistrictUD.py
@ -9,4 +9,3 @@ class DistributedDistrictUD(DistributedObjectUD):

    def setAvailable(self, todo0):
        pass
-
--- a/otp/level/DistributedInteractiveEntityAI.py
+++ b/otp/level/DistributedInteractiveEntityAI.py
@ -21,4 +21,3 @@ class DistributedInteractiveEntityAI(DistributedEntityAI):

    def setState(self, todo0, todo1):
        pass
-
--- a/toontown/battle/ParticleDefs.py
+++ b/toontown/battle/ParticleDefs.py
@ -4902,5 +4902,3 @@ def bossCogFrontAttack(self):
    force0.setActive(1)
    f0.addForce(force0)
    self.addForceGroup(f0)
-
-
--- a/toontown/building/DistributedCJElevatorAI.py
+++ b/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']
-
--- a/toontown/catalog/CatalogHouseItem.py
+++ b/toontown/catalog/CatalogHouseItem.py
@ -69,4 +69,3 @@ class CatalogHouseItem(CatalogItem.CatalogItem):

 def getAllHouses():
    return [CatalogHouseItem(i) for i in xrange(6)]
-    
--- a/toontown/catalog/CatalogManagerAI.py
+++ b/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)
-
--- a/toontown/catalog/CatalogSurfaceItem.py
+++ b/toontown/catalog/CatalogSurfaceItem.py
@ -32,4 +32,3 @@ class CatalogSurfaceItem(CatalogAtticItem.CatalogAtticItem):

    def getDeliveryTime(self):
        return 1
- 
--- a/toontown/coghq/DistributedSellbotHQDoorAI.py
+++ b/toontown/coghq/DistributedSellbotHQDoorAI.py
@ -6,4 +6,3 @@ class DistributedSellbotHQDoorAI(DistributedCogHQDoorAI):

    def informPlayer(self, todo0):
        pass
-
--- a/toontown/coghq/LaserGameAvoid.py
+++ b/toontown/coghq/LaserGameAvoid.py
@ -79,5 +79,3 @@ class LaserGameAvoid(LaserGameBase.LaserGameBase):
            self.funcSendGrid()

        return Task.done
-
-
--- a/toontown/coghq/LaserGameBase.py
+++ b/toontown/coghq/LaserGameBase.py
@ -65,5 +65,3 @@ class LaserGameBase:

    def checkForWin(self):
        return 0
-
-
--- a/toontown/coghq/LaserGameMineSweeper.py
+++ b/toontown/coghq/LaserGameMineSweeper.py
@ -167,5 +167,3 @@ class LaserGameMineSweeper(LaserGameBase.LaserGameBase):


        return sum
-
-
--- a/toontown/coghq/LaserGameRoll.py
+++ b/toontown/coghq/LaserGameRoll.py
@ -73,5 +73,3 @@ class LaserGameRoll(LaserGameBase.LaserGameBase):
            return 0
        else:
            return 1
-
-
--- a/toontown/coghq/LawOfficeLayout.py
+++ b/toontown/coghq/LawOfficeLayout.py
@ -41,5 +41,3 @@ class LawOfficeLayout:

    def getFloorIds(self):
        return self.floorIds
-
-
--- a/toontown/distributed/DistributedTimerAI.py
+++ b/toontown/distributed/DistributedTimerAI.py
@ -15,4 +15,3 @@ class DistributedTimerAI(DistributedObjectAI):

    def getStartTime(self):
        return self.startTime
-
--- a/toontown/parties/DistributedPartyAI.py
+++ b/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)
-
--- a/toontown/parties/DistributedPartyActivityAI.py
+++ b/toontown/parties/DistributedPartyActivityAI.py
@ -78,4 +78,3 @@ class DistributedPartyActivityAI(DistributedObjectAI):

    def showJellybeanReward(self, todo0, todo1, todo2):
        pass
-
--- a/toontown/parties/DistributedPartyCannonActivityAI.py
+++ b/toontown/parties/DistributedPartyCannonActivityAI.py
@ -67,4 +67,3 @@ class DistributedPartyCannonActivityAI(DistributedPartyActivityAI):

    def updateToonTrajectoryStartVel(self, todo0, todo1, todo2, todo3):
        pass
-
--- a/toontown/parties/DistributedPartyCogActivityAI.py
+++ b/toontown/parties/DistributedPartyCogActivityAI.py
@ -18,4 +18,3 @@ class DistributedPartyCogActivityAI(DistributedPartyTeamActivityAI):

    def setHighScore(self, todo0, todo1):
        pass
-
--- a/toontown/parties/DistributedPartyDance20ActivityAI.py
+++ b/toontown/parties/DistributedPartyDance20ActivityAI.py
@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyDanceActivityBaseAI import DistributedPart

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

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

 class DistributedPartyJukebox40ActivityAI(DistributedPartyJukeboxActivityBaseAI):
    notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyJukebox40ActivityAI")
-
--- a/toontown/parties/DistributedPartyJukeboxActivityAI.py
+++ b/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
-
--- a/toontown/parties/DistributedPartyTeamActivityAI.py
+++ b/toontown/parties/DistributedPartyTeamActivityAI.py
@ -33,4 +33,3 @@ class DistributedPartyTeamActivityAI(DistributedPartyActivityAI):

    def switchTeamRequestDenied(self, todo0):
        pass
-
--- a/toontown/parties/DistributedPartyTrampolineActivityAI.py
+++ b/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')
-        
-
-
--- a/toontown/parties/DistributedPartyTugOfWarActivityAI.py
+++ b/toontown/parties/DistributedPartyTugOfWarActivityAI.py
@ -18,4 +18,3 @@ class DistributedPartyTugOfWarActivityAI(DistributedPartyTeamActivityAI):

    def updateToonPositions(self, todo0):
        pass
-
--- a/toontown/parties/DistributedPartyValentineDance20ActivityAI.py
+++ b/toontown/parties/DistributedPartyValentineDance20ActivityAI.py
@ -3,4 +3,3 @@ from toontown.parties.DistributedPartyDanceActivityBaseAI import DistributedPart

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

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

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

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

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

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

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

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

 class DistributedPartyWinterTrampolineActivityAI(DistributedPartyTrampolineActivityAI):
    notify = DirectNotifyGlobal.directNotify.newCategory("DistributedPartyWinterTrampolineActivityAI")
-
--- a/toontown/racing/DistributedGagAI.py
+++ b/toontown/racing/DistributedGagAI.py
@ -46,4 +46,3 @@ class DistributedGagAI(DistributedObjectAI):

    def hitSomebody(self, avId, timestamp):
        self.requestDelete()
-
--- a/toontown/racing/DistributedProjectileAI.py
+++ b/toontown/racing/DistributedProjectileAI.py
@ -21,4 +21,3 @@ class DistributedProjectileAI(DistributedObjectAI):

    def hitSomebody(self, todo0, todo1):
        pass
-
--- a/toontown/racing/DistributedRacePadAI.py
+++ b/toontown/racing/DistributedRacePadAI.py
@ -169,4 +169,3 @@ class DistributedRacePadAI(DistributedKartPadAI, FSM):
    def b_setTrackInfo(self, trackInfo):
        self.setTrackInfo(trackInfo)
        self.d_setTrackInfo(trackInfo)
-
--- a/toontown/racing/DistributedViewPadAI.py
+++ b/toontown/racing/DistributedViewPadAI.py
@ -24,4 +24,3 @@ class DistributedViewPadAI(DistributedKartPadAI):

    def updateTimer(self):
        self.b_setLastEntered(globalClockDelta.getRealNetworkTime())
-
--- a/toontown/safezone/DistributedCheckersAI.py
+++ b/toontown/safezone/DistributedCheckersAI.py
@ -670,6 +670,3 @@ class DistributedCheckersAI(DistributedNodeAI):
                    return False
            else:
                return False
-        
-
-
--- a/toontown/safezone/DistributedChineseCheckersAI.py
+++ b/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([])
-
-
--- a/toontown/safezone/DistributedFindFourAI.py
+++ b/toontown/safezone/DistributedFindFourAI.py
@ -634,5 +634,3 @@ class DistributedFindFourAI(DistributedNodeAI):
            return False

        return False
-
-
--- a/toontown/safezone/DistributedPicnicTableAI.py
+++ b/toontown/safezone/DistributedPicnicTableAI.py
@ -341,4 +341,3 @@ class DistributedPicnicTableAI(DistributedNodeAI):

    def getTableIndex(self):
        return self._tableIndex
-        
--- a/toontown/safezone/MMPlayground.py
+++ b/toontown/safezone/MMPlayground.py
@ -20,5 +20,3 @@ class MMPlayground(Playground.Playground):

    def exitOnPiano(self):
        base.localAvatar.b_setParent(ToontownGlobals.SPRender)
-    
-
--- a/toontown/safezone/TTSafeZoneLoader.py
+++ b/toontown/safezone/TTSafeZoneLoader.py
@ -22,4 +22,3 @@ class TTSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
    def unload(self):
        SafeZoneLoader.SafeZoneLoader.unload(self)
        del self.birdSound
-
--- a/toontown/shtiker/DeleteManagerAI.py
+++ b/toontown/shtiker/DeleteManagerAI.py
@ -6,4 +6,3 @@ class DeleteManagerAI(DistributedObjectAI):

    def setInventory(self, todo0):
        pass
-
--- a/toontown/suit/DistributedGridGoonAI.py
+++ b/toontown/suit/DistributedGridGoonAI.py
@ -6,4 +6,3 @@ class DistributedGridGoonAI(DistributedGoonAI):

    def setPathPts(self, todo0, todo1, todo2, todo3, todo4, todo5):
        pass
-
--- a/toontown/suit/SuitGlobals.py
+++ b/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),
                  }
-
--- a/toontown/toon/DistributedSmartNPCAI.py
+++ b/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()
-        
--- a/toontown/town/DDStreet.py
+++ b/toontown/town/DDStreet.py
@ -9,4 +9,3 @@ class DDStreet(Street.Street):
    def exit(self):
        Street.Street.exit(self)
        self.loader.hood.setNoFog()
-
--- a/toontown/town/DDTownLoader.py
+++ b/toontown/town/DDTownLoader.py
@ -20,4 +20,3 @@ class DDTownLoader(TownLoader.TownLoader):
    def unload(self):
        TownLoader.TownLoader.unload(self)
        Suit.unloadSuits(2)
-
--- a/toontown/town/DGTownLoader.py
+++ b/toontown/town/DGTownLoader.py
@ -20,4 +20,3 @@ class DGTownLoader(TownLoader.TownLoader):
    def unload(self):
        TownLoader.TownLoader.unload(self)
        Suit.unloadSuits(3)
-
--- a/toontown/town/DLTownLoader.py
+++ b/toontown/town/DLTownLoader.py
@ -20,4 +20,3 @@ class DLTownLoader(TownLoader.TownLoader):
    def unload(self):
        TownLoader.TownLoader.unload(self)
        Suit.unloadSuits(3)
-
--- a/toontown/town/MMTownLoader.py
+++ b/toontown/town/MMTownLoader.py
@ -20,4 +20,3 @@ class MMTownLoader(TownLoader.TownLoader):
    def unload(self):
        TownLoader.TownLoader.unload(self)
        Suit.unloadSuits(2)
-
--- a/toontown/town/TTTownLoader.py
+++ b/toontown/town/TTTownLoader.py
@ -20,4 +20,3 @@ class TTTownLoader(TownLoader.TownLoader):
    def unload(self):
        TownLoader.TownLoader.unload(self)
        Suit.unloadSuits(1)
-
--- a/toontown/uberdog/DistributedPartyManagerUD.py
+++ b/toontown/uberdog/DistributedPartyManagerUD.py
@ -128,4 +128,3 @@ class DistributedPartyManagerUD(DistributedObjectUD):

    def mwResponseUdToAllAi(self, todo0, todo1, todo2, todo3):
        pass
-
				`@ -167,5 +167,3 @@ class LaserGameMineSweeper(LaserGameBase.LaserGameBase):`


				`return sum`