sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: base.loadSfx -> base.loader.loadSfx

Browse source
This commit is contained in:
John Cote 2019-11-23 17:07:27 -05:00
parent 89be2e73c7
commit 2ae2175b8a
101 changed files with 352 additions and 352 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/distributed/OTPClientRepository.py
View file

@ -503,7 +503,7 @@ class OTPClientRepository(ClientRepositoryBase):
whisper = WhisperPopup(message, OTPGlobals.getInterfaceFont(), WhisperPopup.WTSystem) whisper = WhisperPopup(message, OTPGlobals.getInterfaceFont(), WhisperPopup.WTSystem)
whisper.manage(base.marginManager) whisper.manage(base.marginManager)
if not self.systemMessageSfx: if not self.systemMessageSfx:
self.systemMessageSfx = base.loadSfx('phase_3/audio/sfx/clock03.mp3') self.systemMessageSfx = base.loader.loadSfx('phase_3/audio/sfx/clock03.mp3')
if self.systemMessageSfx: if self.systemMessageSfx:
base.playSfx(self.systemMessageSfx) base.playSfx(self.systemMessageSfx)

2
otp/level/AmbientSound.py
View file

@ -17,7 +17,7 @@ class AmbientSound(BasicEntities.NodePathEntity):
return return
if self.soundPath == '': if self.soundPath == '':
return return
self.sound = base.loadSfx(self.soundPath) self.sound = base.loader.loadSfx(self.soundPath)
if self.sound is None: if self.sound is None:
return return
self.soundIval = SoundInterval(self.sound, node=self, volume=self.volume) self.soundIval = SoundInterval(self.sound, node=self, volume=self.volume)

6
toontown/battle/Movie.py
View file

@ -356,9 +356,9 @@ class Movie(DirectObject.DirectObject):
self.tutorialTom.setName(TTLocalizer.NPCToonNames[20000]) self.tutorialTom.setName(TTLocalizer.NPCToonNames[20000])
self.tutorialTom.uniqueName = uniqueName self.tutorialTom.uniqueName = uniqueName
if base.config.GetString('language', 'english') == 'japanese': if base.config.GetString('language', 'english') == 'japanese':
self.tomDialogue03 = base.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward01.mp3') self.tomDialogue03 = base.loader.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward01.mp3')
self.tomDialogue04 = base.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward02.mp3') self.tomDialogue04 = base.loader.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward02.mp3')
self.tomDialogue05 = base.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward03.mp3') self.tomDialogue05 = base.loader.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward03.mp3')
self.musicVolume = base.config.GetFloat('tutorial-music-volume', 0.5) self.musicVolume = base.config.GetFloat('tutorial-music-volume', 0.5)
else: else:
self.tomDialogue03 = None self.tomDialogue03 = None

8
toontown/battle/MovieFire.py
View file

@ -310,13 +310,13 @@ def __throwPie(throw, delay, hitCount, showCannon = 1):
smoke.setScale(0.5) smoke.setScale(0.5)
smoke.hide() smoke.hide()
smoke.setBillboardPointEye() smoke.setBillboardPointEye()
soundBomb = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') soundBomb = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
playSoundBomb = SoundInterval(soundBomb, node=cannonHolder) playSoundBomb = SoundInterval(soundBomb, node=cannonHolder)
soundFly = base.loadSfx('phase_4/audio/sfx/firework_whistle_01.mp3') soundFly = base.loader.loadSfx('phase_4/audio/sfx/firework_whistle_01.mp3')
playSoundFly = SoundInterval(soundFly, node=cannonHolder) playSoundFly = SoundInterval(soundFly, node=cannonHolder)
soundCannonAdjust = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') soundCannonAdjust = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
playSoundCannonAdjust = SoundInterval(soundCannonAdjust, duration=0.6, node=cannonHolder) playSoundCannonAdjust = SoundInterval(soundCannonAdjust, duration=0.6, node=cannonHolder)
soundCogPanic = base.loadSfx('phase_5/audio/sfx/ENC_cogafssm.mp3') soundCogPanic = base.loader.loadSfx('phase_5/audio/sfx/ENC_cogafssm.mp3')
playSoundCogPanic = SoundInterval(soundCogPanic, node=cannonHolder) playSoundCogPanic = SoundInterval(soundCogPanic, node=cannonHolder)
reactIval = Parallel(ActorInterval(suit, 'pie-small-react'), Sequence(Wait(0.0), LerpPosInterval(cannonHolder, 2.0, posFinal, startPos=posInit, blendType='easeInOut'), Parallel(LerpHprInterval(barrel, 0.6, Point3(0, 45, 0), startHpr=Point3(0, 90, 0), blendType='easeIn'), playSoundCannonAdjust), Wait(2.0), Parallel(LerpHprInterval(barrel, 0.6, Point3(0, 90, 0), startHpr=Point3(0, 45, 0), blendType='easeIn'), playSoundCannonAdjust), LerpPosInterval(cannonHolder, 1.0, posInit, startPos=posFinal, blendType='easeInOut')), Sequence(Wait(0.0), Parallel(ActorInterval(suit, 'flail'), suit.scaleInterval(1.0, suitScale), LerpPosInterval(suit, 0.25, Point3(0, -1.0, 0.0)), Sequence(Wait(0.25), Parallel(playSoundCogPanic, LerpPosInterval(suit, 1.5, Point3(0, -deep, 0.0), blendType='easeIn')))), Wait(2.5), Parallel(playSoundBomb, playSoundFly, Sequence(Func(smoke.show), Parallel(LerpScaleInterval(smoke, 0.5, 3), LerpColorScaleInterval(smoke, 0.5, Vec4(2, 2, 2, 0))), Func(smoke.hide)), Sequence(Func(kapow.show), reactIval = Parallel(ActorInterval(suit, 'pie-small-react'), Sequence(Wait(0.0), LerpPosInterval(cannonHolder, 2.0, posFinal, startPos=posInit, blendType='easeInOut'), Parallel(LerpHprInterval(barrel, 0.6, Point3(0, 45, 0), startHpr=Point3(0, 90, 0), blendType='easeIn'), playSoundCannonAdjust), Wait(2.0), Parallel(LerpHprInterval(barrel, 0.6, Point3(0, 90, 0), startHpr=Point3(0, 45, 0), blendType='easeIn'), playSoundCannonAdjust), LerpPosInterval(cannonHolder, 1.0, posInit, startPos=posFinal, blendType='easeInOut')), Sequence(Wait(0.0), Parallel(ActorInterval(suit, 'flail'), suit.scaleInterval(1.0, suitScale), LerpPosInterval(suit, 0.25, Point3(0, -1.0, 0.0)), Sequence(Wait(0.25), Parallel(playSoundCogPanic, LerpPosInterval(suit, 1.5, Point3(0, -deep, 0.0), blendType='easeIn')))), Wait(2.5), Parallel(playSoundBomb, playSoundFly, Sequence(Func(smoke.show), Parallel(LerpScaleInterval(smoke, 0.5, 3), LerpColorScaleInterval(smoke, 0.5, Vec4(2, 2, 2, 0))), Func(smoke.hide)), Sequence(Func(kapow.show),
ActorInterval(kapow, 'kapow'), Func(kapow.hide)), LerpPosInterval(suit, 3.0, Point3(0, 150.0, 0.0)), suit.scaleInterval(3.0, 0.01)), Func(suit.hide))) ActorInterval(kapow, 'kapow'), Func(kapow.hide)), LerpPosInterval(suit, 3.0, Point3(0, 150.0, 0.0)), suit.scaleInterval(3.0, 0.01)), Func(suit.hide)))

2
toontown/battle/MovieLure.py
View file

@ -379,7 +379,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp):
explosionTrack = Sequence(Wait(2.3), createTNTExplosionTrack(battle, trapProp=trapProp, relativeTo=parent)) explosionTrack = Sequence(Wait(2.3), createTNTExplosionTrack(battle, trapProp=trapProp, relativeTo=parent))
suitTrack = Sequence(ActorInterval(suit, 'flail', duration=0.7), ActorInterval(suit, 'flail', startTime=0.7, endTime=0.0), ActorInterval(suit, 'neutral', duration=0.4), ActorInterval(suit, 'flail', startTime=0.6, endTime=0.7), Wait(0.4), ActorInterval(suit, 'slip-forward', startTime=2.48, duration=0.1), Func(battle.movie.needRestoreColor), Func(suit.setColorScale, Vec4(0.2, 0.2, 0.2, 1)), Func(trapProp.reparentTo, hidden), ActorInterval(suit, 'slip-forward', startTime=2.58), Func(suit.clearColorScale), Func(trapProp.sparksEffect.cleanup), Func(battle.movie.clearRestoreColor)) suitTrack = Sequence(ActorInterval(suit, 'flail', duration=0.7), ActorInterval(suit, 'flail', startTime=0.7, endTime=0.0), ActorInterval(suit, 'neutral', duration=0.4), ActorInterval(suit, 'flail', startTime=0.6, endTime=0.7), Wait(0.4), ActorInterval(suit, 'slip-forward', startTime=2.48, duration=0.1), Func(battle.movie.needRestoreColor), Func(suit.setColorScale, Vec4(0.2, 0.2, 0.2, 1)), Func(trapProp.reparentTo, hidden), ActorInterval(suit, 'slip-forward', startTime=2.58), Func(suit.clearColorScale), Func(trapProp.sparksEffect.cleanup), Func(battle.movie.clearRestoreColor))
damageTrack = Sequence(Wait(2.3), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp)) damageTrack = Sequence(Wait(2.3), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp))
explosionSound = base.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') explosionSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('TL_dynamite.mp3'), duration=2.0, node=suit), SoundInterval(explosionSound, duration=0.6, node=suit)) soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('TL_dynamite.mp3'), duration=2.0, node=suit), SoundInterval(explosionSound, duration=0.6, node=suit))
result.append(Parallel(tntTrack, suitTrack, damageTrack, explosionTrack, soundTrack)) result.append(Parallel(tntTrack, suitTrack, damageTrack, explosionTrack, soundTrack))
elif trapName == 'traintrack': elif trapName == 'traintrack':

8
toontown/battle/MovieUtil.py
View file

@ -262,8 +262,8 @@ def createSuitReviveTrack(suit, toon, battle, npcs = []):
suitTrack.append(Func(removeReviveSuit, suit, deathSuit, name='remove-death-suit')) suitTrack.append(Func(removeReviveSuit, suit, deathSuit, name='remove-death-suit'))
suitTrack.append(Func(notify.debug, 'after removeDeathSuit')) suitTrack.append(Func(notify.debug, 'after removeDeathSuit'))
suitTrack.append(Func(suit.loop, 'neutral')) suitTrack.append(Func(suit.loop, 'neutral'))
spinningSound = base.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3')
deathSound = base.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
deathSoundTrack = Sequence(Wait(0.8), SoundInterval(spinningSound, duration=1.2, startTime=1.5, volume=0.2, node=suit), SoundInterval(spinningSound, duration=3.0, startTime=0.6, volume=0.8, node=suit), SoundInterval(deathSound, volume=0.32, node=suit)) deathSoundTrack = Sequence(Wait(0.8), SoundInterval(spinningSound, duration=1.2, startTime=1.5, volume=0.2, node=suit), SoundInterval(spinningSound, duration=3.0, startTime=0.6, volume=0.8, node=suit), SoundInterval(deathSound, volume=0.32, node=suit))
BattleParticles.loadParticles() BattleParticles.loadParticles()
smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall') smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall')
@ -307,8 +307,8 @@ def createSuitDeathTrack(suit, toon, battle, npcs = []):
suitTrack.append(Func(notify.debug, 'before removeDeathSuit')) suitTrack.append(Func(notify.debug, 'before removeDeathSuit'))
suitTrack.append(Func(removeDeathSuit, suit, deathSuit, name='remove-death-suit')) suitTrack.append(Func(removeDeathSuit, suit, deathSuit, name='remove-death-suit'))
suitTrack.append(Func(notify.debug, 'after removeDeathSuit')) suitTrack.append(Func(notify.debug, 'after removeDeathSuit'))
spinningSound = base.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3')
deathSound = base.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
deathSoundTrack = Sequence(Wait(0.8), SoundInterval(spinningSound, duration=1.2, startTime=1.5, volume=0.2, node=deathSuit), SoundInterval(spinningSound, duration=3.0, startTime=0.6, volume=0.8, node=deathSuit), SoundInterval(deathSound, volume=0.32, node=deathSuit)) deathSoundTrack = Sequence(Wait(0.8), SoundInterval(spinningSound, duration=1.2, startTime=1.5, volume=0.2, node=deathSuit), SoundInterval(spinningSound, duration=3.0, startTime=0.6, volume=0.8, node=deathSuit), SoundInterval(deathSound, volume=0.32, node=deathSuit))
BattleParticles.loadParticles() BattleParticles.loadParticles()
smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall') smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall')

8
toontown/building/DistributedBossElevator.py
View file

@ -18,10 +18,10 @@ class DistributedBossElevator(DistributedElevatorExt.DistributedElevatorExt):
def __init__(self, cr): def __init__(self, cr):
DistributedElevatorExt.DistributedElevatorExt.__init__(self, cr) DistributedElevatorExt.DistributedElevatorExt.__init__(self, cr)
self.elevatorPoints = BigElevatorPoints self.elevatorPoints = BigElevatorPoints
self.openSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
self.finalOpenSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') self.finalOpenSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
self.closeSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
self.finalCloseSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') self.finalCloseSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
self.type = ELEVATOR_VP self.type = ELEVATOR_VP
self.countdownTime = ElevatorData[self.type]['countdown'] self.countdownTime = ElevatorData[self.type]['countdown']

16
toontown/building/DistributedBuilding.py
View file

@ -346,20 +346,20 @@ class DistributedBuilding(DistributedObject.DistributedObject):
if base.config.GetBool('want-qa-regression', 0): if base.config.GetBool('want-qa-regression', 0):
self.notify.info('QA-REGRESSION: COGBUILDING: Cog Take Over') self.notify.info('QA-REGRESSION: COGBUILDING: Cog Take Over')
if self.cogDropSound == None: if self.cogDropSound == None:
self.cogDropSound = base.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_drop.mp3') self.cogDropSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_drop.mp3')
self.cogLandSound = base.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_land.mp3') self.cogLandSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_land.mp3')
self.cogSettleSound = base.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_settle.mp3') self.cogSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_settle.mp3')
self.openSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3')
return return
def loadAnimToToonSfx(self): def loadAnimToToonSfx(self):
if base.config.GetBool('want-qa-regression', 0): if base.config.GetBool('want-qa-regression', 0):
self.notify.info('QA-REGRESSION: COGBUILDING: Toon Take Over') self.notify.info('QA-REGRESSION: COGBUILDING: Toon Take Over')
if self.cogWeakenSound == None: if self.cogWeakenSound == None:
self.cogWeakenSound = base.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_weaken.mp3') self.cogWeakenSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_weaken.mp3')
self.toonGrowSound = base.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_grow.mp3') self.toonGrowSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_grow.mp3')
self.toonSettleSound = base.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_settle.mp3') self.toonSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_settle.mp3')
self.openSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3')
return return
def unloadSfx(self): def unloadSfx(self):

4
toontown/building/DistributedDoor.py
View file

