diff --git a/toontown/battle/DistributedBattleFinalAI.py b/toontown/battle/DistributedBattleFinalAI.py index c4579a8..bb4ef70 100644 --- a/toontown/battle/DistributedBattleFinalAI.py +++ b/toontown/battle/DistributedBattleFinalAI.py @@ -17,6 +17,7 @@ class DistributedBattleFinalAI(DistributedBattleBaseAI.DistributedBattleBaseAI): DistributedBattleBaseAI.DistributedBattleBaseAI.__init__(self, air, bossCog.zoneId, finishCallback) self.bossCogId = bossCog.doId self.battleNumber = bossCog.battleNumber + self.rewardDuration = bossCog.getEndOfBattleMovieDuration() self.battleSide = battleSide self.streetBattle = 0 self.roundCallback = roundCallback @@ -112,7 +113,7 @@ class DistributedBattleFinalAI(DistributedBattleBaseAI.DistributedBattleBaseAI): return None def enterReward(self): - self.timer.startCallback(FLOOR_REWARD_TIMEOUT + 5, self.serverRewardDone) + self.timer.startCallback(FLOOR_REWARD_TIMEOUT + self.rewardDuration, self.serverRewardDone) return None def exitReward(self): diff --git a/toontown/suit/DistributedBossCogAI.py b/toontown/suit/DistributedBossCogAI.py index 7dc5461..7f67fa4 100644 --- a/toontown/suit/DistributedBossCogAI.py +++ b/toontown/suit/DistributedBossCogAI.py @@ -524,6 +524,10 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI): if self.battleB: self.handleRoundDone(self.battleB, self.suitsB, self.activeSuitsB, toonIds, totalHp, deadSuits) + @staticmethod + def getEndOfBattleMovieDuration(): + return 0 + def handleBattleADone(self, zoneId, toonIds): if self.battleA: self.battleA.requestDelete() diff --git a/toontown/suit/DistributedLawbotBossAI.py b/toontown/suit/DistributedLawbotBossAI.py index ede2291..8ee332e 100644 --- a/toontown/suit/DistributedLawbotBossAI.py +++ b/toontown/suit/DistributedLawbotBossAI.py @@ -264,6 +264,10 @@ class DistributedLawbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FSM def makeBattleOneBattles(self): self.postBattleState = 'RollToBattleTwo' self.initializeBattles(1, ToontownGlobals.LawbotBossBattleOnePosHpr) + + @staticmethod + def getEndOfBattleMovieDuration(): + return 5 def generateSuits(self, battleNumber): if battleNumber == 1: diff --git a/toontown/suit/DistributedSellbotBossAI.py b/toontown/suit/DistributedSellbotBossAI.py index 9675b7e..87c6898 100644 --- a/toontown/suit/DistributedSellbotBossAI.py +++ b/toontown/suit/DistributedSellbotBossAI.py @@ -217,6 +217,10 @@ class DistributedSellbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS def makeBattleOneBattles(self): self.postBattleState = 'RollToBattleTwo' self.initializeBattles(1, ToontownGlobals.SellbotBossBattleOnePosHpr) + + @staticmethod + def getEndOfBattleMovieDuration(): + return 5 def generateSuits(self, battleNumber): if self.nerfed: