diff --git a/toontown/coghq/DistributedCountryClubRoom.py b/toontown/coghq/DistributedCountryClubRoom.py index 543159a8..91bdd4d5 100755 --- a/toontown/coghq/DistributedCountryClubRoom.py +++ b/toontown/coghq/DistributedCountryClubRoom.py @@ -10,7 +10,6 @@ import FactoryEntityCreator import CountryClubRoomSpecs from otp.level import LevelSpec, LevelConstants from toontown.toonbase import TTLocalizer -from toontown.nametag.NametagGlobals import * def getCountryClubRoomReadyPostName(doId): return 'countryClubRoomReady-%s' % doId diff --git a/toontown/coghq/DistributedFactory.py b/toontown/coghq/DistributedFactory.py index 92f04b22..d8dfd3d3 100755 --- a/toontown/coghq/DistributedFactory.py +++ b/toontown/coghq/DistributedFactory.py @@ -14,8 +14,6 @@ from toontown.toonbase import TTLocalizer from toontown.coghq import FactoryCameraViews from direct.controls.ControlManager import CollisionHandlerRayStart from otp.ai.MagicWordGlobal import * -from toontown.nametag.NametagGlobals import * -from toontown.chat.ChatGlobals import CFThought, CFTimeout class DistributedFactory(DistributedLevel.DistributedLevel, FactoryBase.FactoryBase): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedFactory') diff --git a/toontown/coghq/DistributedLawbotCannon.py b/toontown/coghq/DistributedLawbotCannon.py index e97a5d66..11d0e6d3 100755 --- a/toontown/coghq/DistributedLawbotCannon.py +++ b/toontown/coghq/DistributedLawbotCannon.py @@ -7,7 +7,7 @@ from pandac.PandaModules import CollisionSphere, CollisionNode from toontown.toonbase import ToontownGlobals from toontown.estate import DistributedCannon from toontown.estate import CannonGlobals -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals from direct.gui.DirectGui import * from panda3d.core import * from toontown.toon import NPCToons @@ -253,7 +253,7 @@ class DistributedLawbotCannon(DistributedObject.DistributedObject): def __makeGui(self): if self.madeGui: return - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) guiModel = 'phase_4/models/gui/cannon_game_gui' cannonGui = loader.loadModel(guiModel) self.aimPad = DirectFrame(image=cannonGui.find('**/CannonFire_PAD'), relief=None, pos=(0.7, 0, -0.553333), scale=0.8) @@ -297,7 +297,7 @@ class DistributedLawbotCannon(DistributedObject.DistributedObject): if self.flashingLabel: self.flashingLabel.finish() self.flashingLabel = None - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) self.__disableAimInterface() self.upButton.unbind(DGG.B1PRESS) self.upButton.unbind(DGG.B1RELEASE) diff --git a/toontown/coghq/DistributedLevelBattle.py b/toontown/coghq/DistributedLevelBattle.py index 5a1ff8cb..ad1d758e 100755 --- a/toontown/coghq/DistributedLevelBattle.py +++ b/toontown/coghq/DistributedLevelBattle.py @@ -9,9 +9,8 @@ from otp.avatar import Emote from toontown.battle import DistributedBattle from toontown.battle import SuitBattleGlobals from toontown.battle.BattleBase import * -from toontown.chat.ChatGlobals import * -from toontown.nametag import NametagGlobals -from toontown.nametag.NametagGlobals import * +from otp.nametag.NametagConstants import * +from otp.nametag import NametagGlobals from toontown.suit import SuitDNA from toontown.toon import TTEmote from toontown.toonbase import ToontownGlobals @@ -179,7 +178,7 @@ class DistributedLevelBattle(DistributedBattle.DistributedBattle): camTrack.append(Func(camera.lookAt, suit)) mtrack = Parallel(suitTrack, toonTrack) if self.hasLocalToon(): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) mtrack = Parallel(mtrack, camTrack) done = Func(callback) track = Sequence(mtrack, done, name=name) @@ -229,6 +228,6 @@ class DistributedLevelBattle(DistributedBattle.DistributedBattle): self.notify.info('exitReward()') self.clearInterval(self.uniqueName('floorReward')) self._removeMembersKeep() - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) for toon in self.toons: toon.startSmooth() diff --git a/toontown/coghq/DistributedMintBattle.py b/toontown/coghq/DistributedMintBattle.py index b8b6ae99..24300f82 100755 --- a/toontown/coghq/DistributedMintBattle.py +++ b/toontown/coghq/DistributedMintBattle.py @@ -11,7 +11,7 @@ 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 import NametagGlobals class DistributedMintBattle(DistributedLevelBattle.DistributedLevelBattle): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedMintBattle') @@ -29,7 +29,7 @@ class DistributedMintBattle(DistributedLevelBattle.DistributedLevelBattle): self.disableCollision() self.delayDeleteMembers() if self.hasLocalToon(): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) if self.bossBattle: messenger.send('localToonConfrontedMintBoss') self.movie.playReward(ts, self.uniqueName('building-reward'), self.__handleMintRewardDone, noSkip=True) @@ -45,4 +45,4 @@ class DistributedMintBattle(DistributedLevelBattle.DistributedLevelBattle): self.notify.debug('exitMintReward()') self.movie.resetReward(finish=1) self._removeMembersKeep() - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) diff --git a/toontown/coghq/DistributedMintRoom.py b/toontown/coghq/DistributedMintRoom.py index b69311ab..d0ed277d 100755 --- a/toontown/coghq/DistributedMintRoom.py +++ b/toontown/coghq/DistributedMintRoom.py @@ -9,7 +9,6 @@ import MintRoomBase, MintRoom import MintRoomSpecs from otp.level import DistributedLevel from otp.level import LevelSpec, LevelConstants -from toontown.nametag.NametagGlobals import * from toontown.toonbase import TTLocalizer from toontown.toonbase.ToontownGlobals import * diff --git a/toontown/coghq/DistributedStageBattle.py b/toontown/coghq/DistributedStageBattle.py index d98b82e5..178c2edc 100755 --- a/toontown/coghq/DistributedStageBattle.py +++ b/toontown/coghq/DistributedStageBattle.py @@ -11,7 +11,7 @@ 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 import NametagGlobals class DistributedStageBattle(DistributedLevelBattle.DistributedLevelBattle): notify = DirectNotifyGlobal.directNotify.newCategory('DistributedStageBattle') @@ -29,7 +29,7 @@ class DistributedStageBattle(DistributedLevelBattle.DistributedLevelBattle): self.disableCollision() self.delayDeleteMembers() if self.hasLocalToon(): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) if self.bossBattle: messenger.send('localToonConfrontedStageBoss') self.movie.playReward(ts, self.uniqueName('building-reward'), self.__handleStageRewardDone, noSkip=True) @@ -45,4 +45,4 @@ class DistributedStageBattle(DistributedLevelBattle.DistributedLevelBattle): self.notify.debug('exitStageReward()') self.movie.resetReward(finish=1) self._removeMembersKeep() - NametagGlobals.setWant2dNametags(True) + NametagGlobals.setMasterArrowsOn(1) diff --git a/toontown/coghq/DistributedStageRoom.py b/toontown/coghq/DistributedStageRoom.py index 4f2a142c..6077525a 100755 --- a/toontown/coghq/DistributedStageRoom.py +++ b/toontown/coghq/DistributedStageRoom.py @@ -10,7 +10,6 @@ import FactoryEntityCreator import StageRoomSpecs from otp.level import LevelSpec, LevelConstants from toontown.toonbase import TTLocalizer -from toontown.nametag.NametagGlobals import * def getStageRoomReadyPostName(doId): return 'stageRoomReady-%s' % doId diff --git a/toontown/coghq/FactoryExterior.py b/toontown/coghq/FactoryExterior.py index 1a27c647..f29269ec 100755 --- a/toontown/coghq/FactoryExterior.py +++ b/toontown/coghq/FactoryExterior.py @@ -2,7 +2,7 @@ from direct.directnotify import DirectNotifyGlobal from direct.fsm import ClassicFSM, State from direct.fsm import State from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals from panda3d.core import * from toontown.battle import BattlePlace from toontown.building import Elevator @@ -93,7 +93,7 @@ class FactoryExterior(BattlePlace.BattlePlace): self._telemLimiter = TLGatherAllAvs('FactoryExterior', 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/FactoryInterior.py b/toontown/coghq/FactoryInterior.py index 35740dd7..0a1b9eee 100755 --- a/toontown/coghq/FactoryInterior.py +++ b/toontown/coghq/FactoryInterior.py @@ -11,7 +11,8 @@ from toontown.toonbase import TTLocalizer from toontown.toontowngui import TTDialog from toontown.toonbase import ToontownBattleGlobals from toontown.building import Elevator -from toontown.nametag import NametagGlobals +from otp.nametag.NametagConstants import * +from otp.nametag import NametagGlobals class FactoryInterior(BattlePlace.BattlePlace): notify = DirectNotifyGlobal.directNotify.newCategory('FactoryInterior') @@ -79,7 +80,7 @@ class FactoryInterior(BattlePlace.BattlePlace): self._telemLimiter = TLGatherAllAvs('FactoryInterior', 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() @@ -100,7 +101,7 @@ class FactoryInterior(BattlePlace.BattlePlace): self.acceptOnce('localToonConfrontedForeman', handleConfrontedForeman) def exit(self): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) self._telemLimiter.destroy() del self._telemLimiter if hasattr(base, 'factoryReady'): diff --git a/toontown/coghq/MintInterior.py b/toontown/coghq/MintInterior.py index 045ce387..80157cfb 100755 --- a/toontown/coghq/MintInterior.py +++ b/toontown/coghq/MintInterior.py @@ -12,7 +12,7 @@ from toontown.toonbase import TTLocalizer from toontown.toontowngui import TTDialog from toontown.toonbase import ToontownBattleGlobals from toontown.coghq import DistributedMint -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals class MintInterior(BattlePlace.BattlePlace): notify = DirectNotifyGlobal.directNotify.newCategory('MintInterior') @@ -80,7 +80,7 @@ class MintInterior(BattlePlace.BattlePlace): self._telemLimiter = TLGatherAllAvs('MintInterior', 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() @@ -100,7 +100,7 @@ class MintInterior(BattlePlace.BattlePlace): self.acceptOnce('localToonConfrontedMintBoss', handleConfrontedBoss) def exit(self): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) bboard.remove(DistributedMint.DistributedMint.ReadyPost) self._telemLimiter.destroy() del self._telemLimiter diff --git a/toontown/coghq/StageInterior.py b/toontown/coghq/StageInterior.py index 6b08ec86..47233adf 100755 --- a/toontown/coghq/StageInterior.py +++ b/toontown/coghq/StageInterior.py @@ -13,7 +13,7 @@ from toontown.toontowngui import TTDialog from toontown.toonbase import ToontownBattleGlobals from toontown.coghq import DistributedStage from toontown.building import Elevator -from toontown.nametag import NametagGlobals +from otp.nametag import NametagGlobals class StageInterior(BattlePlace.BattlePlace): notify = DirectNotifyGlobal.directNotify.newCategory('StageInterior') @@ -82,7 +82,7 @@ class StageInterior(BattlePlace.BattlePlace): base.cr.forbidCheesyEffects(1) 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() @@ -102,7 +102,7 @@ class StageInterior(BattlePlace.BattlePlace): self.acceptOnce('localToonConfrontedStageBoss', handleConfrontedBoss) def exit(self): - NametagGlobals.setWant2dNametags(False) + NametagGlobals.setMasterArrowsOn(0) self._telemLimiter.destroy() del self._telemLimiter bboard.remove(DistributedStage.DistributedStage.ReadyPost)