From c04375d5e8c534bf4f92a1ba852c636eaf2b8480 Mon Sep 17 00:00:00 2001 From: John Cote Date: Fri, 10 Jan 2020 17:20:26 -0500 Subject: [PATCH] coghq: fix some da office crashes --- toontown/ai/ToontownAIRepository.py | 3 +++ toontown/coghq/DistributedSecurityCamera.py | 4 ++-- toontown/coghq/DistributedStageBattle.py | 1 + toontown/coghq/StageInterior.py | 1 + toontown/quest/QuestManagerAI.py | 3 +++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/toontown/ai/ToontownAIRepository.py b/toontown/ai/ToontownAIRepository.py index ac7e5ff..112fbbe 100644 --- a/toontown/ai/ToontownAIRepository.py +++ b/toontown/ai/ToontownAIRepository.py @@ -430,5 +430,8 @@ class ToontownAIRepository(ToontownInternalRepository): self.zoneAllocator.free(zone) + def trueUniqueName(self, idString): + return self.uniqueName(idString) + def sendQueryToonMaxHp(self, avId, callback): pass # TODO? diff --git a/toontown/coghq/DistributedSecurityCamera.py b/toontown/coghq/DistributedSecurityCamera.py index de5a448..198c049 100644 --- a/toontown/coghq/DistributedSecurityCamera.py +++ b/toontown/coghq/DistributedSecurityCamera.py @@ -314,9 +314,9 @@ class DistributedSecurityCamera(BasicEntities.DistributedNodePathEntity): self.trackShape = [] wideX = 1 wideY = 1 - self.trackShape = getCirclePoints(5 + draw * 12.0, 0.0, 0.0, self.radius, wideX, wideY) + self.trackShape = getCirclePoints(int(5 + draw * 12.0), 0.0, 0.0, self.radius, wideX, wideY) self.trackShapeFloor = [] - self.trackShapeFloor = getCirclePoints(5 + draw * 50.0, 0.0, 0.0, self.radius, wideX, wideY) + self.trackShapeFloor = getCirclePoints(int(5 + draw * 50.0), 0.0, 0.0, self.radius, wideX, wideY) if self.trackBeamGN: self.trackBeamGN.removeAllGeoms() if self.trackFloorGN: diff --git a/toontown/coghq/DistributedStageBattle.py b/toontown/coghq/DistributedStageBattle.py index e63c64f..afce9fb 100644 --- a/toontown/coghq/DistributedStageBattle.py +++ b/toontown/coghq/DistributedStageBattle.py @@ -1,4 +1,5 @@ from pandac.PandaModules import * +from libotp import * from direct.interval.IntervalGlobal import * from toontown.battle.BattleBase import * from toontown.coghq import DistributedLevelBattle diff --git a/toontown/coghq/StageInterior.py b/toontown/coghq/StageInterior.py index b03289f..90f2e60 100644 --- a/toontown/coghq/StageInterior.py +++ b/toontown/coghq/StageInterior.py @@ -4,6 +4,7 @@ from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.showbase import BulletinBoardWatcher from pandac.PandaModules import * +from libotp import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from toontown.toon import Toon from toontown.toonbase import ToontownGlobals diff --git a/toontown/quest/QuestManagerAI.py b/toontown/quest/QuestManagerAI.py index d8378e1..9d7ecd7 100644 --- a/toontown/quest/QuestManagerAI.py +++ b/toontown/quest/QuestManagerAI.py @@ -36,3 +36,6 @@ class QuestManagerAI: def toonDefeatedMint(self, toon, mintId, activeVictors): pass # TODO + + def toonDefeatedStage(self, toon, stageId, activeVictors): + pass # TODO