mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2025-01-09 17:53:50 +00:00
toontown\coghq is fully converted
This commit is contained in:
parent
46cb2afda6
commit
d109dd2a16
12 changed files with 25 additions and 30 deletions
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 *
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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'):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue