Quests: uncommented all references to questmanager, except for tailer, which has changed to not use ticketS
This commit is contained in:
parent
aa0377d85f
commit
fe7658ec3c
8 changed files with 16 additions and 20 deletions
|
@ -182,15 +182,15 @@ def assignRewards(activeToons, toonSkillPtsGained, suitsKilled, zoneId, helpfulT
|
|||
toon.d_setInventory(toon.inventory.makeNetString())
|
||||
toon.b_setAnimState('victory', 1)
|
||||
|
||||
#TODO: all dese managers
|
||||
'''if simbase.air.config.GetBool('battle-passing-no-credit', True):
|
||||
#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
|
||||
|
|
|
@ -88,10 +88,9 @@ class DistributedBattleAI(DistributedBattleBaseAI.DistributedBattleBaseAI):
|
|||
for toonId in self.activeToons:
|
||||
toon = self.getToon(toonId)
|
||||
if toon:
|
||||
#TODO: quest & promotion mgr
|
||||
pass
|
||||
'''self.toonItems[toonId] = self.air.questManager.recoverItems(toon, self.suitsKilled, self.zoneId)
|
||||
if toonId in self.helpfulToons:
|
||||
#TODO: promotion mgr
|
||||
self.toonItems[toonId] = self.air.questManager.recoverItems(toon, self.suitsKilled, self.zoneId)
|
||||
'''if toonId in self.helpfulToons:
|
||||
self.toonMerits[toonId] = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.zoneId)
|
||||
else:
|
||||
self.notify.debug('toon %d not helpful, skipping merits' % toonId)'''
|
||||
|
|
|
@ -13,6 +13,8 @@ from toontown.toonbase import ToontownGlobals
|
|||
from toontown.toonbase import TTLocalizer
|
||||
from toontown.toon import NPCForceAcknowledge
|
||||
from toontown.toon import HealthForceAcknowledge
|
||||
from otp.nametag.NametagConstants import *
|
||||
from otp.nametag import NametagGlobals
|
||||
|
||||
class ToonInterior(Place.Place):
|
||||
notify = DirectNotifyGlobal.directNotify.newCategory('ToonInterior')
|
||||
|
|
|
@ -123,9 +123,8 @@ def createMinigame(air, playerArray, trolleyZone, minigameZone = None, previousG
|
|||
if toon != None:
|
||||
toons.append(toon)
|
||||
|
||||
# TODO: QUESTTODO
|
||||
#for toon in toons:
|
||||
# simbase.air.questManager.toonPlayedMinigame(toon, toons)
|
||||
for toon in toons:
|
||||
simbase.air.questManager.toonPlayedMinigame(toon, toons)
|
||||
|
||||
retVal = {}
|
||||
retVal['minigameZone'] = minigameZone
|
||||
|
|
|
@ -45,11 +45,5 @@ class QuestManagerAI:
|
|||
def avatarChoseTrack(self, avId, npc, pendingTrackQuest, trackId):
|
||||
pass
|
||||
|
||||
def hasTailorClothingTicket(self, av, tailorNpc):
|
||||
pass
|
||||
|
||||
def removeClothingTicket(self, av, tailorNpc):
|
||||
pass
|
||||
|
||||
def toonMadeFriend(self, av, otherAv):
|
||||
pass
|
||||
|
|
|
@ -52,6 +52,8 @@ class SuitLegList:
|
|||
leg = self.getLegIndexAtTime(startTime, 0)
|
||||
time = startTime
|
||||
while time < endTime:
|
||||
if leg >= len(self.legs):
|
||||
return False
|
||||
if self[leg].pointA == point or self[leg].pointB == point:
|
||||
return True
|
||||
time += self[leg].getLegTime()
|
||||
|
|
|
@ -26,8 +26,8 @@ class DistributedNPCToonAI(DistributedNPCToonBaseAI):
|
|||
def avatarEnter(self):
|
||||
avId = self.air.getAvatarIdFromSender()
|
||||
self.notify.debug('avatar enter ' + str(avId))
|
||||
#self.air.questManager.requestInteract(avId, self)
|
||||
#DistributedNPCToonBaseAI.avatarEnter(self)
|
||||
self.air.questManager.requestInteract(avId, self)
|
||||
DistributedNPCToonBaseAI.avatarEnter(self)
|
||||
self.rejectAvatar(avId)
|
||||
|
||||
def chooseQuest(self, questId):
|
||||
|
|
|
@ -669,7 +669,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
|
|||
if friendsList:
|
||||
friendId = friendsList[-1]
|
||||
otherAv = self.air.doId2do.get(friendId)
|
||||
#self.air.questManager.toonMadeFriend(self, otherAv)
|
||||
self.air.questManager.toonMadeFriend(self, otherAv)
|
||||
|
||||
def getFriendsList(self):
|
||||
return self.friendsList
|
||||
|
|
Loading…
Reference in a new issue