@ -23,8 +23,8 @@ class DistributedDoor(DistributedObject.DistributedObject, DelayDeletable):
def __init__(self, cr): def __init__(self, cr):
DistributedObject.DistributedObject.__init__(self, cr) DistributedObject.DistributedObject.__init__(self, cr)
self.openSfx = base.loadSfx('phase_3.5/audio/sfx/Door_Open_1.mp3') self.openSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Open_1.mp3')
self.closeSfx = base.loadSfx('phase_3.5/audio/sfx/Door_Close_1.mp3') self.closeSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Close_1.mp3')
self.nametag = None self.nametag = None
self.fsm = ClassicFSM.ClassicFSM('DistributedDoor_right', [State.State('off', self.enterOff, self.exitOff, ['closing', self.fsm = ClassicFSM.ClassicFSM('DistributedDoor_right', [State.State('off', self.enterOff, self.exitOff, ['closing',
'closed', 'closed',

4
toontown/building/DistributedElevator.py
View file

@ -26,9 +26,9 @@ class DistributedElevator(DistributedObject.DistributedObject):
self.deferredSlots = [] self.deferredSlots = []
self.localToonOnBoard = 0 self.localToonOnBoard = 0
self.boardedAvIds = {} self.boardedAvIds = {}
self.openSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3')
self.finalOpenSfx = None self.finalOpenSfx = None
self.closeSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3')
self.elevatorFSM = None self.elevatorFSM = None
self.finalCloseSfx = None self.finalCloseSfx = None
self.elevatorPoints = ElevatorPoints self.elevatorPoints = ElevatorPoints

4
toontown/building/DistributedElevatorFSM.py
View file

@ -39,9 +39,9 @@ class DistributedElevatorFSM(DistributedObject.DistributedObject, FSM):
self.deferredSlots = [] self.deferredSlots = []
self.localToonOnBoard = 0 self.localToonOnBoard = 0
self.boardedAvIds = {} self.boardedAvIds = {}
self.openSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3')
self.finalOpenSfx = None self.finalOpenSfx = None
self.closeSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3')
self.elevatorFSM = None self.elevatorFSM = None
self.finalCloseSfx = None self.finalCloseSfx = None
self.elevatorPoints = ElevatorPoints self.elevatorPoints = ElevatorPoints

4
toontown/building/DistributedKnockKnockDoor.py
View file

@ -60,8 +60,8 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp)
def knockKnockTrack(self, avatar, duration): def knockKnockTrack(self, avatar, duration):
if avatar == None: if avatar == None:
return return
self.rimshot = base.loadSfx('phase_5/audio/sfx/AA_heal_telljoke.mp3') self.rimshot = base.loader.loadSfx('phase_5/audio/sfx/AA_heal_telljoke.mp3')
self.knockSfx = base.loadSfx('phase_5/audio/sfx/GUI_knock_3.mp3') self.knockSfx = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_3.mp3')
joke = KnockKnockJokes[self.propId % len(KnockKnockJokes)] joke = KnockKnockJokes[self.propId % len(KnockKnockJokes)]
place = base.cr.playGame.getPlace() place = base.cr.playGame.getPlace()
if place: if place:

4
toontown/building/DistributedSuitInterior.py
View file

@ -18,8 +18,8 @@ class DistributedSuitInterior(DistributedObject.DistributedObject):
DistributedObject.DistributedObject.__init__(self, cr) DistributedObject.DistributedObject.__init__(self, cr)
self.toons = [] self.toons = []
self.activeIntervals = {} self.activeIntervals = {}
self.openSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3')
self.closeSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3')
self.suits = [] self.suits = []
self.reserveSuits = [] self.reserveSuits = []
self.joiningReserves = [] self.joiningReserves = []

26
toontown/char/Char.py
View file

@ -398,7 +398,7 @@ class Char(Avatar.Avatar):
chatterType = chatterTypes[categoryIndex] chatterType = chatterTypes[categoryIndex]
for fileIndex in audioIndexArray[categoryIndex]: for fileIndex in audioIndexArray[categoryIndex]:
if fileIndex: if fileIndex:
self.chatterArray[categoryIndex].append(base.loadSfx('%s/CC_%s_chatter_%s%02d.mp3' % (loadPath, self.chatterArray[categoryIndex].append(base.loader.loadSfx('%s/CC_%s_chatter_%s%02d.mp3' % (loadPath,
name, name,
chatterType, chatterType,
fileIndex))) fileIndex)))
@ -413,7 +413,7 @@ class Char(Avatar.Avatar):
self.unloadDialogue() self.unloadDialogue()
language = base.config.GetString('language', 'english') language = base.config.GetString('language', 'english')
if char == 'mk': if char == 'mk':
dialogueFile = base.loadSfx('phase_3/audio/dial/mickey.wav') dialogueFile = base.loader.loadSfx('phase_3/audio/dial/mickey.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
@ -428,7 +428,7 @@ class Char(Avatar.Avatar):
5]) 5])
self.loadChatterDialogue('mickey', chatterIndexArray, 'phase_3/audio/dial', language) self.loadChatterDialogue('mickey', chatterIndexArray, 'phase_3/audio/dial', language)
elif char == 'vmk': elif char == 'vmk':
dialogueFile = base.loadSfx('phase_3/audio/dial/mickey.wav') dialogueFile = base.loader.loadSfx('phase_3/audio/dial/mickey.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
@ -443,7 +443,7 @@ class Char(Avatar.Avatar):
5]) 5])
self.loadChatterDialogue('mickey', chatterIndexArray, 'phase_3/audio/dial', language) self.loadChatterDialogue('mickey', chatterIndexArray, 'phase_3/audio/dial', language)
elif char == 'mn' or char == 'wmn': elif char == 'mn' or char == 'wmn':
dialogueFile = base.loadSfx('phase_3/audio/dial/minnie.wav') dialogueFile = base.loader.loadSfx('phase_3/audio/dial/minnie.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
@ -467,7 +467,7 @@ class Char(Avatar.Avatar):
17], [1, 2, 3]) 17], [1, 2, 3])
self.loadChatterDialogue('minnie', chatterIndexArray, 'phase_3/audio/dial', language) self.loadChatterDialogue('minnie', chatterIndexArray, 'phase_3/audio/dial', language)
elif char == 'dd' or char == 'shdd': elif char == 'dd' or char == 'shdd':
dialogueFile = base.loadSfx('phase_4/audio/dial/daisy.wav') dialogueFile = base.loader.loadSfx('phase_4/audio/dial/daisy.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
@ -489,7 +489,7 @@ class Char(Avatar.Avatar):
4]) 4])
self.loadChatterDialogue('daisy', chatterIndexArray, 'phase_8/audio/dial', language) self.loadChatterDialogue('daisy', chatterIndexArray, 'phase_8/audio/dial', language)
elif char == 'g' or char == 'sg': elif char == 'g' or char == 'sg':
dialogueFile = base.loadSfx('phase_6/audio/dial/goofy.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/goofy.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
@ -511,7 +511,7 @@ class Char(Avatar.Avatar):
4]) 4])
self.loadChatterDialogue('goofy', chatterIndexArray, 'phase_6/audio/dial', language) self.loadChatterDialogue('goofy', chatterIndexArray, 'phase_6/audio/dial', language)
elif char == 'd' or char == 'dw' or char == 'fd': elif char == 'd' or char == 'dw' or char == 'fd':
dialogueFile = base.loadSfx('phase_6/audio/dial/donald.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/donald.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
@ -533,32 +533,32 @@ class Char(Avatar.Avatar):
4]) 4])
self.loadChatterDialogue('donald', chatterIndexArray, 'phase_6/audio/dial', language) self.loadChatterDialogue('donald', chatterIndexArray, 'phase_6/audio/dial', language)
elif char == 'p' or char == 'wp': elif char == 'p' or char == 'wp':
dialogueFile = base.loadSfx('phase_3.5/audio/dial/AV_dog_med.mp3') dialogueFile = base.loader.loadSfx('phase_3.5/audio/dial/AV_dog_med.mp3')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
elif char == 'cl': elif char == 'cl':
dialogueFile = base.loadSfx('phase_3.5/audio/dial/AV_dog_med.mp3') dialogueFile = base.loader.loadSfx('phase_3.5/audio/dial/AV_dog_med.mp3')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
elif char == 'ch': elif char == 'ch':
dialogueFile = base.loadSfx('phase_6/audio/dial/chip.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/chip.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
elif char == 'da': elif char == 'da':
dialogueFile = base.loadSfx('phase_6/audio/dial/dale.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/dale.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
elif char == 'pch': elif char == 'pch':
dialogueFile = base.loadSfx('phase_6/audio/dial/chip.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/chip.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)
elif char == 'jda': elif char == 'jda':
dialogueFile = base.loadSfx('phase_6/audio/dial/dale.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/dale.wav')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)

2
toontown/cogdominium/CogdoBarrelRoom.py
View file

@ -45,7 +45,7 @@ class CogdoBarrelRoom:
self.nearBattleNode.setPos(0, -25, 0) self.nearBattleNode.setPos(0, -25, 0)
self.rewardUi = CogdoBarrelRoomRewardPanel.CogdoBarrelRoomRewardPanel() self.rewardUi = CogdoBarrelRoomRewardPanel.CogdoBarrelRoomRewardPanel()
self.hideRewardUi() self.hideRewardUi()
self.stomperSfx = base.loadSfx(CogdoBarrelRoomConsts.StomperSound) self.stomperSfx = base.loader.loadSfx(CogdoBarrelRoomConsts.StomperSound)
self.fog = Fog('barrel-room-fog') self.fog = Fog('barrel-room-fog')
self.fog.setColor(CogdoBarrelRoomConsts.BarrelRoomFogColor) self.fog.setColor(CogdoBarrelRoomConsts.BarrelRoomFogColor)
self.fog.setLinearRange(*CogdoBarrelRoomConsts.BarrelRoomFogLinearRange) self.fog.setLinearRange(*CogdoBarrelRoomConsts.BarrelRoomFogLinearRange)

4
toontown/cogdominium/CogdoGameExit.py
View file

@ -15,8 +15,8 @@ class CogdoGameExit(NodePath):
self._model.reparentTo(self) self._model.reparentTo(self)
self._leftDoor = self._model.find('**/left_door') self._leftDoor = self._model.find('**/left_door')
self._rightDoor = self._model.find('**/right_door') self._rightDoor = self._model.find('**/right_door')
self._openSfx = openSfx or base.loadSfx('phase_9/audio/sfx/CHQ_VP_door_open.mp3') self._openSfx = openSfx or base.loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_open.mp3')
self._closeSfx = closeSfx or base.loadSfx('phase_9/audio/sfx/CHQ_VP_door_close.mp3') self._closeSfx = closeSfx or base.loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_close.mp3')
self._elevatorPoints = [] self._elevatorPoints = []
for point in ElevatorConstants.ElevatorPoints: for point in ElevatorConstants.ElevatorPoints:
self._elevatorPoints.append(point[0]) self._elevatorPoints.append(point[0])

8
toontown/cogdominium/DistCogdoCrane.py
View file

@ -70,11 +70,11 @@ class DistCogdoCrane(DistributedObject.DistributedObject, FSM.FSM):
self.heldObject = None self.heldObject = None
self.craneAdviceLabel = None self.craneAdviceLabel = None
self.magnetAdviceLabel = None self.magnetAdviceLabel = None
self.atLimitSfx = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.atLimitSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.magnetOnSfx = base.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3') self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3')
self.magnetLoopSfx = base.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav') self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav')
self.magnetSoundInterval = Parallel(SoundInterval(self.magnetOnSfx), Sequence(Wait(0.5), Func(base.playSfx, self.magnetLoopSfx, looping=1))) self.magnetSoundInterval = Parallel(SoundInterval(self.magnetOnSfx), Sequence(Wait(0.5), Func(base.playSfx, self.magnetLoopSfx, looping=1)))
self.craneMoveSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_elevator_up_down.mp3') self.craneMoveSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_elevator_up_down.mp3')
self.fadeTrack = None self.fadeTrack = None
return return

4
toontown/cogdominium/DistributedCogdoBarrel.py
View file

@ -21,8 +21,8 @@ class DistributedCogdoBarrel(DistributedObject.DistributedObject):
def generate(self): def generate(self):
DistributedObject.DistributedObject.generate(self) DistributedObject.DistributedObject.generate(self)
self.bumpSound = base.loadSfx(CogdoBarrelRoomConsts.BarrelBumpSound) self.bumpSound = base.loader.loadSfx(CogdoBarrelRoomConsts.BarrelBumpSound)
self.grabSound = base.loadSfx(CogdoBarrelRoomConsts.BarrelGrabSound) self.grabSound = base.loader.loadSfx(CogdoBarrelRoomConsts.BarrelGrabSound)
def __setModel(self): def __setModel(self):
self.model = loader.loadModel(CogdoBarrelRoomConsts.BarrelModel) self.model = loader.loadModel(CogdoBarrelRoomConsts.BarrelModel)

4
toontown/cogdominium/DistributedCogdoInterior.py
View file

@ -34,8 +34,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject):
DistributedObject.DistributedObject.__init__(self, cr) DistributedObject.DistributedObject.__init__(self, cr)
self.toons = [] self.toons = []
self.activeIntervals = {} self.activeIntervals = {}
self.openSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3')
self.closeSfx = base.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3')
self.suits = [] self.suits = []
self.reserveSuits = [] self.reserveSuits = []
self.joiningReserves = [] self.joiningReserves = []

6
toontown/coghq/DistributedBanquetTable.py
View file

@ -177,7 +177,7 @@ class DistributedBanquetTable(DistributedObject.DistributedObject, FSM.FSM, Banq
self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/SA_watercooler_spray_only.mp3') self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/SA_watercooler_spray_only.mp3')
self.hitBossSoundInterval = SoundInterval(self.hitBossSfx, node=self.boss, volume=1.0) self.hitBossSoundInterval = SoundInterval(self.hitBossSfx, node=self.boss, volume=1.0)
self.serveFoodSfx = loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_bell_for_trolley.mp3') self.serveFoodSfx = loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_bell_for_trolley.mp3')
self.pitcherMoveSfx = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.pitcherMoveSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
def setupDiners(self): def setupDiners(self):
for i in xrange(self.numDiners): for i in xrange(self.numDiners):
@ -367,8 +367,8 @@ class DistributedBanquetTable(DistributedObject.DistributedObject, FSM.FSM, Banq
locator = self.tableGroup.find('**/chair_%d' % (chairIndex + 1)) locator = self.tableGroup.find('**/chair_%d' % (chairIndex + 1))
deathSuit = diner.getLoseActor() deathSuit = diner.getLoseActor()
ival = Sequence(Func(self.notify.debug, 'before actorinterval sit-lose'), ActorInterval(diner, 'sit-lose'), Func(self.notify.debug, 'before deathSuit.setHpr'), Func(deathSuit.setHpr, diner.getHpr()), Func(self.notify.debug, 'before diner.hide'), Func(diner.hide), Func(self.notify.debug, 'before deathSuit.reparentTo'), Func(deathSuit.reparentTo, self.chairLocators[chairIndex]), Func(self.notify.debug, 'befor ActorInterval lose'), ActorInterval(deathSuit, 'lose', duration=MovieUtil.SUIT_LOSE_DURATION), Func(self.notify.debug, 'before remove deathsuit'), Func(removeDeathSuit, diner, deathSuit, name='remove-death-suit-%d-%d' % (chairIndex, self.index)), Func(self.notify.debug, 'diner.stash'), Func(diner.stash)) ival = Sequence(Func(self.notify.debug, 'before actorinterval sit-lose'), ActorInterval(diner, 'sit-lose'), Func(self.notify.debug, 'before deathSuit.setHpr'), Func(deathSuit.setHpr, diner.getHpr()), Func(self.notify.debug, 'before diner.hide'), Func(diner.hide), Func(self.notify.debug, 'before deathSuit.reparentTo'), Func(deathSuit.reparentTo, self.chairLocators[chairIndex]), Func(self.notify.debug, 'befor ActorInterval lose'), ActorInterval(deathSuit, 'lose', duration=MovieUtil.SUIT_LOSE_DURATION), Func(self.notify.debug, 'before remove deathsuit'), Func(removeDeathSuit, diner, deathSuit, name='remove-death-suit-%d-%d' % (chairIndex, self.index)), Func(self.notify.debug, 'diner.stash'), Func(diner.stash))
spinningSound = base.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3')
deathSound = base.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
deathSoundTrack = Sequence(Wait(0.8), SoundInterval(spinningSound, duration=1.2, startTime=1.5, volume=0.2, node=deathSuit), SoundInterval(spinningSound, duration=3.0, startTime=0.6, volume=0.8, node=deathSuit), SoundInterval(deathSound, volume=0.32, node=deathSuit)) deathSoundTrack = Sequence(Wait(0.8), SoundInterval(spinningSound, duration=1.2, startTime=1.5, volume=0.2, node=deathSuit), SoundInterval(spinningSound, duration=3.0, startTime=0.6, volume=0.8, node=deathSuit), SoundInterval(deathSound, volume=0.32, node=deathSuit))
intervalName = 'dinerDie-%d-%d' % (self.index, chairIndex) intervalName = 'dinerDie-%d-%d' % (self.index, chairIndex)
deathIval = Parallel(ival, deathSoundTrack) deathIval = Parallel(ival, deathSoundTrack)

4
toontown/coghq/DistributedBarrelBase.py
View file

@ -59,8 +59,8 @@ class DistributedBarrelBase(BasicEntities.DistributedNodePathEntity, BarrelBase.
self.accept(self.uniqueName('enterbarrelSphere'), self.handleEnterSphere) self.accept(self.uniqueName('enterbarrelSphere'), self.handleEnterSphere)
def loadModel(self): def loadModel(self):
self.grabSound = base.loadSfx(self.grabSoundPath) self.grabSound = base.loader.loadSfx(self.grabSoundPath)
self.rejectSound = base.loadSfx(self.rejectSoundPath) self.rejectSound = base.loader.loadSfx(self.rejectSoundPath)
self.barrel = loader.loadModel('phase_4/models/cogHQ/gagTank') self.barrel = loader.loadModel('phase_4/models/cogHQ/gagTank')
self.barrel.setScale(self.barrelScale) self.barrel.setScale(self.barrelScale)
self.barrel.reparentTo(self) self.barrel.reparentTo(self)

6
toontown/coghq/DistributedButton.py
View file

@ -89,7 +89,7 @@ class DistributedButton(DistributedSwitch.DistributedSwitch):
DistributedSwitch.DistributedSwitch.exitTrigger(self, args) DistributedSwitch.DistributedSwitch.exitTrigger(self, args)
def switchOnTrack(self): def switchOnTrack(self):
onSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_pressed.mp3') onSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_pressed.mp3')
duration = 0.8 duration = 0.8
halfDur = duration * 0.5 halfDur = duration * 0.5
pos = Vec3(0.0, 0.0, -0.2) pos = Vec3(0.0, 0.0, -0.2)
@ -99,7 +99,7 @@ class DistributedButton(DistributedSwitch.DistributedSwitch):
def switchCountdownTrack(self): def switchCountdownTrack(self):
wait = self.secondsOn - self.countdownSeconds wait = self.secondsOn - self.countdownSeconds
countDownSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_depressed.mp3') countDownSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_depressed.mp3')
track = Parallel( track = Parallel(
SoundInterval(countDownSfx), SoundInterval(countDownSfx),
Sequence( Sequence(
@ -123,7 +123,7 @@ class DistributedButton(DistributedSwitch.DistributedSwitch):
return track return track
def switchOffTrack(self): def switchOffTrack(self):
offSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_popup.mp3') offSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_popup.mp3')
duration = 1.0 duration = 1.0
halfDur = duration * 0.5 halfDur = duration * 0.5
pos = Vec3(0.0) pos = Vec3(0.0)

8
toontown/coghq/DistributedCashbotBossCrane.py
View file

@ -71,11 +71,11 @@ class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM):
self.closeButton = None self.closeButton = None
self.craneAdviceLabel = None self.craneAdviceLabel = None
self.magnetAdviceLabel = None self.magnetAdviceLabel = None
self.atLimitSfx = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.atLimitSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.magnetOnSfx = base.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3') self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3')
self.magnetLoopSfx = base.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav') self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav')
self.magnetSoundInterval = Parallel(SoundInterval(self.magnetOnSfx), Sequence(Wait(0.5), Func(base.playSfx, self.magnetLoopSfx, looping=1))) self.magnetSoundInterval = Parallel(SoundInterval(self.magnetOnSfx), Sequence(Wait(0.5), Func(base.playSfx, self.magnetLoopSfx, looping=1)))
self.craneMoveSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_elevator_up_down.mp3') self.craneMoveSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_elevator_up_down.mp3')
self.fadeTrack = None self.fadeTrack = None
return return

