Battle fix

This commit is contained in:
John 2015-06-21 22:38:00 +03:00
parent 39b42edbda
commit 74429800e7

View file

@ -849,16 +849,8 @@ class DistributedSuitPlannerAI(DistributedObjectAI.DistributedObjectAI, SuitPlan
pos = self.battlePosDict[canonicalZoneId]
interactivePropTrackBonus = -1
if simbase.config.GetBool('props-buff-battles', True) and self.cellToGagBonusDict.has_key(canonicalZoneId):
tentativeBonusTrack = self.cellToGagBonusDict[canonicalZoneId]
trackToHolidayDict = {
ToontownBattleGlobals.SQUIRT_TRACK: ToontownGlobals.HYDRANTS_BUFF_BATTLES,
ToontownBattleGlobals.THROW_TRACK: ToontownGlobals.MAILBOXES_BUFF_BATTLES,
ToontownBattleGlobals.HEAL_TRACK: ToontownGlobals.TRASHCANS_BUFF_BATTLES }
if tentativeBonusTrack in trackToHolidayDict:
holidayId = trackToHolidayDict[tentativeBonusTrack]
if simbase.air.holidayManager.isHolidayRunning(holidayId):#and simbase.air.holidayManager.getCurPhase(holidayId) >= 1:
interactivePropTrackBonus = tentativeBonusTrack
if config.GetBool('props-buff-battles', True) and canonicalZoneId in self.cellToGagBonusDict:
interactivePropTrackBonus = self.cellToGagBonusDict[canonicalZoneId]
self.battleMgr.newBattle(
zoneId, zoneId, pos, suit, toonId, self.__battleFinished,