zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

catalog: various generation fixes, goodbye accessories

Browse source
This commit is contained in:
Aidan Noll 2014-05-31 02:08:23 -04:00
parent 462a63944c
commit ec24a4be7f
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
toontown/catalog/CatalogAccessoryItem.py
View file

@ -19,6 +19,7 @@ class CatalogAccessoryItem(CatalogItem.CatalogItem):
return 1
def notOfferedTo(self, avatar):
return 1 # We're not offering accessories at the moment.
article = AccessoryTypes[self.accessoryType][ATArticle]
if article in [AHat,
AGlasses,

8
toontown/catalog/CatalogManagerAI.py
View file

@ -2,7 +2,6 @@ from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectAI import DistributedObjectAI
from CatalogGenerator import CatalogGenerator
from toontown.toonbase import ToontownGlobals
import datetime
import time
class CatalogManagerAI(DistributedObjectAI):
@ -20,10 +19,11 @@ class CatalogManagerAI(DistributedObjectAI):
def deliverCatalogFor(self, av):
monthlyCatalog = self.catalogGenerator.generateMonthlyCatalog(av, time.time() / 60)
weeklyCatalog = self.catalogGenerator.generateWeeklyCatalog(av, av.catalogScheduleCurrentWeek, monthlyCatalog)
backCatalog = self.catalogGenerator.generateBackCatalog(av, av.catalogScheduleCurrentWeek, av.catalogScheduleCurrentWeek - 1, monthlyCatalog)
newWeek = (av.catalogScheduleCurrentWeek + 1) % ToontownGlobals.CatalogNumWeeks
weeklyCatalog = self.catalogGenerator.generateWeeklyCatalog(av, newWeek, monthlyCatalog)
backCatalog = self.catalogGenerator.generateBackCatalog(av, newWeek, av.catalogScheduleCurrentWeek, monthlyCatalog)
av.b_setCatalog(monthlyCatalog, weeklyCatalog, backCatalog)
av.b_setCatalogSchedule((av.catalogScheduleCurrentWeek + 1) % ToontownGlobals.CatalogNumWeeks, time.time() + 604800)
av.b_setCatalogSchedule(newWeek, int((time.time() + 604800)/60))
av.b_setCatalogNotify(ToontownGlobals.NewItems, av.mailboxNotify)
def isItemReleased(self, accessory):