4
toontown/coghq/DistributedCogHQDoor.py
View file

@ -14,8 +14,8 @@ class DistributedCogHQDoor(DistributedDoor.DistributedDoor):
def __init__(self, cr): def __init__(self, cr):
DistributedDoor.DistributedDoor.__init__(self, cr) DistributedDoor.DistributedDoor.__init__(self, cr)
self.openSfx = base.loadSfx('phase_9/audio/sfx/CHQ_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_open.mp3')
self.closeSfx = base.loadSfx('phase_9/audio/sfx/CHQ_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_close.mp3')
def wantsNametag(self): def wantsNametag(self):
return 0 return 0

22
toontown/coghq/DistributedDoorEntity.py
View file

@ -58,7 +58,7 @@ class DistributedDoorEntityLock(DistributedDoorEntityBase.LockBase, FourState.Fo
def enterState1(self): def enterState1(self):
FourState.FourState.enterState1(self) FourState.FourState.enterState1(self)
beat = self.duration * 0.05 beat = self.duration * 0.05
slideSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.mp3')
self.setTrack(Sequence(Wait(beat * 2.0), Parallel(SoundInterval(slideSfx, node=self.door.node, volume=0.8), Sequence(ShowInterval(self.leftNodePath), ShowInterval(self.rightNodePath), Parallel(LerpPosInterval(nodePath=self.leftNodePath, other=self.lockedNodePath, duration=beat * 16.0, pos=Vec3(0.0), blendType='easeIn'), LerpPosInterval(nodePath=self.rightNodePath, other=self.lockedNodePath, duration=beat * 16.0, pos=Vec3(0.0), blendType='easeIn')), HideInterval(self.leftNodePath), HideInterval(self.rightNodePath), ShowInterval(self.lockedNodePath))))) self.setTrack(Sequence(Wait(beat * 2.0), Parallel(SoundInterval(slideSfx, node=self.door.node, volume=0.8), Sequence(ShowInterval(self.leftNodePath), ShowInterval(self.rightNodePath), Parallel(LerpPosInterval(nodePath=self.leftNodePath, other=self.lockedNodePath, duration=beat * 16.0, pos=Vec3(0.0), blendType='easeIn'), LerpPosInterval(nodePath=self.rightNodePath, other=self.lockedNodePath, duration=beat * 16.0, pos=Vec3(0.0), blendType='easeIn')), HideInterval(self.leftNodePath), HideInterval(self.rightNodePath), ShowInterval(self.lockedNodePath)))))
def enterState2(self): def enterState2(self):
@ -73,8 +73,8 @@ class DistributedDoorEntityLock(DistributedDoorEntityBase.LockBase, FourState.Fo
def enterState3(self): def enterState3(self):
FourState.FourState.enterState3(self) FourState.FourState.enterState3(self)
unlockSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_unlock.mp3') unlockSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_unlock.mp3')
slideSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.mp3')
beat = self.duration * 0.05 beat = self.duration * 0.05
self.setTrack(Sequence(Wait(beat * 2), Parallel(SoundInterval(unlockSfx, node=self.door.node, volume=0.8), SoundInterval(slideSfx, node=self.door.node, volume=0.8), Sequence(HideInterval(self.lockedNodePath), ShowInterval(self.leftNodePath), ShowInterval(self.rightNodePath), Parallel(LerpPosInterval(nodePath=self.leftNodePath, other=self.lockedNodePath, duration=beat * 16, pos=self.slideLeft, blendType='easeOut'), LerpPosInterval(nodePath=self.rightNodePath, other=self.lockedNodePath, duration=beat * 16, pos=self.slideRight, blendType='easeOut')), HideInterval(self.leftNodePath), HideInterval(self.rightNodePath))))) self.setTrack(Sequence(Wait(beat * 2), Parallel(SoundInterval(unlockSfx, node=self.door.node, volume=0.8), SoundInterval(slideSfx, node=self.door.node, volume=0.8), Sequence(HideInterval(self.lockedNodePath), ShowInterval(self.leftNodePath), ShowInterval(self.rightNodePath), Parallel(LerpPosInterval(nodePath=self.leftNodePath, other=self.lockedNodePath, duration=beat * 16, pos=self.slideLeft, blendType='easeOut'), LerpPosInterval(nodePath=self.rightNodePath, other=self.lockedNodePath, duration=beat * 16, pos=self.slideRight, blendType='easeOut')), HideInterval(self.leftNodePath), HideInterval(self.rightNodePath)))))
@ -366,15 +366,15 @@ class DistributedDoorEntity(DistributedDoorEntityBase.DistributedDoorEntityBase,
if not self.level.complexVis() or self.isOuterDoorOpen and (not self.isVisBlocker or self.isVisReady): if not self.level.complexVis() or self.isOuterDoorOpen and (not self.isVisBlocker or self.isVisReady):
print 'openInnerDoors stage Two' print 'openInnerDoors stage Two'
duration = self.duration duration = self.duration
slideSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
finalSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
moveDistance = 8.0 moveDistance = 8.0
self.setInnerDoorsTrack(Sequence(Func(self.leftInnerCollision.unstash), Func(self.rightInnerCollision.unstash), Parallel(SoundInterval(slideSfx, node=self.node, duration=duration * 0.4, volume=0.8), LerpPosInterval(nodePath=self.doorLeft, duration=duration * 0.4, pos=Vec3(-moveDistance, 0.0, 0.0), blendType='easeOut'), LerpPosInterval(nodePath=self.doorRight, duration=duration * 0.4, pos=Vec3(moveDistance, 0.0, 0.0), blendType='easeOut'), Sequence(Wait(duration * 0.375), SoundInterval(finalSfx, node=self.node, duration=1.0, volume=0.8))), Func(self.doorLeft.stash), Func(self.doorRight.stash))) self.setInnerDoorsTrack(Sequence(Func(self.leftInnerCollision.unstash), Func(self.rightInnerCollision.unstash), Parallel(SoundInterval(slideSfx, node=self.node, duration=duration * 0.4, volume=0.8), LerpPosInterval(nodePath=self.doorLeft, duration=duration * 0.4, pos=Vec3(-moveDistance, 0.0, 0.0), blendType='easeOut'), LerpPosInterval(nodePath=self.doorRight, duration=duration * 0.4, pos=Vec3(moveDistance, 0.0, 0.0), blendType='easeOut'), Sequence(Wait(duration * 0.375), SoundInterval(finalSfx, node=self.node, duration=1.0, volume=0.8))), Func(self.doorLeft.stash), Func(self.doorRight.stash)))
def closeInnerDoors(self): def closeInnerDoors(self):
duration = self.duration duration = self.duration
slideSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
finalSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
moveDistance = 8.0 moveDistance = 8.0
self.setInnerDoorsTrack(Sequence(Func(self.doorLeft.unstash), Func(self.doorRight.unstash), Parallel(SoundInterval(slideSfx, node=self.node, duration=duration * 0.4, volume=0.8), LerpPosInterval(nodePath=self.doorLeft, duration=duration * 0.4, pos=Vec3(0.0), blendType='easeIn'), LerpPosInterval(nodePath=self.doorRight, duration=duration * 0.4, pos=Vec3(0.0), blendType='easeIn'), Sequence(Wait(duration * 0.375), SoundInterval(finalSfx, node=self.node, duration=1.0, volume=0.8))), Func(self.leftInnerCollision.stash), Func(self.rightInnerCollision.stash))) self.setInnerDoorsTrack(Sequence(Func(self.doorLeft.unstash), Func(self.doorRight.unstash), Parallel(SoundInterval(slideSfx, node=self.node, duration=duration * 0.4, volume=0.8), LerpPosInterval(nodePath=self.doorLeft, duration=duration * 0.4, pos=Vec3(0.0), blendType='easeIn'), LerpPosInterval(nodePath=self.doorRight, duration=duration * 0.4, pos=Vec3(0.0), blendType='easeIn'), Sequence(Wait(duration * 0.375), SoundInterval(finalSfx, node=self.node, duration=1.0, volume=0.8))), Func(self.leftInnerCollision.stash), Func(self.rightInnerCollision.stash)))
@ -391,8 +391,8 @@ class DistributedDoorEntity(DistributedDoorEntityBase.DistributedDoorEntityBase,
else: else:
self.okToUnblockVis() self.okToUnblockVis()
duration = self.duration duration = self.duration
slideSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
finalSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
moveDistance = 8.0 moveDistance = 8.0
self.setTrack(Sequence(Wait(duration * 0.1), Parallel(SoundInterval(slideSfx, node=self.node, duration=duration * 0.4, volume=0.8), LerpPosInterval(nodePath=self.doorTop, duration=duration * 0.4, pos=Vec3(0.0, 0.0, moveDistance), blendType='easeOut'), LerpPosInterval(nodePath=self.doorBottom, duration=duration * 0.4, pos=Vec3(0.0, 0.0, -moveDistance), blendType='easeOut'), Sequence(Wait(duration * 0.375), SoundInterval(finalSfx, node=self.node, duration=1.0, volume=0.8))), Func(self.doorTop.stash), Func(self.doorBottom.stash), Func(self.setisOuterDoorOpen, 1), Func(self.openInnerDoors))) self.setTrack(Sequence(Wait(duration * 0.1), Parallel(SoundInterval(slideSfx, node=self.node, duration=duration * 0.4, volume=0.8), LerpPosInterval(nodePath=self.doorTop, duration=duration * 0.4, pos=Vec3(0.0, 0.0, moveDistance), blendType='easeOut'), LerpPosInterval(nodePath=self.doorBottom, duration=duration * 0.4, pos=Vec3(0.0, 0.0, -moveDistance), blendType='easeOut'), Sequence(Wait(duration * 0.375), SoundInterval(finalSfx, node=self.node, duration=1.0, volume=0.8))), Func(self.doorTop.stash), Func(self.doorBottom.stash), Func(self.setisOuterDoorOpen, 1), Func(self.openInnerDoors)))
@ -420,8 +420,8 @@ class DistributedDoorEntity(DistributedDoorEntityBase.DistributedDoorEntityBase,
def enterState3(self): def enterState3(self):
FourState.FourState.enterState3(self) FourState.FourState.enterState3(self)
duration = self.duration duration = self.duration
slideSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
finalSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
self.setTrack(Sequence(Wait(duration * 0.1), self.setTrack(Sequence(Wait(duration * 0.1),
Func(self.closeInnerDoors), Func(self.closeInnerDoors),
Wait(duration * 0.4), Wait(duration * 0.4),

2
toontown/coghq/DistributedFoodBelt.py
View file

@ -166,7 +166,7 @@ class DistributedFoodBelt(DistributedObject.DistributedObject, FSM.FSM, FoodBelt
joint = self.beltActor.find('**/uvj_WakeWhiteTide1') joint = self.beltActor.find('**/uvj_WakeWhiteTide1')
mesh.setTexProjector(mesh.findTextureStage('default'), joint, self.beltActor) mesh.setTexProjector(mesh.findTextureStage('default'), joint, self.beltActor)
self.beltActor.setPos(self.startLocator.getPos()) self.beltActor.setPos(self.startLocator.getPos())
self.beltSound = base.loadSfx('phase_12/audio/sfx/CHQ_FACT_conveyor_belt.wav') self.beltSound = base.loader.loadSfx('phase_12/audio/sfx/CHQ_FACT_conveyor_belt.wav')
self.beltSound.setLoop(1) self.beltSound.setLoop(1)
self.beltSoundInterval = SoundInterval(self.beltSound, node=self.beltModel, listenerNode=base.localAvatar, seamlessLoop=True, volume=0.25, cutOff=100) self.beltSoundInterval = SoundInterval(self.beltSound, node=self.beltModel, listenerNode=base.localAvatar, seamlessLoop=True, volume=0.25, cutOff=100)

16
toontown/coghq/DistributedGolfGreenGame.py
View file

@ -277,14 +277,14 @@ class DistributedGolfGreenGame(BattleBlocker.BattleBlocker):
self.invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons') self.invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons')
self.model = model self.model = model
self.model1 = model1 self.model1 = model1
self.soundFire = base.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3') self.soundFire = base.loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3')
self.soundLand = base.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3') self.soundLand = base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3')
self.soundBurst = base.loadSfx('phase_5/audio/sfx/Toon_bodyfall_synergy.mp3') self.soundBurst = base.loader.loadSfx('phase_5/audio/sfx/Toon_bodyfall_synergy.mp3')
self.soundBomb = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.soundBomb = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
self.soundLose = base.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.mp3') self.soundLose = base.loader.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.mp3')
self.soundWin = base.loadSfx('phase_4/audio/sfx/MG_pairing_match_bonus_both.mp3') self.soundWin = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match_bonus_both.mp3')
self.soundDone = base.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3') self.soundDone = base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3')
self.soundMove = base.loadSfx('phase_3.5/audio/sfx/SA_shred.mp3') self.soundMove = base.loader.loadSfx('phase_3.5/audio/sfx/SA_shred.mp3')
background = model.find('**/bg') background = model.find('**/bg')
itemBoard = model.find('**/item_board') itemBoard = model.find('**/item_board')
self.focusPoint = self.baseNode.attachNewNode('GolfGreenGameFrame') self.focusPoint = self.baseNode.attachNewNode('GolfGreenGameFrame')

8
toontown/coghq/DistributedLawbotCannon.py
View file

@ -128,10 +128,10 @@ class DistributedLawbotCannon(DistributedObject.DistributedObject):
self.cannon.reparentTo(self.nodePath) self.cannon.reparentTo(self.nodePath)
self.kartColNode = CollisionNode(self.uniqueName('KartColNode')) self.kartColNode = CollisionNode(self.uniqueName('KartColNode'))
self.kartNode = self.nodePath.attachNewNode(self.kartColNode) self.kartNode = self.nodePath.attachNewNode(self.kartColNode)
self.sndCannonMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.sndCannonFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
self.sndHitGround = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndHitChair = base.loadSfx('phase_11/audio/sfx/LB_toon_jury.mp3') self.sndHitChair = base.loader.loadSfx('phase_11/audio/sfx/LB_toon_jury.mp3')
self.cannon.hide() self.cannon.hide()
self.flashingLabel = None self.flashingLabel = None
return return

6
toontown/coghq/DistributedLawbotChair.py
View file

@ -93,11 +93,11 @@ class DistributedLawbotChair(DistributedObject.DistributedObject, FSM.FSM):
def loadSounds(self): def loadSounds(self):
if self.propInSound == None: if self.propInSound == None:
self.propInSound = base.loadSfx('phase_5/audio/sfx/ENC_propeller_in.mp3') self.propInSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_in.mp3')
if self.propOutSound == None: if self.propOutSound == None:
self.propOutSound = base.loadSfx('phase_5/audio/sfx/ENC_propeller_out.mp3') self.propOutSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_out.mp3')
if self.cogJurorSound == None: if self.cogJurorSound == None:
self.cogJurorSound = base.loadSfx('phase_11/audio/sfx/LB_cog_jury.mp3') self.cogJurorSound = base.loader.loadSfx('phase_11/audio/sfx/LB_cog_jury.mp3')
return return
def unloadSounds(self): def unloadSounds(self):

2
toontown/coghq/DistributedLift.py
View file

@ -17,7 +17,7 @@ class DistributedLift(BasicEntities.DistributedNodePathEntity):
def generateInit(self): def generateInit(self):
self.notify.debug('generateInit') self.notify.debug('generateInit')
BasicEntities.DistributedNodePathEntity.generateInit(self) BasicEntities.DistributedNodePathEntity.generateInit(self)
self.moveSnd = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_elevator_up_down.mp3') self.moveSnd = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_elevator_up_down.mp3')
self.fsm = ClassicFSM.ClassicFSM('DistributedLift', [State.State('off', self.enterOff, self.exitOff, ['moving']), State.State('moving', self.enterMoving, self.exitMoving, ['waiting']), State.State('waiting', self.enterWaiting, self.exitWaiting, ['moving'])], 'off', 'off') self.fsm = ClassicFSM.ClassicFSM('DistributedLift', [State.State('off', self.enterOff, self.exitOff, ['moving']), State.State('moving', self.enterMoving, self.exitMoving, ['waiting']), State.State('waiting', self.enterWaiting, self.exitWaiting, ['moving'])], 'off', 'off')
self.fsm.enterInitialState() self.fsm.enterInitialState()

10
toontown/coghq/DistributedMoleField.py
View file

@ -111,11 +111,11 @@ class DistributedMoleField(DistributedNodePathEntity, MoleFieldBase.MoleFieldBas
self.numMoles = len(self.moleHills) self.numMoles = len(self.moleHills)
self.centerNode = self.attachNewNode('center') self.centerNode = self.attachNewNode('center')
self.centerCenterNode() self.centerCenterNode()
self.soundBomb = base.loadSfx('phase_12/audio/sfx/Mole_Surprise.mp3') self.soundBomb = base.loader.loadSfx('phase_12/audio/sfx/Mole_Surprise.mp3')
self.soundBomb2 = base.loadSfx('phase_3.5/audio/dial/AV_pig_howl.mp3') self.soundBomb2 = base.loader.loadSfx('phase_3.5/audio/dial/AV_pig_howl.mp3')
self.soundCog = base.loadSfx('phase_12/audio/sfx/Mole_Stomp.mp3') self.soundCog = base.loader.loadSfx('phase_12/audio/sfx/Mole_Stomp.mp3')
self.soundUp = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.soundUp = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3')
self.soundDown = base.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.soundDown = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3')
upInterval = SoundInterval(self.soundUp, loop=0) upInterval = SoundInterval(self.soundUp, loop=0)
downInterval = SoundInterval(self.soundDown, loop=0) downInterval = SoundInterval(self.soundDown, loop=0)
self.soundIUpDown = Sequence(upInterval, downInterval) self.soundIUpDown = Sequence(upInterval, downInterval)

16
toontown/estate/DistributedCannon.py
View file

@ -290,14 +290,14 @@ class DistributedCannon(DistributedObject.DistributedObject):
self.splash = Splash.Splash(render) self.splash = Splash.Splash(render)
self.dustCloud = DustCloud.DustCloud(render) self.dustCloud = DustCloud.DustCloud(render)
self.dustCloud.setBillboardPointEye() self.dustCloud.setBillboardPointEye()
self.sndCannonMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.sndCannonFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
self.sndHitGround = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndHitTower = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3') self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3')
self.sndHitWater = base.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3')
self.sndWhizz = base.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3')
self.sndWin = base.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3')
self.sndHitHouse = base.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3') self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3')
self.collSphere = CollisionSphere(0, 0, 0, self.getSphereRadius()) self.collSphere = CollisionSphere(0, 0, 0, self.getSphereRadius())
self.collSphere.setTangible(1) self.collSphere.setTangible(1)
self.collNode = CollisionNode(self.uniqueName('CannonSphere')) self.collNode = CollisionNode(self.uniqueName('CannonSphere'))

8
toontown/estate/DistributedMailbox.py
View file

@ -170,9 +170,9 @@ class DistributedMailbox(DistributedObject.DistributedObject):
return return
elif mode == MailboxGlobals.MAILBOX_MOVIE_EXIT: elif mode == MailboxGlobals.MAILBOX_MOVIE_EXIT:
if random.random() < 0.5: if random.random() < 0.5:
sfx = base.loadSfx('phase_5.5/audio/sfx/mailbox_close_1.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_close_1.mp3')
else: else:
sfx = base.loadSfx('phase_5.5/audio/sfx/mailbox_close_2.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_close_2.mp3')
sfxTrack = SoundInterval(sfx, node=self.model) sfxTrack = SoundInterval(sfx, node=self.model)
sfxTrack.start() sfxTrack.start()
DistributedMailbox.notify.debug('setMovie: exit') DistributedMailbox.notify.debug('setMovie: exit')
@ -190,9 +190,9 @@ class DistributedMailbox(DistributedObject.DistributedObject):
elif mode == MailboxGlobals.MAILBOX_MOVIE_READY: elif mode == MailboxGlobals.MAILBOX_MOVIE_READY:
DistributedMailbox.notify.debug('setMovie: ready') DistributedMailbox.notify.debug('setMovie: ready')
if random.random() < 0.5: if random.random() < 0.5:
sfx = base.loadSfx('phase_5.5/audio/sfx/mailbox_open_1.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_open_1.mp3')
else: else:
sfx = base.loadSfx('phase_5.5/audio/sfx/mailbox_open_2.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_open_2.mp3')
sfxTrack = SoundInterval(sfx, node=self.model) sfxTrack = SoundInterval(sfx, node=self.model)
sfxTrack.start() sfxTrack.start()
if isLocalToon: if isLocalToon:

4
toontown/estate/DistributedTarget.py
View file

@ -51,8 +51,8 @@ class DistributedTarget(DistributedObject.DistributedObject):
self.geom.setPos(0, 0, 40) self.geom.setPos(0, 0, 40)
self.geom.setScale(3) self.geom.setScale(3)
self.geom.stash() self.geom.stash()
self.hitSound = base.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3') self.hitSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3')
self.rewardSound = base.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.rewardSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav')
self.scoreText = TextNode('scoreText') self.scoreText = TextNode('scoreText')
self.scoreText.setTextColor(1, 0, 0, 1) self.scoreText.setTextColor(1, 0, 0, 1)
self.scoreText.setAlign(self.scoreText.ACenter) self.scoreText.setAlign(self.scoreText.ACenter)

10
toontown/estate/EstateLoader.py
View file

@ -48,11 +48,11 @@ class EstateLoader(SafeZoneLoader.SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.music = base.loadMusic('phase_4/audio/bgm/TC_nbrhood.mid') self.music = base.loadMusic('phase_4/audio/bgm/TC_nbrhood.mid')
self.underwaterSound = base.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3')
self.swimSound = base.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3')
self.submergeSound = base.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3')
self.birdSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.birdSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
self.cricketSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.cricketSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
if base.goonsEnabled: if base.goonsEnabled:
invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons') invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons')
self.invModels = [] self.invModels = []

2
toontown/golf/GolfRewardDialog.py
View file

@ -186,7 +186,7 @@ class GolfRewardDialog:
self.trophy.hide() self.trophy.hide()
self.rankLabel['text'] = text self.rankLabel['text'] = text
if len(self.avIdList) > 1: if len(self.avIdList) > 1:
self.victory = base.loadSfx('phase_6/audio/sfx/KART_Applause_%d.mp3' % self.myPlace) self.victory = base.loader.loadSfx('phase_6/audio/sfx/KART_Applause_%d.mp3' % self.myPlace)
self.victory.play() self.victory.play()
for avId in self.avIdList: for avId in self.avIdList:

12
toontown/makeatoon/MakeAToon.py
View file

@ -254,13 +254,13 @@ class MakeAToon(StateData.StateData):
self.music = base.loadMusic('phase_3/audio/bgm/create_a_toon.mid') self.music = base.loadMusic('phase_3/audio/bgm/create_a_toon.mid')
self.musicVolume = base.config.GetFloat('makeatoon-music-volume', 1) self.musicVolume = base.config.GetFloat('makeatoon-music-volume', 1)
self.sfxVolume = base.config.GetFloat('makeatoon-sfx-volume', 1) self.sfxVolume = base.config.GetFloat('makeatoon-sfx-volume', 1)
self.soundBack = base.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3') self.soundBack = base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3')
self.crashSounds = [] self.crashSounds = []
self.crashSounds.append(base.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_boing.mp3')) self.crashSounds.append(base.loader.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_boing.mp3'))
self.crashSounds.append(base.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_glassBoing.mp3')) self.crashSounds.append(base.loader.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_glassBoing.mp3'))
self.crashSounds.append(base.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_wood.mp3')) self.crashSounds.append(base.loader.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_wood.mp3'))
self.crashSounds.append(base.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_woodBoing.mp3')) self.crashSounds.append(base.loader.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_woodBoing.mp3'))
self.crashSounds.append(base.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_woodGlass.mp3')) self.crashSounds.append(base.loader.loadSfx('phase_3/audio/sfx/tt_s_ara_mat_crash_woodGlass.mp3'))
return return
def unload(self): def unload(self):

16
toontown/minigame/DistributedCannonGame.py
View file

@ -112,14 +112,14 @@ class DistributedCannonGame(DistributedMinigame):
self.rewardPanel = DirectLabel(parent=hidden, relief=None, pos=(1.16, 0.0, 0.45), scale=0.65, text='', text_scale=0.2, text_fg=(0.95, 0.95, 0, 1), text_pos=(0, -.13), text_font=ToontownGlobals.getSignFont(), image=self.jarImage) self.rewardPanel = DirectLabel(parent=hidden, relief=None, pos=(1.16, 0.0, 0.45), scale=0.65, text='', text_scale=0.2, text_fg=(0.95, 0.95, 0, 1), text_pos=(0, -.13), text_font=ToontownGlobals.getSignFont(), image=self.jarImage)
self.rewardPanelTitle = DirectLabel(parent=self.rewardPanel, relief=None, pos=(0, 0, 0.06), scale=0.08, text=TTLocalizer.CannonGameReward, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1)) self.rewardPanelTitle = DirectLabel(parent=self.rewardPanel, relief=None, pos=(0, 0, 0.06), scale=0.08, text=TTLocalizer.CannonGameReward, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1))
self.music = base.loadMusic('phase_4/audio/bgm/MG_cannon_game.mid') self.music = base.loadMusic('phase_4/audio/bgm/MG_cannon_game.mid')
self.sndCannonMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.sndCannonFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
self.sndHitGround = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndHitTower = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3') self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3')
self.sndHitWater = base.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3')
self.sndWhizz = base.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3')
self.sndWin = base.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3')
self.sndRewardTick = base.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3')
guiModel = 'phase_4/models/gui/cannon_game_gui' guiModel = 'phase_4/models/gui/cannon_game_gui'
cannonGui = loader.loadModel(guiModel) cannonGui = loader.loadModel(guiModel)
self.aimPad = DirectFrame(image=cannonGui.find('**/CannonFire_PAD'), relief=None, pos=(0.7, 0, -0.553333), scale=0.8) self.aimPad = DirectFrame(image=cannonGui.find('**/CannonFire_PAD'), relief=None, pos=(0.7, 0, -0.553333), scale=0.8)

