From 46cb2afda68c80e88b125669f89379d0aee122c5 Mon Sep 17 00:00:00 2001 From: John Cote Date: Thu, 25 Jun 2015 21:10:16 -0400 Subject: [PATCH] This is really getting boring... --- toontown/cogdominium/DistributedCogdoInterior.py | 3 +-- toontown/coghq/CogHQBossBattle.py | 6 +++--- toontown/coghq/CogHQExterior.py | 4 ++-- toontown/coghq/CountryClubInterior.py | 7 +++---- toontown/coghq/DistributedBattleFactory.py | 7 ++++--- toontown/coghq/DistributedCashbotBossCrane.py | 6 +++--- toontown/coghq/DistributedCountryClubBattle.py | 6 +++--- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/toontown/cogdominium/DistributedCogdoInterior.py b/toontown/cogdominium/DistributedCogdoInterior.py index 28865f33..6925340f 100755 --- a/toontown/cogdominium/DistributedCogdoInterior.py +++ b/toontown/cogdominium/DistributedCogdoInterior.py @@ -31,8 +31,7 @@ PAINTING_DICT = {'s': 'tt_m_ara_crg_paintingMoverShaker', 'm': 'tt_m_ara_crg_paintingMoverShaker', 'c': 'tt_m_ara_crg_paintingMoverShaker'} -from toontown.nametag.NametagGlobals import * -from toontown.chat.ChatGlobals import * +from otp.nametag.NametagConstants import * class DistributedCogdoInterior(DistributedObject.DistributedObject): id = 0 diff --git a/toontown/coghq/CogHQBossBattle.py b/toontown/coghq/CogHQBossBattle.py index 233203eb..d9de04a7 100755 --- a/toontown/coghq/CogHQBossBattle.py +++ b/toontown/coghq/CogHQBossBattle.py @@ -9,8 +9,8 @@ from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownBattleGlobals from toontown.battle import BattlePlace from toontown.suit import Suit -from toontown.nametag.NametagGlobals import * -from toontown.nametag import NametagGlobals +from otp.nametag.NametagConstants import * +from otp.nametag import NametagGlobals import math class CogHQBossBattle(BattlePlace.BattlePlace): @@ -109,7 +109,7 @@ class CogHQBossBattle(BattlePlace.BattlePlace): if self.bossCog: self.bossCog.d_avatarEnter() self._telemLimiter = TLGatherAllAvs('CogHQBossBattle', RotationLimitToH) - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) base.localAvatar.inventory.setRespectInvasions(0) self.fsm.request(requestStatus['how'], [requestStatus]) diff --git a/toontown/coghq/CogHQExterior.py b/toontown/coghq/CogHQExterior.py index 9db9976b..4e186469 100755 --- a/toontown/coghq/CogHQExterior.py +++ b/toontown/coghq/CogHQExterior.py @@ -5,7 +5,7 @@ from direct.fsm import State from toontown.toonbase import ToontownGlobals from panda3d.core import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals class CogHQExterior(BattlePlace.BattlePlace): notify = DirectNotifyGlobal.directNotify.newCategory('CogHQExterior') @@ -69,7 +69,7 @@ class CogHQExterior(BattlePlace.BattlePlace): self._telemLimiter = TLGatherAllAvs('CogHQExterior', RotationLimitToH) self.accept('doorDoneEvent', self.handleDoorDoneEvent) self.accept('DistributedDoor_doorTrigger', self.handleDoorTrigger) - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) self.tunnelOriginList = base.cr.hoodMgr.addLinkTunnelHooks(self, self.nodeList) how = requestStatus['how'] self.fsm.request(how, [requestStatus]) diff --git a/toontown/coghq/CountryClubInterior.py b/toontown/coghq/CountryClubInterior.py index ced2378e..37833f7e 100755 --- a/toontown/coghq/CountryClubInterior.py +++ b/toontown/coghq/CountryClubInterior.py @@ -5,7 +5,6 @@ from direct.fsm import State from direct.showbase import BulletinBoardWatcher from panda3d.core import * from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs -from toontown.nametag import NametagGlobals from toontown.toon import Toon from toontown.toonbase import ToontownGlobals from toontown.hood import ZoneUtil @@ -14,7 +13,7 @@ from toontown.toontowngui import TTDialog from toontown.toonbase import ToontownBattleGlobals from toontown.coghq import DistributedCountryClub from toontown.building import Elevator -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals import random class CountryClubInterior(BattlePlace.BattlePlace): @@ -87,7 +86,7 @@ class CountryClubInterior(BattlePlace.BattlePlace): self._telemLimiter = TLGatherAllAvs('CountryClubInterior', RotationLimitToH) def commence(self = self): - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) self.fsm.request(requestStatus['how'], [requestStatus]) base.playMusic(self.music, looping=1, volume=0.8) base.transitions.irisIn() @@ -107,7 +106,7 @@ class CountryClubInterior(BattlePlace.BattlePlace): self.acceptOnce('localToonConfrontedCountryClubBoss', handleConfrontedBoss) def exit(self): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) bboard.remove(DistributedCountryClub.DistributedCountryClub.ReadyPost) self._telemLimiter.destroy() del self._telemLimiter diff --git a/toontown/coghq/DistributedBattleFactory.py b/toontown/coghq/DistributedBattleFactory.py index 0bd2e0c7..1396bccb 100755 --- a/toontown/coghq/DistributedBattleFactory.py +++ b/toontown/coghq/DistributedBattleFactory.py @@ -11,7 +11,8 @@ from toontown.suit import SuitDNA from direct.fsm import State from direct.fsm import ClassicFSM, State from toontown.toonbase import ToontownGlobals -from toontown.nametag import NametagGlobals +from otp.nametag.NametagConstants import * +from otp.nametag import NametagGlobals class DistributedBattleFactory(DistributedLevelBattle.DistributedLevelBattle): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleFactory') @@ -29,7 +30,7 @@ class DistributedBattleFactory(DistributedLevelBattle.DistributedLevelBattle): self.disableCollision() self.delayDeleteMembers() if self.hasLocalToon(): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) if self.bossBattle: messenger.send('localToonConfrontedForeman') self.movie.playReward(ts, self.uniqueName('building-reward'), self.__handleFactoryRewardDone, noSkip=True) @@ -45,4 +46,4 @@ class DistributedBattleFactory(DistributedLevelBattle.DistributedLevelBattle): self.notify.info('exitFactoryReward()') self.movie.resetReward(finish=1) self._removeMembersKeep() - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) diff --git a/toontown/coghq/DistributedCashbotBossCrane.py b/toontown/coghq/DistributedCashbotBossCrane.py index f9e20d7c..21dfdc33 100755 --- a/toontown/coghq/DistributedCashbotBossCrane.py +++ b/toontown/coghq/DistributedCashbotBossCrane.py @@ -10,8 +10,8 @@ from direct.task import Task from toontown.toonbase import ToontownGlobals from toontown.toonbase import TTLocalizer from otp.otpbase import OTPGlobals +from otp.nametag import NametagGlobals import random -from toontown.nametag import NametagGlobals class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedCashbotBossCrane') @@ -407,7 +407,7 @@ class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM): taskMgr.add(self.__watchControls, 'watchCraneControls') taskMgr.doMethodLater(5, self.__displayCraneAdvice, self.craneAdviceName) taskMgr.doMethodLater(10, self.__displayMagnetAdvice, self.magnetAdviceName) - NametagGlobals.setForceOnscreenChat(True) + NametagGlobals.setOnscreenChatForced(1) self.arrowVert = 0 self.arrowHorz = 0 return @@ -428,7 +428,7 @@ class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM): self.ignore('InputState-turnRight') self.arrowVert = 0 self.arrowHorz = 0 - NametagGlobals.setForceOnscreenChat(False) + NametagGlobals.setOnscreenChatForced(0) taskMgr.remove('watchCraneControls') self.__setMoveSound(None) return diff --git a/toontown/coghq/DistributedCountryClubBattle.py b/toontown/coghq/DistributedCountryClubBattle.py index 81597846..68d99544 100755 --- a/toontown/coghq/DistributedCountryClubBattle.py +++ b/toontown/coghq/DistributedCountryClubBattle.py @@ -5,7 +5,7 @@ from direct.fsm import ClassicFSM, State from direct.fsm import State from direct.interval.IntervalGlobal import * from otp.avatar import Emote -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals from panda3d.core import * from toontown.battle import SuitBattleGlobals from toontown.battle.BattleBase import * @@ -31,7 +31,7 @@ class DistributedCountryClubBattle(DistributedLevelBattle.DistributedLevelBattle self.disableCollision() self.delayDeleteMembers() if self.hasLocalToon(): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) if self.bossBattle: messenger.send('localToonConfrontedCountryClubBoss') self.movie.playReward(ts, self.uniqueName('building-reward'), self.__handleCountryClubRewardDone, noSkip=True) @@ -47,4 +47,4 @@ class DistributedCountryClubBattle(DistributedLevelBattle.DistributedLevelBattle self.notify.debug('exitCountryClubReward()') self.movie.resetReward(finish=1) self._removeMembersKeep() - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1)