mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2025-01-09 17:53:50 +00:00
Battle fix
This commit is contained in:
parent
39b42edbda
commit
74429800e7
1 changed files with 2 additions and 10 deletions
|
@ -849,16 +849,8 @@ class DistributedSuitPlannerAI(DistributedObjectAI.DistributedObjectAI, SuitPlan
|
||||||
pos = self.battlePosDict[canonicalZoneId]
|
pos = self.battlePosDict[canonicalZoneId]
|
||||||
|
|
||||||
interactivePropTrackBonus = -1
|
interactivePropTrackBonus = -1
|
||||||
if simbase.config.GetBool('props-buff-battles', True) and self.cellToGagBonusDict.has_key(canonicalZoneId):
|
if config.GetBool('props-buff-battles', True) and canonicalZoneId in self.cellToGagBonusDict:
|
||||||
tentativeBonusTrack = self.cellToGagBonusDict[canonicalZoneId]
|
interactivePropTrackBonus = 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
|
|
||||||
|
|
||||||
self.battleMgr.newBattle(
|
self.battleMgr.newBattle(
|
||||||
zoneId, zoneId, pos, suit, toonId, self.__battleFinished,
|
zoneId, zoneId, pos, suit, toonId, self.__battleFinished,
|
||||||
|
|
Loading…
Reference in a new issue