8
toontown/minigame/DistributedCatchGame.py
View file

@ -96,10 +96,10 @@ class DistributedCatchGame(DistributedMinigame):
model.flattenMedium() model.flattenMedium()
self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.mid') self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.mid')
self.sndGoodCatch = base.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3') self.sndGoodCatch = base.loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3')
self.sndOof = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndAnvilLand = base.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3') self.sndAnvilLand = base.loader.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3')
self.sndPerfect = base.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3')
self.toonSDs = {} self.toonSDs = {}
avId = self.localAvId avId = self.localAvId
toonSD = CatchGameToonSD.CatchGameToonSD(avId, self) toonSD = CatchGameToonSD.CatchGameToonSD(avId, self)

10
toontown/minigame/DistributedCogThiefGame.py
View file

@ -120,9 +120,9 @@ class DistributedCogThiefGame(DistributedMinigame):
self.loadCogs() self.loadCogs()
self.toonHitTracks = {} self.toonHitTracks = {}
self.toonPieTracks = {} self.toonPieTracks = {}
self.sndOof = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndRewardTick = base.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3')
self.sndPerfect = base.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3')
self.timer = ToontownTimer.ToontownTimer() self.timer = ToontownTimer.ToontownTimer()
self.timer.posInTopRightCorner() self.timer.posInTopRightCorner()
self.timer.hide() self.timer.hide()
@ -187,8 +187,8 @@ class DistributedCogThiefGame(DistributedMinigame):
self.sndTable = {'hitBySuit': [None] * self.numPlayers, self.sndTable = {'hitBySuit': [None] * self.numPlayers,
'falling': [None] * self.numPlayers} 'falling': [None] * self.numPlayers}
for i in xrange(self.numPlayers): for i in xrange(self.numPlayers):
self.sndTable['hitBySuit'][i] = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.sndTable['hitBySuit'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3')
self.sndTable['falling'][i] = base.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndTable['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3')
base.playMusic(self.music, looping=1, volume=0.8) base.playMusic(self.music, looping=1, volume=0.8)
self.introTrack = self.getIntroTrack() self.introTrack = self.getIntroTrack()

2
toontown/minigame/DistributedDivingGame.py
View file

@ -70,7 +70,7 @@ class DistributedDivingGame(DistributedMinigame):
DistributedMinigame.load(self) DistributedMinigame.load(self)
loadBase = 'phase_4/models/minigames/' loadBase = 'phase_4/models/minigames/'
loadBaseShip = 'phase_5/models/props/' loadBaseShip = 'phase_5/models/props/'
self.sndAmbience = base.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.sndAmbience = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3')
self.environModel = loader.loadModel(loadBase + 'diving_game.bam') self.environModel = loader.loadModel(loadBase + 'diving_game.bam')
self.boatModel = self.environModel.find('**/boat') self.boatModel = self.environModel.find('**/boat')
self.skyModel = self.environModel.find('**/sky') self.skyModel = self.environModel.find('**/sky')

6
toontown/minigame/DistributedMazeGame.py
View file

@ -579,12 +579,12 @@ class DistributedMazeGame(DistributedMinigame):
self.sndTable = {'hitBySuit': [None] * self.numPlayers, self.sndTable = {'hitBySuit': [None] * self.numPlayers,
'falling': [None] * self.numPlayers} 'falling': [None] * self.numPlayers}
for i in xrange(self.numPlayers): for i in xrange(self.numPlayers):
self.sndTable['hitBySuit'][i] = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.sndTable['hitBySuit'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3')
self.sndTable['falling'][i] = base.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndTable['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3')
self.grabSounds = [] self.grabSounds = []
for i in xrange(5): for i in xrange(5):
self.grabSounds.append(base.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3')) self.grabSounds.append(base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3'))
self.grabSoundIndex = 0 self.grabSoundIndex = 0
for avId in self.avIdList: for avId in self.avIdList:

10
toontown/minigame/DistributedPairingGame.py
View file

@ -117,16 +117,16 @@ class DistributedPairingGame(DistributedMinigame):
self.__textGen = TextNode('ringGame') self.__textGen = TextNode('ringGame')
self.__textGen.setFont(ToontownGlobals.getSignFont()) self.__textGen.setFont(ToontownGlobals.getSignFont())
self.__textGen.setAlign(TextNode.ACenter) self.__textGen.setAlign(TextNode.ACenter)
self.sndPerfect = base.loadSfx('phase_4/audio/sfx/MG_pairing_all_matched.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_all_matched.mp3')
self.calcBonusTraversal() self.calcBonusTraversal()
self.music = base.loadMusic('phase_4/audio/bgm/MG_Pairing.mid') self.music = base.loadMusic('phase_4/audio/bgm/MG_Pairing.mid')
self.matchSfx = base.loadSfx('phase_4/audio/sfx/MG_pairing_match.mp3') self.matchSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match.mp3')
self.matchWithBonusSfx = base.loadSfx('phase_4/audio/sfx/MG_pairing_match_bonus_both.mp3') self.matchWithBonusSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match_bonus_both.mp3')
self.signalSfx = [] self.signalSfx = []
for i in range(4): for i in range(4):
self.signalSfx.append(base.loadSfx('phase_4/audio/sfx/MG_pairing_jumping_signal.mp3')) self.signalSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_jumping_signal.mp3'))
self.bonusMovesSfx = base.loadSfx('phase_4/audio/sfx/MG_pairing_bonus_moves.mp3') self.bonusMovesSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_bonus_moves.mp3')
return return
def unload(self): def unload(self):

10
toontown/minigame/DistributedPatternGame.py
View file

@ -85,12 +85,12 @@ class DistributedPatternGame(DistributedMinigame):
self.room = loader.loadModel('phase_4/models/minigames/matching_room') self.room = loader.loadModel('phase_4/models/minigames/matching_room')
self.buttonSounds = [] self.buttonSounds = []
for soundName in self.ButtonSoundNames: for soundName in self.ButtonSoundNames:
self.buttonSounds.append(base.loadSfx(soundName)) self.buttonSounds.append(base.loader.loadSfx(soundName))
self.correctSound = base.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav')
self.incorrectSound = base.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav') self.incorrectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav')
self.perfectSound = base.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.perfectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3')
self.fallSound = base.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3') self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3')
self.music = base.loadMusic(self.bgm) self.music = base.loadMusic(self.bgm)
self.waitingText = DirectLabel(text=self.strPleaseWait, text_fg=(0.9, 0.9, 0.9, 1.0), frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0, 0, -.78), scale=0.12) self.waitingText = DirectLabel(text=self.strPleaseWait, text_fg=(0.9, 0.9, 0.9, 1.0), frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0, 0, -.78), scale=0.12)
self.roundText = DirectLabel(text=self.strRound % 1, text_fg=self.normalTextColor, frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0.014, 0, -.84), scale=0.12) self.roundText = DirectLabel(text=self.strRound % 1, text_fg=self.normalTextColor, frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0.014, 0, -.84), scale=0.12)

