Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

This is really getting boring...

Browse source
This commit is contained in:
John Cote 2015-06-25 21:10:16 -04:00
parent 7cf799814c
commit 46cb2afda6
7 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toontown/cogdominium/DistributedCogdoInterior.py
View file

@ -31,8 +31,7 @@ PAINTING_DICT = {'s': 'tt_m_ara_crg_paintingMoverShaker',
'm': 'tt_m_ara_crg_paintingMoverShaker', 'm': 'tt_m_ara_crg_paintingMoverShaker',
'c': 'tt_m_ara_crg_paintingMoverShaker'} 'c': 'tt_m_ara_crg_paintingMoverShaker'}
from toontown.nametag.NametagGlobals import * from otp.nametag.NametagConstants import *
from toontown.chat.ChatGlobals import *
class DistributedCogdoInterior(DistributedObject.DistributedObject): class DistributedCogdoInterior(DistributedObject.DistributedObject):
id = 0 id = 0

6
toontown/coghq/CogHQBossBattle.py
View file

@ -9,8 +9,8 @@ from toontown.toonbase import ToontownGlobals
from toontown.toonbase import ToontownBattleGlobals from toontown.toonbase import ToontownBattleGlobals
from toontown.battle import BattlePlace from toontown.battle import BattlePlace
from toontown.suit import Suit from toontown.suit import Suit
from toontown.nametag.NametagGlobals import * from otp.nametag.NametagConstants import *
from toontown.nametag import NametagGlobals from otp.nametag import NametagGlobals
import math import math
class CogHQBossBattle(BattlePlace.BattlePlace): class CogHQBossBattle(BattlePlace.BattlePlace):
@ -109,7 +109,7 @@ class CogHQBossBattle(BattlePlace.BattlePlace):
if self.bossCog: if self.bossCog:
self.bossCog.d_avatarEnter() self.bossCog.d_avatarEnter()
self._telemLimiter = TLGatherAllAvs('CogHQBossBattle', RotationLimitToH) self._telemLimiter = TLGatherAllAvs('CogHQBossBattle', RotationLimitToH)
NametagGlobals.setWant2dNametags(True) NametagGlobals.setMasterArrowsOn(1)
base.localAvatar.inventory.setRespectInvasions(0) base.localAvatar.inventory.setRespectInvasions(0)
self.fsm.request(requestStatus['how'], [requestStatus]) self.fsm.request(requestStatus['how'], [requestStatus])

4
toontown/coghq/CogHQExterior.py
View file

@ -5,7 +5,7 @@ from direct.fsm import State
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from panda3d.core import * from panda3d.core import *
from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs
from toontown.nametag import NametagGlobals from otp.nametag import NametagGlobals
class CogHQExterior(BattlePlace.BattlePlace): class CogHQExterior(BattlePlace.BattlePlace):
notify = DirectNotifyGlobal.directNotify.newCategory('CogHQExterior') notify = DirectNotifyGlobal.directNotify.newCategory('CogHQExterior')
@ -69,7 +69,7 @@ class CogHQExterior(BattlePlace.BattlePlace):
self._telemLimiter = TLGatherAllAvs('CogHQExterior', RotationLimitToH) self._telemLimiter = TLGatherAllAvs('CogHQExterior', RotationLimitToH)
self.accept('doorDoneEvent', self.handleDoorDoneEvent) self.accept('doorDoneEvent', self.handleDoorDoneEvent)
self.accept('DistributedDoor_doorTrigger', self.handleDoorTrigger) self.accept('DistributedDoor_doorTrigger', self.handleDoorTrigger)
NametagGlobals.setWant2dNametags(True) NametagGlobals.setMasterArrowsOn(1)
self.tunnelOriginList = base.cr.hoodMgr.addLinkTunnelHooks(self, self.nodeList) self.tunnelOriginList = base.cr.hoodMgr.addLinkTunnelHooks(self, self.nodeList)
how = requestStatus['how'] how = requestStatus['how']
self.fsm.request(how, [requestStatus]) self.fsm.request(how, [requestStatus])

7
toontown/coghq/CountryClubInterior.py
View file

@ -5,7 +5,6 @@ from direct.fsm import State
from direct.showbase import BulletinBoardWatcher from direct.showbase import BulletinBoardWatcher
from panda3d.core import * from panda3d.core import *
from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs from otp.distributed.TelemetryLimiter import RotationLimitToH, TLGatherAllAvs
from toontown.nametag import NametagGlobals
from toontown.toon import Toon from toontown.toon import Toon
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from toontown.hood import ZoneUtil from toontown.hood import ZoneUtil
@ -14,7 +13,7 @@ from toontown.toontowngui import TTDialog
from toontown.toonbase import ToontownBattleGlobals from toontown.toonbase import ToontownBattleGlobals
from toontown.coghq import DistributedCountryClub from toontown.coghq import DistributedCountryClub
from toontown.building import Elevator from toontown.building import Elevator
from toontown.nametag import NametagGlobals from otp.nametag import NametagGlobals
import random import random
class CountryClubInterior(BattlePlace.BattlePlace): class CountryClubInterior(BattlePlace.BattlePlace):
@ -87,7 +86,7 @@ class CountryClubInterior(BattlePlace.BattlePlace):
self._telemLimiter = TLGatherAllAvs('CountryClubInterior', RotationLimitToH) self._telemLimiter = TLGatherAllAvs('CountryClubInterior', RotationLimitToH)
def commence(self = self): def commence(self = self):
NametagGlobals.setWant2dNametags(True) NametagGlobals.setMasterArrowsOn(1)
self.fsm.request(requestStatus['how'], [requestStatus]) self.fsm.request(requestStatus['how'], [requestStatus])
base.playMusic(self.music, looping=1, volume=0.8) base.playMusic(self.music, looping=1, volume=0.8)
base.transitions.irisIn() base.transitions.irisIn()
@ -107,7 +106,7 @@ class CountryClubInterior(BattlePlace.BattlePlace):
self.acceptOnce('localToonConfrontedCountryClubBoss', handleConfrontedBoss) self.acceptOnce('localToonConfrontedCountryClubBoss', handleConfrontedBoss)
def exit(self): def exit(self):
NametagGlobals.setWant2dNametags(False) NametagGlobals.setMasterArrowsOn(0)
bboard.remove(DistributedCountryClub.DistributedCountryClub.ReadyPost) bboard.remove(DistributedCountryClub.DistributedCountryClub.ReadyPost)
self._telemLimiter.destroy() self._telemLimiter.destroy()
del self._telemLimiter del self._telemLimiter

