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

There you go loudrob

Browse source
This commit is contained in:
John 2015-07-06 22:13:54 +03:00
parent 394e232b6d
commit 66600531fb
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
toontown/ai/NewsManagerAI.py
View file

@ -13,7 +13,7 @@ class NewsManagerAI(DistributedObjectAI):
def __init__(self, air): def __init__(self, air):
DistributedObjectAI.__init__(self, air) DistributedObjectAI.__init__(self, air)
self.activeHolidays = [] self.activeHolidays = []
self.fireworkTask = None self.fireworkTasks = []
def announceGenerate(self): def announceGenerate(self):
DistributedObjectAI.announceGenerate(self) DistributedObjectAI.announceGenerate(self)
@ -24,12 +24,13 @@ class NewsManagerAI(DistributedObjectAI):
def delete(self): def delete(self):
DistributedObjectAI.delete(self) DistributedObjectAI.delete(self)
taskMgr.remove(self.checkTask) taskMgr.remove(self.checkTask)
self.deleteFireworkTask() self.deleteFireworkTasks()
def deleteFireworkTask(self): def deleteFireworkTasks(self):
if self.fireworkTask: if self.fireworkTasks:
taskMgr.remove(self.fireworkTask) for task in self.fireworkTasks:
self.fireworkTask = None taskMgr.remove(task)
self.fireworkTasks = []
def __handleAvatarEntered(self, av): def __handleAvatarEntered(self, av):
avId = av.getDoId() avId = av.getDoId()
@ -86,14 +87,18 @@ class NewsManagerAI(DistributedObjectAI):
if id == ToontownGlobals.FISH_BINGO or id == ToontownGlobals.SILLY_SATURDAY: if id == ToontownGlobals.FISH_BINGO or id == ToontownGlobals.SILLY_SATURDAY:
messenger.send('checkBingoState') messenger.send('checkBingoState')
elif id in [ToontownGlobals.SUMMER_FIREWORKS, ToontownGlobals.NEW_YEAR_FIREWORKS]: elif id in [ToontownGlobals.SUMMER_FIREWORKS, ToontownGlobals.NEW_YEAR_FIREWORKS]:
if not self.fireworkTask: self.fireworkTasks.append(taskMgr.doMethodLater((60 - datetime.datetime.now().minute) * 60, self.startFireworkTask))
self.fireworkTask = taskMgr.doMethodLater(3600, self.startFireworks, 'newsFireworkTask', extraArgs=[id])
def endSpecialHoliday(self, id): def endSpecialHoliday(self, id):
if id == ToontownGlobals.FISH_BINGO or id == ToontownGlobals.SILLY_SATURDAY: if id == ToontownGlobals.FISH_BINGO or id == ToontownGlobals.SILLY_SATURDAY:
messenger.send('checkBingoState') messenger.send('checkBingoState')
elif id in [ToontownGlobals.SUMMER_FIREWORKS, ToontownGlobals.NEW_YEAR_FIREWORKS]: elif id in [ToontownGlobals.SUMMER_FIREWORKS, ToontownGlobals.NEW_YEAR_FIREWORKS]:
self.deleteFireworkTask() self.deleteFireworkTasks()
def startFireworkTask(self, id, task=None):
self.startFireworks(id)
self.fireworkTasks.append(taskMgr.doMethodLater(3600, self.startFireworks, extraArgs=[id]))
return Task.done
def startFireworks(self, type, task=None): def startFireworks(self, type, task=None):
maxShow = len(FireworkShows.shows.get(type, [])) - 1 maxShow = len(FireworkShows.shows.get(type, [])) - 1

2
toontown/battle/DistributedBattleFinal.py
View file

@ -92,7 +92,7 @@ class DistributedBattleFinal(DistributedBattleBase.DistributedBattleBase):
if self.bossCog == None: if self.bossCog == None:
return return
random.seed(suits[0].dna.name) random.seed(suits[0].doId)
bossTaunt = Func(self.bossCog.setChatAbsolute, random.choice(TTLocalizer.BossTaunts), CFSpeech | CFTimeout) bossTaunt = Func(self.bossCog.setChatAbsolute, random.choice(TTLocalizer.BossTaunts), CFSpeech | CFTimeout)
if self.battleSide: if self.battleSide: