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

battle: working CogPageManagerAI, tempfix crash caused by QuestManager

Browse source
This commit is contained in:
Aidan Noll 2014-04-08 23:44:47 -04:00
parent ab8addec5d
commit a93d5d1bab
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/ai/ToontownAIRepository.py
View file

@ -42,6 +42,7 @@ from DistributedAprilToonsMgrAI import DistributedAprilToonsMgrAI
from toontown.quest.QuestManagerAI import QuestManagerAI
from toontown.building.DistributedTrophyMgrAI import DistributedTrophyMgrAI
from toontown.shtiker.CogPageManagerAI import CogPageManagerAI
class ToontownAIRepository(ToontownInternalRepository):
def __init__(self, baseChannel, serverId, districtName):
@ -66,6 +67,7 @@ class ToontownAIRepository(ToontownInternalRepository):
self.fishManager = FishManagerAI()
self.questManager = QuestManagerAI()
self.cogPageManager = CogPageManagerAI()
def getTrackClsends(self):
return False

5
toontown/battle/BattleExperienceAI.py
View file

@ -182,15 +182,14 @@ def assignRewards(activeToons, toonSkillPtsGained, suitsKilled, zoneId, helpfulT
toon.d_setInventory(toon.inventory.makeNetString())
toon.b_setAnimState('victory', 1)
#TODO: cogPageManager
if simbase.air.config.GetBool('battle-passing-no-credit', True):
if helpfulToons and toon.doId in helpfulToons:
simbase.air.questManager.toonKilledCogs(toon, suitsKilled, zoneId, activeToonList)
#simbase.air.cogPageManager.toonKilledCogs(toon, suitsKilled, zoneId)
simbase.air.cogPageManager.toonKilledCogs(toon, suitsKilled, zoneId)
else:
BattleExperienceAINotify.debug('toon=%d unhelpful not getting killed cog quest credit' % toon.doId)
else:
simbase.air.questManager.toonKilledCogs(toon, suitsKilled, zoneId, activeToonList)
#simbase.air.cogPageManager.toonKilledCogs(toon, suitsKilled, zoneId)
simbase.air.cogPageManager.toonKilledCogs(toon, suitsKilled, zoneId)
return

2
toontown/quest/QuestManagerAI.py
View file

@ -11,7 +11,7 @@ class QuestManagerAI:
def recoverItems(self, toon, suitsKilled, zoneId):
#return (recovered, notRecovered)
pass
return ([], [])
def toonKilledBuilding(self, toon, track, difficulty, numFloors, zoneId, activeToons):
pass