Merge branch 'master' of gitlab.com:ToontownUnited/src

This commit is contained in:
Zach 2015-05-10 14:26:41 -05:00
commit cbd35a95ac
3 changed files with 4 additions and 3 deletions

View file

@ -181,6 +181,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
TexturePool.garbageCollect()
self.sendSetAvatarIdMsg(0)
self.clearFriendState()
self.startHeartbeat()
if self.music == None and base.musicManagerIsValid:
self.music = base.musicManager.getSound('phase_3/audio/bgm/tt_theme.ogg')
if self.music:

View file

@ -126,7 +126,7 @@ class DistributedPhoneAI(DistributedFurnitureItemAI):
av.takeMoney(item.getPrice(priceType))
if item.getDeliveryTime():
if len(av.onOrder) > 5:
if len(av.onOrder) > 25:
self.sendUpdateToAvatarId(avId, 'requestPurchaseResponse', [context, ToontownGlobals.P_OnOrderListFull])
return

View file

@ -41,7 +41,7 @@ SpeedwayCameraFar = 8000.0
SpeedwayCameraNear = 1.0
MaxMailboxContents = 60
MaxHouseItems = 250
MaxAccessories = 50
MaxAccessories = 75
ExtraDeletedItems = 5
DeletedItemLifetime = 7 * 24 * 60
CatalogNumWeeksPerSeries = 13