Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Spring cleaning"

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/tools/rpc/generate_key.py
View file

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

86
dev/tools/rpc/rpc-invasions.py
View file

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

15
otp/ai/MagicWordManagerAI.py
View file

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

1
otp/avatar/DistributedAvatarUD.py
View file

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

1
otp/chat/ChatAgent.py
View file

@ -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")

3
otp/chat/ChatAgentUD.py
View file

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

1
otp/distributed/AccountAI.py
View file

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

1
otp/distributed/AccountUD.py
View file

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

1
otp/distributed/DistributedDistrictUD.py
View file

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

1
otp/level/DistributedInteractiveEntityAI.py
View file

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

1
otp/movement/CMover.py
View file

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

2
toontown/ai/HalloweenHolidayDecorator.py
View file

@ -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())

2
toontown/battle/ParticleDefs.py
View file

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

1
toontown/building/DistributedCJElevatorAI.py
View file

@ -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']

2
toontown/building/DistributedToonHallInterior.py
View file

@ -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)))

1
toontown/catalog/CatalogHouseItem.py
View file

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

1
toontown/catalog/CatalogManagerAI.py
View file

@ -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)

1
toontown/catalog/CatalogSurfaceItem.py
View file

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

1
toontown/coghq/DistributedSellbotHQDoorAI.py
View file

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

2
toontown/coghq/LaserGameAvoid.py
View file

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

2
toontown/coghq/LaserGameBase.py
View file

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

2
toontown/coghq/LaserGameMineSweeper.py
View file

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

2
toontown/coghq/LaserGameRoll.py
View file

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

2
toontown/coghq/LawOfficeLayout.py
View file

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

1
toontown/distributed/DistributedTimerAI.py
View file

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

1
toontown/estate/DistributedCannon.py
View file

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

16
toontown/estate/DistributedClosetAI.py
View file

@ -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!')
return
self.air.writeServerEvent('suspicious', avId, 'Tried to change their DNA temporarily!')
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':
self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
return
elif self.customerDNA.torso[0] != testDna.torso[0]:
self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
return
if self.customerDNA.gender == 'm':
self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
return
elif self.customerDNA.torso[0] != testDna.torso[0]:
self.air.writeServerEvent('suspicious', avId, 'Tried to change their torso size!')
return
self.customerDNA.torso = testDna.torso
else:
self.air.writeServerEvent('suspicious', avId, 'Tried to set their shorts to a pair they don\'t own!')

10
toontown/estate/DistributedPhoneAI.py
View file

@ -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']:
return
if dclass != self.air.dclassesByName['DistributedHouseAI']:
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))
self.sendUpdateToAvatarId(fields['setAvatarId'][0], 'setLimits', [numItems])
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])
def avatarExit(self):
avId = self.air.getAvatarIdFromSender()
@ -144,7 +144,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', []])

2
toontown/estate/GardenDropGame.py
View file

@ -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()

16
toontown/estate/TrunkGUI.py
View file

@ -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.hats.append((self.toon.hat[0], self.toon.hat[1], self.toon.hat[2]))
self.hatChoice = 1
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.glasses.append((self.toon.glasses[0], self.toon.glasses[1], self.toon.glasses[2]))
self.glassesChoice = 1
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.backpacks.append((self.toon.backpack[0], self.toon.backpack[1], self.toon.backpack[2]))
self.backpackChoice = 1
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.shoes.append((self.toon.shoes[0], self.toon.shoes[1], self.toon.shoes[2]))
self.shoesChoice = 1
self.shoes.append((self.toon.shoes[0], self.toon.shoes[1], self.toon.shoes[2]))
i = 0
while i < len(self.hatList):

78
toontown/golf/GolfGlobals.py
View file

File diff suppressed because one or more lines are too long

1
toontown/parties/DistributedPartyAI.py
View file

@ -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)

1
toontown/parties/DistributedPartyActivityAI.py
View file

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

1
toontown/parties/DistributedPartyCannonActivityAI.py
View file

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

1
toontown/parties/DistributedPartyCogActivityAI.py
View file

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

1
toontown/parties/DistributedPartyDance20ActivityAI.py
View file

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

1
toontown/parties/DistributedPartyDanceActivityAI.py
View file

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

1
toontown/parties/DistributedPartyJukebox40ActivityAI.py
View file

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

1
toontown/parties/DistributedPartyJukeboxActivityAI.py
View file

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

1
toontown/parties/DistributedPartyTeamActivityAI.py
View file

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

3
toontown/parties/DistributedPartyTrampolineActivityAI.py
View file

@ -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')

1
toontown/parties/DistributedPartyTugOfWarActivityAI.py
View file

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

1
toontown/parties/DistributedPartyValentineDance20ActivityAI.py
View file

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

1
toontown/parties/DistributedPartyValentineDanceActivityAI.py
View file

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

1
toontown/parties/DistributedPartyValentineJukebox40ActivityAI.py
View file

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

1
toontown/parties/DistributedPartyValentineJukeboxActivityAI.py
View file

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

1
toontown/parties/DistributedPartyValentineTrampolineActivityAI.py
View file

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

1
toontown/parties/DistributedPartyVictoryTrampolineActivityAI.py
View file

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

1
toontown/parties/DistributedPartyWinterCatchActivityAI.py
View file

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

1
toontown/parties/DistributedPartyWinterCogActivityAI.py
View file

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

1
toontown/parties/DistributedPartyWinterTrampolineActivityAI.py
View file

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

1
toontown/racing/DistributedGagAI.py
View file

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

1
toontown/racing/DistributedLeaderBoardAI.py
View file

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

1
toontown/racing/DistributedProjectileAI.py
View file

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

1
toontown/racing/DistributedRacePadAI.py
View file

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

1
toontown/racing/DistributedViewPadAI.py
View file

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

3
toontown/safezone/DistributedCheckersAI.py
View file

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

2
toontown/safezone/DistributedChineseCheckersAI.py
View file

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

2
toontown/safezone/DistributedFindFourAI.py
View file

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

1
toontown/safezone/DistributedPicnicTableAI.py
View file

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

2
toontown/safezone/MMPlayground.py
View file

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

1
toontown/safezone/TTSafeZoneLoader.py
View file

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

1
toontown/shtiker/DeleteManagerAI.py
View file

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

1
toontown/suit/DistributedGridGoonAI.py
View file

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

2
toontown/suit/DistributedLawbotBossAI.py
View file

@ -694,7 +694,7 @@ class DistributedLawbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FSM
possibleSummonType = ['single', 'building', 'invasion']
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(typeWeights)
randomDeptIndex = random.choice(possibleDeptIndex)

1
toontown/suit/SuitGlobals.py
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),
'mh': (7.0 / aSize, SuitDNA.salesPolyColor, ['yesman'], '', 8.95),
}

1
toontown/toon/DistributedSmartNPCAI.py
View file

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

4
toontown/toon/GroupInvitee.py
View file

@ -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

6
toontown/toon/ToonDNA.py
View file

@ -1690,13 +1690,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]

4
toontown/toonbase/TTLocalizerEnglish.py
View file

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

1
toontown/town/DDStreet.py
View file

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

1
toontown/town/DDTownLoader.py
View file

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

1
toontown/town/DGTownLoader.py
View file

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

1
toontown/town/DLTownLoader.py
View file

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

1
toontown/town/MMTownLoader.py
View file

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

1
toontown/town/TTTownLoader.py
View file

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

1
toontown/uberdog/DistributedPartyManagerUD.py
View file

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