8
toontown/minigame/DistributedPhotoGame.py
View file

@ -133,10 +133,10 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase):
self.filmPanel = DirectLabel(parent=hidden, relief=None, pos=(1.16, 0.0, 0.45), scale=0.65, text=str(self.filmCount), text_scale=0.2, text_fg=(0.95, 0.95, 0, 1), text_pos=(0.08, -0.15), text_font=ToontownGlobals.getSignFont(), image=self.filmImage, image_scale=Point3(1.0, 0.0, 0.85)) self.filmPanel = DirectLabel(parent=hidden, relief=None, pos=(1.16, 0.0, 0.45), scale=0.65, text=str(self.filmCount), text_scale=0.2, text_fg=(0.95, 0.95, 0, 1), text_pos=(0.08, -0.15), text_font=ToontownGlobals.getSignFont(), image=self.filmImage, image_scale=Point3(1.0, 0.0, 0.85))
self.filmPanelTitle = DirectLabel(parent=self.filmPanel, relief=None, pos=(0.08, 0, 0.04), scale=0.08, text=TTLocalizer.PhotoGameFilm, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1)) self.filmPanelTitle = DirectLabel(parent=self.filmPanel, relief=None, pos=(0.08, 0, 0.04), scale=0.08, text=TTLocalizer.PhotoGameFilm, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1))
self.music = base.loadMusic('phase_4/audio/bgm/MG_cannon_game.mid') self.music = base.loadMusic('phase_4/audio/bgm/MG_cannon_game.mid')
self.sndPhotoMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndPhotoMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.sndPhotoFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndPhotoFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
self.sndWin = base.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3')
self.sndFilmTick = base.loadSfx('phase_4/audio/sfx/Photo_instamatic.mp3') self.sndFilmTick = base.loader.loadSfx('phase_4/audio/sfx/Photo_instamatic.mp3')
self.timer = ToontownTimer.ToontownTimer() self.timer = ToontownTimer.ToontownTimer()
self.timer.posInTopRightCorner() self.timer.posInTopRightCorner()
self.timer.hide() self.timer.hide()

10
toontown/minigame/DistributedRaceGame.py
View file

@ -300,10 +300,10 @@ class DistributedRaceGame(DistributedMinigame):
self.dice3, self.dice3,
self.dice4] self.dice4]
self.music = base.loadMusic('phase_4/audio/bgm/minigame_race.mid') self.music = base.loadMusic('phase_4/audio/bgm/minigame_race.mid')
self.posBuzzer = base.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.posBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav')
self.negBuzzer = base.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav') self.negBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav')
self.winSting = base.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.winSting = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3')
self.loseSting = base.loadSfx('phase_4/audio/sfx/MG_lose.mp3') self.loseSting = base.loader.loadSfx('phase_4/audio/sfx/MG_lose.mp3')
self.diceButtonList = [] self.diceButtonList = []
for i in range(1, 5): for i in range(1, 5):
button = self.dice.find('**/dice_button' + str(i)) button = self.dice.find('**/dice_button' + str(i))
@ -322,7 +322,7 @@ class DistributedRaceGame(DistributedMinigame):
self.chanceCard = loader.loadModel('phase_4/models/minigames/chance_card') self.chanceCard = loader.loadModel('phase_4/models/minigames/chance_card')
self.chanceCardText = OnscreenText('', fg=(1.0, 0, 0, 1), scale=0.14, font=ToontownGlobals.getSignFont(), wordwrap=14, pos=(0.0, 0.2), mayChange=1) self.chanceCardText = OnscreenText('', fg=(1.0, 0, 0, 1), scale=0.14, font=ToontownGlobals.getSignFont(), wordwrap=14, pos=(0.0, 0.2), mayChange=1)
self.chanceCardText.hide() self.chanceCardText.hide()
self.cardSound = base.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.mp3') self.cardSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.mp3')
self.chanceMarkers = [] self.chanceMarkers = []
return return

8
toontown/minigame/DistributedRingGame.py
View file

@ -81,8 +81,8 @@ class DistributedRingGame(DistributedMinigame):
DistributedMinigame.load(self) DistributedMinigame.load(self)
self.defineConstants() self.defineConstants()
self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.mid') self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.mid')
self.sndAmbience = base.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.sndAmbience = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3')
self.sndPerfect = base.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3')
loadBase = 'phase_4/models/minigames/' loadBase = 'phase_4/models/minigames/'
self.environModel = loader.loadModel(loadBase + 'swimming_game.bam') self.environModel = loader.loadModel(loadBase + 'swimming_game.bam')
self.environModel.setPos(0, self.ENVIRON_LENGTH / 2.0, self.SEA_FLOOR_Z) self.environModel.setPos(0, self.ENVIRON_LENGTH / 2.0, self.SEA_FLOOR_Z)
@ -166,8 +166,8 @@ class DistributedRingGame(DistributedMinigame):
self.sndTable = {'gotRing': [None] * self.numPlayers, self.sndTable = {'gotRing': [None] * self.numPlayers,
'missedRing': [None] * self.numPlayers} 'missedRing': [None] * self.numPlayers}
for i in range(0, self.numPlayers): for i in range(0, self.numPlayers):
self.sndTable['gotRing'][i] = base.loadSfx('phase_4/audio/sfx/ring_get.mp3') self.sndTable['gotRing'][i] = base.loader.loadSfx('phase_4/audio/sfx/ring_get.mp3')
self.sndTable['missedRing'][i] = base.loadSfx('phase_4/audio/sfx/ring_miss.mp3') self.sndTable['missedRing'][i] = base.loader.loadSfx('phase_4/audio/sfx/ring_miss.mp3')
self.__addToonDropShadow(self.getAvatar(self.localAvId)) self.__addToonDropShadow(self.getAvatar(self.localAvId))
self.__spawnUpdateEnvironTask() self.__spawnUpdateEnvironTask()

2
toontown/minigame/DistributedTagGame.py
View file

@ -51,7 +51,7 @@ class DistributedTagGame(DistributedMinigame):
self.sky = loader.loadModel('phase_3.5/models/props/TT_sky') self.sky = loader.loadModel('phase_3.5/models/props/TT_sky')
self.ground = loader.loadModel('phase_4/models/minigames/tag_arena') self.ground = loader.loadModel('phase_4/models/minigames/tag_arena')
self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.mid') self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.mid')
self.tagSfx = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.tagSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3')
self.itPointer = loader.loadModel('phase_4/models/minigames/bboard-pointer') self.itPointer = loader.loadModel('phase_4/models/minigames/bboard-pointer')
self.tracks = [] self.tracks = []
self.IT = None self.IT = None

12
toontown/minigame/DistributedTravelGame.py
View file

@ -109,12 +109,12 @@ class DistributedTravelGame(DistributedMinigame):
self.minigameLabels = [] self.minigameLabels = []
self.minigameIcons = [] self.minigameIcons = []
self.bonusLabels = [] self.bonusLabels = []
self.trolleyAwaySfx = base.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3') self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3')
self.trolleyBellSfx = base.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3') self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3')
self.turntableRotateSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_turntble_rotate_2.mp3') self.turntableRotateSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_turntble_rotate_2.mp3')
self.wonGameSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_bonus.mp3') self.wonGameSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_bonus.mp3')
self.lostGameSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus_2.mp3') self.lostGameSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus_2.mp3')
self.noWinnerSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus.mp3') self.noWinnerSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus.mp3')
self.boardIndex = 0 self.boardIndex = 0
self.avNames = [] self.avNames = []
self.disconnectedAvIds = [] self.disconnectedAvIds = []

6
toontown/minigame/DistributedTugOfWarGame.py
View file

@ -122,9 +122,9 @@ class DistributedTugOfWarGame(DistributedMinigame):
ropeModel.removeNode() ropeModel.removeNode()
self.sky = loader.loadModel('phase_3.5/models/props/TT_sky') self.sky = loader.loadModel('phase_3.5/models/props/TT_sky')
self.dropShadow = loader.loadModel('phase_3/models/props/drop_shadow') self.dropShadow = loader.loadModel('phase_3/models/props/drop_shadow')
self.correctSound = base.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav')
self.sndHitWater = base.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3')
self.whistleSound = base.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3') self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3')
self.music = base.loadMusic(self.bgm) self.music = base.loadMusic(self.bgm)
self.roundText = DirectLabel(text=' ', text_fg=(0, 1, 0, 1), frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0.014, 0, -.84), scale=0.2) self.roundText = DirectLabel(text=' ', text_fg=(0, 1, 0, 1), frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0.014, 0, -.84), scale=0.2)
self.powerMeter = MinigamePowerMeter.MinigamePowerMeter(17) self.powerMeter = MinigamePowerMeter.MinigamePowerMeter(17)

16
toontown/minigame/DistributedVineGame.py
View file

@ -107,14 +107,14 @@ class DistributedVineGame(DistributedMinigame):
self.gameBoard.hide(VineGameGlobals.RadarCameraBitmask) self.gameBoard.hide(VineGameGlobals.RadarCameraBitmask)
self.treasureModel = self.gameAssets.find('**/bananas') self.treasureModel = self.gameAssets.find('**/bananas')
self.setupVineCourse() self.setupVineCourse()
self.grabSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.mp3') self.grabSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.mp3')
self.jumpSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.mp3') self.jumpSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.mp3')
self.catchSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_catch.mp3') self.catchSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_catch.mp3')
self.spiderHitSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_spider_hit.mp3') self.spiderHitSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_spider_hit.mp3')
self.batHitVineSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit.mp3') self.batHitVineSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit.mp3')
self.batHitMidairSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit_midair.mp3') self.batHitMidairSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit_midair.mp3')
self.winSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_finish.mp3') self.winSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_finish.mp3')
self.fallSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3') self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3')
self.loadBats() self.loadBats()
self.createBatIvals() self.createBatIvals()
bothPlatform = loader.loadModel('phase_4/models/minigames/vine_game_shelf') bothPlatform = loader.loadModel('phase_4/models/minigames/vine_game_shelf')

4
toontown/minigame/PairingGameCard.py
View file

@ -59,8 +59,8 @@ class PairingGameCard(PlayingCardNodePath):
self.setR(0) self.setR(0)
self.setScale(2.5) self.setScale(2.5)
self.flipIval = None self.flipIval = None
self.turnUpSound = base.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_up.mp3') self.turnUpSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_up.mp3')
self.turnDownSound = base.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_down.mp3') self.turnDownSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_down.mp3')
return return
def unload(self): def unload(self):

6
toontown/minigame/Purchase.py
View file

@ -141,9 +141,9 @@ class Purchase(PurchaseBase):
self.convertingVotesToBeansLabel.hide() self.convertingVotesToBeansLabel.hide()
self.rewardDoubledJellybeanLabel = DirectLabel(text=TTLocalizer.PartyRewardDoubledJellybean, text_fg=(1.0, 0.125, 0.125, 1.0), text_shadow=(0, 0, 0, 1), relief=None, pos=(0.0, 0, -0.67), scale=0.08) self.rewardDoubledJellybeanLabel = DirectLabel(text=TTLocalizer.PartyRewardDoubledJellybean, text_fg=(1.0, 0.125, 0.125, 1.0), text_shadow=(0, 0, 0, 1), relief=None, pos=(0.0, 0, -0.67), scale=0.08)
self.rewardDoubledJellybeanLabel.hide() self.rewardDoubledJellybeanLabel.hide()
self.countSound = base.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.countSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3')
self.overMaxSound = base.loadSfx('phase_3.5/audio/sfx/AV_collision.mp3') self.overMaxSound = base.loader.loadSfx('phase_3.5/audio/sfx/AV_collision.mp3')
self.celebrateSound = base.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.celebrateSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3')
return return
def unload(self): def unload(self):

10
toontown/minigame/ToonBlitzAssetMgr.py
View file

@ -48,11 +48,11 @@ class ToonBlitzAssetMgr(DirectObject):
self.world.attachNewNode(dropPlane) self.world.attachNewNode(dropPlane)
self.gameMusic = base.loadMusic('phase_4/audio/bgm/MG_TwoDGame.mid') self.gameMusic = base.loadMusic('phase_4/audio/bgm/MG_TwoDGame.mid')
self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3') self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3')
self.sndOof = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.soundJump = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.mp3') self.soundJump = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.mp3')
self.fallSound = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3') self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3')
self.watergunSound = base.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.mp3') self.watergunSound = base.loader.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.mp3')
self.splashSound = base.loadSfx('phase_4/audio/sfx/Seltzer_squirt_2dgame_hit.mp3') self.splashSound = base.loader.loadSfx('phase_4/audio/sfx/Seltzer_squirt_2dgame_hit.mp3')
self.threeSparkles = loader.loadSfx('phase_4/audio/sfx/threeSparkles.mp3') self.threeSparkles = loader.loadSfx('phase_4/audio/sfx/threeSparkles.mp3')
self.sparkleSound = loader.loadSfx('phase_4/audio/sfx/sparkly.mp3') self.sparkleSound = loader.loadSfx('phase_4/audio/sfx/sparkly.mp3')
self.headCollideSound = loader.loadSfx('phase_3.5/audio/sfx/AV_collision.mp3') self.headCollideSound = loader.loadSfx('phase_3.5/audio/sfx/AV_collision.mp3')

6
toontown/minigame/TwoDEnemy.py
View file

@ -118,7 +118,7 @@ class TwoDEnemy(DirectObject):
self.propTrack = Sequence(ActorInterval(self.suit.prop, 'propeller', startFrame=8, endFrame=25, playRate=2.0)) self.propTrack = Sequence(ActorInterval(self.suit.prop, 'propeller', startFrame=8, endFrame=25, playRate=2.0))
self.animTrack = Sequence(ActorInterval(self.suit, 'landing', startFrame=8, endFrame=28, playRate=0.5), ActorInterval(self.suit, 'landing', startFrame=8, endFrame=28, playRate=-0.5)) self.animTrack = Sequence(ActorInterval(self.suit, 'landing', startFrame=8, endFrame=28, playRate=0.5), ActorInterval(self.suit, 'landing', startFrame=8, endFrame=28, playRate=-0.5))
self.moveIval = Sequence(Func(setIsGoingUp, True), getForwardIval('easeInOut'), Func(setIsGoingUp, False), getBackwardIval('easeInOut')) self.moveIval = Sequence(Func(setIsGoingUp, True), getForwardIval('easeInOut'), Func(setIsGoingUp, False), getBackwardIval('easeInOut'))
self.suitSound = base.loadSfx('phase_4/audio/sfx/TB_propeller.wav') self.suitSound = base.loader.loadSfx('phase_4/audio/sfx/TB_propeller.wav')
else: else:
self.isMovingLeftRight = True self.isMovingLeftRight = True
self.moveIval = Sequence(Func(self.setHeading, finalPos, initPos), getForwardIval('noBlend'), Func(self.setHeading, initPos, finalPos), getBackwardIval('noBlend')) self.moveIval = Sequence(Func(self.setHeading, finalPos, initPos), getForwardIval('noBlend'), Func(self.setHeading, initPos, finalPos), getBackwardIval('noBlend'))
@ -229,8 +229,8 @@ class TwoDEnemy(DirectObject):
self.collNodePath.reparentTo(self.deathSuit) self.collNodePath.reparentTo(self.deathSuit)
treasureSpawnPoint = Point3(self.suit.getX(), self.suit.getY(), self.suit.getZ() + self.suit.height / 2.0) treasureSpawnPoint = Point3(self.suit.getX(), self.suit.getY(), self.suit.getZ() + self.suit.height / 2.0)
gearPoint = Point3(0, 0, self.suit.height / 2.0 + 2.0) gearPoint = Point3(0, 0, self.suit.height / 2.0 + 2.0)
spinningSound = base.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3')
deathSound = base.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall') smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall')
singleGear = BattleParticles.createParticleEffect('GearExplosion', numParticles=1) singleGear = BattleParticles.createParticleEffect('GearExplosion', numParticles=1)
smallGearExplosion = BattleParticles.createParticleEffect('GearExplosion', numParticles=10) smallGearExplosion = BattleParticles.createParticleEffect('GearExplosion', numParticles=10)

2
toontown/minigame/TwoDGameToonSD.py
View file

