Revert "Spring cleaning"

This reverts commit 1e4bad8c6b.
This commit is contained in:
John 2015-06-16 20:26:44 +03:00
parent 1e4bad8c6b
commit 35b646c4e6
279 changed files with 1050 additions and 967 deletions

View file

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

View file

@ -73,3 +73,4 @@ def words():
return "You are chopped liver" return "You are chopped liver"
else: else:
return wordString return wordString

View file

@ -15,3 +15,4 @@ class DistributedAvatarUD(DistributedObjectUD):
def confirmAvOnShard(self, todo0, todo1): def confirmAvOnShard(self, todo0, todo1):
pass pass

View file

@ -52,3 +52,4 @@ def chatmode(mode=-1):
return "Chat mode 1 is reserved for moderators." return "Chat mode 1 is reserved for moderators."
base.cr.chatAgent.chatMode = mode base.cr.chatAgent.chatMode = mode
return "You are now talking in the %s chat mode." % mode2name.get(mode, "N/A") return "You are now talking in the %s chat mode." % mode2name.get(mode, "N/A")

View file

@ -134,3 +134,6 @@ class ChatAgentUD(DistributedObjectGlobalUD):
offset += len(word) + 1 offset += len(word) + 1
return modifications return modifications

View file

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

View file

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

View file

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

View file

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

View file

@ -6,3 +6,4 @@ class CMover:
self.objNodePath = objNodePath self.objNodePath = objNodePath
self.fwdSpeed = fwdSpeed self.fwdSpeed = fwdSpeed
self.rotSpeed = rotSpeed self.rotSpeed = rotSpeed

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1581,3 +1581,4 @@ class DistributedCannon(DistributedObject.DistributedObject):
def turnOnBumperCollision(self, whatever = 0): def turnOnBumperCollision(self, whatever = 0):
if self.bumperCol: if self.bumperCol:
self.bumperCol.setCollideMask(ToontownGlobals.WallBitmask) self.bumperCol.setCollideMask(ToontownGlobals.WallBitmask)

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -9,3 +9,4 @@ class DistributedLeaderBoardAI(DistributedObjectAI):
def setDisplay(self, todo0): def setDisplay(self, todo0):
pass pass

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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