7
toontown/coghq/DistributedBattleFactory.py
View file

@ -11,7 +11,8 @@ from toontown.suit import SuitDNA
from direct.fsm import State from direct.fsm import State
from direct.fsm import ClassicFSM, State from direct.fsm import ClassicFSM, State
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from toontown.nametag import NametagGlobals from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
class DistributedBattleFactory(DistributedLevelBattle.DistributedLevelBattle): class DistributedBattleFactory(DistributedLevelBattle.DistributedLevelBattle):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleFactory') notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleFactory')
@ -29,7 +30,7 @@ class DistributedBattleFactory(DistributedLevelBattle.DistributedLevelBattle):
self.disableCollision() self.disableCollision()
self.delayDeleteMembers() self.delayDeleteMembers()
if self.hasLocalToon(): if self.hasLocalToon():
NametagGlobals.setWant2dNametags(False) NametagGlobals.setMasterArrowsOn(0)
if self.bossBattle: if self.bossBattle:
messenger.send('localToonConfrontedForeman') messenger.send('localToonConfrontedForeman')
self.movie.playReward(ts, self.uniqueName('building-reward'), self.__handleFactoryRewardDone, noSkip=True) 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.notify.info('exitFactoryReward()')
self.movie.resetReward(finish=1) self.movie.resetReward(finish=1)
self._removeMembersKeep() self._removeMembersKeep()
NametagGlobals.setWant2dNametags(True) NametagGlobals.setMasterArrowsOn(1)

6
toontown/coghq/DistributedCashbotBossCrane.py
View file

@ -10,8 +10,8 @@ from direct.task import Task
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from toontown.toonbase import TTLocalizer from toontown.toonbase import TTLocalizer
from otp.otpbase import OTPGlobals from otp.otpbase import OTPGlobals
from otp.nametag import NametagGlobals
import random import random
from toontown.nametag import NametagGlobals
class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM): class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedCashbotBossCrane') notify = DirectNotifyGlobal.directNotify.newCategory('DistributedCashbotBossCrane')
@ -407,7 +407,7 @@ class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM):
taskMgr.add(self.__watchControls, 'watchCraneControls') taskMgr.add(self.__watchControls, 'watchCraneControls')
taskMgr.doMethodLater(5, self.__displayCraneAdvice, self.craneAdviceName) taskMgr.doMethodLater(5, self.__displayCraneAdvice, self.craneAdviceName)
taskMgr.doMethodLater(10, self.__displayMagnetAdvice, self.magnetAdviceName) taskMgr.doMethodLater(10, self.__displayMagnetAdvice, self.magnetAdviceName)
NametagGlobals.setForceOnscreenChat(True) NametagGlobals.setOnscreenChatForced(1)
self.arrowVert = 0 self.arrowVert = 0
self.arrowHorz = 0 self.arrowHorz = 0
return return
@ -428,7 +428,7 @@ class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM):
self.ignore('InputState-turnRight') self.ignore('InputState-turnRight')
self.arrowVert = 0 self.arrowVert = 0
self.arrowHorz = 0 self.arrowHorz = 0
NametagGlobals.setForceOnscreenChat(False) NametagGlobals.setOnscreenChatForced(0)
taskMgr.remove('watchCraneControls') taskMgr.remove('watchCraneControls')
self.__setMoveSound(None) self.__setMoveSound(None)
return return

6
toontown/coghq/DistributedCountryClubBattle.py
View file

@ -5,7 +5,7 @@ from direct.fsm import ClassicFSM, State
from direct.fsm import State from direct.fsm import State
from direct.interval.IntervalGlobal import * from direct.interval.IntervalGlobal import *
from otp.avatar import Emote from otp.avatar import Emote
from toontown.nametag import NametagGlobals from otp.nametag import NametagGlobals
from panda3d.core import * from panda3d.core import *
from toontown.battle import SuitBattleGlobals from toontown.battle import SuitBattleGlobals
from toontown.battle.BattleBase import * from toontown.battle.BattleBase import *
@ -31,7 +31,7 @@ class DistributedCountryClubBattle(DistributedLevelBattle.DistributedLevelBattle
self.disableCollision() self.disableCollision()
self.delayDeleteMembers() self.delayDeleteMembers()
if self.hasLocalToon(): if self.hasLocalToon():
NametagGlobals.setWant2dNametags(False) NametagGlobals.setMasterArrowsOn(0)
if self.bossBattle: if self.bossBattle:
messenger.send('localToonConfrontedCountryClubBoss') messenger.send('localToonConfrontedCountryClubBoss')
self.movie.playReward(ts, self.uniqueName('building-reward'), self.__handleCountryClubRewardDone, noSkip=True) 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.notify.debug('exitCountryClubReward()')
self.movie.resetReward(finish=1) self.movie.resetReward(finish=1)
self._removeMembersKeep() self._removeMembersKeep()
NametagGlobals.setWant2dNametags(True) NametagGlobals.setMasterArrowsOn(1)