@ -64,7 +64,7 @@ class TwoDGameToonSD(StateData.StateData):
self.toon.pose(anim, 0) self.toon.pose(anim, 0)
self.battleMgr = TwoDBattleMgr.TwoDBattleMgr(self.game, self.toon) self.battleMgr = TwoDBattleMgr.TwoDBattleMgr(self.game, self.toon)
self.squishSound = base.loadSfx('phase_3.5/audio/dial/AV_' + self.toon.style.getAnimal() + '_exclaim.mp3') self.squishSound = base.loader.loadSfx('phase_3.5/audio/dial/AV_' + self.toon.style.getAnimal() + '_exclaim.mp3')
def destroy(self): def destroy(self):
if self.fallBackIval != None: if self.fallBackIval != None:

4
toontown/minigame/VineBat.py
View file

@ -50,8 +50,8 @@ class VineBat(NodePath, DirectObject):
self.collNodePath = self.attachNewNode(self.collNode) self.collNodePath = self.attachNewNode(self.collNode)
self.collNodePath.hide() self.collNodePath.hide()
self.accept('enter' + self.sphereName, self.__handleEnterSphere) self.accept('enter' + self.sphereName, self.__handleEnterSphere)
self.screechSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_shriek_3.mp3') self.screechSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_shriek_3.mp3')
self.flySfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_flying_lp.wav') self.flySfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_flying_lp.wav')
self.oldCutoffDistance = base.sfxPlayer.getCutoffDistance() self.oldCutoffDistance = base.sfxPlayer.getCutoffDistance()
base.sfxPlayer.setCutoffDistance(240) base.sfxPlayer.setCutoffDistance(240)
self.soundInterval = SoundInterval(self.flySfx, node=self, listenerNode=base.localAvatar, seamlessLoop=True, volume=0.5, cutOff=240) self.soundInterval = SoundInterval(self.flySfx, node=self, listenerNode=base.localAvatar, seamlessLoop=True, volume=0.5, cutOff=240)

10
toontown/minigame/VoteResultsTrolleyPanel.py
View file

@ -102,12 +102,12 @@ class VoteResultsTrolleyPanel(DirectFrame):
self.upArrowSfx = [] self.upArrowSfx = []
self.downArrowSfx = [] self.downArrowSfx = []
for i in range(5): for i in range(5):
self.upArrowSfx.append(base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_blue_arrow.mp3')) self.upArrowSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_blue_arrow.mp3'))
self.downArrowSfx.append(base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_red_arrow.mp3')) self.downArrowSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_red_arrow.mp3'))
self.winVoteSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_win_vote.mp3') self.winVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_win_vote.mp3')
self.noVoteSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_square_no_vote_1.mp3') self.noVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_square_no_vote_1.mp3')
self.loseVoteSfx = base.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_lose_vote.mp3') self.loseVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_lose_vote.mp3')
self.localAvatarWon = False self.localAvatarWon = False
self.localAvatarLost = False self.localAvatarLost = False
localIndex = self.avIdList.index(base.localAvatar.doId) localIndex = self.avIdList.index(base.localAvatar.doId)

4
toontown/parties/Cannon.py
View file

@ -52,8 +52,8 @@ class Cannon:
self.shadowNode = self.cannonNode.find('**/square_drop_shadow') self.shadowNode = self.cannonNode.find('**/square_drop_shadow')
self.smokeNode = loader.loadModel('phase_4/models/props/test_clouds') self.smokeNode = loader.loadModel('phase_4/models/props/test_clouds')
self.smokeNode.setBillboardPointEye() self.smokeNode.setBillboardPointEye()
self.sndCannonMove = base.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3')
self.sndCannonFire = base.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3')
self.collSphere = CollisionSphere(0, 0, 0, self.getSphereRadius()) self.collSphere = CollisionSphere(0, 0, 0, self.getSphereRadius())
self.collSphere.setTangible(1) self.collSphere.setTangible(1)
self.collNode = CollisionNode(self.getCollisionName()) self.collNode = CollisionNode(self.getCollisionName())

12
toontown/parties/DistributedPartyCannonActivity.py
View file

@ -100,12 +100,12 @@ class DistributedPartyCannonActivity(DistributedPartyActivity):
self.splash = Splash.Splash(render) self.splash = Splash.Splash(render)
self.dustCloud = DustCloud.DustCloud(render) self.dustCloud = DustCloud.DustCloud(render)
self.dustCloud.setBillboardPointEye() self.dustCloud.setBillboardPointEye()
self.sndHitGround = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndHitWater = base.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3')
self.sndHitHouse = base.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3') self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3')
self.sndBounce1 = base.loadSfx('phase_13/audio/sfx/bounce1.mp3') self.sndBounce1 = base.loader.loadSfx('phase_13/audio/sfx/bounce1.mp3')
self.sndBounce2 = base.loadSfx('phase_13/audio/sfx/bounce2.mp3') self.sndBounce2 = base.loader.loadSfx('phase_13/audio/sfx/bounce2.mp3')
self.sndBounce3 = base.loadSfx('phase_13/audio/sfx/bounce3.mp3') self.sndBounce3 = base.loader.loadSfx('phase_13/audio/sfx/bounce3.mp3')
self.onstage() self.onstage()
self.sign.reparentTo(hidden) self.sign.reparentTo(hidden)
self.sign.setPos(-6.0, 10.0, 0.0) self.sign.setPos(-6.0, 10.0, 0.0)

8
toontown/parties/DistributedPartyCatchActivity.py
View file

@ -173,10 +173,10 @@ class DistributedPartyCatchActivity(DistributedPartyActivity, DistributedPartyCa
self.dropObjModels = {} self.dropObjModels = {}
if loadModels: if loadModels:
self.__loadDropModels() self.__loadDropModels()
self.sndGoodCatch = base.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3') self.sndGoodCatch = base.loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3')
self.sndOof = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
self.sndAnvilLand = base.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3') self.sndAnvilLand = base.loader.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3')
self.sndPerfect = base.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3')
self.__textGen = TextNode('partyCatchActivity') self.__textGen = TextNode('partyCatchActivity')
self.__textGen.setFont(ToontownGlobals.getSignFont()) self.__textGen.setFont(ToontownGlobals.getSignFont())
self.__textGen.setAlign(TextNode.ACenter) self.__textGen.setAlign(TextNode.ACenter)

2
toontown/parties/DistributedPartyFireworksActivity.py
View file

@ -61,7 +61,7 @@ class DistributedPartyFireworksActivity(DistributedPartyActivity, FireworkShowMi
effectsLocator = self.rocketActor.find('**/joint1') effectsLocator = self.rocketActor.find('**/joint1')
self.rocketExplosionEffect = RocketExplosion(effectsLocator, rocketLocator) self.rocketExplosionEffect = RocketExplosion(effectsLocator, rocketLocator)
self.rocketParticleSeq = None self.rocketParticleSeq = None
self.launchSound = base.loadSfx('phase_13/audio/sfx/rocket_launch.mp3') self.launchSound = base.loader.loadSfx('phase_13/audio/sfx/rocket_launch.mp3')
self.activityFSM = FireworksActivityFSM(self) self.activityFSM = FireworksActivityFSM(self)
self.activityFSM.request('Idle') self.activityFSM.request('Idle')
return return

6
toontown/parties/DistributedPartyTrampolineActivity.py
View file

@ -175,9 +175,9 @@ class DistributedPartyTrampolineActivity(DistributedPartyActivity):
return return
def loadSounds(self): def loadSounds(self):
self.jellyBeanSound = base.loadSfx('phase_4/audio/sfx/sparkly.mp3') self.jellyBeanSound = base.loader.loadSfx('phase_4/audio/sfx/sparkly.mp3')
self.boingSound = base.loadSfx('phase_4/audio/sfx/target_trampoline_2.mp3') self.boingSound = base.loader.loadSfx('phase_4/audio/sfx/target_trampoline_2.mp3')
self.whistleSound = base.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3') self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3')
def loadIntervals(self): def loadIntervals(self):

4
toontown/parties/DistributedPartyTugOfWarActivity.py
View file

@ -222,8 +222,8 @@ class DistributedPartyTugOfWarActivity(DistributedPartyTeamActivity):
return return
def loadSounds(self): def loadSounds(self):
self.splashSound = base.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.splashSound = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3')
self.whistleSound = base.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3') self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3')
def loadIntervals(self): def loadIntervals(self):
self.updateIdealRateInterval = Sequence() self.updateIdealRateInterval = Sequence()

4
toontown/parties/JellybeanRewardGui.py
View file

@ -38,8 +38,8 @@ class JellybeanRewardGui(DirectFrame):
publicPartyGui.find('**/startButton_inactive')), geom_pos=(-0.39, 0.0, 0.125), command=self._close) publicPartyGui.find('**/startButton_inactive')), geom_pos=(-0.39, 0.0, 0.125), command=self._close)
publicPartyGui.removeNode() publicPartyGui.removeNode()
del publicPartyGui del publicPartyGui
self.countSound = base.loadSfx('phase_13/audio/sfx/tick_counter_short.mp3') self.countSound = base.loader.loadSfx('phase_13/audio/sfx/tick_counter_short.mp3')
self.overMaxSound = base.loadSfx('phase_13/audio/sfx/tick_counter_overflow.mp3') self.overMaxSound = base.loader.loadSfx('phase_13/audio/sfx/tick_counter_overflow.mp3')
return return
def showReward(self, earnedAmount, jarAmount, message): def showReward(self, earnedAmount, jarAmount, message):

10
toontown/parties/PartyLoader.py
View file

@ -40,11 +40,11 @@ class PartyLoader(SafeZoneLoader.SafeZoneLoader):
self.oldClear = base.win.getClearColor() self.oldClear = base.win.getClearColor()
base.win.setClearColor(Vec4(0.47, 0.69, 0.3, 1.0)) base.win.setClearColor(Vec4(0.47, 0.69, 0.3, 1.0))
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.underwaterSound = base.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3')
self.swimSound = base.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3')
self.submergeSound = base.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3')
self.birdSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.birdSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
self.cricketSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.cricketSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
def unload(self): def unload(self):
self.ignoreAll() self.ignoreAll()

8
toontown/quest/QuestParser.py
View file

@ -471,7 +471,7 @@ class NPCMoviePlayer(DirectObject.DirectObject):
def parseLoadSfx(self, line): def parseLoadSfx(self, line):
token, varName, fileName = line token, varName, fileName = line
sfx = base.loadSfx(fileName) sfx = base.loader.loadSfx(fileName)
self.setVar(varName, sfx) self.setVar(varName, sfx)
def parseLoadDialogue(self, line): def parseLoadDialogue(self, line):
@ -479,7 +479,7 @@ class NPCMoviePlayer(DirectObject.DirectObject):
if varName == 'tomDialogue_01': if varName == 'tomDialogue_01':
notify.debug('VarName tomDialogue getting added. Tutorial Ack: %d' % base.localAvatar.tutorialAck) notify.debug('VarName tomDialogue getting added. Tutorial Ack: %d' % base.localAvatar.tutorialAck)
if base.config.GetString('language', 'english') == 'japanese': if base.config.GetString('language', 'english') == 'japanese':
dialogue = base.loadSfx(fileName) dialogue = base.loader.loadSfx(fileName)
else: else:
dialogue = None dialogue = None
self.setVar(varName, dialogue) self.setVar(varName, dialogue)
@ -493,7 +493,7 @@ class NPCMoviePlayer(DirectObject.DirectObject):
classicChar = 'minnie' classicChar = 'minnie'
filename = filenameTemplate % classicChar filename = filenameTemplate % classicChar
if base.config.GetString('language', 'english') == 'japanese': if base.config.GetString('language', 'english') == 'japanese':
dialogue = base.loadSfx(filename) dialogue = base.loader.loadSfx(filename)
else: else:
dialogue = None dialogue = None
self.setVar(varName, dialogue) self.setVar(varName, dialogue)
@ -877,7 +877,7 @@ class NPCMoviePlayer(DirectObject.DirectObject):
def parseAddInventory(self, line): def parseAddInventory(self, line):
token, track, level, number = line token, track, level, number = line
inventory = self.getVar('inventory') inventory = self.getVar('inventory')
countSound = base.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') countSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3')
return Sequence(Func(base.playSfx, countSound), Func(inventory.buttonBoing, track, level), Func(inventory.addItems, track, level, number), Func(inventory.updateGUI, track, level)) return Sequence(Func(base.playSfx, countSound), Func(inventory.buttonBoing, track, level), Func(inventory.addItems, track, level, number), Func(inventory.updateGUI, track, level))
def parseSetInventory(self, line): def parseSetInventory(self, line):

12
toontown/racing/DistributedRace.py
View file

@ -69,8 +69,8 @@ class DistributedRace(DistributedObject.DistributedObject):
self.hasFog = False self.hasFog = False
self.dummyNode = None self.dummyNode = None
self.fog = None self.fog = None
self.bananaSound = base.loadSfx('phase_6/audio/sfx/KART_tossBanana.mp3') self.bananaSound = base.loader.loadSfx('phase_6/audio/sfx/KART_tossBanana.mp3')
self.anvilFall = base.loadSfx('phase_6/audio/sfx/KART_Gag_Hit_Anvil.mp3') self.anvilFall = base.loader.loadSfx('phase_6/audio/sfx/KART_Gag_Hit_Anvil.mp3')
self.accept('leaveRace', self.leaveRace) self.accept('leaveRace', self.leaveRace)
self.toonsToLink = [] self.toonsToLink = []
self.curveTs = [] self.curveTs = []
@ -98,8 +98,8 @@ class DistributedRace(DistributedObject.DistributedObject):
bboard.post('race', self) bboard.post('race', self)
self.roomWatcher = None self.roomWatcher = None
self.cutoff = 0.01 self.cutoff = 0.01
self.startBoopSfx = base.loadSfx(self.SFX_StartBoop) self.startBoopSfx = base.loader.loadSfx(self.SFX_StartBoop)
self.startBoop2Sfx = base.loadSfx(self.SFX_StartBoop2) self.startBoop2Sfx = base.loader.loadSfx(self.SFX_StartBoop2)
return return
def announceGenerate(self): def announceGenerate(self):
@ -234,7 +234,7 @@ class DistributedRace(DistributedObject.DistributedObject):
cheerToPlay = place + (4 - self.numRacers) cheerToPlay = place + (4 - self.numRacers)
if cheerToPlay > 4: if cheerToPlay > 4:
cheerToPlay = 4 cheerToPlay = 4
self.victory = base.loadSfx(self.SFX_Applause % cheerToPlay) self.victory = base.loader.loadSfx(self.SFX_Applause % cheerToPlay)
self.victory.play() self.victory.play()
self.knownPlace[avId] = place self.knownPlace[avId] = place
kart = base.cr.doId2do.get(self.kartMap.get(avId, None), None) kart = base.cr.doId2do.get(self.kartMap.get(avId, None), None)
@ -256,7 +256,7 @@ class DistributedRace(DistributedObject.DistributedObject):
return return
if avId == localAvatar.doId: if avId == localAvatar.doId:
cheerToPlay = place + (4 - self.numRacers) cheerToPlay = place + (4 - self.numRacers)
self.victory = base.loadSfx(self.SFX_Applause % cheerToPlay) self.victory = base.loader.loadSfx(self.SFX_Applause % cheerToPlay)
self.victory.play() self.victory.play()
oldPlace = 0 oldPlace = 0
if self.knownPlace.get(avId): if self.knownPlace.get(avId):

2
toontown/racing/DistributedStartingBlock.py
View file

@ -497,7 +497,7 @@ class DistributedStartingBlock(DistributedObject.DistributedObject, FSM):
jumpTrack = self.generateToonJumpTrack() jumpTrack = self.generateToonJumpTrack()
name = self.av.uniqueName('EnterRaceTrack') name = self.av.uniqueName('EnterRaceTrack')
if self.av is not None and self.localToonKarting: if self.av is not None and self.localToonKarting:
kartAppearSfx = base.loadSfx(self.SFX_KartAppear) kartAppearSfx = base.loader.loadSfx(self.SFX_KartAppear)
cameraTrack = self.generateCameraMoveTrack() cameraTrack = self.generateCameraMoveTrack()
engineStartTrack = self.kart.generateEngineStartTrack() engineStartTrack = self.kart.generateEngineStartTrack()
self.finishMovie() self.finishMovie()

10
toontown/racing/DistributedVehicle.py
View file

