coghq: fix a bunch of vp crashes

This commit is contained in:
John Cote 2020-01-09 20:12:42 -05:00
parent 19080e8754
commit bac1d10200
7 changed files with 10 additions and 4 deletions

View file

@ -1,4 +1,5 @@
from pandac.PandaModules import *
from libotp import *
from direct.interval.IntervalGlobal import *
from .BattleBase import *
from direct.actor import Actor

View file

@ -1,4 +1,5 @@
from pandac.PandaModules import *
from libotp import *
from direct.interval.IntervalGlobal import *
from direct.directnotify import DirectNotifyGlobal
from toontown.hood import Place

View file

@ -5,6 +5,7 @@ from toontown.hood import Place
from toontown.building import Elevator
from toontown.toonbase import ToontownGlobals
from pandac.PandaModules import *
from libotp import *
from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs
class CogHQLobby(Place.Place):

View file

@ -1,4 +1,5 @@
from pandac.PandaModules import *
from libotp import *
from direct.interval.IntervalGlobal import *
from direct.actor import Actor
from otp.avatar import Avatar

View file

@ -1,4 +1,5 @@
from pandac.PandaModules import *
from libotp import *
from direct.interval.IntervalGlobal import *
from direct.distributed.ClockDelta import *
from direct.directnotify import DirectNotifyGlobal

View file

@ -403,9 +403,9 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI):
random.shuffle(toons)
numToons = min(len(toons), 8)
if numToons < 4:
numToonsB = numToons / 2
numToonsB = numToons // 2
else:
numToonsB = (numToons + random.choice([0, 1])) / 2
numToonsB = (numToons + random.choice([0, 1])) // 2
teamA = toons[numToonsB:numToons]
teamB = toons[:numToonsB]
loose = toons[numToons:]
@ -575,7 +575,7 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI):
joinedReserves = []
if len(self.reserveSuits) > 0 and len(activeSuits) < 4:
hpPercent = 100 - totalHp / totalMaxHp * 100.0
hpPercent = 100 - totalHp // totalMaxHp * 100.0
for info in self.reserveSuits:
if info[1] <= hpPercent and len(activeSuits) < 4:
suits.append(info[0])

View file

@ -1,4 +1,5 @@
from pandac.PandaModules import *
from libotp import *
from direct.interval.IntervalGlobal import *
from toontown.battle.BattleProps import *
from direct.distributed.ClockDelta import *
@ -73,7 +74,7 @@ class DistributedSellbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
global OneBossCog
DistributedBossCog.DistributedBossCog.announceGenerate(self)
self.setName(TTLocalizer.SellbotBossName)
nameInfo = TTLocalizer.BossCogNameWithDept % {'name': self.name,
nameInfo = TTLocalizer.BossCogNameWithDept % {'name': self._name,
'dept': SuitDNA.getDeptFullname(self.style.dept)}
self.setDisplayName(nameInfo)
self.cageDoorSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_door.mp3')