Revert "Spring cleaning"

This reverts commit 1e4bad8c6b.
2024-12-23 11:42:39 -06:00 · 2015-06-16 20:26:44 +03:00 · 2015-06-16 20:26:44 +03:00 · 35b646c4e6
commit 35b646c4e6
parent 1e4bad8c6b
279 changed files with 1050 additions and 967 deletions
--- a/dev/tools/rpc/generate_key.py
+++ b/dev/tools/rpc/generate_key.py
@ -32,3 +32,7 @@ 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,3 +73,4 @@ def words():
        return "You are chopped liver"
    else:
        return wordString
+            
--- a/otp/avatar/DistributedAvatarUD.py
+++ b/otp/avatar/DistributedAvatarUD.py
@ -15,3 +15,4 @@ class DistributedAvatarUD(DistributedObjectUD):

    def confirmAvOnShard(self, todo0, todo1):
        pass
+
--- a/otp/chat/ChatAgent.py
+++ b/otp/chat/ChatAgent.py
@ -52,3 +52,4 @@ def chatmode(mode=-1):
        return "Chat mode 1 is reserved for moderators."
    base.cr.chatAgent.chatMode = mode
    return "You are now talking in the %s chat mode." % mode2name.get(mode, "N/A")
+
--- a/otp/chat/ChatAgentUD.py
+++ b/otp/chat/ChatAgentUD.py
@ -134,3 +134,6 @@ class ChatAgentUD(DistributedObjectGlobalUD):
            offset += len(word) + 1

        return modifications
+
+
+
--- a/otp/distributed/AccountAI.py
+++ b/otp/distributed/AccountAI.py
@ -3,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +9,4 @@ class DistributedDistrictUD(DistributedObjectUD):

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

    def setState(self, todo0, todo1):
        pass
+
--- a/otp/movement/CMover.py
+++ b/otp/movement/CMover.py
@ -6,3 +6,4 @@ class CMover:
        self.objNodePath = objNodePath
        self.fwdSpeed = fwdSpeed
        self.rotSpeed = rotSpeed
+        
--- a/toontown/battle/ParticleDefs.py
+++ b/toontown/battle/ParticleDefs.py
@ -4902,3 +4902,5 @@ def bossCogFrontAttack(self):
    force0.setActive(1)
    f0.addForce(force0)
    self.addForceGroup(f0)
+
+
--- a/toontown/building/DistributedCJElevatorAI.py
+++ b/toontown/building/DistributedCJElevatorAI.py
@ -7,3 +7,4 @@ 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,3 +69,4 @@ 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,3 +25,4 @@ 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,3 +32,4 @@ class CatalogSurfaceItem(CatalogAtticItem.CatalogAtticItem):

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

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

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

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


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

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

    def getStartTime(self):
        return self.startTime
+
--- a/toontown/estate/DistributedCannon.py
+++ b/toontown/estate/DistributedCannon.py
@ -1581,3 +1581,4 @@ class DistributedCannon(DistributedObject.DistributedObject):
    def turnOnBumperCollision(self, whatever = 0):
        if self.bumperCol:
            self.bumperCol.setCollideMask(ToontownGlobals.WallBitmask)
+            
--- a/toontown/parties/DistributedPartyAI.py
+++ b/toontown/parties/DistributedPartyAI.py
@ -152,3 +152,4 @@ 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,3 +78,4 @@ class DistributedPartyActivityAI(DistributedObjectAI):

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

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

    def setHighScore(self, todo0, todo1):
        pass
+
--- a/toontown/parties/DistributedPartyDance20ActivityAI.py
+++ b/toontown/parties/DistributedPartyDance20ActivityAI.py
@ -3,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +8,4 @@ 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,3 +33,4 @@ class DistributedPartyTeamActivityAI(DistributedPartyActivityAI):

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

    def updateToonPositions(self, todo0):
        pass
+
--- a/toontown/parties/DistributedPartyValentineDance20ActivityAI.py
+++ b/toontown/parties/DistributedPartyValentineDance20ActivityAI.py
@ -3,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +3,4 @@ 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,3 +46,4 @@ class DistributedGagAI(DistributedObjectAI):

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

    def setDisplay(self, todo0):
        pass
+
--- a/toontown/racing/DistributedProjectileAI.py
+++ b/toontown/racing/DistributedProjectileAI.py
@ -21,3 +21,4 @@ class DistributedProjectileAI(DistributedObjectAI):

    def hitSomebody(self, todo0, todo1):
        pass
+
--- a/toontown/racing/DistributedRacePadAI.py
+++ b/toontown/racing/DistributedRacePadAI.py
@ -169,3 +169,4 @@ 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,3 +24,4 @@ class DistributedViewPadAI(DistributedKartPadAI):
        
    def updateTimer(self):
        self.b_setLastEntered(globalClockDelta.getRealNetworkTime())
+
--- a/toontown/safezone/DistributedCheckersAI.py
+++ b/toontown/safezone/DistributedCheckersAI.py
@ -670,3 +670,6 @@ class DistributedCheckersAI(DistributedNodeAI):
                    return False
            else:
                return False
+        
+
+
--- a/toontown/safezone/DistributedChineseCheckersAI.py
+++ b/toontown/safezone/DistributedChineseCheckersAI.py
@ -690,3 +690,5 @@ 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,3 +634,5 @@ class DistributedFindFourAI(DistributedNodeAI):
            return False
        
        return False
+
+
--- a/toontown/safezone/DistributedPicnicTableAI.py
+++ b/toontown/safezone/DistributedPicnicTableAI.py
@ -341,3 +341,4 @@ class DistributedPicnicTableAI(DistributedNodeAI):
        
    def getTableIndex(self):
        return self._tableIndex
+        
--- a/toontown/safezone/MMPlayground.py
+++ b/toontown/safezone/MMPlayground.py
@ -20,3 +20,5 @@ class MMPlayground(Playground.Playground):

    def exitOnPiano(self):
        base.localAvatar.b_setParent(ToontownGlobals.SPRender)
+    
+
--- a/toontown/safezone/TTSafeZoneLoader.py
+++ b/toontown/safezone/TTSafeZoneLoader.py
@ -22,3 +22,4 @@ 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,3 +6,4 @@ class DeleteManagerAI(DistributedObjectAI):

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

    def setPathPts(self, todo0, todo1, todo2, todo3, todo4, todo5):
        pass
+
--- a/toontown/suit/SuitGlobals.py
+++ b/toontown/suit/SuitGlobals.py
@ -51,3 +51,4 @@ 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,3 +74,4 @@ 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,3 +9,4 @@ 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,3 +20,4 @@ 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,3 +20,4 @@ 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,3 +20,4 @@ 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,3 +20,4 @@ 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,3 +20,4 @@ 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,3 +128,4 @@ class DistributedPartyManagerUD(DistributedObjectUD):

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


				`return sum`