@ -163,14 +163,14 @@ class DistributedVehicle(DistributedSmoothNode.DistributedSmoothNode, Kart.Kart,
self.forward.setPos(0, 1, 0) self.forward.setPos(0, 1, 0)
self.wallHitsSfx = [] self.wallHitsSfx = []
for wallHit in self.SFX_WallHits: for wallHit in self.SFX_WallHits:
self.wallHitsSfx.append(base.loadSfx(wallHit)) self.wallHitsSfx.append(base.loader.loadSfx(wallHit))
self.skidLoopAsphaltSfx = base.loadSfx(self.SFX_SkidLoop_Asphalt) self.skidLoopAsphaltSfx = base.loader.loadSfx(self.SFX_SkidLoop_Asphalt)
self.skidLoopAsphaltSfx.setLoop() self.skidLoopAsphaltSfx.setLoop()
self.skidLoopGrassSfx = base.loadSfx(self.SFX_SkidLoop_Grass) self.skidLoopGrassSfx = base.loader.loadSfx(self.SFX_SkidLoop_Grass)
self.skidLoopGrassSfx.setLoop() self.skidLoopGrassSfx.setLoop()
self.turboStartSfx = base.loadSfx(self.SFX_TurboStart) self.turboStartSfx = base.loader.loadSfx(self.SFX_TurboStart)
self.turboLoopSfx = base.loadSfx(self.SFX_TurboLoop) self.turboLoopSfx = base.loader.loadSfx(self.SFX_TurboLoop)
self.turboLoopSfx.setLoop() self.turboLoopSfx.setLoop()
self.forward.reparentTo(self.geom[0]) self.forward.reparentTo(self.geom[0])
self.anvil = globalPropPool.getProp('anvil') self.anvil = globalPropPool.getProp('anvil')

4
toontown/racing/Kart.py
View file

@ -113,8 +113,8 @@ class Kart(NodePath, ShadowCaster.ShadowCaster):
self.setActiveShadow() self.setActiveShadow()
self.dropShadow.setScale(1.3, 3, 1) self.dropShadow.setScale(1.3, 3, 1)
kartType = self.kartDNA[KartDNA.bodyType] kartType = self.kartDNA[KartDNA.bodyType]
self.kartStartSfx = base.loadSfx(self.SFX_KartStart % kartType) self.kartStartSfx = base.loader.loadSfx(self.SFX_KartStart % kartType)
self.kartLoopSfx = base.loadSfx(self.SFX_KartLoop % kartType) self.kartLoopSfx = base.loader.loadSfx(self.SFX_KartLoop % kartType)
self.kartLoopSfx.setLoop() self.kartLoopSfx.setLoop()
def __createLODKart(self, level): def __createLODKart(self, level):

4
toontown/racing/RaceGUI.py
View file

@ -102,11 +102,11 @@ class RaceGUI:
self.raceTimeDelta = 0 self.raceTimeDelta = 0
self.raceModeReady = False self.raceModeReady = False
self.resultModeReady = False self.resultModeReady = False
self.gagCycleSound = base.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.gagCycleSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3')
if hasattr(self.gagCycleSound, 'setPlayRate'): if hasattr(self.gagCycleSound, 'setPlayRate'):
self.gagCycleSound.setPlayRate(0.2) self.gagCycleSound.setPlayRate(0.2)
self.gagCycleSound.setLoop(1) self.gagCycleSound.setLoop(1)
self.gagAcquireSound = base.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3') self.gagAcquireSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3')
self.disable() self.disable()
return return

2
toontown/racing/RaceGag.py
View file

@ -25,7 +25,7 @@ class RaceGag(DirectObject.DirectObject):
self.slot = slot self.slot = slot
self.type = 0 self.type = 0
self.accept('imIn-' + self.name, self.hitGag) self.accept('imIn-' + self.name, self.hitGag)
self.pickupSound = base.loadSfx('phase_6/audio/sfx/KART_getGag.mp3') self.pickupSound = base.loader.loadSfx('phase_6/audio/sfx/KART_getGag.mp3')
self.fadeout = None self.fadeout = None
return return

6
toontown/safezone/BRSafeZoneLoader.py
View file

@ -17,9 +17,9 @@ class BRSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.wind1Sound = base.loadSfx('phase_8/audio/sfx/SZ_TB_wind_1.mp3') self.wind1Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_1.mp3')
self.wind2Sound = base.loadSfx('phase_8/audio/sfx/SZ_TB_wind_2.mp3') self.wind2Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_2.mp3')
self.wind3Sound = base.loadSfx('phase_8/audio/sfx/SZ_TB_wind_3.mp3') self.wind3Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_3.mp3')
self.snow = BattleParticles.loadParticleFile('snowdisk.ptf') self.snow = BattleParticles.loadParticleFile('snowdisk.ptf')
self.snow.setPos(0, 0, 5) self.snow.setPos(0, 0, 5)
self.snowRender = self.geom.attachNewNode('snowRender') self.snowRender = self.geom.attachNewNode('snowRender')

16
toontown/safezone/DDSafeZoneLoader.py
View file

@ -18,10 +18,10 @@ class DDSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.seagullSound = base.loadSfx('phase_6/audio/sfx/SZ_DD_Seagull.mp3') self.seagullSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_Seagull.mp3')
self.underwaterSound = base.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3')
self.swimSound = base.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3')
self.submergeSound = base.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3')
water = self.geom.find('**/water') water = self.geom.find('**/water')
water.setTransparency(1) water.setTransparency(1)
water.setColor(1, 1, 1, 0.8) water.setColor(1, 1, 1, 0.8)
@ -35,10 +35,10 @@ class DDSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
else: else:
wheel.hide() wheel.hide()
self.boat.stash() self.boat.stash()
self.dockSound = base.loadSfx('phase_6/audio/sfx/SZ_DD_dockcreak.mp3') self.dockSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_dockcreak.mp3')
self.foghornSound = base.loadSfx('phase_5/audio/sfx/SZ_DD_foghorn.mp3') self.foghornSound = base.loader.loadSfx('phase_5/audio/sfx/SZ_DD_foghorn.mp3')
self.bellSound = base.loadSfx('phase_6/audio/sfx/SZ_DD_shipbell.mp3') self.bellSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_shipbell.mp3')
self.waterSound = base.loadSfx('phase_6/audio/sfx/SZ_DD_waterlap.mp3') self.waterSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_waterlap.mp3')
def unload(self): def unload(self):
SafeZoneLoader.SafeZoneLoader.unload(self) SafeZoneLoader.SafeZoneLoader.unload(self)

8
toontown/safezone/DGSafeZoneLoader.py
View file

@ -14,10 +14,10 @@ class DGSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.bird1Sound = base.loadSfx('phase_8/audio/sfx/SZ_DG_bird_01.mp3') self.bird1Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_01.mp3')
self.bird2Sound = base.loadSfx('phase_8/audio/sfx/SZ_DG_bird_02.mp3') self.bird2Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_02.mp3')
self.bird3Sound = base.loadSfx('phase_8/audio/sfx/SZ_DG_bird_03.mp3') self.bird3Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_03.mp3')
self.bird4Sound = base.loadSfx('phase_8/audio/sfx/SZ_DG_bird_04.mp3') self.bird4Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_04.mp3')
def unload(self): def unload(self):
SafeZoneLoader.SafeZoneLoader.unload(self) SafeZoneLoader.SafeZoneLoader.unload(self)

6
toontown/safezone/DistributedCheckers.py
View file

@ -87,9 +87,9 @@ class DistributedCheckers(DistributedNode.DistributedNode):
29, 29,
30, 30,
31]] 31]]
self.knockSound = base.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3') self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3')
self.clickSound = base.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3')
self.moveSound = base.loadSfx('phase_6/audio/sfx/CC_move.mp3') self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.mp3')
self.accept('stoppedAsleep', self.handleSleep) self.accept('stoppedAsleep', self.handleSleep)
self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin') self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin')
x = self.boardNode.find('**/locator*') x = self.boardNode.find('**/locator*')

6
toontown/safezone/DistributedChineseCheckers.py
View file

@ -134,9 +134,9 @@ class DistributedChineseCheckers(DistributedNode.DistributedNode):
45, 45,
55]] 55]]
self.nonOpposingPositions = [] self.nonOpposingPositions = []
self.knockSound = base.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3') self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3')
self.clickSound = base.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3')
self.moveSound = base.loadSfx('phase_6/audio/sfx/CC_move.mp3') self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.mp3')
self.accept('stoppedAsleep', self.handleSleep) self.accept('stoppedAsleep', self.handleSleep)
from direct.fsm import ClassicFSM, State from direct.fsm import ClassicFSM, State
self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin') self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin')

6
toontown/safezone/DistributedFindFour.py
View file

@ -109,9 +109,9 @@ class DistributedFindFour(DistributedNode.DistributedNode):
self.clockNode.hide() self.clockNode.hide()
self.tintConstant = Vec4(0.25, 0.25, 0.25, 0) self.tintConstant = Vec4(0.25, 0.25, 0.25, 0)
self.ghostConstant = Vec4(0, 0, 0, 0.5) self.ghostConstant = Vec4(0, 0, 0, 0.5)
self.knockSound = base.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3') self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3')
self.clickSound = base.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3')
self.moveSound = base.loadSfx('phase_6/audio/sfx/CC_move.mp3') self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.mp3')
self.accept('stoppedAsleep', self.handleSleep) self.accept('stoppedAsleep', self.handleSleep)
from direct.fsm import ClassicFSM, State from direct.fsm import ClassicFSM, State
self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin') self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin')

2
toontown/safezone/DistributedFishingSpot.py
View file

@ -295,7 +295,7 @@ class DistributedFishingSpot(DistributedObject.DistributedObject):
self.ripples.setScale(0.4) self.ripples.setScale(0.4)
self.ripples.hide() self.ripples.hide()
if self.splashSounds == None: if self.splashSounds == None:
self.splashSounds = (base.loadSfx('phase_4/audio/sfx/TT_splash1.mp3'), base.loadSfx('phase_4/audio/sfx/TT_splash2.mp3')) self.splashSounds = (base.loader.loadSfx('phase_4/audio/sfx/TT_splash1.mp3'), base.loader.loadSfx('phase_4/audio/sfx/TT_splash2.mp3'))
return return
def __placeAvatar(self): def __placeAvatar(self):

4
toontown/safezone/DistributedGolfKart.py
View file

@ -41,8 +41,8 @@ class DistributedGolfKart(DistributedObject.DistributedObject):
State.State('waitCountdown', self.enterWaitCountdown, self.exitWaitCountdown, ['waitEmpty', 'leaving']), State.State('waitCountdown', self.enterWaitCountdown, self.exitWaitCountdown, ['waitEmpty', 'leaving']),
State.State('leaving', self.enterLeaving, self.exitLeaving, ['entering'])], 'off', 'off') State.State('leaving', self.enterLeaving, self.exitLeaving, ['entering'])], 'off', 'off')
self.fsm.enterInitialState() self.fsm.enterInitialState()
self.trolleyAwaySfx = base.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3') self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3')
self.trolleyBellSfx = base.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3') self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3')
self.__toonTracks = {} self.__toonTracks = {}
self.avIds = [0, self.avIds = [0,
0, 0,

4
toontown/safezone/DistributedMMPiano.py
View file

@ -30,8 +30,8 @@ class DistributedMMPiano(DistributedObject.DistributedObject):
self.accept('enterlarge_round_keyboard_collisions', self.__handleOnFloor) self.accept('enterlarge_round_keyboard_collisions', self.__handleOnFloor)
self.accept('exitlarge_round_keyboard_collisions', self.__handleOffFloor) self.accept('exitlarge_round_keyboard_collisions', self.__handleOffFloor)
self.accept('entero7', self.__handleChangeDirectionButton) self.accept('entero7', self.__handleChangeDirectionButton)
self.speedUpSound = base.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3') self.speedUpSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3')
self.changeDirectionSound = base.loadSfx('phase_6/audio/sfx/SZ_MM_cymbal.mp3') self.changeDirectionSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_cymbal.mp3')
self.__setupSpin() self.__setupSpin()
DistributedObject.DistributedObject.generate(self) DistributedObject.DistributedObject.generate(self)

2
toontown/safezone/DistributedPartyGate.py
View file

@ -32,7 +32,7 @@ class DistributedPartyGate(DistributedObject.DistributedObject):
si = '0%d' % i si = '0%d' % i
else: else:
si = '%d' % i si = '%d' % i
self.clockSounds.append(base.loadSfx('phase_4/audio/sfx/clock%s.mp3' % si)) self.clockSounds.append(base.loader.loadSfx('phase_4/audio/sfx/clock%s.mp3' % si))
def generate(self): def generate(self):
DistributedObject.DistributedObject.generate(self) DistributedObject.DistributedObject.generate(self)

4
toontown/safezone/DistributedPicnicTable.py
View file

@ -57,8 +57,8 @@ class DistributedPicnicTable(DistributedNode.DistributedNode):
None, None,
None] None]
self.haveAnimated = [] self.haveAnimated = []
self.winSound = base.loadSfx('phase_6/audio/sfx/KART_Applause_1.mp3') self.winSound = base.loader.loadSfx('phase_6/audio/sfx/KART_Applause_1.mp3')
self.happyDance = base.loadSfx('phase_5/audio/sfx/AA_heal_happydance.mp3') self.happyDance = base.loader.loadSfx('phase_5/audio/sfx/AA_heal_happydance.mp3')
self.accept('stoppedAsleep', self.handleSleep) self.accept('stoppedAsleep', self.handleSleep)
base.localAvatar.startSleepWatch(self.handleSleep) base.localAvatar.startSleepWatch(self.handleSleep)
self.__toonTracks = {} self.__toonTracks = {}

4
toontown/safezone/DistributedTreasure.py
View file

@ -58,8 +58,8 @@ class DistributedTreasure(DistributedObject.DistributedObject):
return 2.0 return 2.0
def loadModel(self, modelPath, modelFindString = None): def loadModel(self, modelPath, modelFindString = None):
self.grabSound = base.loadSfx(self.grabSoundPath) self.grabSound = base.loader.loadSfx(self.grabSoundPath)
self.rejectSound = base.loadSfx(self.rejectSoundPath) self.rejectSound = base.loader.loadSfx(self.rejectSoundPath)
if self.nodePath == None: if self.nodePath == None:
self.makeNodePath() self.makeNodePath()
else: else:

4
toontown/safezone/DistributedTrolley.py
View file

@ -29,8 +29,8 @@ class DistributedTrolley(DistributedObject.DistributedObject):
State.State('waitCountdown', self.enterWaitCountdown, self.exitWaitCountdown, ['waitEmpty', 'leaving']), State.State('waitCountdown', self.enterWaitCountdown, self.exitWaitCountdown, ['waitEmpty', 'leaving']),
State.State('leaving', self.enterLeaving, self.exitLeaving, ['entering'])], 'off', 'off') State.State('leaving', self.enterLeaving, self.exitLeaving, ['entering'])], 'off', 'off')
self.fsm.enterInitialState() self.fsm.enterInitialState()
self.trolleyAwaySfx = base.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3') self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3')
self.trolleyBellSfx = base.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3') self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3')
self.__toonTracks = {} self.__toonTracks = {}
def generate(self): def generate(self):

2
toontown/safezone/GSSafeZoneLoader.py
View file

@ -36,7 +36,7 @@ class GSSafeZoneLoader(SafeZoneLoader):
holidayIds = base.cr.newsManager.getDecorationHolidayId() holidayIds = base.cr.newsManager.getDecorationHolidayId()
if ToontownGlobals.CRASHED_LEADERBOARD in holidayIds: if ToontownGlobals.CRASHED_LEADERBOARD in holidayIds:
self.startSmokeEffect() self.startSmokeEffect()
self.birdSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.birdSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
def unload(self): def unload(self):
del self.birdSound del self.birdSound

2
toontown/safezone/GZSafeZoneLoader.py
View file

@ -31,7 +31,7 @@ class GZSafeZoneLoader(SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.load(self) SafeZoneLoader.load(self)
self.birdSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.birdSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
def unload(self): def unload(self):
del self.birdSound del self.birdSound

8
toontown/safezone/OZSafeZoneLoader.py
View file

@ -40,10 +40,10 @@ class OZSafeZoneLoader(SafeZoneLoader):
self.done = 0 self.done = 0
self.geyserTrack = None self.geyserTrack = None
SafeZoneLoader.load(self) SafeZoneLoader.load(self)
self.birdSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.birdSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
self.underwaterSound = base.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3')
self.swimSound = base.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3')
self.submergeSound = base.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3')
geyserPlacer = self.geom.find('**/geyser*') geyserPlacer = self.geom.find('**/geyser*')
waterfallPlacer = self.geom.find('**/waterfall*') waterfallPlacer = self.geom.find('**/waterfall*')
binMgr = CullBinManager.getGlobalPtr() binMgr = CullBinManager.getGlobalPtr()

2
toontown/safezone/TTSafeZoneLoader.py
View file

@ -16,7 +16,7 @@ class TTSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.birdSound = map(base.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3']) self.birdSound = map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.mp3', 'phase_4/audio/sfx/SZ_TC_bird2.mp3', 'phase_4/audio/sfx/SZ_TC_bird3.mp3'])
def unload(self): def unload(self):
del self.birdSound del self.birdSound

4
toontown/safezone/Train.py
View file

@ -28,8 +28,8 @@ class Train(DirectObject):
self.numCars = len(self.CarFiles) self.numCars = len(self.CarFiles)
self.locomotive = loader.loadModel(self.LocomotiveFile) self.locomotive = loader.loadModel(self.LocomotiveFile)
self.cars = [] self.cars = []
self.trainPassingSfx = base.loadSfx(self.Sfx_TrainPass) self.trainPassingSfx = base.loader.loadSfx(self.Sfx_TrainPass)
self.trainStopStartSfx = base.loadSfx(self.Sfx_TrainStopStart) self.trainStopStartSfx = base.loader.loadSfx(self.Sfx_TrainStopStart)
self.trainId = trackNum self.trainId = trackNum
self.bFlipped = False self.bFlipped = False
if trackStartPos[0] < trackEndPos[0]: if trackStartPos[0] < trackEndPos[0]:

4
toontown/shtiker/OptionsPage.py
View file

@ -491,8 +491,8 @@ class CodesTabPage(DirectFrame):
self.resultPanelSuccessGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_success') self.resultPanelSuccessGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_success')
self.resultPanelFailureGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_failure') self.resultPanelFailureGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_failure')
self.resultPanelErrorGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_error') self.resultPanelErrorGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_error')
self.successSfx = base.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrSuccess.mp3') self.successSfx = base.loader.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrSuccess.mp3')
self.failureSfx = base.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrFailure.mp3') self.failureSfx = base.loader.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrFailure.mp3')
self.instructionPanel = DirectFrame(parent=self, relief=None, image=instructionGui, image_scale=0.8, text=TTLocalizer.CdrInstructions, text_pos=TTLocalizer.OPCodesInstructionPanelTextPos, text_align=TextNode.ACenter, text_scale=TTLocalizer.OPCodesResultPanelTextScale, text_wordwrap=TTLocalizer.OPCodesInstructionPanelTextWordWrap, pos=(-0.429, 0, -0.05)) self.instructionPanel = DirectFrame(parent=self, relief=None, image=instructionGui, image_scale=0.8, text=TTLocalizer.CdrInstructions, text_pos=TTLocalizer.OPCodesInstructionPanelTextPos, text_align=TextNode.ACenter, text_scale=TTLocalizer.OPCodesResultPanelTextScale, text_wordwrap=TTLocalizer.OPCodesInstructionPanelTextWordWrap, pos=(-0.429, 0, -0.05))
self.codeBox = DirectFrame(parent=self, relief=None, image=codeBoxGui, pos=(0.433, 0, 0.35)) self.codeBox = DirectFrame(parent=self, relief=None, image=codeBoxGui, pos=(0.433, 0, 0.35))
self.flippyFrame = DirectFrame(parent=self, relief=None, image=flippyGui, pos=(0.44, 0, -0.353)) self.flippyFrame = DirectFrame(parent=self, relief=None, image=flippyGui, pos=(0.44, 0, -0.353))

6
toontown/shtiker/ShtikerBook.py
View file

@ -130,9 +130,9 @@ class ShtikerBook(DirectFrame, StateData.StateData):
self.nextArrow = DirectButton(parent=self, relief=None, image=(bookModel.find('**/arrow_button'), bookModel.find('**/arrow_down'), bookModel.find('**/arrow_rollover')), scale=(0.1, 0.1, 0.1), pos=(0.838, 0, -0.661), command=self.__pageChange, extraArgs=[1]) self.nextArrow = DirectButton(parent=self, relief=None, image=(bookModel.find('**/arrow_button'), bookModel.find('**/arrow_down'), bookModel.find('**/arrow_rollover')), scale=(0.1, 0.1, 0.1), pos=(0.838, 0, -0.661), command=self.__pageChange, extraArgs=[1])
self.prevArrow = DirectButton(parent=self, relief=None, image=(bookModel.find('**/arrow_button'), bookModel.find('**/arrow_down'), bookModel.find('**/arrow_rollover')), scale=(-0.1, 0.1, 0.1), pos=(-0.838, 0, -0.661), command=self.__pageChange, extraArgs=[-1]) self.prevArrow = DirectButton(parent=self, relief=None, image=(bookModel.find('**/arrow_button'), bookModel.find('**/arrow_down'), bookModel.find('**/arrow_rollover')), scale=(-0.1, 0.1, 0.1), pos=(-0.838, 0, -0.661), command=self.__pageChange, extraArgs=[-1])
bookModel.removeNode() bookModel.removeNode()
self.openSound = base.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_open.mp3') self.openSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_open.mp3')
self.closeSound = base.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_delete.mp3') self.closeSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_delete.mp3')
self.pageSound = base.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.mp3') self.pageSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.mp3')
return return
def unload(self): def unload(self):

8
toontown/suit/DistributedBossCog.py
View file

@ -548,10 +548,10 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
self.rightDoor = self.elevatorModel.find('**/right-door') self.rightDoor = self.elevatorModel.find('**/right-door')
if self.rightDoor.isEmpty(): if self.rightDoor.isEmpty():
self.rightDoor = self.elevatorModel.find('**/right_door') self.rightDoor = self.elevatorModel.find('**/right_door')
self.openSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
self.finalOpenSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') self.finalOpenSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
self.closeSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3')
self.finalCloseSfx = base.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') self.finalCloseSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3')
self.openDoors = ElevatorUtils.getOpenInterval(self, self.leftDoor, self.rightDoor, self.openSfx, self.finalOpenSfx, self.elevatorType) self.openDoors = ElevatorUtils.getOpenInterval(self, self.leftDoor, self.rightDoor, self.openSfx, self.finalOpenSfx, self.elevatorType)
self.closeDoors = ElevatorUtils.getCloseInterval(self, self.leftDoor, self.rightDoor, self.closeSfx, self.finalCloseSfx, self.elevatorType) self.closeDoors = ElevatorUtils.getCloseInterval(self, self.leftDoor, self.rightDoor, self.closeSfx, self.finalCloseSfx, self.elevatorType)
self.closeDoors.start() self.closeDoors.start()

2
toontown/suit/DistributedCashbotBoss.py
View file

@ -486,7 +486,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
loco = loader.loadModel('phase_10/models/cogHQ/CashBotLocomotive') loco = loader.loadModel('phase_10/models/cogHQ/CashBotLocomotive')
car1 = loader.loadModel('phase_10/models/cogHQ/CashBotBoxCar') car1 = loader.loadModel('phase_10/models/cogHQ/CashBotBoxCar')
car2 = loader.loadModel('phase_10/models/cogHQ/CashBotTankCar') car2 = loader.loadModel('phase_10/models/cogHQ/CashBotTankCar')
trainPassingSfx = base.loadSfx('phase_10/audio/sfx/CBHQ_TRAIN_pass.mp3') trainPassingSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_TRAIN_pass.mp3')
boomSfx = loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') boomSfx = loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
rollThroughDoor = self.rollBossToPoint(fromPos=Point3(120, -280, 0), fromHpr=None, toPos=Point3(120, -250, 0), toHpr=None, reverse=0) rollThroughDoor = self.rollBossToPoint(fromPos=Point3(120, -280, 0), fromHpr=None, toPos=Point3(120, -250, 0), toHpr=None, reverse=0)
rollTrack = Sequence(Func(self.getGeomNode().setH, 180), rollThroughDoor[0], Func(self.getGeomNode().setH, 0)) rollTrack = Sequence(Func(self.getGeomNode().setH, 180), rollThroughDoor[0], Func(self.getGeomNode().setH, 0))

4
toontown/suit/DistributedSuitBase.py
View file

@ -155,9 +155,9 @@ class DistributedSuitBase(DistributedAvatar.DistributedAvatar, Suit.Suit, SuitBa
if self.prop == None: if self.prop == None:
self.prop = BattleProps.globalPropPool.getProp('propeller') self.prop = BattleProps.globalPropPool.getProp('propeller')
if self.propInSound == None: if self.propInSound == None:
self.propInSound = base.loadSfx('phase_5/audio/sfx/ENC_propeller_in.mp3') self.propInSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_in.mp3')
if self.propOutSound == None: if self.propOutSound == None:
self.propOutSound = base.loadSfx('phase_5/audio/sfx/ENC_propeller_out.mp3') self.propOutSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_out.mp3')
if base.config.GetBool('want-new-cogs', 0): if base.config.GetBool('want-new-cogs', 0):
head = self.find('**/to_head') head = self.find('**/to_head')
if head.isEmpty(): if head.isEmpty():

2
toontown/suit/GoonDeath.py
View file

@ -19,5 +19,5 @@ def createGoonExplosion(parent, explosionPoint, scale):
explosion = createExplosionTrack(parent, deathNode, scale) explosion = createExplosionTrack(parent, deathNode, scale)
smallGearExplosion = BattleParticles.createParticleEffect('GearExplosion', numParticles=10) smallGearExplosion = BattleParticles.createParticleEffect('GearExplosion', numParticles=10)
bigGearExplosion = BattleParticles.createParticleEffect('WideGearExplosion', numParticles=30) bigGearExplosion = BattleParticles.createParticleEffect('WideGearExplosion', numParticles=30)
deathSound = base.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3')
return Parallel(explosion, SoundInterval(deathSound), ParticleInterval(smallGearExplosion, deathNode, worldRelative=0, duration=4.3, cleanup=True), ParticleInterval(bigGearExplosion, deathNode, worldRelative=0, duration=1.0, cleanup=True), name='gears2MTrack') return Parallel(explosion, SoundInterval(deathSound), ParticleInterval(smallGearExplosion, deathNode, worldRelative=0, duration=4.3, cleanup=True), ParticleInterval(bigGearExplosion, deathNode, worldRelative=0, duration=1.0, cleanup=True), name='gears2MTrack')

2
toontown/suit/Suit.py
View file

@ -255,7 +255,7 @@ def loadDialog(level):
'COG_VO_statement', 'COG_VO_statement',
'COG_VO_question'] 'COG_VO_question']
for file in SuitDialogFiles: for file in SuitDialogFiles:
SuitDialogArray.append(base.loadSfx(loadPath + file + '.mp3')) SuitDialogArray.append(base.loader.loadSfx(loadPath + file + '.mp3'))
SuitDialogArray.append(SuitDialogArray[2]) SuitDialogArray.append(SuitDialogArray[2])
SuitDialogArray.append(SuitDialogArray[2]) SuitDialogArray.append(SuitDialogArray[2])

10
toontown/toon/LocalToon.py
View file

@ -79,11 +79,11 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar):
chatMgr = ToontownChatManager.ToontownChatManager(cr, self) chatMgr = ToontownChatManager.ToontownChatManager(cr, self)
talkAssistant = TTTalkAssistant.TTTalkAssistant() talkAssistant = TTTalkAssistant.TTTalkAssistant()
LocalAvatar.LocalAvatar.__init__(self, cr, chatMgr, talkAssistant, passMessagesThrough=True) LocalAvatar.LocalAvatar.__init__(self, cr, chatMgr, talkAssistant, passMessagesThrough=True)
self.soundRun = base.loadSfx('phase_3.5/audio/sfx/AV_footstep_runloop.wav') self.soundRun = base.loader.loadSfx('phase_3.5/audio/sfx/AV_footstep_runloop.wav')
self.soundWalk = base.loadSfx('phase_3.5/audio/sfx/AV_footstep_walkloop.wav') self.soundWalk = base.loader.loadSfx('phase_3.5/audio/sfx/AV_footstep_walkloop.wav')
self.soundWhisper = base.loadSfx('phase_3.5/audio/sfx/GUI_whisper_3.mp3') self.soundWhisper = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_whisper_3.mp3')
self.soundPhoneRing = base.loadSfx('phase_3.5/audio/sfx/telephone_ring.mp3') self.soundPhoneRing = base.loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.mp3')
self.soundSystemMessage = base.loadSfx('phase_3/audio/sfx/clock03.mp3') self.soundSystemMessage = base.loader.loadSfx('phase_3/audio/sfx/clock03.mp3')
self.positionExaminer = PositionExaminer.PositionExaminer() self.positionExaminer = PositionExaminer.PositionExaminer()
friendsGui = loader.loadModel('phase_3.5/models/gui/friendslist_gui') friendsGui = loader.loadModel('phase_3.5/models/gui/friendslist_gui')
friendsButtonNormal = friendsGui.find('**/FriendsBox_Closed') friendsButtonNormal = friendsGui.find('**/FriendsBox_Closed')

30
toontown/toon/TTEmote.py
View file

@ -14,7 +14,7 @@ EmoteClear = -1
def doVictory(toon, volume = 1): def doVictory(toon, volume = 1):
duration = toon.getDuration('victory', 'legs') duration = toon.getDuration('victory', 'legs')
sfx = base.loadSfx('phase_3.5/audio/sfx/ENC_Win.mp3') sfx = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_Win.mp3')
sfxDuration = duration - 1.0 sfxDuration = duration - 1.0
sfxTrack = SoundInterval(sfx, loop=1, duration=sfxDuration, node=toon, volume=volume) sfxTrack = SoundInterval(sfx, loop=1, duration=sfxDuration, node=toon, volume=volume)
track = Sequence(Func(toon.play, 'victory'), sfxTrack, duration=0) track = Sequence(Func(toon.play, 'victory'), sfxTrack, duration=0)
@ -35,9 +35,9 @@ def doAnnoyed(toon, volume = 1):
duration = toon.getDuration('angry', 'torso') duration = toon.getDuration('angry', 'torso')
sfx = None sfx = None
if toon.style.getAnimal() == 'bear': if toon.style.getAnimal() == 'bear':
sfx = base.loadSfx('phase_3.5/audio/dial/AV_bear_exclaim.mp3') sfx = base.loader.loadSfx('phase_3.5/audio/dial/AV_bear_exclaim.mp3')
else: else:
sfx = base.loadSfx('phase_3.5/audio/sfx/avatar_emotion_angry.mp3') sfx = base.loader.loadSfx('phase_3.5/audio/sfx/avatar_emotion_angry.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -106,7 +106,7 @@ def doOk(toon, volume = 1):
def doShrug(toon, volume = 1): def doShrug(toon, volume = 1):
sfx = base.loadSfx('phase_3.5/audio/sfx/avatar_emotion_shrug.mp3') sfx = base.loader.loadSfx('phase_3.5/audio/sfx/avatar_emotion_shrug.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -123,7 +123,7 @@ def doWave(toon, volume = 1):
def doApplause(toon, volume = 1): def doApplause(toon, volume = 1):
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_applause.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_applause.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, volume=1, node=toon) base.playSfx(sfx, volume=1, node=toon)
@ -134,7 +134,7 @@ def doApplause(toon, volume = 1):
def doConfused(toon, volume = 1): def doConfused(toon, volume = 1):
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_confused.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_confused.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, node=toon, volume=volume) base.playSfx(sfx, node=toon, volume=volume)
@ -145,7 +145,7 @@ def doConfused(toon, volume = 1):
def doSlipForward(toon, volume = 1): def doSlipForward(toon, volume = 1):
sfx = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -157,7 +157,7 @@ def doSlipForward(toon, volume = 1):
def doBored(toon, volume = 1): def doBored(toon, volume = 1):
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_bored.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_bored.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -179,7 +179,7 @@ def doBow(toon, volume = 1):
def doSlipBackward(toon, volume = 1): def doSlipBackward(toon, volume = 1):
sfx = base.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3')
def playSfx(): def playSfx():
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -217,7 +217,7 @@ def doNothing(toon, volume = 1):
def doSurprise(toon, volume = 1): def doSurprise(toon, volume = 1):
sfx = None sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_surprise.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_surprise.mp3')
def playSfx(volume = 1): def playSfx(volume = 1):
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -238,7 +238,7 @@ def doSurprise(toon, volume = 1):
def doUpset(toon, volume = 1): def doUpset(toon, volume = 1):
sfx = None sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_very_sad_1.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_very_sad_1.mp3')
def playSfx(volume = 1): def playSfx(volume = 1):
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -259,7 +259,7 @@ def doUpset(toon, volume = 1):
def doDelighted(toon, volume = 1): def doDelighted(toon, volume = 1):
sfx = None sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/delighted_06.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/delighted_06.mp3')
def playSfx(volume = 1): def playSfx(volume = 1):
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -281,7 +281,7 @@ def doDelighted(toon, volume = 1):
def doFurious(toon, volume = 1): def doFurious(toon, volume = 1):
duration = toon.getDuration('angry', 'torso') duration = toon.getDuration('angry', 'torso')
sfx = None sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/furious_03.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/furious_03.mp3')
def playSfx(volume = 1): def playSfx(volume = 1):
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -293,7 +293,7 @@ def doFurious(toon, volume = 1):
def doLaugh(toon, volume = 1): def doLaugh(toon, volume = 1):
sfx = None sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_laugh.mp3') sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_laugh.mp3')
def playSfx(volume = 1): def playSfx(volume = 1):
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)
@ -316,7 +316,7 @@ def getSingingNote(toon, note, volume = 1):
filePrefix = 'tt_s_dlg_sng_' filePrefix = 'tt_s_dlg_sng_'
fileSuffix = '.mp3' fileSuffix = '.mp3'
speciesName = ToonDNA.getSpeciesName(toon.style.head) speciesName = ToonDNA.getSpeciesName(toon.style.head)
sfx = base.loadSfx(filePath + filePrefix + speciesName + '_' + note + fileSuffix) sfx = base.loader.loadSfx(filePath + filePrefix + speciesName + '_' + note + fileSuffix)
def playSfx(volume = 1): def playSfx(volume = 1):
base.playSfx(sfx, volume=volume, node=toon) base.playSfx(sfx, volume=volume, node=toon)

Some files were not shown because too many files have changed in this diff Show more