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

audio: .mid, .wav, .mp3 -> .ogg

Browse source
This commit is contained in:
John Cote 2020-01-14 14:28:52 -05:00
parent de283ca597
commit 259c505a1b
197 changed files with 899 additions and 899 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/distributed/OTPClientRepository.py
View file

@ -502,7 +502,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.loader.loadSfx('phase_3/audio/sfx/clock03.mp3') self.systemMessageSfx = base.loader.loadSfx('phase_3/audio/sfx/clock03.ogg')
if self.systemMessageSfx: if self.systemMessageSfx:
base.playSfx(self.systemMessageSfx) base.playSfx(self.systemMessageSfx)

4
toontown/battle/DistributedBattleBldg.py
View file

@ -37,9 +37,9 @@ class DistributedBattleBldg(DistributedBattleBase.DistributedBattleBase):
def setBossBattle(self, value): def setBossBattle(self, value):
self.bossBattle = value self.bossBattle = value
if self.bossBattle: if self.bossBattle:
self.battleMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') self.battleMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg')
else: else:
self.battleMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_general_bg_indoor.mid') self.battleMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_general_bg_indoor.ogg')
base.playMusic(self.battleMusic, looping=1, volume=0.9) base.playMusic(self.battleMusic, looping=1, volume=0.9)
def getBossBattleTaunt(self): def getBossBattleTaunt(self):

6
toontown/battle/Fanfare.py
View file

@ -135,9 +135,9 @@ def doFanfare(delay, toon, panel):
red_p0.renderer.getColorInterpolationManager().addConstant(0.0, 1.0, Vec4(1.0, 0.0, 0.0, 1.0), 1) red_p0.renderer.getColorInterpolationManager().addConstant(0.0, 1.0, Vec4(1.0, 0.0, 0.0, 1.0), 1)
trumpetsAppear = LerpColorInterval(trumpetNode, 0.3, startColor=Vec4(1, 1, 0, 0), color=Vec4(1, 1, 0, 1)) trumpetsAppear = LerpColorInterval(trumpetNode, 0.3, startColor=Vec4(1, 1, 0, 0), color=Vec4(1, 1, 0, 1))
trumpetsVanish = LerpColorInterval(trumpetNode, 0.3, startColor=Vec4(1, 1, 0, 1), color=Vec4(1, 1, 0, 0)) trumpetsVanish = LerpColorInterval(trumpetNode, 0.3, startColor=Vec4(1, 1, 0, 1), color=Vec4(1, 1, 0, 0))
crabHorn = globalBattleSoundCache.getSound('King_Crab.mp3') crabHorn = globalBattleSoundCache.getSound('King_Crab.ogg')
drumroll = globalBattleSoundCache.getSound('SZ_MM_drumroll.mp3') drumroll = globalBattleSoundCache.getSound('SZ_MM_drumroll.ogg')
fanfare = globalBattleSoundCache.getSound('SZ_MM_fanfare.mp3') fanfare = globalBattleSoundCache.getSound('SZ_MM_fanfare.ogg')
crabHorn.setTime(1.5) crabHorn.setTime(1.5)
partyBall.setTransparency(1) partyBall.setTransparency(1)
partyBall.setColorScale(1, 1, 1, 1) partyBall.setColorScale(1, 1, 1, 1)

6
toontown/battle/Movie.py
View file

@ -357,9 +357,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.loader.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.ogg')
self.tomDialogue04 = base.loader.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.ogg')
self.tomDialogue05 = base.loader.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.ogg')
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

10
toontown/battle/MovieDrop.py
View file

@ -10,8 +10,8 @@ from .MovieUtil import calcAvgSuitPos
from direct.showutil import Effects from direct.showutil import Effects
import functools import functools
notify = DirectNotifyGlobal.directNotify.newCategory('MovieDrop') notify = DirectNotifyGlobal.directNotify.newCategory('MovieDrop')
hitSoundFiles = ('AA_drop_flowerpot.mp3', 'AA_drop_sandbag.mp3', 'AA_drop_anvil.mp3', 'AA_drop_bigweight.mp3', 'AA_drop_safe.mp3', 'AA_drop_piano.mp3', 'AA_drop_boat.mp3') hitSoundFiles = ('AA_drop_flowerpot.ogg', 'AA_drop_sandbag.ogg', 'AA_drop_anvil.ogg', 'AA_drop_bigweight.ogg', 'AA_drop_safe.ogg', 'AA_drop_piano.ogg', 'AA_drop_boat.ogg')
missSoundFiles = ('AA_drop_flowerpot_miss.mp3', 'AA_drop_sandbag_miss.mp3', 'AA_drop_anvil_miss.mp3', 'AA_drop_bigweight_miss.mp3', 'AA_drop_safe_miss.mp3', 'AA_drop_piano_miss.mp3', 'AA_drop_boat_miss.mp3') missSoundFiles = ('AA_drop_flowerpot_miss.ogg', 'AA_drop_sandbag_miss.ogg', 'AA_drop_anvil_miss.ogg', 'AA_drop_bigweight_miss.ogg', 'AA_drop_safe_miss.ogg', 'AA_drop_piano_miss.ogg', 'AA_drop_boat_miss.ogg')
tDropShadow = 1.3 tDropShadow = 1.3
tSuitDodges = 2.45 + tDropShadow tSuitDodges = 2.45 + tDropShadow
tObjectAppears = 3.0 + tDropShadow tObjectAppears = 3.0 + tDropShadow
@ -99,12 +99,12 @@ def __getSoundTrack(level, hitSuit, node = None):
soundEffect = globalBattleSoundCache.getSound(missSoundFiles[level]) soundEffect = globalBattleSoundCache.getSound(missSoundFiles[level])
soundTrack = Sequence() soundTrack = Sequence()
if soundEffect: if soundEffect:
buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.ogg')
fallingSound = None fallingSound = None
buttonDelay = tButtonPressed - 0.3 buttonDelay = tButtonPressed - 0.3
fallingDuration = 1.5 fallingDuration = 1.5
if not level == UBER_GAG_LEVEL_INDEX: if not level == UBER_GAG_LEVEL_INDEX:
fallingSound = globalBattleSoundCache.getSound('incoming_whistleALT.mp3') fallingSound = globalBattleSoundCache.getSound('incoming_whistleALT.ogg')
soundTrack.append(Wait(buttonDelay)) soundTrack.append(Wait(buttonDelay))
soundTrack.append(SoundInterval(buttonSound, duration=0.67, node=node)) soundTrack.append(SoundInterval(buttonSound, duration=0.67, node=node))
if fallingSound: if fallingSound:
@ -407,7 +407,7 @@ def __createSuitTrack(drop, delay, level, alreadyDodged, alreadyTeased, target,
suitTrack.append(updateHealthBar) suitTrack.append(updateHealthBar)
suitGettingHit = Parallel(suitReact) suitGettingHit = Parallel(suitReact)
if level == UBER_GAG_LEVEL_INDEX: if level == UBER_GAG_LEVEL_INDEX:
gotHitSound = globalBattleSoundCache.getSound('AA_drop_boat_cog.mp3') gotHitSound = globalBattleSoundCache.getSound('AA_drop_boat_cog.ogg')
suitGettingHit.append(SoundInterval(gotHitSound, node=toon)) suitGettingHit.append(SoundInterval(gotHitSound, node=toon))
suitTrack.append(suitGettingHit) suitTrack.append(suitGettingHit)
bonusTrack = None bonusTrack = None

12
toontown/battle/MovieFire.py
View file

@ -12,7 +12,7 @@ from . import MovieCamera
from . import MovieUtil from . import MovieUtil
from .MovieUtil import calcAvgSuitPos from .MovieUtil import calcAvgSuitPos
notify = DirectNotifyGlobal.directNotify.newCategory('MovieThrow') notify = DirectNotifyGlobal.directNotify.newCategory('MovieThrow')
hitSoundFiles = ('AA_tart_only.mp3', 'AA_slice_only.mp3', 'AA_slice_only.mp3', 'AA_slice_only.mp3', 'AA_slice_only.mp3', 'AA_wholepie_only.mp3', 'AA_wholepie_only.mp3') hitSoundFiles = ('AA_tart_only.ogg', 'AA_slice_only.ogg', 'AA_slice_only.ogg', 'AA_slice_only.ogg', 'AA_slice_only.ogg', 'AA_wholepie_only.ogg', 'AA_wholepie_only.ogg')
tPieLeavesHand = 2.7 tPieLeavesHand = 2.7
tPieHitsSuit = 3.0 tPieHitsSuit = 3.0
tSuitDodges = 2.45 tSuitDodges = 2.45
@ -216,7 +216,7 @@ def __pieMissGroupLerpCallback(t, missDict):
def __getSoundTrack(level, hitSuit, node = None): def __getSoundTrack(level, hitSuit, node = None):
throwSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') throwSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.ogg')
throwTrack = Sequence(Wait(2.15), SoundInterval(throwSound, node=node)) throwTrack = Sequence(Wait(2.15), SoundInterval(throwSound, node=node))
return throwTrack return throwTrack
@ -311,13 +311,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.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') soundBomb = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
playSoundBomb = SoundInterval(soundBomb, node=cannonHolder) playSoundBomb = SoundInterval(soundBomb, node=cannonHolder)
soundFly = base.loader.loadSfx('phase_4/audio/sfx/firework_whistle_01.mp3') soundFly = base.loader.loadSfx('phase_4/audio/sfx/firework_whistle_01.ogg')
playSoundFly = SoundInterval(soundFly, node=cannonHolder) playSoundFly = SoundInterval(soundFly, node=cannonHolder)
soundCannonAdjust = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') soundCannonAdjust = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
playSoundCannonAdjust = SoundInterval(soundCannonAdjust, duration=0.6, node=cannonHolder) playSoundCannonAdjust = SoundInterval(soundCannonAdjust, duration=0.6, node=cannonHolder)
soundCogPanic = base.loader.loadSfx('phase_5/audio/sfx/ENC_cogafssm.mp3') soundCogPanic = base.loader.loadSfx('phase_5/audio/sfx/ENC_cogafssm.ogg')
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/MovieHeal.py
View file

@ -15,7 +15,7 @@ from . import MovieNPCSOS
from toontown.effects import Splash from toontown.effects import Splash
from direct.task import Task from direct.task import Task
notify = DirectNotifyGlobal.directNotify.newCategory('MovieHeal') notify = DirectNotifyGlobal.directNotify.newCategory('MovieHeal')
soundFiles = ('AA_heal_tickle.mp3', 'AA_heal_telljoke.mp3', 'AA_heal_smooch.mp3', 'AA_heal_happydance.mp3', 'AA_heal_pixiedust.mp3', 'AA_heal_juggle.mp3', 'AA_heal_High_Dive.mp3') soundFiles = ('AA_heal_tickle.ogg', 'AA_heal_telljoke.ogg', 'AA_heal_smooch.ogg', 'AA_heal_happydance.ogg', 'AA_heal_pixiedust.ogg', 'AA_heal_juggle.ogg', 'AA_heal_High_Dive.ogg')
healPos = Point3(0, 0, 0) healPos = Point3(0, 0, 0)
healHpr = Vec3(180.0, 0, 0) healHpr = Vec3(180.0, 0, 0)
runHealTime = 1.0 runHealTime = 1.0

30
toontown/battle/MovieLure.py
View file

@ -123,7 +123,7 @@ def __createFishingPoleMultiTrack(lure, dollar, dollarName):
tracks.append(suitTrack) tracks.append(suitTrack)
else: else:
tracks.append(Sequence(Wait(3.7), Func(MovieUtil.indicateMissed, suit))) tracks.append(Sequence(Wait(3.7), Func(MovieUtil.indicateMissed, suit)))
tracks.append(getSoundTrack('TL_fishing_pole.mp3', delay=0.5, node=toon)) tracks.append(getSoundTrack('TL_fishing_pole.ogg', delay=0.5, node=toon))
return tracks return tracks
@ -181,9 +181,9 @@ def __createMagnetMultiTrack(lure, magnet, pos, hpr, scale, isSmallMagnet = 1, n
tracks.append(Sequence(Wait(3.7), Func(MovieUtil.indicateMissed, suit))) tracks.append(Sequence(Wait(3.7), Func(MovieUtil.indicateMissed, suit)))
if isSmallMagnet == 1: if isSmallMagnet == 1:
tracks.append(getSoundTrack('TL_small_magnet.mp3', delay=0.7, node=toon)) tracks.append(getSoundTrack('TL_small_magnet.ogg', delay=0.7, node=toon))
else: else:
tracks.append(getSoundTrack('TL_large_magnet.mp3', delay=0.7, node=toon)) tracks.append(getSoundTrack('TL_large_magnet.ogg', delay=0.7, node=toon))
return tracks return tracks
@ -236,7 +236,7 @@ def __createHypnoGogglesMultiTrack(lure, npcs = []):
else: else:
tracks.append(Sequence(Wait(2.3), Func(MovieUtil.indicateMissed, suit, 1.1))) tracks.append(Sequence(Wait(2.3), Func(MovieUtil.indicateMissed, suit, 1.1)))
tracks.append(getSoundTrack('TL_hypnotize.mp3', delay=0.5, node=toon)) tracks.append(getSoundTrack('TL_hypnotize.ogg', delay=0.5, node=toon))
return tracks return tracks
@ -322,7 +322,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp):
animTrack = Sequence(ActorInterval(trapProp, 'banana', startTime=3.1), Wait(1.1), LerpScaleInterval(trapProp, 1, Point3(0.01, 0.01, 0.01))) animTrack = Sequence(ActorInterval(trapProp, 'banana', startTime=3.1), Wait(1.1), LerpScaleInterval(trapProp, 1, Point3(0.01, 0.01, 0.01)))
suitTrack = ActorInterval(suit, 'slip-backward') suitTrack = ActorInterval(suit, 'slip-backward')
damageTrack = Sequence(Wait(0.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp)) damageTrack = Sequence(Wait(0.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp))
soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('AA_pie_throw_only.mp3'), duration=0.55, node=suit), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.mp3'), node=suit)) soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('AA_pie_throw_only.ogg'), duration=0.55, node=suit), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.ogg'), node=suit))
result.append(Parallel(moveTrack, animTrack, suitTrack, damageTrack, soundTrack)) result.append(Parallel(moveTrack, animTrack, suitTrack, damageTrack, soundTrack))
elif trapName == 'rake' or trapName == 'rake-react': elif trapName == 'rake' or trapName == 'rake-react':
hpr = trapProp.getHpr(parent) hpr = trapProp.getHpr(parent)
@ -333,7 +333,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp):
rakeAnimDuration = 3.125 rakeAnimDuration = 3.125
suitTrack = ActorInterval(suit, 'rake-react', duration=rakeAnimDuration) suitTrack = ActorInterval(suit, 'rake-react', duration=rakeAnimDuration)
damageTrack = Sequence(Wait(0.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp)) damageTrack = Sequence(Wait(0.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp))
soundTrack = getSoundTrack('TL_step_on_rake.mp3', delay=0.6, node=suit) soundTrack = getSoundTrack('TL_step_on_rake.ogg', delay=0.6, node=suit)
result.append(Parallel(rakeTrack, suitTrack, damageTrack, soundTrack)) result.append(Parallel(rakeTrack, suitTrack, damageTrack, soundTrack))
elif trapName == 'marbles': elif trapName == 'marbles':
slidePos = trapProp.getPos(parent) slidePos = trapProp.getPos(parent)
@ -342,7 +342,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp):
animTrack = ActorInterval(trapProp, 'marbles', startTime=3.1) animTrack = ActorInterval(trapProp, 'marbles', startTime=3.1)
suitTrack = ActorInterval(suit, 'slip-backward') suitTrack = ActorInterval(suit, 'slip-backward')
damageTrack = Sequence(Wait(0.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp)) damageTrack = Sequence(Wait(0.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp))
soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('AA_pie_throw_only.mp3'), duration=0.55, node=suit), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.mp3'), node=suit)) soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('AA_pie_throw_only.ogg'), duration=0.55, node=suit), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.ogg'), node=suit))
result.append(Parallel(moveTrack, animTrack, suitTrack, damageTrack, soundTrack)) result.append(Parallel(moveTrack, animTrack, suitTrack, damageTrack, soundTrack))
elif trapName == 'quicksand': elif trapName == 'quicksand':
sinkPos1 = trapProp.getPos(battle) sinkPos1 = trapProp.getPos(battle)
@ -360,7 +360,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp):
moveTrack = Sequence(Wait(0.9), LerpPosInterval(suit, 0.9, sinkPos1, other=battle), LerpPosInterval(suit, 0.4, sinkPos2, other=battle), Func(suit.setPos, battle, dropPos), Func(suit.wrtReparentTo, hidden), Wait(1.1), Func(suit.wrtReparentTo, battle), LerpPosInterval(suit, 0.3, landPos, other=battle)) moveTrack = Sequence(Wait(0.9), LerpPosInterval(suit, 0.9, sinkPos1, other=battle), LerpPosInterval(suit, 0.4, sinkPos2, other=battle), Func(suit.setPos, battle, dropPos), Func(suit.wrtReparentTo, hidden), Wait(1.1), Func(suit.wrtReparentTo, battle), LerpPosInterval(suit, 0.3, landPos, other=battle))
animTrack = Sequence(ActorInterval(suit, 'flail'), ActorInterval(suit, 'flail', startTime=1.1), Wait(0.7), ActorInterval(suit, 'slip-forward', duration=2.1)) animTrack = Sequence(ActorInterval(suit, 'flail'), ActorInterval(suit, 'flail', startTime=1.1), Wait(0.7), ActorInterval(suit, 'slip-forward', duration=2.1))
damageTrack = Sequence(Wait(3.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp)) damageTrack = Sequence(Wait(3.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp))
soundTrack = Sequence(Wait(0.7), SoundInterval(globalBattleSoundCache.getSound('TL_quicksand.mp3'), node=suit), Wait(0.1), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.mp3'), node=suit)) soundTrack = Sequence(Wait(0.7), SoundInterval(globalBattleSoundCache.getSound('TL_quicksand.ogg'), node=suit), Wait(0.1), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.ogg'), node=suit))
result.append(Parallel(trapTrack, moveTrack, animTrack, damageTrack, soundTrack)) result.append(Parallel(trapTrack, moveTrack, animTrack, damageTrack, soundTrack))
elif trapName == 'trapdoor': elif trapName == 'trapdoor':
sinkPos = trapProp.getPos(battle) sinkPos = trapProp.getPos(battle)
@ -372,15 +372,15 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp):
moveTrack = Sequence(Wait(2.2), LerpPosInterval(suit, 0.4, sinkPos, other=battle), Func(suit.setPos, battle, dropPos), Func(suit.wrtReparentTo, hidden), Wait(1.6), Func(suit.wrtReparentTo, battle), LerpPosInterval(suit, 0.3, landPos, other=battle)) moveTrack = Sequence(Wait(2.2), LerpPosInterval(suit, 0.4, sinkPos, other=battle), Func(suit.setPos, battle, dropPos), Func(suit.wrtReparentTo, hidden), Wait(1.6), Func(suit.wrtReparentTo, battle), LerpPosInterval(suit, 0.3, landPos, other=battle))
animTrack = Sequence(getSplicedLerpAnimsTrack(suit, 'flail', 0.7, 0.25), Func(trapProp.setColor, Vec4(0, 0, 0, 1)), ActorInterval(suit, 'flail', startTime=0.7, endTime=0), ActorInterval(suit, 'neutral', duration=0.5), ActorInterval(suit, 'flail', startTime=1.1), Wait(1.1), ActorInterval(suit, 'slip-forward', duration=2.1)) animTrack = Sequence(getSplicedLerpAnimsTrack(suit, 'flail', 0.7, 0.25), Func(trapProp.setColor, Vec4(0, 0, 0, 1)), ActorInterval(suit, 'flail', startTime=0.7, endTime=0), ActorInterval(suit, 'neutral', duration=0.5), ActorInterval(suit, 'flail', startTime=1.1), Wait(1.1), ActorInterval(suit, 'slip-forward', duration=2.1))
damageTrack = Sequence(Wait(3.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp)) damageTrack = Sequence(Wait(3.5), Func(suit.showHpText, -hp, openEnded=0), Func(suit.updateHealthBar, hp))
soundTrack = Sequence(Wait(0.8), SoundInterval(globalBattleSoundCache.getSound('TL_trap_door.mp3'), node=suit), Wait(0.8), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.mp3'), node=suit)) soundTrack = Sequence(Wait(0.8), SoundInterval(globalBattleSoundCache.getSound('TL_trap_door.ogg'), node=suit), Wait(0.8), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.ogg'), node=suit))
result.append(Parallel(trapTrack, moveTrack, animTrack, damageTrack, soundTrack)) result.append(Parallel(trapTrack, moveTrack, animTrack, damageTrack, soundTrack))
elif trapName == 'tnt': elif trapName == 'tnt':
tntTrack = ActorInterval(trapProp, 'tnt') tntTrack = ActorInterval(trapProp, 'tnt')
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.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') explosionSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg')
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.ogg'), 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':
trainInterval = createIncomingTrainInterval(battle, suit, hp, lure, trapProp) trainInterval = createIncomingTrainInterval(battle, suit, hp, lure, trapProp)
@ -472,7 +472,7 @@ def createSuitReactionToTrain(battle, suit, hp, lure, trapProp):
updateHealthBar = Func(suit.updateHealthBar, hp) updateHealthBar = Func(suit.updateHealthBar, hp)
anim = 'flatten' anim = 'flatten'
suitReact = ActorInterval(suit, anim) suitReact = ActorInterval(suit, anim)
cogGettingHit = getSoundTrack('TL_train_cog.mp3', node=toon) cogGettingHit = getSoundTrack('TL_train_cog.ogg', node=toon)
suitTrack.append(Func(suit.loop, 'neutral')) suitTrack.append(Func(suit.loop, 'neutral'))
suitTrack.append(Wait(timeToGetHit + TRAIN_MATERIALIZE_TIME)) suitTrack.append(Wait(timeToGetHit + TRAIN_MATERIALIZE_TIME))
suitTrack.append(updateHealthBar) suitTrack.append(updateHealthBar)
@ -539,7 +539,7 @@ def createIncomingTrainInterval(battle, suit, hp, lure, trapProp):
trainIval.append(LerpPosInterval(train, TRAIN_DURATION, Point3(endingX, 0, 0), other=battle)) trainIval.append(LerpPosInterval(train, TRAIN_DURATION, Point3(endingX, 0, 0), other=battle))
trainIval.append(LerpColorScaleInterval(train, TRAIN_MATERIALIZE_TIME, Point4(1, 1, 1, 0))) trainIval.append(LerpColorScaleInterval(train, TRAIN_MATERIALIZE_TIME, Point4(1, 1, 1, 0)))
retval.append(trainIval) retval.append(trainIval)
trainSoundTrack = getSoundTrack('TL_train.mp3', node=toon) trainSoundTrack = getSoundTrack('TL_train.ogg', node=toon)
retval.append(trainSoundTrack) retval.append(trainSoundTrack)
return retval return retval
@ -613,6 +613,6 @@ def __createSlideshowMultiTrack(lure, npcs = []):
else: else:
tracks.append(Sequence(Wait(2.3), Func(MovieUtil.indicateMissed, suit, 1.1))) tracks.append(Sequence(Wait(2.3), Func(MovieUtil.indicateMissed, suit, 1.1)))
tracks.append(getSoundTrack('TL_presentation.mp3', delay=2.3, node=toon)) tracks.append(getSoundTrack('TL_presentation.ogg', delay=2.3, node=toon))
tracks.append(getSoundTrack('AA_drop_trigger_box.mp3', delay=slideshowDelay, node=toon)) tracks.append(getSoundTrack('AA_drop_trigger_box.ogg', delay=slideshowDelay, node=toon))
return tracks return tracks

2
toontown/battle/MovieNPCSOS.py
View file

@ -12,7 +12,7 @@ from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals from toontown.toonbase import ToontownBattleGlobals
from toontown.toon import NPCToons from toontown.toon import NPCToons
notify = DirectNotifyGlobal.directNotify.newCategory('MovieNPCSOS') notify = DirectNotifyGlobal.directNotify.newCategory('MovieNPCSOS')
soundFiles = ('AA_heal_tickle.mp3', 'AA_heal_telljoke.mp3', 'AA_heal_smooch.mp3', 'AA_heal_happydance.mp3', 'AA_heal_pixiedust.mp3', 'AA_heal_juggle.mp3') soundFiles = ('AA_heal_tickle.ogg', 'AA_heal_telljoke.ogg', 'AA_heal_smooch.ogg', 'AA_heal_happydance.ogg', 'AA_heal_pixiedust.ogg', 'AA_heal_juggle.ogg')
offset = Point3(0, 4.0, 0) offset = Point3(0, 4.0, 0)
def __cogsMiss(attack, level, hp): def __cogsMiss(attack, level, hp):

2
toontown/battle/MoviePetSOS.py
View file

@ -11,7 +11,7 @@ from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals from toontown.toonbase import ToontownBattleGlobals
from toontown.pets import Pet, PetTricks from toontown.pets import Pet, PetTricks
notify = DirectNotifyGlobal.directNotify.newCategory('MoviePetSOS') notify = DirectNotifyGlobal.directNotify.newCategory('MoviePetSOS')
soundFiles = ('AA_heal_tickle.mp3', 'AA_heal_telljoke.mp3', 'AA_heal_smooch.mp3', 'AA_heal_happydance.mp3', 'AA_heal_pixiedust.mp3', 'AA_heal_juggle.mp3') soundFiles = ('AA_heal_tickle.ogg', 'AA_heal_telljoke.ogg', 'AA_heal_smooch.ogg', 'AA_heal_happydance.ogg', 'AA_heal_pixiedust.ogg', 'AA_heal_juggle.ogg')
offset = Point3(0, 4.0, 0) offset = Point3(0, 4.0, 0)
def doPetSOSs(PetSOSs): def doPetSOSs(PetSOSs):

6
toontown/battle/MovieSound.py
View file

@ -10,9 +10,9 @@ from . import MovieUtil
from . import MovieNPCSOS from . import MovieNPCSOS
from toontown.toonbase import ToontownBattleGlobals from toontown.toonbase import ToontownBattleGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MovieSound') notify = DirectNotifyGlobal.directNotify.newCategory('MovieSound')
soundFiles = ('AA_sound_bikehorn.mp3', 'AA_sound_whistle.mp3', 'AA_sound_bugle.mp3', 'AA_sound_aoogah.mp3', 'AA_sound_elephant.mp3', 'SZ_DD_foghorn.mp3', 'AA_sound_Opera_Singer.mp3') soundFiles = ('AA_sound_bikehorn.ogg', 'AA_sound_whistle.ogg', 'AA_sound_bugle.ogg', 'AA_sound_aoogah.ogg', 'AA_sound_elephant.ogg', 'SZ_DD_foghorn.ogg', 'AA_sound_Opera_Singer.ogg')
appearSoundFiles = ('MG_tag_1.mp3', 'LB_receive_evidence.mp3', 'm_match_trumpet.mp3', 'TL_step_on_rake.mp3', 'toonbldg_grow.mp3', 'mailbox_full_wobble.mp3', 'mailbox_full_wobble.mp3') appearSoundFiles = ('MG_tag_1.ogg', 'LB_receive_evidence.ogg', 'm_match_trumpet.ogg', 'TL_step_on_rake.ogg', 'toonbldg_grow.ogg', 'mailbox_full_wobble.ogg', 'mailbox_full_wobble.ogg')
hitSoundFiles = ('AA_sound_Opera_Singer_Cog_Glass.mp3',) hitSoundFiles = ('AA_sound_Opera_Singer_Cog_Glass.ogg',)
tSound = 2.45 tSound = 2.45
tSuitReact = 2.8 tSuitReact = 2.8
DISTANCE_TO_WALK_BACK = MovieUtil.SUIT_LURE_DISTANCE * 0.75 DISTANCE_TO_WALK_BACK = MovieUtil.SUIT_LURE_DISTANCE * 0.75

4
toontown/battle/MovieSquirt.py
View file

@ -13,8 +13,8 @@ from toontown.toonbase import ToontownBattleGlobals
import random import random
import functools import functools
notify = DirectNotifyGlobal.directNotify.newCategory('MovieSquirt') notify = DirectNotifyGlobal.directNotify.newCategory('MovieSquirt')
hitSoundFiles = ('AA_squirt_flowersquirt.mp3', 'AA_squirt_glasswater.mp3', 'AA_squirt_neonwatergun.mp3', 'AA_squirt_seltzer.mp3', 'firehose_spray.mp3', 'AA_throw_stormcloud.mp3', 'AA_squirt_Geyser.mp3') hitSoundFiles = ('AA_squirt_flowersquirt.ogg', 'AA_squirt_glasswater.ogg', 'AA_squirt_neonwatergun.ogg', 'AA_squirt_seltzer.ogg', 'firehose_spray.ogg', 'AA_throw_stormcloud.ogg', 'AA_squirt_Geyser.ogg')
missSoundFiles = ('AA_squirt_flowersquirt_miss.mp3', 'AA_squirt_glasswater_miss.mp3', 'AA_squirt_neonwatergun_miss.mp3', 'AA_squirt_seltzer_miss.mp3', 'firehose_spray.mp3', 'AA_throw_stormcloud_miss.mp3', 'AA_squirt_Geyser.mp3') missSoundFiles = ('AA_squirt_flowersquirt_miss.ogg', 'AA_squirt_glasswater_miss.ogg', 'AA_squirt_neonwatergun_miss.ogg', 'AA_squirt_seltzer_miss.ogg', 'firehose_spray.ogg', 'AA_throw_stormcloud_miss.ogg', 'AA_squirt_Geyser.ogg')
sprayScales = [0.2, sprayScales = [0.2,
0.3, 0.3,
0.1, 0.1,

92
toontown/battle/MovieSuitAttacks.py
View file

@ -595,10 +595,10 @@ def getAllyToonsDodgeParallel(target):
toonDodgeList = PoMR toonDodgeList = PoMR
if toonDodgeList is leftToons: if toonDodgeList is leftToons:
sidestepAnim = 'sidestep-left' sidestepAnim = 'sidestep-left'
soundEffect = globalBattleSoundCache.getSound('AV_side_step.mp3') soundEffect = globalBattleSoundCache.getSound('AV_side_step.ogg')
else: else:
sidestepAnim = 'sidestep-right' sidestepAnim = 'sidestep-right'
soundEffect = globalBattleSoundCache.getSound('AV_jump_to_side.mp3') soundEffect = globalBattleSoundCache.getSound('AV_jump_to_side.ogg')
toonTracks = Parallel() toonTracks = Parallel()
for t in toonDodgeList: for t in toonDodgeList:
toonTracks.append(Sequence(ActorInterval(t, sidestepAnim), Func(t.loop, 'neutral'))) toonTracks.append(Sequence(ActorInterval(t, sidestepAnim), Func(t.loop, 'neutral')))
@ -808,7 +808,7 @@ def doClipOnTie(attack):
tiePropTrack.append(Func(tie.setHpr, Point3(0, -90, 0))) tiePropTrack.append(Func(tie.setHpr, Point3(0, -90, 0)))
tiePropTrack.append(getPropThrowTrack(attack, tie, [__toonFacePoint(toon)], [__toonGroundPoint(attack, toon, 0.1)], hitDuration=0.4, missDuration=0.8, missScaleDown=1.2)) tiePropTrack.append(getPropThrowTrack(attack, tie, [__toonFacePoint(toon)], [__toonGroundPoint(attack, toon, 0.1)], hitDuration=0.4, missDuration=0.8, missScaleDown=1.2))
toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep']) toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep'])
throwSound = getSoundTrack('SA_powertie_throw.mp3', delay=throwDelay + 1, node=suit) throwSound = getSoundTrack('SA_powertie_throw.ogg', delay=throwDelay + 1, node=suit)
return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound) return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound)
@ -826,7 +826,7 @@ def doPoundKey(attack):
receiverPosPoints = [Point3(0.23, 0.17, -0.11), VBase3(5.939, 2.763, -177.591)] receiverPosPoints = [Point3(0.23, 0.17, -0.11), VBase3(5.939, 2.763, -177.591)]
propTrack = Sequence(Wait(0.3), Func(__showProp, phone, suit.getLeftHand(), phonePosPoints[0], phonePosPoints[1]), Func(__showProp, receiver, suit.getLeftHand(), receiverPosPoints[0], receiverPosPoints[1]), LerpScaleInterval(phone, 0.5, MovieUtil.PNT3_ONE, MovieUtil.PNT3_NEARZERO), Wait(0.74), Func(receiver.wrtReparentTo, suit.getRightHand()), LerpPosHprInterval(receiver, 0.0001, Point3(-0.45, 0.48, -0.62), VBase3(-87.47, -18.21, 7.82)), Wait(3.14), Func(receiver.wrtReparentTo, phone), Wait(0.62), LerpScaleInterval(phone, 0.5, MovieUtil.PNT3_NEARZERO), Func(MovieUtil.removeProps, [receiver, phone])) propTrack = Sequence(Wait(0.3), Func(__showProp, phone, suit.getLeftHand(), phonePosPoints[0], phonePosPoints[1]), Func(__showProp, receiver, suit.getLeftHand(), receiverPosPoints[0], receiverPosPoints[1]), LerpScaleInterval(phone, 0.5, MovieUtil.PNT3_ONE, MovieUtil.PNT3_NEARZERO), Wait(0.74), Func(receiver.wrtReparentTo, suit.getRightHand()), LerpPosHprInterval(receiver, 0.0001, Point3(-0.45, 0.48, -0.62), VBase3(-87.47, -18.21, 7.82)), Wait(3.14), Func(receiver.wrtReparentTo, phone), Wait(0.62), LerpScaleInterval(phone, 0.5, MovieUtil.PNT3_NEARZERO), Func(MovieUtil.removeProps, [receiver, phone]))
toonTrack = getToonTrack(attack, 2.7, ['cringe'], 1.9, ['sidestep']) toonTrack = getToonTrack(attack, 2.7, ['cringe'], 1.9, ['sidestep'])
soundTrack = getSoundTrack('SA_hangup.mp3', delay=1.3, node=suit) soundTrack = getSoundTrack('SA_hangup.ogg', delay=1.3, node=suit)
return Parallel(suitTrack, toonTrack, propTrack, partTrack, soundTrack) return Parallel(suitTrack, toonTrack, propTrack, partTrack, soundTrack)
@ -843,7 +843,7 @@ def doShred(attack):
shredderPosPoints = [Point3(0, -0.12, -0.34), VBase3(-90.0, -53.77, -0.0)] shredderPosPoints = [Point3(0, -0.12, -0.34), VBase3(-90.0, -53.77, -0.0)]
shredderPropTrack = getPropTrack(shredder, suit.getLeftHand(), shredderPosPoints, 1, 3, scaleUpPoint=Point3(4.81, 4.81, 4.81)) shredderPropTrack = getPropTrack(shredder, suit.getLeftHand(), shredderPosPoints, 1, 3, scaleUpPoint=Point3(4.81, 4.81, 4.81))
toonTrack = getToonTrack(attack, suitTrack.getDuration() - 1.1, ['conked'], suitTrack.getDuration() - 3.1, ['sidestep']) toonTrack = getToonTrack(attack, suitTrack.getDuration() - 1.1, ['conked'], suitTrack.getDuration() - 3.1, ['sidestep'])
soundTrack = getSoundTrack('SA_shred.mp3', delay=3.4, node=suit) soundTrack = getSoundTrack('SA_shred.ogg', delay=3.4, node=suit)
return Parallel(suitTrack, paperPropTrack, shredderPropTrack, partTrack, toonTrack, soundTrack) return Parallel(suitTrack, paperPropTrack, shredderPropTrack, partTrack, toonTrack, soundTrack)
@ -995,7 +995,7 @@ def doFountainPen(attack):
penSpill.setPos(getPenTip()) penSpill.setPos(getPenTip())
penSpillTrack = getPartTrack(penSpill, 1.4, 0.7, [penSpill, pen, 0]) penSpillTrack = getPartTrack(penSpill, 1.4, 0.7, [penSpill, pen, 0])
toonTrack = getToonTrack(attack, 1.81, ['conked'], dodgeDelay=0.11, splicedDodgeAnims=[['duck', 0.01, 0.6]], showMissedExtraTime=1.66) toonTrack = getToonTrack(attack, 1.81, ['conked'], dodgeDelay=0.11, splicedDodgeAnims=[['duck', 0.01, 0.6]], showMissedExtraTime=1.66)
soundTrack = getSoundTrack('SA_fountain_pen.mp3', delay=1.6, node=suit) soundTrack = getSoundTrack('SA_fountain_pen.ogg', delay=1.6, node=suit)
return Parallel(suitTrack, toonTrack, propTrack, soundTrack, penSpillTrack, splashTrack) return Parallel(suitTrack, toonTrack, propTrack, soundTrack, penSpillTrack, splashTrack)
@ -1054,7 +1054,7 @@ def doRubOut(attack):
return track return track
soundTrack = getSoundTrack('SA_rubout.mp3', delay=1.7, node=suit) soundTrack = getSoundTrack('SA_rubout.ogg', delay=1.7, node=suit)
if dmg > 0: if dmg > 0:
hideTrack.append(Wait(2.2)) hideTrack.append(Wait(2.2))
hideTrack.append(Func(battle.movie.needRestoreColor)) hideTrack.append(Func(battle.movie.needRestoreColor))
@ -1108,7 +1108,7 @@ def doFingerWag(attack):
particleEffect.setPos(0.167, 1.9, suit.getHeight() - 1.8) particleEffect.setPos(0.167, 1.9, suit.getHeight() - 1.8)
particleEffect.setP(-110) particleEffect.setP(-110)
toonTrack = getToonTrack(attack, damageDelay, ['slip-backward'], dodgeDelay, ['sidestep']) toonTrack = getToonTrack(attack, damageDelay, ['slip-backward'], dodgeDelay, ['sidestep'])
soundTrack = getSoundTrack('SA_finger_wag.mp3', delay=1.3, node=suit) soundTrack = getSoundTrack('SA_finger_wag.ogg', delay=1.3, node=suit)
return Parallel(suitTrack, toonTrack, partTrack, soundTrack) return Parallel(suitTrack, toonTrack, partTrack, soundTrack)
@ -1137,7 +1137,7 @@ def doWriteOff(attack):
pencilPropTrack.append(LerpScaleInterval(pencil, 0.5, MovieUtil.PNT3_NEARZERO)) pencilPropTrack.append(LerpScaleInterval(pencil, 0.5, MovieUtil.PNT3_NEARZERO))
pencilPropTrack.append(Func(MovieUtil.removeProp, pencil)) pencilPropTrack.append(Func(MovieUtil.removeProp, pencil))
toonTrack = getToonTrack(attack, 3.4, ['slip-forward'], 2.4, ['sidestep']) toonTrack = getToonTrack(attack, 3.4, ['slip-forward'], 2.4, ['sidestep'])
soundTrack = Sequence(Wait(2.3), SoundInterval(globalBattleSoundCache.getSound('SA_writeoff_pen_only.mp3'), duration=0.9, node=suit), SoundInterval(globalBattleSoundCache.getSound('SA_writeoff_ding_only.mp3'), node=suit)) soundTrack = Sequence(Wait(2.3), SoundInterval(globalBattleSoundCache.getSound('SA_writeoff_pen_only.ogg'), duration=0.9, node=suit), SoundInterval(globalBattleSoundCache.getSound('SA_writeoff_ding_only.ogg'), node=suit))
return Parallel(suitTrack, toonTrack, padPropTrack, pencilPropTrack, soundTrack) return Parallel(suitTrack, toonTrack, padPropTrack, pencilPropTrack, soundTrack)
@ -1170,7 +1170,7 @@ def doRubberStamp(attack):
propTrack.append(LerpScaleInterval(stamp, 0.5, MovieUtil.PNT3_NEARZERO)) propTrack.append(LerpScaleInterval(stamp, 0.5, MovieUtil.PNT3_NEARZERO))
propTrack.append(Func(MovieUtil.removeProp, stamp)) propTrack.append(Func(MovieUtil.removeProp, stamp))
toonTrack = getToonTrack(attack, 3.4, ['conked'], 1.9, ['sidestep']) toonTrack = getToonTrack(attack, 3.4, ['conked'], 1.9, ['sidestep'])
soundTrack = getSoundTrack('SA_rubber_stamp.mp3', delay=1.3, duration=1.1, node=suit) soundTrack = getSoundTrack('SA_rubber_stamp.ogg', delay=1.3, duration=1.1, node=suit)
return Parallel(suitTrack, toonTrack, propTrack, padPropTrack, soundTrack) return Parallel(suitTrack, toonTrack, propTrack, padPropTrack, soundTrack)
@ -1193,7 +1193,7 @@ def doRazzleDazzle(attack):
signPropTrack = Sequence(Wait(0.5), Func(__showProp, sign, suit.getRightHand(), signPosPoints[0], signPosPoints[1]), LerpScaleInterval(sign, 0.5, Point3(1.39, 1.39, 1.39)), Wait(0.5), Func(battle.movie.needRestoreParticleEffect, particleEffect), Func(particleEffect.start, sign), Func(particleEffect.wrtReparentTo, render), LerpPosInterval(particleEffect, 2.0, pos=hitPoint), Func(particleEffect.cleanup), Func(battle.movie.clearRestoreParticleEffect, particleEffect)) signPropTrack = Sequence(Wait(0.5), Func(__showProp, sign, suit.getRightHand(), signPosPoints[0], signPosPoints[1]), LerpScaleInterval(sign, 0.5, Point3(1.39, 1.39, 1.39)), Wait(0.5), Func(battle.movie.needRestoreParticleEffect, particleEffect), Func(particleEffect.start, sign), Func(particleEffect.wrtReparentTo, render), LerpPosInterval(particleEffect, 2.0, pos=hitPoint), Func(particleEffect.cleanup), Func(battle.movie.clearRestoreParticleEffect, particleEffect))
signPropAnimTrack = ActorInterval(sign, 'smile', duration=4, startTime=0) signPropAnimTrack = ActorInterval(sign, 'smile', duration=4, startTime=0)
toonTrack = getToonTrack(attack, 2.6, ['cringe'], 1.9, ['sidestep']) toonTrack = getToonTrack(attack, 2.6, ['cringe'], 1.9, ['sidestep'])
soundTrack = getSoundTrack('SA_razzle_dazzle.mp3', delay=1.6, node=suit) soundTrack = getSoundTrack('SA_razzle_dazzle.ogg', delay=1.6, node=suit)
return Sequence(Parallel(suitTrack, signPropTrack, signPropAnimTrack, toonTrack, soundTrack), Func(MovieUtil.removeProp, sign)) return Sequence(Parallel(suitTrack, signPropTrack, signPropAnimTrack, toonTrack, soundTrack), Func(MovieUtil.removeProp, sign))
@ -1221,9 +1221,9 @@ def doSynergy(attack):
dodgeAnims.extend(getSplicedLerpAnims('jump', 0.31, 1.3, startTime=0.6)) dodgeAnims.extend(getSplicedLerpAnims('jump', 0.31, 1.3, startTime=0.6))
dodgeAnims.append(['jump', 0, 0.91]) dodgeAnims.append(['jump', 0, 0.91])
toonTracks = getToonTracks(attack, damageDelay=damageDelay, damageAnimNames=['slip-forward'], dodgeDelay=0.91, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=1.0) toonTracks = getToonTracks(attack, damageDelay=damageDelay, damageAnimNames=['slip-forward'], dodgeDelay=0.91, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=1.0)
synergySoundTrack = Sequence(Wait(0.9), SoundInterval(globalBattleSoundCache.getSound('SA_synergy.mp3'), node=suit)) synergySoundTrack = Sequence(Wait(0.9), SoundInterval(globalBattleSoundCache.getSound('SA_synergy.ogg'), node=suit))
if hitAtleastOneToon > 0: if hitAtleastOneToon > 0:
fallingSoundTrack = Sequence(Wait(damageDelay + 0.5), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.mp3'), node=suit)) fallingSoundTrack = Sequence(Wait(damageDelay + 0.5), SoundInterval(globalBattleSoundCache.getSound('Toon_bodyfall_synergy.ogg'), node=suit))
return Parallel(suitTrack, partTrack, waterfallTrack, synergySoundTrack, fallingSoundTrack, toonTracks) return Parallel(suitTrack, partTrack, waterfallTrack, synergySoundTrack, fallingSoundTrack, toonTracks)
else: else:
return Parallel(suitTrack, partTrack, waterfallTrack, synergySoundTrack, toonTracks) return Parallel(suitTrack, partTrack, waterfallTrack, synergySoundTrack, toonTracks)
@ -1256,7 +1256,7 @@ def doTeeOff(attack):
ballPropTrack.append(Func(battle.movie.clearRenderProp, ball)) ballPropTrack.append(Func(battle.movie.clearRenderProp, ball))
dodgeDelay = suitTrack.getDuration() - 4.35 dodgeDelay = suitTrack.getDuration() - 4.35
toonTrack = getToonTrack(attack, suitTrack.getDuration() - 2.25, ['conked'], dodgeDelay, ['duck'], showMissedExtraTime=1.7) toonTrack = getToonTrack(attack, suitTrack.getDuration() - 2.25, ['conked'], dodgeDelay, ['duck'], showMissedExtraTime=1.7)
soundTrack = getSoundTrack('SA_tee_off.mp3', delay=4.1, node=suit) soundTrack = getSoundTrack('SA_tee_off.ogg', delay=4.1, node=suit)
return Parallel(suitTrack, toonTrack, clubPropTrack, ballPropTrack, soundTrack) return Parallel(suitTrack, toonTrack, clubPropTrack, ballPropTrack, soundTrack)
@ -1310,7 +1310,7 @@ def doBrainStorm(attack):
0.4, 0.4,
0.8], ['duck', 1e-06, 1.6]] 0.8], ['duck', 1e-06, 1.6]]
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep'], showMissedExtraTime=1.1) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep'], showMissedExtraTime=1.1)
soundTrack = getSoundTrack('SA_brainstorm.mp3', delay=2.6, node=suit) soundTrack = getSoundTrack('SA_brainstorm.ogg', delay=2.6, node=suit)
return Parallel(suitTrack, toonTrack, cloudPropTrack, soundTrack) return Parallel(suitTrack, toonTrack, cloudPropTrack, soundTrack)
@ -1366,7 +1366,7 @@ def doBuzzWord(attack):
particleTracks.append(getPartTrack(effect, partDelay, partDuration, [effect, suit, 0])) particleTracks.append(getPartTrack(effect, partDelay, partDuration, [effect, suit, 0]))
toonTrack = getToonTrack(attack, damageDelay=damageDelay, damageAnimNames=['cringe'], splicedDodgeAnims=[['duck', dodgeDelay, 1.4]], showMissedExtraTime=dodgeDelay + 0.5) toonTrack = getToonTrack(attack, damageDelay=damageDelay, damageAnimNames=['cringe'], splicedDodgeAnims=[['duck', dodgeDelay, 1.4]], showMissedExtraTime=dodgeDelay + 0.5)
soundTrack = getSoundTrack('SA_buzz_word.mp3', delay=3.9, node=suit) soundTrack = getSoundTrack('SA_buzz_word.ogg', delay=3.9, node=suit)
return Parallel(suitTrack, toonTrack, soundTrack, *particleTracks) return Parallel(suitTrack, toonTrack, soundTrack, *particleTracks)
@ -1401,7 +1401,7 @@ def doDemotion(attack):
damageAnims.extend(getSplicedLerpAnims('cringe', 0.3, 0.6, startTime=1.2)) damageAnims.extend(getSplicedLerpAnims('cringe', 0.3, 0.6, startTime=1.2))
damageAnims.append(['cringe', 2.6, 1.5]) damageAnims.append(['cringe', 2.6, 1.5])
toonTrack = getToonTrack(attack, damageDelay=1.0, splicedDamageAnims=damageAnims, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=1.6, showDamageExtraTime=1.3) toonTrack = getToonTrack(attack, damageDelay=1.0, splicedDamageAnims=damageAnims, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=1.6, showDamageExtraTime=1.3)
soundTrack = getSoundTrack('SA_demotion.mp3', delay=1.2, node=suit) soundTrack = getSoundTrack('SA_demotion.ogg', delay=1.2, node=suit)
if dmg > 0: if dmg > 0:
return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3) return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3)
else: else:
@ -1462,7 +1462,7 @@ def doCanned(attack):
throwTrack.append(Func(battle.movie.clearRestoreHips)) throwTrack.append(Func(battle.movie.clearRestoreHips))
scaleTrack = Sequence(Wait(propDelay + suitDelay), LerpScaleInterval(can, throwDuration, scaleUpPoint)) scaleTrack = Sequence(Wait(propDelay + suitDelay), LerpScaleInterval(can, throwDuration, scaleUpPoint))
hprTrack = Sequence(Wait(propDelay + suitDelay), LerpHprInterval(can, throwDuration, canHpr)) hprTrack = Sequence(Wait(propDelay + suitDelay), LerpHprInterval(can, throwDuration, canHpr))
soundTrack = Sequence(Wait(2.6), SoundInterval(globalBattleSoundCache.getSound('SA_canned_tossup_only.mp3'), node=suit), SoundInterval(globalBattleSoundCache.getSound('SA_canned_impact_only.mp3'), node=suit)) soundTrack = Sequence(Wait(2.6), SoundInterval(globalBattleSoundCache.getSound('SA_canned_tossup_only.ogg'), node=suit), SoundInterval(globalBattleSoundCache.getSound('SA_canned_impact_only.ogg'), node=suit))
else: else:
land = toon.getPos(battle) land = toon.getPos(battle)
land.setZ(land.getZ() + 0.7) land.setZ(land.getZ() + 0.7)
@ -1479,7 +1479,7 @@ def doCanned(attack):
throwTrack.append(LerpScaleInterval(can, 0.3, MovieUtil.PNT3_NEARZERO)) throwTrack.append(LerpScaleInterval(can, 0.3, MovieUtil.PNT3_NEARZERO))
scaleTrack = Sequence(Wait(propDelay + suitDelay), LerpScaleInterval(can, throwDuration, Point3(11, 11, 11))) scaleTrack = Sequence(Wait(propDelay + suitDelay), LerpScaleInterval(can, throwDuration, Point3(11, 11, 11)))
hprTrack = Sequence(Wait(propDelay + suitDelay), LerpHprInterval(can, throwDuration, canHpr), Wait(0.4), LerpHprInterval(can, 0.4, Point3(83.27, 19.52, -177.92)), LerpHprInterval(can, 0.3, Point3(95.24, -72.09, 88.65)), LerpHprInterval(can, 0.2, Point3(-96.34, -2.63, 179.89))) hprTrack = Sequence(Wait(propDelay + suitDelay), LerpHprInterval(can, throwDuration, canHpr), Wait(0.4), LerpHprInterval(can, 0.4, Point3(83.27, 19.52, -177.92)), LerpHprInterval(can, 0.3, Point3(95.24, -72.09, 88.65)), LerpHprInterval(can, 0.2, Point3(-96.34, -2.63, 179.89)))
soundTrack = getSoundTrack('SA_canned_tossup_only.mp3', delay=2.6, node=suit) soundTrack = getSoundTrack('SA_canned_tossup_only.ogg', delay=2.6, node=suit)
canTrack = Sequence(Parallel(throwTrack, scaleTrack, hprTrack), Func(MovieUtil.removeProp, can), Func(battle.movie.clearRenderProp, can)) canTrack = Sequence(Parallel(throwTrack, scaleTrack, hprTrack), Func(MovieUtil.removeProp, can), Func(battle.movie.clearRenderProp, can))
damageAnims = [['struggle', damageAnims = [['struggle',
propDelay + suitDelay + throwDuration, propDelay + suitDelay + throwDuration,
@ -1575,7 +1575,7 @@ def doPinkSlip(attack):
0.3, 0.3,
0.7], ['slip-forward', 0.01]] 0.7], ['slip-forward', 0.01]]
toonTrack = getToonTrack(attack, damageDelay=2.81, splicedDamageAnims=damageAnims, dodgeDelay=2.8, dodgeAnimNames=['jump'], showDamageExtraTime=0.9) toonTrack = getToonTrack(attack, damageDelay=2.81, splicedDamageAnims=damageAnims, dodgeDelay=2.8, dodgeAnimNames=['jump'], showDamageExtraTime=0.9)
soundTrack = getSoundTrack('SA_pink_slip.mp3', delay=2.9, duration=1.1, node=suit) soundTrack = getSoundTrack('SA_pink_slip.ogg', delay=2.9, duration=1.1, node=suit)
return Parallel(suitTrack, toonTrack, propTrack, soundTrack) return Parallel(suitTrack, toonTrack, propTrack, soundTrack)
@ -1736,7 +1736,7 @@ def doGlowerPower(attack):
damageAnims = [['slip-backward', 0.01, 0.35]] damageAnims = [['slip-backward', 0.01, 0.35]]
toonTrack = getToonTrack(attack, damageDelay=1.6, splicedDamageAnims=damageAnims, dodgeDelay=0.7, dodgeAnimNames=['sidestep']) toonTrack = getToonTrack(attack, damageDelay=1.6, splicedDamageAnims=damageAnims, dodgeDelay=0.7, dodgeAnimNames=['sidestep'])
soundTrack = getSoundTrack('SA_glower_power.mp3', delay=1.1, node=suit) soundTrack = getSoundTrack('SA_glower_power.ogg', delay=1.1, node=suit)
return Parallel(suitTrack, toonTrack, soundTrack, leftKnifeTracks, rightKnifeTracks) return Parallel(suitTrack, toonTrack, soundTrack, leftKnifeTracks, rightKnifeTracks)
@ -1863,8 +1863,8 @@ def doHeadShrink(attack):
0.4]) 0.4])
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep']) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep'])
if dmg > 0: if dmg > 0:
shrinkSound = globalBattleSoundCache.getSound('SA_head_shrink_only.mp3') shrinkSound = globalBattleSoundCache.getSound('SA_head_shrink_only.ogg')
growSound = globalBattleSoundCache.getSound('SA_head_grow_back_only.mp3') growSound = globalBattleSoundCache.getSound('SA_head_grow_back_only.ogg')
soundTrack = Sequence(Wait(2.1), SoundInterval(shrinkSound, duration=2.1, node=suit), Wait(1.6), SoundInterval(growSound, node=suit)) soundTrack = Sequence(Wait(2.1), SoundInterval(shrinkSound, duration=2.1, node=suit), Wait(1.6), SoundInterval(growSound, node=suit))
return Parallel(suitTrack, sprayTrack, cloudTrack, dropTrack, toonTrack, shrinkTrack, soundTrack) return Parallel(suitTrack, sprayTrack, cloudTrack, dropTrack, toonTrack, shrinkTrack, soundTrack)
else: else:
@ -1919,7 +1919,7 @@ def doRolodex(attack):
suitTrack = getSuitTrack(attack) suitTrack = getSuitTrack(attack)
propTrack = getPropTrack(rollodex, suit.getLeftHand(), propPosPoints, 1e-06, 4.7, scaleUpPoint=propScale, anim=0, propName='rollodex', animDuration=0, animStartTime=0) propTrack = getPropTrack(rollodex, suit.getLeftHand(), propPosPoints, 1e-06, 4.7, scaleUpPoint=propScale, anim=0, propName='rollodex', animDuration=0, animStartTime=0)
toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep']) toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep'])
soundTrack = getSoundTrack('SA_rolodex.mp3', delay=2.8, node=suit) soundTrack = getSoundTrack('SA_rolodex.ogg', delay=2.8, node=suit)
return Parallel(suitTrack, toonTrack, propTrack, soundTrack, partTrack2, partTrack3) return Parallel(suitTrack, toonTrack, propTrack, soundTrack, partTrack2, partTrack3)
@ -1969,7 +1969,7 @@ def doEvilEye(attack):
0.01, 0.01,
1.4], ['cringe', 0.01, 0.3]] 1.4], ['cringe', 0.01, 0.3]]
toonTrack = getToonTrack(attack, splicedDamageAnims=damageAnims, damageDelay=damageDelay, dodgeDelay=dodgeDelay, dodgeAnimNames=['duck'], showDamageExtraTime=1.7, showMissedExtraTime=1.7) toonTrack = getToonTrack(attack, splicedDamageAnims=damageAnims, damageDelay=damageDelay, dodgeDelay=dodgeDelay, dodgeAnimNames=['duck'], showDamageExtraTime=1.7, showMissedExtraTime=1.7)
soundTrack = getSoundTrack('SA_evil_eye.mp3', delay=1.3, node=suit) soundTrack = getSoundTrack('SA_evil_eye.ogg', delay=1.3, node=suit)
return Parallel(suitTrack, toonTrack, eyePropTrack, soundTrack) return Parallel(suitTrack, toonTrack, eyePropTrack, soundTrack)
@ -2014,7 +2014,7 @@ def doPlayHardball(attack):
propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y + 8.5, z + 0.6))) propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y + 8.5, z + 0.6)))
propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y + 9, z + 0.2))) propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y + 9, z + 0.2)))
propTrack.append(Wait(0.4)) propTrack.append(Wait(0.4))
soundTrack = getSoundTrack('SA_hardball_impact_only.mp3', delay=2.8, node=suit) soundTrack = getSoundTrack('SA_hardball_impact_only.ogg', delay=2.8, node=suit)
else: else:
propTrack.append(LerpPosInterval(ball, 0.5, Point3(x, y + 2, z))) propTrack.append(LerpPosInterval(ball, 0.5, Point3(x, y + 2, z)))
propTrack.append(LerpPosInterval(ball, 0.4, Point3(x, y - 1, z + 2))) propTrack.append(LerpPosInterval(ball, 0.4, Point3(x, y - 1, z + 2)))
@ -2024,7 +2024,7 @@ def doPlayHardball(attack):
propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y - 5.5, z + 0.6))) propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y - 5.5, z + 0.6)))
propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y - 6, z + 0.2))) propTrack.append(LerpPosInterval(ball, 0.1, Point3(x, y - 6, z + 0.2)))
propTrack.append(Wait(0.4)) propTrack.append(Wait(0.4))
soundTrack = getSoundTrack('SA_hardball.mp3', delay=3.1, node=suit) soundTrack = getSoundTrack('SA_hardball.ogg', delay=3.1, node=suit)
propTrack.append(LerpScaleInterval(ball, 0.3, MovieUtil.PNT3_NEARZERO)) propTrack.append(LerpScaleInterval(ball, 0.3, MovieUtil.PNT3_NEARZERO))
propTrack.append(Func(MovieUtil.removeProp, ball)) propTrack.append(Func(MovieUtil.removeProp, ball))
propTrack.append(Func(battle.movie.clearRenderProp, ball)) propTrack.append(Func(battle.movie.clearRenderProp, ball))
@ -2063,9 +2063,9 @@ def doPowerTie(attack):
tiePropTrack.append(Func(tie.setBillboardPointEye)) tiePropTrack.append(Func(tie.setBillboardPointEye))
tiePropTrack.append(getPropThrowTrack(attack, tie, [__toonFacePoint(toon)], [__toonGroundPoint(attack, toon, 0.1)], hitDuration=0.4, missDuration=0.8)) tiePropTrack.append(getPropThrowTrack(attack, tie, [__toonFacePoint(toon)], [__toonGroundPoint(attack, toon, 0.1)], hitDuration=0.4, missDuration=0.8))
toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep']) toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep'])
throwSound = getSoundTrack('SA_powertie_throw.mp3', delay=2.3, node=suit) throwSound = getSoundTrack('SA_powertie_throw.ogg', delay=2.3, node=suit)
if dmg > 0: if dmg > 0:
hitSound = getSoundTrack('SA_powertie_impact.mp3', delay=2.9, node=suit) hitSound = getSoundTrack('SA_powertie_impact.ogg', delay=2.9, node=suit)
return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound, hitSound) return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound, hitSound)
else: else:
return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound) return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound)
@ -2100,7 +2100,7 @@ def doDoubleTalk(attack):
0.4, 0.4,
1.05], ['cringe', 1e-06, 0.8]] 1.05], ['cringe', 1e-06, 0.8]]
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=[['duck', 0.01, 1.4]], showMissedExtraTime=0.9, showDamageExtraTime=0.8) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=[['duck', 0.01, 1.4]], showMissedExtraTime=0.9, showDamageExtraTime=0.8)
soundTrack = getSoundTrack('SA_filibuster.mp3', delay=2.5, node=suit) soundTrack = getSoundTrack('SA_filibuster.ogg', delay=2.5, node=suit)
return Parallel(suitTrack, toonTrack, partTrack, partTrack2, soundTrack) return Parallel(suitTrack, toonTrack, partTrack, partTrack2, soundTrack)
@ -2222,7 +2222,7 @@ def doHotAir(attack):
1.2]) 1.2])
damageAnims.append(['slip-forward', 0.01, 1.0]) damageAnims.append(['slip-forward', 0.01, 1.0])
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep']) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep'])
soundTrack = getSoundTrack('SA_hot_air.mp3', delay=1.6, node=suit) soundTrack = getSoundTrack('SA_hot_air.ogg', delay=1.6, node=suit)
if dmg > 0: if dmg > 0:
return Parallel(suitTrack, toonTrack, sprayTrack, soundTrack, baseFlameTrack, flameTrack, flecksTrack, colorTrack) return Parallel(suitTrack, toonTrack, sprayTrack, soundTrack, baseFlameTrack, flameTrack, flecksTrack, colorTrack)
else: else:
@ -2241,7 +2241,7 @@ def doPickPocket(attack):
toonTrack = getToonTrack(attack, 0.6, ['cringe'], 0.01, ['sidestep']) toonTrack = getToonTrack(attack, 0.6, ['cringe'], 0.01, ['sidestep'])
multiTrackList = Parallel(suitTrack, toonTrack) multiTrackList = Parallel(suitTrack, toonTrack)
if dmg > 0: if dmg > 0:
soundTrack = getSoundTrack('SA_pick_pocket.mp3', delay=0.2, node=suit) soundTrack = getSoundTrack('SA_pick_pocket.ogg', delay=0.2, node=suit)
multiTrackList.append(billPropTrack) multiTrackList.append(billPropTrack)
multiTrackList.append(soundTrack) multiTrackList.append(soundTrack)
return multiTrackList return multiTrackList
@ -2279,7 +2279,7 @@ def doFilibuster(attack):
0.8]) 0.8])
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep']) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep'])
soundTrack = getSoundTrack('SA_filibuster.mp3', delay=1.1, node=suit) soundTrack = getSoundTrack('SA_filibuster.ogg', delay=1.1, node=suit)
if dmg > 0: if dmg > 0:
return Parallel(suitTrack, toonTrack, soundTrack, sprayTrack, sprayTrack2, sprayTrack3, sprayTrack4) return Parallel(suitTrack, toonTrack, soundTrack, sprayTrack, sprayTrack2, sprayTrack3, sprayTrack4)
else: else:
@ -2370,7 +2370,7 @@ def doTremor(attack):
damageAnims = [['slip-forward'], ['slip-forward', 0.01]] damageAnims = [['slip-forward'], ['slip-forward', 0.01]]
dodgeAnims = [['jump'], ['jump', 0.01]] dodgeAnims = [['jump'], ['jump', 0.01]]
toonTracks = getToonTracks(attack, damageDelay=1.1, splicedDamageAnims=damageAnims, dodgeDelay=0.7, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=2.8, showDamageExtraTime=1.1) toonTracks = getToonTracks(attack, damageDelay=1.1, splicedDamageAnims=damageAnims, dodgeDelay=0.7, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=2.8, showDamageExtraTime=1.1)
soundTrack = getSoundTrack('SA_tremor.mp3', delay=0.9, node=suit) soundTrack = getSoundTrack('SA_tremor.ogg', delay=0.9, node=suit)
return Parallel(suitTrack, soundTrack, toonTracks) return Parallel(suitTrack, soundTrack, toonTracks)
@ -2399,7 +2399,7 @@ def doHangUp(attack):
scaleUpPoint = MovieUtil.PNT3_ONE scaleUpPoint = MovieUtil.PNT3_ONE
propTrack = Sequence(Wait(0.3), Func(__showProp, phone, suit.getLeftHand(), phonePosPoints[0], phonePosPoints[1]), Func(__showProp, receiver, suit.getLeftHand(), receiverPosPoints[0], receiverPosPoints[1]), LerpScaleInterval(phone, 0.5, scaleUpPoint, MovieUtil.PNT3_NEARZERO), Wait(pickupDelay), Func(receiver.wrtReparentTo, suit.getRightHand()), LerpScaleInterval(receiver, 0.01, receiverAdjustScale), LerpPosHprInterval(receiver, 0.0001, Point3(-0.53, 0.21, -0.54), VBase3(-99.49, -35.27, 1.84)), Wait(dialDuration), Func(receiver.wrtReparentTo, phone), Wait(finalPhoneDelay), LerpScaleInterval(phone, 0.5, MovieUtil.PNT3_NEARZERO), Func(MovieUtil.removeProps, [receiver, phone])) propTrack = Sequence(Wait(0.3), Func(__showProp, phone, suit.getLeftHand(), phonePosPoints[0], phonePosPoints[1]), Func(__showProp, receiver, suit.getLeftHand(), receiverPosPoints[0], receiverPosPoints[1]), LerpScaleInterval(phone, 0.5, scaleUpPoint, MovieUtil.PNT3_NEARZERO), Wait(pickupDelay), Func(receiver.wrtReparentTo, suit.getRightHand()), LerpScaleInterval(receiver, 0.01, receiverAdjustScale), LerpPosHprInterval(receiver, 0.0001, Point3(-0.53, 0.21, -0.54), VBase3(-99.49, -35.27, 1.84)), Wait(dialDuration), Func(receiver.wrtReparentTo, phone), Wait(finalPhoneDelay), LerpScaleInterval(phone, 0.5, MovieUtil.PNT3_NEARZERO), Func(MovieUtil.removeProps, [receiver, phone]))
toonTrack = getToonTrack(attack, 5.5, ['slip-backward'], 4.7, ['jump']) toonTrack = getToonTrack(attack, 5.5, ['slip-backward'], 4.7, ['jump'])
soundTrack = getSoundTrack('SA_hangup.mp3', delay=1.3, node=suit) soundTrack = getSoundTrack('SA_hangup.ogg', delay=1.3, node=suit)
return Parallel(suitTrack, toonTrack, propTrack, soundTrack) return Parallel(suitTrack, toonTrack, propTrack, soundTrack)
@ -2451,7 +2451,7 @@ def doRedTape(attack):
tubeTracks.append(Func(battle.movie.clearRestoreHips)) tubeTracks.append(Func(battle.movie.clearRestoreHips))
toonTrack = getToonTrack(attack, 3.4, ['struggle'], 2.8, ['jump']) toonTrack = getToonTrack(attack, 3.4, ['struggle'], 2.8, ['jump'])
soundTrack = getSoundTrack('SA_red_tape.mp3', delay=2.9, node=suit) soundTrack = getSoundTrack('SA_red_tape.ogg', delay=2.9, node=suit)
if dmg > 0: if dmg > 0:
return Parallel(suitTrack, toonTrack, propTrack, soundTrack, tubeTracks) return Parallel(suitTrack, toonTrack, propTrack, soundTrack, tubeTracks)
else: else:
@ -2538,7 +2538,7 @@ def doParadigmShift(attack):
dodgeAnims.append(['jump', 0, 0.91]) dodgeAnims.append(['jump', 0, 0.91])
toonTracks = getToonTracks(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=dodgeAnims, showDamageExtraTime=2.7) toonTracks = getToonTracks(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=dodgeAnims, showDamageExtraTime=2.7)
if hitAtleastOneToon == 1: if hitAtleastOneToon == 1:
soundTrack = getSoundTrack('SA_paradigm_shift.mp3', delay=2.1, node=suit) soundTrack = getSoundTrack('SA_paradigm_shift.ogg', delay=2.1, node=suit)
return Parallel(suitTrack, sprayTrack, soundTrack, liftTracks, toonTracks, toonRiseTracks) return Parallel(suitTrack, sprayTrack, soundTrack, liftTracks, toonTracks, toonRiseTracks)
else: else:
return Parallel(suitTrack, sprayTrack, liftTracks, toonTracks, toonRiseTracks) return Parallel(suitTrack, sprayTrack, liftTracks, toonTracks, toonRiseTracks)
@ -2640,7 +2640,7 @@ def doBounceCheck(attack):
checkPropTrack.append(LerpScaleInterval(check, 0.3, MovieUtil.PNT3_NEARZERO)) checkPropTrack.append(LerpScaleInterval(check, 0.3, MovieUtil.PNT3_NEARZERO))
checkPropTrack.append(Func(MovieUtil.removeProp, check)) checkPropTrack.append(Func(MovieUtil.removeProp, check))
toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep']) toonTrack = getToonTrack(attack, damageDelay, ['conked'], dodgeDelay, ['sidestep'])
soundTracks = Sequence(getSoundTrack('SA_pink_slip.mp3', delay=throwDelay + 0.5, duration=0.6, node=suit), getSoundTrack('SA_pink_slip.mp3', delay=0.4, duration=0.6, node=suit)) soundTracks = Sequence(getSoundTrack('SA_pink_slip.ogg', delay=throwDelay + 0.5, duration=0.6, node=suit), getSoundTrack('SA_pink_slip.ogg', delay=0.4, duration=0.6, node=suit))
return Parallel(suitTrack, checkPropTrack, toonTrack, soundTracks) return Parallel(suitTrack, checkPropTrack, toonTrack, soundTracks)
@ -2683,7 +2683,7 @@ def doWatercooler(attack):
splash.setScale(0.3) splash.setScale(0.3)
splashTrack = Sequence(Func(battle.movie.needRestoreRenderProp, splash), Wait(3.2), Func(prepSplash, splash, __toonFacePoint(toon)), ActorInterval(splash, 'splash-from-splat'), Func(MovieUtil.removeProp, splash), Func(battle.movie.clearRenderProp, splash)) splashTrack = Sequence(Func(battle.movie.needRestoreRenderProp, splash), Wait(3.2), Func(prepSplash, splash, __toonFacePoint(toon)), ActorInterval(splash, 'splash-from-splat'), Func(MovieUtil.removeProp, splash), Func(battle.movie.clearRenderProp, splash))
toonTrack = getToonTrack(attack, suitTrack.getDuration() - 1.5, ['cringe'], 2.4, ['sidestep']) toonTrack = getToonTrack(attack, suitTrack.getDuration() - 1.5, ['cringe'], 2.4, ['sidestep'])
soundTrack = Sequence(Wait(1.1), SoundInterval(globalBattleSoundCache.getSound('SA_watercooler_appear_only.mp3'), node=suit, duration=1.4722), Wait(0.4), SoundInterval(globalBattleSoundCache.getSound('SA_watercooler_spray_only.mp3'), node=suit, duration=2.313)) soundTrack = Sequence(Wait(1.1), SoundInterval(globalBattleSoundCache.getSound('SA_watercooler_appear_only.ogg'), node=suit, duration=1.4722), Wait(0.4), SoundInterval(globalBattleSoundCache.getSound('SA_watercooler_spray_only.ogg'), node=suit, duration=2.313))
return Parallel(suitTrack, toonTrack, propTrack, soundTrack, splashTrack) return Parallel(suitTrack, toonTrack, propTrack, soundTrack, splashTrack)
@ -2759,7 +2759,7 @@ def doFired(attack):
1.2]) 1.2])
damageAnims.extend(getSplicedLerpAnims('slip-forward', 0.31, 0.8, startTime=1.2)) damageAnims.extend(getSplicedLerpAnims('slip-forward', 0.31, 0.8, startTime=1.2))
toonTrack = getToonTrack(attack, damageDelay=1.5, splicedDamageAnims=damageAnims, dodgeDelay=0.3, dodgeAnimNames=['sidestep']) toonTrack = getToonTrack(attack, damageDelay=1.5, splicedDamageAnims=damageAnims, dodgeDelay=0.3, dodgeAnimNames=['sidestep'])
soundTrack = getSoundTrack('SA_hot_air.mp3', delay=1.0, node=suit) soundTrack = getSoundTrack('SA_hot_air.ogg', delay=1.0, node=suit)
if dmg > 0: if dmg > 0:
return Parallel(suitTrack, baseFlameTrack, flameTrack, flecksTrack, toonTrack, colorTrack, soundTrack) return Parallel(suitTrack, baseFlameTrack, flameTrack, flecksTrack, toonTrack, colorTrack, soundTrack)
else: else:
@ -2800,7 +2800,7 @@ def doAudit(attack):
scaleUpPoint = Point3(1.0, 1.37, 1.31) scaleUpPoint = Point3(1.0, 1.37, 1.31)
calcPropTrack = getPropTrack(calculator, suit.getLeftHand(), calcPosPoints, 1e-06, calcDuration, scaleUpPoint=scaleUpPoint, anim=1, propName='calculator', animStartTime=0.5, animDuration=3.4) calcPropTrack = getPropTrack(calculator, suit.getLeftHand(), calcPosPoints, 1e-06, calcDuration, scaleUpPoint=scaleUpPoint, anim=1, propName='calculator', animStartTime=0.5, animDuration=3.4)
toonTrack = getToonTrack(attack, 3.2, ['conked'], 0.9, ['duck'], showMissedExtraTime=2.2) toonTrack = getToonTrack(attack, 3.2, ['conked'], 0.9, ['duck'], showMissedExtraTime=2.2)
soundTrack = getSoundTrack('SA_audit.mp3', delay=1.9, node=suit) soundTrack = getSoundTrack('SA_audit.ogg', delay=1.9, node=suit)
return Parallel(suitTrack, toonTrack, calcPropTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4, partTrack5) return Parallel(suitTrack, toonTrack, calcPropTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4, partTrack5)
@ -2985,7 +2985,7 @@ def doLiquidate(attack):
cloudPropTrack.append(Func(battle.movie.clearRenderProp, cloud)) cloudPropTrack.append(Func(battle.movie.clearRenderProp, cloud))
damageAnims = [['melt'], ['jump', 1.5, 0.4]] damageAnims = [['melt'], ['jump', 1.5, 0.4]]
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep']) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep'])
soundTrack = getSoundTrack('SA_liquidate.mp3', delay=2.0, node=suit) soundTrack = getSoundTrack('SA_liquidate.ogg', delay=2.0, node=suit)
if dmg > 0: if dmg > 0:
puddle = globalPropPool.getProp('quicksand') puddle = globalPropPool.getProp('quicksand')
puddle.setColor(Vec4(0.0, 0.0, 1.0, 1)) puddle.setColor(Vec4(0.0, 0.0, 1.0, 1))
@ -3242,7 +3242,7 @@ def doWithdrawal(attack):
return track return track
soundTrack = getSoundTrack('SA_withdrawl.mp3', delay=1.4, node=suit) soundTrack = getSoundTrack('SA_withdrawl.ogg', delay=1.4, node=suit)
if dmg > 0: if dmg > 0:
colorTrack = Sequence() colorTrack = Sequence()
colorTrack.append(Wait(1.6)) colorTrack.append(Wait(1.6))
@ -3323,7 +3323,7 @@ def doJargon(attack):
damageAnims.append(['conked', 0.0001, 0.4]) damageAnims.append(['conked', 0.0001, 0.4])
dodgeAnims = [['duck', 0.0001, 1.2], ['duck', 0.0001, 1.3]] dodgeAnims = [['duck', 0.0001, 1.2], ['duck', 0.0001, 1.3]]
toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=1.6, showDamageExtraTime=0.7) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=dodgeAnims, showMissedExtraTime=1.6, showDamageExtraTime=0.7)
soundTrack = getSoundTrack('SA_jargon.mp3', delay=2.1, node=suit) soundTrack = getSoundTrack('SA_jargon.ogg', delay=2.1, node=suit)
return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4) return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4)
@ -3351,7 +3351,7 @@ def doMumboJumbo(attack):
partTrack4 = getPartTrack(particleEffect4, 3.3, 1.7, [particleEffect4, toon, 0]) partTrack4 = getPartTrack(particleEffect4, 3.3, 1.7, [particleEffect4, toon, 0])
partTrack5 = getPartTrack(particleEffect5, 3.3, 1.7, [particleEffect5, toon, 0]) partTrack5 = getPartTrack(particleEffect5, 3.3, 1.7, [particleEffect5, toon, 0])
toonTrack = getToonTrack(attack, 3.2, ['cringe'], 2.2, ['sidestep']) toonTrack = getToonTrack(attack, 3.2, ['cringe'], 2.2, ['sidestep'])
soundTrack = getSoundTrack('SA_mumbo_jumbo.mp3', delay=2.5, node=suit) soundTrack = getSoundTrack('SA_mumbo_jumbo.ogg', delay=2.5, node=suit)
if dmg > 0: if dmg > 0:
return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4, partTrack5) return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4, partTrack5)
else: else:
@ -3392,7 +3392,7 @@ def doGuiltTrip(attack):
partTrack2 = getPowerTrack(powerBar2) partTrack2 = getPowerTrack(powerBar2)
waterfallTrack = getPartTrack(waterfallEffect, 0.6, 0.6, [waterfallEffect, suit, 0]) waterfallTrack = getPartTrack(waterfallEffect, 0.6, 0.6, [waterfallEffect, suit, 0])
toonTracks = getToonTracks(attack, 1.5, ['slip-forward'], 0.86, ['jump']) toonTracks = getToonTracks(attack, 1.5, ['slip-forward'], 0.86, ['jump'])
soundTrack = getSoundTrack('SA_guilt_trip.mp3', delay=1.1, node=suit) soundTrack = getSoundTrack('SA_guilt_trip.ogg', delay=1.1, node=suit)
return Parallel(suitTrack, partTrack1, partTrack2, soundTrack, waterfallTrack, toonTracks) return Parallel(suitTrack, partTrack1, partTrack2, soundTrack, waterfallTrack, toonTracks)

10
toontown/battle/MovieThrow.py
View file

@ -12,7 +12,7 @@ from . import MovieCamera
from . import MovieUtil from . import MovieUtil
from .MovieUtil import calcAvgSuitPos from .MovieUtil import calcAvgSuitPos
notify = DirectNotifyGlobal.directNotify.newCategory('MovieThrow') notify = DirectNotifyGlobal.directNotify.newCategory('MovieThrow')
hitSoundFiles = ('AA_tart_only.mp3', 'AA_slice_only.mp3', 'AA_slice_only.mp3', 'AA_slice_only.mp3', 'AA_slice_only.mp3', 'AA_wholepie_only.mp3', 'AA_wholepie_only.mp3') hitSoundFiles = ('AA_tart_only.ogg', 'AA_slice_only.ogg', 'AA_slice_only.ogg', 'AA_slice_only.ogg', 'AA_slice_only.ogg', 'AA_wholepie_only.ogg', 'AA_wholepie_only.ogg')
tPieLeavesHand = 2.7 tPieLeavesHand = 2.7
tPieHitsSuit = 3.0 tPieHitsSuit = 3.0
tSuitDodges = 2.45 tSuitDodges = 2.45
@ -234,17 +234,17 @@ def __pieMissGroupLerpCallback(t, missDict):
def __getWeddingCakeSoundTrack(level, hitSuit, node = None): def __getWeddingCakeSoundTrack(level, hitSuit, node = None):
throwTrack = Sequence() throwTrack = Sequence()
if hitSuit: if hitSuit:
throwSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake.mp3') throwSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake.ogg')
songTrack = Sequence() songTrack = Sequence()
songTrack.append(Wait(1.0)) songTrack.append(Wait(1.0))
songTrack.append(SoundInterval(throwSound, node=node)) songTrack.append(SoundInterval(throwSound, node=node))
splatSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake_cog.mp3') splatSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake_cog.ogg')
splatTrack = Sequence() splatTrack = Sequence()
splatTrack.append(Wait(tPieHitsSuit)) splatTrack.append(Wait(tPieHitsSuit))
splatTrack.append(SoundInterval(splatSound, node=node)) splatTrack.append(SoundInterval(splatSound, node=node))
throwTrack.append(Parallel(songTrack, splatTrack)) throwTrack.append(Parallel(songTrack, splatTrack))
else: else:
throwSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake_miss.mp3') throwSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake_miss.ogg')
throwTrack.append(Wait(tSuitDodges)) throwTrack.append(Wait(tSuitDodges))
throwTrack.append(SoundInterval(throwSound, node=node)) throwTrack.append(SoundInterval(throwSound, node=node))
return throwTrack return throwTrack
@ -253,7 +253,7 @@ def __getWeddingCakeSoundTrack(level, hitSuit, node = None):
def __getSoundTrack(level, hitSuit, node = None): def __getSoundTrack(level, hitSuit, node = None):
if level == UBER_GAG_LEVEL_INDEX: if level == UBER_GAG_LEVEL_INDEX:
return __getWeddingCakeSoundTrack(level, hitSuit, node) return __getWeddingCakeSoundTrack(level, hitSuit, node)
throwSound = globalBattleSoundCache.getSound('AA_pie_throw_only.mp3') throwSound = globalBattleSoundCache.getSound('AA_pie_throw_only.ogg')
throwTrack = Sequence(Wait(2.6), SoundInterval(throwSound, node=node)) throwTrack = Sequence(Wait(2.6), SoundInterval(throwSound, node=node))
if hitSuit: if hitSuit:
hitSound = globalBattleSoundCache.getSound(hitSoundFiles[level]) hitSound = globalBattleSoundCache.getSound(hitSoundFiles[level])

2
toontown/battle/MovieToonVictory.py
View file

@ -79,7 +79,7 @@ def doToonVictory(localToonActive, toons, rewardToonIds, rewardDicts, deathList,
track.append(Func(NametagGlobals.setOnscreenChatForced, 1)) track.append(Func(NametagGlobals.setOnscreenChatForced, 1))
camTrack = Sequence() camTrack = Sequence()
endTrack = Sequence() endTrack = Sequence()
danceSound = globalBattleSoundCache.getSound('ENC_Win.mp3') danceSound = globalBattleSoundCache.getSound('ENC_Win.ogg')
toonList = [] toonList = []
countToons = 0 countToons = 0
uberListNew = [] uberListNew = []

22
toontown/battle/MovieTrap.py
View file

@ -188,7 +188,7 @@ def __createThrownTrapMultiTrack(trap, propList, propName, propPos = None, propH
slideTrack = Parallel(moveTrack, animTrack) slideTrack = Parallel(moveTrack, animTrack)
motionTrack = Sequence(throwingTrack, slideTrack) motionTrack = Sequence(throwingTrack, slideTrack)
hprTrack = LerpHprInterval(thrownProp, 1.7, hpr=Point3(0, 0, 0)) hprTrack = LerpHprInterval(thrownProp, 1.7, hpr=Point3(0, 0, 0))
soundTrack = getSoundTrack('TL_banana.mp3', node=toon) soundTrack = getSoundTrack('TL_banana.ogg', node=toon)
scaleTrack = LerpScaleInterval(thrownProp, 1.7, scale=MovieUtil.PNT3_ONE) scaleTrack = LerpScaleInterval(thrownProp, 1.7, scale=MovieUtil.PNT3_ONE)
throwTrack.append(Wait(0.25)) throwTrack.append(Wait(0.25))
throwTrack.append(Func(thrownProp.wrtReparentTo, suit)) throwTrack.append(Func(thrownProp.wrtReparentTo, suit))
@ -200,7 +200,7 @@ def __createThrownTrapMultiTrack(trap, propList, propName, propPos = None, propH
throwingTrack = createThrowingTrack(thrownProp, trapPoint, duration=throwDuration, parent=battle) throwingTrack = createThrowingTrack(thrownProp, trapPoint, duration=throwDuration, parent=battle)
hprTrack = LerpHprInterval(thrownProp, 0.9, hpr=Point3(0, 90, 0)) hprTrack = LerpHprInterval(thrownProp, 0.9, hpr=Point3(0, 90, 0))
scaleTrack = LerpScaleInterval(thrownProp, 0.9, scale=MovieUtil.PNT3_ONE) scaleTrack = LerpScaleInterval(thrownProp, 0.9, scale=MovieUtil.PNT3_ONE)
soundTrack = getSoundTrack('TL_dynamite.mp3', delay=0.8, duration=0.7, node=suit) soundTrack = getSoundTrack('TL_dynamite.ogg', delay=0.8, duration=0.7, node=suit)
throwTrack.append(Wait(0.2)) throwTrack.append(Wait(0.2))
throwTrack.append(Parallel(throwingTrack, hprTrack, scaleTrack, soundTrack)) throwTrack.append(Parallel(throwingTrack, hprTrack, scaleTrack, soundTrack))
elif trapName == 'marbles': elif trapName == 'marbles':
@ -214,7 +214,7 @@ def __createThrownTrapMultiTrack(trap, propList, propName, propPos = None, propH
moveTrack = Sequence(Func(thrownProp.wrtReparentTo, suit), Func(thrownProp.setHpr, Point3(94, 0, 0)), LerpPosInterval(thrownProp, flingDuration, pos=landPoint, other=suit), LerpPosInterval(thrownProp, rollDuration, pos=throwPoint, other=suit)) moveTrack = Sequence(Func(thrownProp.wrtReparentTo, suit), Func(thrownProp.setHpr, Point3(94, 0, 0)), LerpPosInterval(thrownProp, flingDuration, pos=landPoint, other=suit), LerpPosInterval(thrownProp, rollDuration, pos=throwPoint, other=suit))
animTrack = ActorInterval(thrownProp, propName, startTime=throwDelay + 0.9) animTrack = ActorInterval(thrownProp, propName, startTime=throwDelay + 0.9)
scaleTrack = LerpScaleInterval(thrownProp, throwDuration, scale=MovieUtil.PNT3_ONE) scaleTrack = LerpScaleInterval(thrownProp, throwDuration, scale=MovieUtil.PNT3_ONE)
soundTrack = getSoundTrack('TL_marbles.mp3', delay=0.1, node=toon) soundTrack = getSoundTrack('TL_marbles.ogg', delay=0.1, node=toon)
throwTrack.append(Wait(0.2)) throwTrack.append(Wait(0.2))
throwTrack.append(Parallel(moveTrack, animTrack, scaleTrack, soundTrack)) throwTrack.append(Parallel(moveTrack, animTrack, scaleTrack, soundTrack))
elif trapName == 'rake': elif trapName == 'rake':
@ -224,7 +224,7 @@ def __createThrownTrapMultiTrack(trap, propList, propName, propPos = None, propH
throwingTrack = createThrowingTrack(thrownProp, trapPoint, duration=throwDuration, parent=suit) throwingTrack = createThrowingTrack(thrownProp, trapPoint, duration=throwDuration, parent=suit)
hprTrack = LerpHprInterval(thrownProp, throwDuration, hpr=VBase3(63.43, -90.0, 63.43)) hprTrack = LerpHprInterval(thrownProp, throwDuration, hpr=VBase3(63.43, -90.0, 63.43))
scaleTrack = LerpScaleInterval(thrownProp, 0.9, scale=Point3(0.7, 0.7, 0.7)) scaleTrack = LerpScaleInterval(thrownProp, 0.9, scale=Point3(0.7, 0.7, 0.7))
soundTrack = SoundInterval(globalBattleSoundCache.getSound('TL_rake_throw_only.mp3'), duration=1.1, node=suit) soundTrack = SoundInterval(globalBattleSoundCache.getSound('TL_rake_throw_only.ogg'), duration=1.1, node=suit)
throwTrack.append(Wait(0.2)) throwTrack.append(Wait(0.2))
throwTrack.append(Parallel(throwingTrack, hprTrack, scaleTrack, soundTrack)) throwTrack.append(Parallel(throwingTrack, hprTrack, scaleTrack, soundTrack))
else: else:
@ -343,10 +343,10 @@ def __createPlacedTrapMultiTrack(trap, prop, propName, propPos = None, propHpr =
toonTrack.append(Func(toon.loop, 'neutral')) toonTrack.append(Func(toon.loop, 'neutral'))
toonTrack.append(Func(toon.setHpr, battle, origHpr)) toonTrack.append(Func(toon.setHpr, battle, origHpr))
if propName == 'quicksand': if propName == 'quicksand':
propSound = globalBattleSoundCache.getSound('TL_quicksand.mp3') propSound = globalBattleSoundCache.getSound('TL_quicksand.ogg')
else: else:
propSound = globalBattleSoundCache.getSound('TL_trap_door.mp3') propSound = globalBattleSoundCache.getSound('TL_trap_door.ogg')
buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.ogg')
soundTrack = Sequence(Wait(2.3), SoundInterval(buttonSound, duration=0.67, node=toon), Wait(0.3), SoundInterval(propSound, duration=0.5, node=toon)) soundTrack = Sequence(Wait(2.3), SoundInterval(buttonSound, duration=0.67, node=toon), Wait(0.3), SoundInterval(propSound, duration=0.5, node=toon))
return Parallel(trapTracks, toonTrack, soundTrack) return Parallel(trapTracks, toonTrack, soundTrack)
@ -572,11 +572,11 @@ def __createPlacedGroupTrapTrack(trap, prop, propName, centerSuit, propPos = Non
toonTrack.append(Func(toon.loop, 'neutral')) toonTrack.append(Func(toon.loop, 'neutral'))
toonTrack.append(Func(toon.setHpr, battle, origHpr)) toonTrack.append(Func(toon.setHpr, battle, origHpr))
if propName == 'quicksand': if propName == 'quicksand':
propSound = globalBattleSoundCache.getSound('TL_quicksand.mp3') propSound = globalBattleSoundCache.getSound('TL_quicksand.ogg')
elif propName == 'traintrack': elif propName == 'traintrack':
propSound = globalBattleSoundCache.getSound('TL_train_track_appear.mp3') propSound = globalBattleSoundCache.getSound('TL_train_track_appear.ogg')
else: else:
propSound = globalBattleSoundCache.getSound('TL_trap_door.mp3') propSound = globalBattleSoundCache.getSound('TL_trap_door.ogg')
buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.ogg')
soundTrack = Sequence(Wait(2.3), Parallel(SoundInterval(buttonSound, duration=0.67, node=toon), SoundInterval(propSound, node=toon))) soundTrack = Sequence(Wait(2.3), Parallel(SoundInterval(buttonSound, duration=0.67, node=toon), SoundInterval(propSound, node=toon)))
return Parallel(trapTracks, toonTrack, soundTrack) return Parallel(trapTracks, toonTrack, soundTrack)

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.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.ogg')
deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg')
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.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.ogg')
deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg')
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.loader.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.ogg')
self.finalOpenSfx = base.loader.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.ogg')
self.closeSfx = base.loader.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.ogg')
self.finalCloseSfx = base.loader.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.ogg')
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.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_drop.mp3') self.cogDropSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_drop.ogg')
self.cogLandSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_land.mp3') self.cogLandSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_land.ogg')
self.cogSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_settle.mp3') self.cogSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_settle.ogg')
self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg')
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.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_weaken.mp3') self.cogWeakenSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_weaken.ogg')
self.toonGrowSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_grow.mp3') self.toonGrowSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_grow.ogg')
self.toonSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_settle.mp3') self.toonSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_settle.ogg')
self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg')
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.loader.loadSfx('phase_3.5/audio/sfx/Door_Open_1.mp3') self.openSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Open_1.ogg')
self.closeSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Close_1.mp3') self.closeSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Close_1.ogg')
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.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg')
self.finalOpenSfx = None self.finalOpenSfx = None
self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.ogg')
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.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg')
self.finalOpenSfx = None self.finalOpenSfx = None
self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.ogg')
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.loader.loadSfx('phase_5/audio/sfx/AA_heal_telljoke.mp3') self.rimshot = base.loader.loadSfx('phase_5/audio/sfx/AA_heal_telljoke.ogg')
self.knockSfx = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_3.mp3') self.knockSfx = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_3.ogg')
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:

8
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.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg')
self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.ogg')
self.suits = [] self.suits = []
self.reserveSuits = [] self.reserveSuits = []
self.joiningReserves = [] self.joiningReserves = []
@ -53,8 +53,8 @@ class DistributedSuitInterior(DistributedObject.DistributedObject):
120, 120,
12, 12,
38] 38]
self.waitMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_toon_winning_indoor.mid') self.waitMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_toon_winning_indoor.ogg')
self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.mid') self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.ogg')
self.fsm = ClassicFSM.ClassicFSM('DistributedSuitInterior', [State.State('WaitForAllToonsInside', self.enterWaitForAllToonsInside, self.exitWaitForAllToonsInside, ['Elevator']), self.fsm = ClassicFSM.ClassicFSM('DistributedSuitInterior', [State.State('WaitForAllToonsInside', self.enterWaitForAllToonsInside, self.exitWaitForAllToonsInside, ['Elevator']),
State.State('Elevator', self.enterElevator, self.exitElevator, ['Battle']), State.State('Elevator', self.enterElevator, self.exitElevator, ['Battle']),
State.State('Battle', self.enterBattle, self.exitBattle, ['Resting', 'Reward', 'ReservesJoining']), State.State('Battle', self.enterBattle, self.exitBattle, ['Resting', 'Reward', 'ReservesJoining']),

14
toontown/building/DistributedToonHallInterior.py
View file

@ -216,19 +216,19 @@ class DistributedToonHallInterior(DistributedToonInterior):
self.sillyMeter.makeSubpart('arrow', ['uvj_progressBar*', 'def_springA']) self.sillyMeter.makeSubpart('arrow', ['uvj_progressBar*', 'def_springA'])
self.sillyMeter.makeSubpart('meter', ['def_pivot'], ['uvj_progressBar*', 'def_springA']) self.sillyMeter.makeSubpart('meter', ['def_pivot'], ['uvj_progressBar*', 'def_springA'])
self.audio3d = Audio3DManager.Audio3DManager(base.sfxManagerList[0], camera) self.audio3d = Audio3DManager.Audio3DManager(base.sfxManagerList[0], camera)
self.phase1Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseOne.mp3') self.phase1Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseOne.ogg')
self.phase1Sfx.setLoop(True) self.phase1Sfx.setLoop(True)
self.phase2Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseTwo.mp3') self.phase2Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseTwo.ogg')
self.phase2Sfx.setLoop(True) self.phase2Sfx.setLoop(True)
self.phase3Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseThree.mp3') self.phase3Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseThree.ogg')
self.phase3Sfx.setLoop(True) self.phase3Sfx.setLoop(True)
self.phase4Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseFour.mp3') self.phase4Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseFour.ogg')
self.phase4Sfx.setLoop(True) self.phase4Sfx.setLoop(True)
self.phase4To5Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseFourToFive.mp3') self.phase4To5Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseFourToFive.ogg')
self.phase4To5Sfx.setLoop(False) self.phase4To5Sfx.setLoop(False)
self.phase5Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseFive.mp3') self.phase5Sfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterPhaseFive.ogg')
self.phase5Sfx.setLoop(True) self.phase5Sfx.setLoop(True)
self.arrowSfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterArrow.mp3') self.arrowSfx = self.audio3d.loadSfx('phase_4/audio/sfx/tt_s_prp_sillyMeterArrow.ogg')
self.arrowSfx.setLoop(False) self.arrowSfx.setLoop(False)
self.audio3d.setDropOffFactor(0.1) self.audio3d.setDropOffFactor(0.1)
self.accept('SillyMeterPhase', self.selectPhase) self.accept('SillyMeterPhase', self.selectPhase)

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.loader.loadSfx('%s/CC_%s_chatter_%s%02d.mp3' % (loadPath, self.chatterArray[categoryIndex].append(base.loader.loadSfx('%s/CC_%s_chatter_%s%02d.ogg' % (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.loader.loadSfx('phase_3/audio/dial/mickey.wav') dialogueFile = base.loader.loadSfx('phase_3/audio/dial/mickey.ogg')
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.loader.loadSfx('phase_3/audio/dial/mickey.wav') dialogueFile = base.loader.loadSfx('phase_3/audio/dial/mickey.ogg')
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.loader.loadSfx('phase_3/audio/dial/minnie.wav') dialogueFile = base.loader.loadSfx('phase_3/audio/dial/minnie.ogg')
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.loader.loadSfx('phase_4/audio/dial/daisy.wav') dialogueFile = base.loader.loadSfx('phase_4/audio/dial/daisy.ogg')
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.loader.loadSfx('phase_6/audio/dial/goofy.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/goofy.ogg')
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.loader.loadSfx('phase_6/audio/dial/donald.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/donald.ogg')
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.loader.loadSfx('phase_3.5/audio/dial/AV_dog_med.mp3') dialogueFile = base.loader.loadSfx('phase_3.5/audio/dial/AV_dog_med.ogg')
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.loader.loadSfx('phase_3.5/audio/dial/AV_dog_med.mp3') dialogueFile = base.loader.loadSfx('phase_3.5/audio/dial/AV_dog_med.ogg')
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.loader.loadSfx('phase_6/audio/dial/chip.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/chip.ogg')
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.loader.loadSfx('phase_6/audio/dial/dale.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/dale.ogg')
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.loader.loadSfx('phase_6/audio/dial/chip.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/chip.ogg')
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.loader.loadSfx('phase_6/audio/dial/dale.wav') dialogueFile = base.loader.loadSfx('phase_6/audio/dial/dale.ogg')
for i in range(0, 6): for i in range(0, 6):
self.dialogueArray.append(dialogueFile) self.dialogueArray.append(dialogueFile)

2
toontown/chat/ToontownChatManager.py
View file

@ -34,7 +34,7 @@ class ToontownChatManager(ChatManager.ChatManager):
gui = loader.loadModel('phase_3.5/models/gui/chat_input_gui') gui = loader.loadModel('phase_3.5/models/gui/chat_input_gui')
self.normalButton = DirectButton(image=(gui.find('**/ChtBx_ChtBtn_UP'), gui.find('**/ChtBx_ChtBtn_DN'), gui.find('**/ChtBx_ChtBtn_RLVR')), pos=(-1.2647, 0, 0.928), scale=1.179, relief=None, image_color=Vec4(1, 1, 1, 1), text=('', OTPLocalizer.ChatManagerChat, OTPLocalizer.ChatManagerChat), text_align=TextNode.ALeft, text_scale=TTLocalizer.TCMnormalButton, text_fg=Vec4(1, 1, 1, 1), text_shadow=Vec4(0, 0, 0, 1), text_pos=(-0.0525, -0.09), textMayChange=0, sortOrder=DGG.FOREGROUND_SORT_INDEX, command=self.__normalButtonPressed) self.normalButton = DirectButton(image=(gui.find('**/ChtBx_ChtBtn_UP'), gui.find('**/ChtBx_ChtBtn_DN'), gui.find('**/ChtBx_ChtBtn_RLVR')), pos=(-1.2647, 0, 0.928), scale=1.179, relief=None, image_color=Vec4(1, 1, 1, 1), text=('', OTPLocalizer.ChatManagerChat, OTPLocalizer.ChatManagerChat), text_align=TextNode.ALeft, text_scale=TTLocalizer.TCMnormalButton, text_fg=Vec4(1, 1, 1, 1), text_shadow=Vec4(0, 0, 0, 1), text_pos=(-0.0525, -0.09), textMayChange=0, sortOrder=DGG.FOREGROUND_SORT_INDEX, command=self.__normalButtonPressed)
self.normalButton.hide() self.normalButton.hide()
self.openScSfx = loader.loadSfx('phase_3.5/audio/sfx/GUI_quicktalker.mp3') self.openScSfx = loader.loadSfx('phase_3.5/audio/sfx/GUI_quicktalker.ogg')
self.openScSfx.setVolume(0.6) self.openScSfx.setVolume(0.6)
self.scButton = DirectButton(image=(gui.find('**/ChtBx_ChtBtn_UP'), gui.find('**/ChtBx_ChtBtn_DN'), gui.find('**/ChtBx_ChtBtn_RLVR')), pos=TTLocalizer.TCMscButtonPos, scale=1.179, relief=None, image_color=Vec4(0.75, 1, 0.6, 1), text=('', OTPLocalizer.GlobalSpeedChatName, OTPLocalizer.GlobalSpeedChatName), text_scale=TTLocalizer.TCMscButton, text_fg=Vec4(1, 1, 1, 1), text_shadow=Vec4(0, 0, 0, 1), text_pos=(0, -0.09), textMayChange=0, sortOrder=DGG.FOREGROUND_SORT_INDEX, command=self.__scButtonPressed, clickSound=self.openScSfx) self.scButton = DirectButton(image=(gui.find('**/ChtBx_ChtBtn_UP'), gui.find('**/ChtBx_ChtBtn_DN'), gui.find('**/ChtBx_ChtBtn_RLVR')), pos=TTLocalizer.TCMscButtonPos, scale=1.179, relief=None, image_color=Vec4(0.75, 1, 0.6, 1), text=('', OTPLocalizer.GlobalSpeedChatName, OTPLocalizer.GlobalSpeedChatName), text_scale=TTLocalizer.TCMscButton, text_fg=Vec4(1, 1, 1, 1), text_shadow=Vec4(0, 0, 0, 1), text_pos=(0, -0.09), textMayChange=0, sortOrder=DGG.FOREGROUND_SORT_INDEX, command=self.__scButtonPressed, clickSound=self.openScSfx)
self.scButton.hide() self.scButton.hide()

6
toontown/cogdominium/CogdoBarrelRoomConsts.py
View file

@ -51,7 +51,7 @@ StomperProps = [{'path': '**/stomper_GRP_01/stomper_cylinder_01',
{'path': '**/stomper_GRP_12/stomper_cylinder_034', {'path': '**/stomper_GRP_12/stomper_cylinder_034',
'motion': 'up'}] 'motion': 'up'}]
StomperHaltTime = 7.3 StomperHaltTime = 7.3
StomperSound = 'phase_9/audio/sfx/CHQ_FACT_stomper_raise.mp3' StomperSound = 'phase_9/audio/sfx/CHQ_FACT_stomper_raise.ogg'
MaxToons = 4 MaxToons = 4
BarrelRoomModel = 'phase_5/models/cogdominium/tt_m_ara_cbr_barrelRoom' BarrelRoomModel = 'phase_5/models/cogdominium/tt_m_ara_cbr_barrelRoom'
BarrelRoomModelPos = (0, 0, 0) BarrelRoomModelPos = (0, 0, 0)
@ -89,8 +89,8 @@ BarrelCollParams = (0,
0, 0,
2, 2,
2.0) 2.0)
BarrelBumpSound = 'phase_4/audio/sfx/Golf_Hit_Barrier_2.mp3' BarrelBumpSound = 'phase_4/audio/sfx/Golf_Hit_Barrier_2.ogg'
BarrelGrabSound = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' BarrelGrabSound = 'phase_4/audio/sfx/SZ_DD_treasure.ogg'
StateHidden, StateAvailable, StateUsed, StateCrushed = list(range(4)) StateHidden, StateAvailable, StateUsed, StateCrushed = list(range(4))
def numBarrels(): def numBarrels():

2
toontown/cogdominium/CogdoElevatorMovie.py
View file

@ -77,7 +77,7 @@ class CogdoElevatorMovie(CogdoGameMovie):
self.clipPlane = self.toonHead.attachNewNode(PlaneNode('clip')) self.clipPlane = self.toonHead.attachNewNode(PlaneNode('clip'))
self.clipPlane.node().setPlane(Plane(0, 0, 1, 0)) self.clipPlane.node().setPlane(Plane(0, 0, 1, 0))
self.clipPlane.setPos(0, 0, 2.45) self.clipPlane.setPos(0, 0, 2.45)
self._toonDialogueSfx = loader.loadSfx('phase_3.5/audio/dial/AV_dog_long.mp3') self._toonDialogueSfx = loader.loadSfx('phase_3.5/audio/dial/AV_dog_long.ogg')
self._camHelperNode = NodePath('CamHelperNode') self._camHelperNode = NodePath('CamHelperNode')
self._camHelperNode.reparentTo(render) self._camHelperNode.reparentTo(render)
dialogue = TTLocalizer.CogdoElevatorRewardLaff dialogue = TTLocalizer.CogdoElevatorRewardLaff

2
toontown/cogdominium/CogdoExecutiveSuiteMovies.py
View file

@ -82,7 +82,7 @@ class CogdoExecutiveSuiteIntro(CogdoGameMovie):
self.clipPlane = self.toonHead.attachNewNode(PlaneNode('clip')) self.clipPlane = self.toonHead.attachNewNode(PlaneNode('clip'))
self.clipPlane.node().setPlane(Plane(0, 0, 1, 0)) self.clipPlane.node().setPlane(Plane(0, 0, 1, 0))
self.clipPlane.setPos(0, 0, 2.45) self.clipPlane.setPos(0, 0, 2.45)
self._toonDialogueSfx = loader.loadSfx('phase_3.5/audio/dial/AV_dog_long.mp3') self._toonDialogueSfx = loader.loadSfx('phase_3.5/audio/dial/AV_dog_long.ogg')
self._camHelperNode = NodePath('CamHelperNode') self._camHelperNode = NodePath('CamHelperNode')
self._camHelperNode.reparentTo(render) self._camHelperNode.reparentTo(render)
dialogue = TTLocalizer.CogdoExecutiveSuiteIntroMessage dialogue = TTLocalizer.CogdoExecutiveSuiteIntroMessage

54
toontown/cogdominium/CogdoFlyingGameGlobals.py
View file

@ -172,33 +172,33 @@ Dev.Invincibility = False
Dev.NoLegalEagleAttacks = False Dev.NoLegalEagleAttacks = False
Audio = VariableContainer() Audio = VariableContainer()
Audio.Cutoff = 75.0 Audio.Cutoff = 75.0
Audio.MusicFiles = {'normal': 'phase_4/audio/bgm/MG_cannon_game.mid', Audio.MusicFiles = {'normal': 'phase_4/audio/bgm/MG_cannon_game.ogg',
'end': 'phase_4/audio/bgm/FF_safezone.mid', 'end': 'phase_4/audio/bgm/FF_safezone.ogg',
'waiting': 'phase_4/audio/bgm/m_match_bg2.mid', 'waiting': 'phase_4/audio/bgm/m_match_bg2.ogg',
'invul': 'phase_4/audio/bgm/MG_CogThief.mid', 'invul': 'phase_4/audio/bgm/MG_CogThief.ogg',
'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.mid'} 'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.ogg'}
Audio.SfxFiles = {'propeller': 'phase_4/audio/sfx/TB_propeller.wav', Audio.SfxFiles = {'propeller': 'phase_4/audio/sfx/TB_propeller.ogg',
'propeller_damaged': 'phase_5/audio/sfx/tt_s_ara_cfg_propellers_damaged.mp3', 'propeller_damaged': 'phase_5/audio/sfx/tt_s_ara_cfg_propellers_damaged.ogg',
'fan': 'phase_4/audio/sfx/target_wind_float_loop.wav', 'fan': 'phase_4/audio/sfx/target_wind_float_loop.ogg',
'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.mp3', 'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.ogg',
'getLaff': 'phase_4/audio/sfx/avatar_emotion_laugh.mp3', 'getLaff': 'phase_4/audio/sfx/avatar_emotion_laugh.ogg',
'getRedTape': 'phase_5/audio/sfx/SA_red_tape.mp3', 'getRedTape': 'phase_5/audio/sfx/SA_red_tape.ogg',
'invulBuff': 'phase_4/audio/sfx/ring_get.mp3', 'invulBuff': 'phase_4/audio/sfx/ring_get.ogg',
'invulDebuff': 'phase_4/audio/sfx/ring_miss.mp3', 'invulDebuff': 'phase_4/audio/sfx/ring_miss.ogg',
'refuel': 'phase_5/audio/sfx/LB_receive_evidence.mp3', 'refuel': 'phase_5/audio/sfx/LB_receive_evidence.ogg',
'bladeBreak': 'phase_5/audio/sfx/tt_s_ara_cfg_propellerBreaks.mp3', 'bladeBreak': 'phase_5/audio/sfx/tt_s_ara_cfg_propellerBreaks.ogg',
'popupHelpText': 'phase_3/audio/sfx/GUI_balloon_popup.mp3', 'popupHelpText': 'phase_3/audio/sfx/GUI_balloon_popup.ogg',
'collide': 'phase_3.5/audio/sfx/AV_collision.mp3', 'collide': 'phase_3.5/audio/sfx/AV_collision.ogg',
'whirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_whirlwind.mp3', 'whirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_whirlwind.ogg',
'toonInWhirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_toonInWhirlwind.mp3', 'toonInWhirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_toonInWhirlwind.ogg',
'death': 'phase_5/audio/sfx/tt_s_ara_cfg_toonFalls.mp3', 'death': 'phase_5/audio/sfx/tt_s_ara_cfg_toonFalls.ogg',
'legalEagleScream': 'phase_5/audio/sfx/tt_s_ara_cfg_eagleCry.mp3', 'legalEagleScream': 'phase_5/audio/sfx/tt_s_ara_cfg_eagleCry.ogg',
'toonHit': 'phase_5/audio/sfx/tt_s_ara_cfg_toonHit.mp3', 'toonHit': 'phase_5/audio/sfx/tt_s_ara_cfg_toonHit.ogg',
'lose': 'phase_4/audio/sfx/MG_lose.mp3', 'lose': 'phase_4/audio/sfx/MG_lose.ogg',
'win': 'phase_4/audio/sfx/MG_win.mp3', 'win': 'phase_4/audio/sfx/MG_win.ogg',
'refuelSpin': 'phase_4/audio/sfx/clock12.mp3', 'refuelSpin': 'phase_4/audio/sfx/clock12.ogg',
'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.mp3', 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.ogg',
'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.mp3'} 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'}
Level = VariableContainer() Level = VariableContainer()
Level.GatherableTypes = PythonUtil.Enum(('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup')) Level.GatherableTypes = PythonUtil.Enum(('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup'))
Level.ObstacleTypes = PythonUtil.Enum(('Whirlwind', 'Fan', 'Minion')) Level.ObstacleTypes = PythonUtil.Enum(('Whirlwind', 'Fan', 'Minion'))

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.loader.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.ogg')
self._closeSfx = closeSfx or base.loader.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.ogg')
self._elevatorPoints = [] self._elevatorPoints = []
for point in ElevatorConstants.ElevatorPoints: for point in ElevatorConstants.ElevatorPoints:
self._elevatorPoints.append(point[0]) self._elevatorPoints.append(point[0])

36
toontown/cogdominium/CogdoMazeGameGlobals.py
View file

@ -171,24 +171,24 @@ WaterCoolerCollisionName = 'WaterCooler_Collision'
WaterCoolerShowEventName = 'CogdoMazeWaterCooler_Show' WaterCoolerShowEventName = 'CogdoMazeWaterCooler_Show'
WaterCoolerHideEventName = 'CogdoMazeWaterCooler_Hide' WaterCoolerHideEventName = 'CogdoMazeWaterCooler_Hide'
AudioCutoff = 75.0 AudioCutoff = 75.0
MusicFiles = {'normal': 'phase_9/audio/bgm/CHQ_FACT_bg.mid', MusicFiles = {'normal': 'phase_9/audio/bgm/CHQ_FACT_bg.ogg',
'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.mid'} 'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.ogg'}
SfxFiles = {'toonHitByDrop': 'phase_5/audio/sfx/tt_s_ara_cmg_toonHit.mp3', SfxFiles = {'toonHitByDrop': 'phase_5/audio/sfx/tt_s_ara_cmg_toonHit.ogg',
'toonHit': 'phase_4/audio/sfx/MG_cannon_hit_dirt.mp3', 'toonHit': 'phase_4/audio/sfx/MG_cannon_hit_dirt.ogg',
'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.mp3', 'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.ogg',
'drop': 'phase_5/audio/sfx/tt_s_ara_cmg_itemHitsFloor.mp3', 'drop': 'phase_5/audio/sfx/tt_s_ara_cmg_itemHitsFloor.ogg',
'throw': 'phase_3.5/audio/sfx/AA_pie_throw_only.mp3', 'throw': 'phase_3.5/audio/sfx/AA_pie_throw_only.ogg',
'splat': 'phase_5/audio/sfx/SA_watercooler_spray_only.mp3', 'splat': 'phase_5/audio/sfx/SA_watercooler_spray_only.ogg',
'cogSpin': 'phase_3.5/audio/sfx/Cog_Death.mp3', 'cogSpin': 'phase_3.5/audio/sfx/Cog_Death.ogg',
'cogDeath': 'phase_3.5/audio/sfx/ENC_cogfall_apart.mp3', 'cogDeath': 'phase_3.5/audio/sfx/ENC_cogfall_apart.ogg',
'bossCogAngry': 'phase_5/audio/sfx/tt_s_ara_cmg_bossCogAngry.mp3', 'bossCogAngry': 'phase_5/audio/sfx/tt_s_ara_cmg_bossCogAngry.ogg',
'cogStomp': 'phase_5/audio/sfx/tt_s_ara_cmg_cogStomp.mp3', 'cogStomp': 'phase_5/audio/sfx/tt_s_ara_cmg_cogStomp.ogg',
'quake': 'phase_5/audio/sfx/tt_s_ara_cmg_groundquake.mp3', 'quake': 'phase_5/audio/sfx/tt_s_ara_cmg_groundquake.ogg',
'waterCoolerFill': 'phase_5/audio/sfx/tt_s_ara_cmg_waterCoolerFill.mp3', 'waterCoolerFill': 'phase_5/audio/sfx/tt_s_ara_cmg_waterCoolerFill.ogg',
'lose': 'phase_4/audio/sfx/MG_lose.mp3', 'lose': 'phase_4/audio/sfx/MG_lose.ogg',
'win': 'phase_4/audio/sfx/MG_win.mp3', 'win': 'phase_4/audio/sfx/MG_win.ogg',
'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.mp3', 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.ogg',
'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.mp3'} 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'}
MessageLabelPos = (0.0, 0.0, -0.4) MessageLabelPos = (0.0, 0.0, -0.4)
MemoGuiPos = (-0.85, 0, -0.9) MemoGuiPos = (-0.85, 0, -0.9)
MemoGuiTextScale = 0.1 MemoGuiTextScale = 0.1

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.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.atLimitSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3') self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.ogg')
self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav') self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.ogg')
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.loader.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.ogg')
self.fadeTrack = None self.fadeTrack = None
return return

6
toontown/cogdominium/DistCogdoCraneMoneyBag.py
View file

@ -18,10 +18,10 @@ class DistCogdoCraneMoneyBag(DistCogdoCraneObject):
DistCogdoCraneObject.__init__(self, cr) DistCogdoCraneObject.__init__(self, cr)
NodePath.__init__(self, 'object') NodePath.__init__(self, 'object')
self.index = None self.index = None
self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.mp3') self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.ogg')
self.hitMagnetSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe.mp3') self.hitMagnetSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe.ogg')
self.toMagnetSoundInterval = Parallel(SoundInterval(self.flyToMagnetSfx, duration=ToontownGlobals.CashbotBossToMagnetTime, node=self), Sequence(Wait(ToontownGlobals.CashbotBossToMagnetTime - 0.02), SoundInterval(self.hitMagnetSfx, duration=1.0, node=self))) self.toMagnetSoundInterval = Parallel(SoundInterval(self.flyToMagnetSfx, duration=ToontownGlobals.CashbotBossToMagnetTime, node=self), Sequence(Wait(ToontownGlobals.CashbotBossToMagnetTime - 0.02), SoundInterval(self.hitMagnetSfx, duration=1.0, node=self)))
self.hitFloorSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_bigweight_miss.mp3') self.hitFloorSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_bigweight_miss.ogg')
self.hitFloorSoundInterval = SoundInterval(self.hitFloorSfx, node=self) self.hitFloorSoundInterval = SoundInterval(self.hitFloorSfx, node=self)
return return

4
toontown/cogdominium/DistCogdoCraneObject.py
View file

@ -26,9 +26,9 @@ class DistCogdoCraneObject(DistributedSmoothNode.DistributedSmoothNode, FSM.FSM)
self.physicsActivated = 0 self.physicsActivated = 0
self.toMagnetSoundInterval = Sequence() self.toMagnetSoundInterval = Sequence()
self.hitFloorSoundInterval = Sequence() self.hitFloorSoundInterval = Sequence()
self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe_miss.mp3') self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe_miss.ogg')
self.hitBossSoundInterval = SoundInterval(self.hitBossSfx) self.hitBossSoundInterval = SoundInterval(self.hitBossSfx)
self.touchedBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3') self.touchedBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.ogg')
self.touchedBossSoundInterval = SoundInterval(self.touchedBossSfx, duration=0.8) self.touchedBossSoundInterval = SoundInterval(self.touchedBossSfx, duration=0.8)
self.lerpInterval = None self.lerpInterval = None
return return

12
toontown/cogdominium/DistributedCogdoInterior.py
View file

@ -35,8 +35,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.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg')
self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.ogg')
self.suits = [] self.suits = []
self.reserveSuits = [] self.reserveSuits = []
self.joiningReserves = [] self.joiningReserves = []
@ -77,8 +77,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject):
self.penthouseOutroTrack = None self.penthouseOutroTrack = None
self.penthouseOutroChatDoneTrack = None self.penthouseOutroChatDoneTrack = None
self.penthouseIntroTrack = None self.penthouseIntroTrack = None
self.waitMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_toon_winning_indoor.mid') self.waitMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_toon_winning_indoor.ogg')
self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.mid') self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.ogg')
self.fsm = ClassicFSM.ClassicFSM('DistributedCogdoInterior', [State.State('WaitForAllToonsInside', self.enterWaitForAllToonsInside, self.exitWaitForAllToonsInside, ['Elevator']), self.fsm = ClassicFSM.ClassicFSM('DistributedCogdoInterior', [State.State('WaitForAllToonsInside', self.enterWaitForAllToonsInside, self.exitWaitForAllToonsInside, ['Elevator']),
State.State('Elevator', self.enterElevator, self.exitElevator, ['Game']), State.State('Elevator', self.enterElevator, self.exitElevator, ['Game']),
State.State('Game', self.enterGame, self.exitGame, ['Resting', 'Failed', 'BattleIntro']), State.State('Game', self.enterGame, self.exitGame, ['Resting', 'Failed', 'BattleIntro']),
@ -174,8 +174,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject):
def handleAnnounceGenerate(self, obj): def handleAnnounceGenerate(self, obj):
self.ignore(self.announceGenerateName) self.ignore(self.announceGenerateName)
self.cageDoorSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_door.mp3') self.cageDoorSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_door.ogg')
self.cageLowerSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_lower.mp3') self.cageLowerSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_lower.ogg')
self.sendUpdate('setAvatarJoined', []) self.sendUpdate('setAvatarJoined', [])
def disable(self): def disable(self):

2
toontown/coghq/BossbotCogHQLoader.py
View file

@ -24,7 +24,7 @@ class BossbotCogHQLoader(CogHQLoader.CogHQLoader):
state = self.fsm.getStateNamed(stateName) state = self.fsm.getStateNamed(stateName)
state.addTransition('countryClubInterior') state.addTransition('countryClubInterior')
self.musicFile = random.choice(['phase_12/audio/bgm/Bossbot_Entry_v1.mid', 'phase_12/audio/bgm/Bossbot_Entry_v2.mid', 'phase_12/audio/bgm/Bossbot_Entry_v3.mid']) self.musicFile = random.choice(['phase_12/audio/bgm/Bossbot_Entry_v1.ogg', 'phase_12/audio/bgm/Bossbot_Entry_v2.ogg', 'phase_12/audio/bgm/Bossbot_Entry_v3.ogg'])
self.cogHQExteriorModelPath = 'phase_12/models/bossbotHQ/CogGolfHub' self.cogHQExteriorModelPath = 'phase_12/models/bossbotHQ/CogGolfHub'
self.factoryExteriorModelPath = 'phase_11/models/lawbotHQ/LB_DA_Lobby' self.factoryExteriorModelPath = 'phase_11/models/lawbotHQ/LB_DA_Lobby'
self.cogHQLobbyModelPath = 'phase_12/models/bossbotHQ/CogGolfCourtyard' self.cogHQLobbyModelPath = 'phase_12/models/bossbotHQ/CogGolfCourtyard'

2
toontown/coghq/CashbotCogHQLoader.py
View file

@ -20,7 +20,7 @@ class CashbotCogHQLoader(CogHQLoader.CogHQLoader):
state = self.fsm.getStateNamed(stateName) state = self.fsm.getStateNamed(stateName)
state.addTransition('mintInterior') state.addTransition('mintInterior')
self.musicFile = 'phase_9/audio/bgm/encntr_suit_HQ_nbrhood.mid' self.musicFile = 'phase_9/audio/bgm/encntr_suit_HQ_nbrhood.ogg'
self.cogHQExteriorModelPath = 'phase_10/models/cogHQ/CashBotShippingStation' self.cogHQExteriorModelPath = 'phase_10/models/cogHQ/CashBotShippingStation'
self.cogHQLobbyModelPath = 'phase_10/models/cogHQ/VaultLobby' self.cogHQLobbyModelPath = 'phase_10/models/cogHQ/VaultLobby'
self.geom = None self.geom = None

2
toontown/coghq/CogHQLoader.py
View file

@ -29,7 +29,7 @@ class CogHQLoader(StateData.StateData):
def load(self, zoneId): def load(self, zoneId):
self.parentFSMState.addChild(self.fsm) self.parentFSMState.addChild(self.fsm)
self.music = base.loader.loadMusic(self.musicFile) self.music = base.loader.loadMusic(self.musicFile)
self.battleMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_suit_winning.mid') self.battleMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_suit_winning.ogg')
self.townBattle = TownBattle.TownBattle(self.townBattleDoneEvent) self.townBattle = TownBattle.TownBattle(self.townBattleDoneEvent)
self.townBattle.load() self.townBattle.load()
Suit.loadSuits(3) Suit.loadSuits(3)

2
toontown/coghq/CountryClubInterior.py
View file

@ -72,7 +72,7 @@ class CountryClubInterior(BattlePlace.BattlePlace):
def load(self): def load(self):
self.parentFSM.getStateNamed('countryClubInterior').addChild(self.fsm) self.parentFSM.getStateNamed('countryClubInterior').addChild(self.fsm)
BattlePlace.BattlePlace.load(self) BattlePlace.BattlePlace.load(self)
musicName = random.choice(['phase_12/audio/bgm/Bossbot_Factory_v1.mid', 'phase_12/audio/bgm/Bossbot_Factory_v2.mid', 'phase_12/audio/bgm/Bossbot_Factory_v3.mid']) musicName = random.choice(['phase_12/audio/bgm/Bossbot_Factory_v1.ogg', 'phase_12/audio/bgm/Bossbot_Factory_v2.ogg', 'phase_12/audio/bgm/Bossbot_Factory_v3.ogg'])
self.music = base.loader.loadMusic(musicName) self.music = base.loader.loadMusic(musicName)
def unload(self): def unload(self):

12
toontown/coghq/DistributedBanquetTable.py
View file

@ -173,11 +173,11 @@ class DistributedBanquetTable(DistributedObject.DistributedObject, FSM.FSM, Banq
self.tableGeom = self.tableGroup.find('**/Geometry') self.tableGeom = self.tableGroup.find('**/Geometry')
self.setupDiners() self.setupDiners()
self.setupChairCols() self.setupChairCols()
self.squirtSfx = loader.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.mp3') self.squirtSfx = loader.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.ogg')
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.ogg')
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.ogg')
self.pitcherMoveSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.pitcherMoveSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
def setupDiners(self): def setupDiners(self):
for i in range(self.numDiners): for i in range(self.numDiners):
@ -371,8 +371,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.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.ogg')
deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg')
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

@ -11,8 +11,8 @@ class DistributedBarrelBase(BasicEntities.DistributedNodePathEntity, BarrelBase.
def __init__(self, cr): def __init__(self, cr):
self.rewardPerGrabMax = 0 self.rewardPerGrabMax = 0
BasicEntities.DistributedNodePathEntity.__init__(self, cr) BasicEntities.DistributedNodePathEntity.__init__(self, cr)
self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg'
self.rejectSoundPath = 'phase_4/audio/sfx/ring_miss.mp3' self.rejectSoundPath = 'phase_4/audio/sfx/ring_miss.ogg'
self.animTrack = None self.animTrack = None
self.shadow = 0 self.shadow = 0
self.barrelScale = 0.5 self.barrelScale = 0.5

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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_pressed.mp3') onSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_pressed.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_depressed.mp3') countDownSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_depressed.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_popup.mp3') offSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_switch_popup.ogg')
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

@ -72,11 +72,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.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.atLimitSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3') self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.ogg')
self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav') self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.ogg')
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.loader.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.ogg')
self.fadeTrack = None self.fadeTrack = None
return return

4
toontown/coghq/DistributedCashbotBossObject.py
View file

@ -26,9 +26,9 @@ class DistributedCashbotBossObject(DistributedSmoothNode.DistributedSmoothNode,
self.physicsActivated = 0 self.physicsActivated = 0
self.toMagnetSoundInterval = Sequence() self.toMagnetSoundInterval = Sequence()
self.hitFloorSoundInterval = Sequence() self.hitFloorSoundInterval = Sequence()
self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe_miss.mp3') self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe_miss.ogg')
self.hitBossSoundInterval = SoundInterval(self.hitBossSfx) self.hitBossSoundInterval = SoundInterval(self.hitBossSfx)
self.touchedBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3') self.touchedBossSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.ogg')
self.touchedBossSoundInterval = SoundInterval(self.touchedBossSfx, duration=0.8) self.touchedBossSoundInterval = SoundInterval(self.touchedBossSfx, duration=0.8)
self.lerpInterval = None self.lerpInterval = None
return return

6
toontown/coghq/DistributedCashbotBossSafe.py
View file

@ -17,10 +17,10 @@ class DistributedCashbotBossSafe(DistributedCashbotBossObject.DistributedCashbot
DistributedCashbotBossObject.DistributedCashbotBossObject.__init__(self, cr) DistributedCashbotBossObject.DistributedCashbotBossObject.__init__(self, cr)
NodePath.__init__(self, 'object') NodePath.__init__(self, 'object')
self.index = None self.index = None
self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.mp3') self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.ogg')
self.hitMagnetSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe.mp3') self.hitMagnetSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe.ogg')
self.toMagnetSoundInterval = Parallel(SoundInterval(self.flyToMagnetSfx, duration=ToontownGlobals.CashbotBossToMagnetTime, node=self), Sequence(Wait(ToontownGlobals.CashbotBossToMagnetTime - 0.02), SoundInterval(self.hitMagnetSfx, duration=1.0, node=self))) self.toMagnetSoundInterval = Parallel(SoundInterval(self.flyToMagnetSfx, duration=ToontownGlobals.CashbotBossToMagnetTime, node=self), Sequence(Wait(ToontownGlobals.CashbotBossToMagnetTime - 0.02), SoundInterval(self.hitMagnetSfx, duration=1.0, node=self)))
self.hitFloorSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_bigweight_miss.mp3') self.hitFloorSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_bigweight_miss.ogg')
self.hitFloorSoundInterval = SoundInterval(self.hitFloorSfx, node=self) self.hitFloorSoundInterval = SoundInterval(self.hitFloorSfx, node=self)
return return

2
toontown/coghq/DistributedCashbotBossTreasure.py
View file

@ -13,7 +13,7 @@ class DistributedCashbotBossTreasure(DistributedSZTreasure.DistributedSZTreasure
def __init__(self, cr): def __init__(self, cr):
DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr)
self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg'
def setStyle(self, hoodId): def setStyle(self, hoodId):
newModel = Models[hoodId] newModel = Models[hoodId]

4
toontown/coghq/DistributedCogHQDoor.py
View file

@ -15,8 +15,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.loader.loadSfx('phase_9/audio/sfx/CHQ_door_open.mp3') self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_open.ogg')
self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_close.mp3') self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_close.ogg')
def wantsNametag(self): def wantsNametag(self):
return 0 return 0

4
toontown/coghq/DistributedCrate.py
View file

@ -34,8 +34,8 @@ class DistributedCrate(DistributedCrushableEntity.DistributedCrushableEntity):
self.stuckToCrate = 0 self.stuckToCrate = 0
self.upPressed = 0 self.upPressed = 0
self.isPushing = 0 self.isPushing = 0
self.creakSound = loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_crate_effort.mp3') self.creakSound = loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_crate_effort.ogg')
self.pushSound = loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_crate_sliding.mp3') self.pushSound = loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_crate_sliding.ogg')
return return
def disable(self): def disable(self):

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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_unlock.mp3') unlockSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_unlock.ogg')
slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.ogg')
finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.ogg')
finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.ogg')
finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.ogg')
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.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.ogg')
finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.ogg')
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.loader.loadSfx('phase_12/audio/sfx/CHQ_FACT_conveyor_belt.wav') self.beltSound = base.loader.loadSfx('phase_12/audio/sfx/CHQ_FACT_conveyor_belt.ogg')
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.loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3') self.soundFire = base.loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.ogg')
self.soundLand = base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3') self.soundLand = base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.ogg')
self.soundBurst = base.loader.loadSfx('phase_5/audio/sfx/Toon_bodyfall_synergy.mp3') self.soundBurst = base.loader.loadSfx('phase_5/audio/sfx/Toon_bodyfall_synergy.ogg')
self.soundBomb = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.soundBomb = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.soundLose = base.loader.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.mp3') self.soundLose = base.loader.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.ogg')
self.soundWin = base.loader.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.ogg')
self.soundDone = base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3') self.soundDone = base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.ogg')
self.soundMove = base.loader.loadSfx('phase_3.5/audio/sfx/SA_shred.mp3') self.soundMove = base.loader.loadSfx('phase_3.5/audio/sfx/SA_shred.ogg')
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')

6
toontown/coghq/DistributedGolfSpot.py
View file

@ -107,7 +107,7 @@ class DistributedGolfSpot(DistributedObject.DistributedObject, FSM.FSM):
cn.setIntoCollideMask(ToontownGlobals.WallBitmask) cn.setIntoCollideMask(ToontownGlobals.WallBitmask)
self.trigger = self.root.attachNewNode(cn) self.trigger = self.root.attachNewNode(cn)
self.trigger.stash() self.trigger.stash()
self.hitBallSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3') self.hitBallSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.ogg')
def cleanup(self): def cleanup(self):
if self.swingInterval: if self.swingInterval:
@ -738,10 +738,10 @@ class DistributedGolfSpot(DistributedObject.DistributedObject, FSM.FSM):
if flyBallCode == ToontownGlobals.PieCodeBossCog: if flyBallCode == ToontownGlobals.PieCodeBossCog:
self.notify.debug('changing color to %s' % self.ballColor) self.notify.debug('changing color to %s' % self.ballColor)
splat.setColor(self.ballColor) splat.setColor(self.ballColor)
sound = loader.loadSfx('phase_11/audio/sfx/LB_evidence_miss.mp3') sound = loader.loadSfx('phase_11/audio/sfx/LB_evidence_miss.ogg')
vol = 1.0 vol = 1.0
if flyBallCode == ToontownGlobals.PieCodeBossCog: if flyBallCode == ToontownGlobals.PieCodeBossCog:
sound = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.mp3') sound = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.ogg')
soundIval = SoundInterval(sound, node=splat, volume=vol) soundIval = SoundInterval(sound, node=splat, volume=vol)
if flyBallCode == ToontownGlobals.PieCodeBossCog and localAvatar.doId == throwerId: if flyBallCode == ToontownGlobals.PieCodeBossCog and localAvatar.doId == throwerId:
vol = 1.0 vol = 1.0

4
toontown/coghq/DistributedLaserField.py
View file

@ -56,9 +56,9 @@ class DistributedLaserField(BattleBlocker.BattleBlocker):
self.gridGame = 'some game' self.gridGame = 'some game'
self.gridGameText = ' ' self.gridGameText = ' '
self.activeLF = 1 self.activeLF = 1
self.successSound = loader.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.mp3') self.successSound = loader.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.ogg')
self.successTrack = Parallel(SoundInterval(self.successSound, node=self, volume=0.8)) self.successTrack = Parallel(SoundInterval(self.successSound, node=self, volume=0.8))
self.failSound = loader.loadSfx('phase_11/audio/sfx/LB_sparks_1.mp3') self.failSound = loader.loadSfx('phase_11/audio/sfx/LB_sparks_1.ogg')
self.failTrack = Parallel(SoundInterval(self.failSound, node=self, volume=0.8)) self.failTrack = Parallel(SoundInterval(self.failSound, node=self, volume=0.8))
return return

2
toontown/coghq/DistributedLawbotBossGavel.py
View file

@ -36,7 +36,7 @@ class DistributedLawbotBossGavel(DistributedObject.DistributedObject, FSM.FSM):
self.name = 'gavel-%s' % self.doId self.name = 'gavel-%s' % self.doId
self.loadModel(self.modelPath, self.modelFindString) self.loadModel(self.modelPath, self.modelFindString)
self.nodePath.wrtReparentTo(render) self.nodePath.wrtReparentTo(render)
self.gavelSfx = loader.loadSfx('phase_11/audio/sfx/LB_gavel.mp3') self.gavelSfx = loader.loadSfx('phase_11/audio/sfx/LB_gavel.ogg')
tempTuple = ToontownGlobals.LawbotBossGavelPosHprs[self.index] tempTuple = ToontownGlobals.LawbotBossGavelPosHprs[self.index]
self.nodePath.setPosHpr(*tempTuple) self.nodePath.setPosHpr(*tempTuple)
self.origHpr = Point3(tempTuple[3], tempTuple[4], tempTuple[5]) self.origHpr = Point3(tempTuple[3], tempTuple[4], tempTuple[5])

8
toontown/coghq/DistributedLawbotCannon.py
View file

@ -129,10 +129,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.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg')
self.sndHitChair = base.loader.loadSfx('phase_11/audio/sfx/LB_toon_jury.mp3') self.sndHitChair = base.loader.loadSfx('phase_11/audio/sfx/LB_toon_jury.ogg')
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.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_in.mp3') self.propInSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_in.ogg')
if self.propOutSound == None: if self.propOutSound == None:
self.propOutSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_out.mp3') self.propOutSound = base.loader.loadSfx('phase_5/audio/sfx/ENC_propeller_out.ogg')
if self.cogJurorSound == None: if self.cogJurorSound == None:
self.cogJurorSound = base.loader.loadSfx('phase_11/audio/sfx/LB_cog_jury.mp3') self.cogJurorSound = base.loader.loadSfx('phase_11/audio/sfx/LB_cog_jury.ogg')
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.loader.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.ogg')
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.loader.loadSfx('phase_12/audio/sfx/Mole_Surprise.mp3') self.soundBomb = base.loader.loadSfx('phase_12/audio/sfx/Mole_Surprise.ogg')
self.soundBomb2 = base.loader.loadSfx('phase_3.5/audio/dial/AV_pig_howl.mp3') self.soundBomb2 = base.loader.loadSfx('phase_3.5/audio/dial/AV_pig_howl.ogg')
self.soundCog = base.loader.loadSfx('phase_12/audio/sfx/Mole_Stomp.mp3') self.soundCog = base.loader.loadSfx('phase_12/audio/sfx/Mole_Stomp.ogg')
self.soundUp = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.soundUp = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg')
self.soundDown = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.soundDown = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.ogg')
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)

10
toontown/coghq/DistributedSecurityCamera.py
View file

@ -83,15 +83,15 @@ class DistributedSecurityCamera(BasicEntities.DistributedNodePathEntity):
self.Alert['Green'] = 0.0 self.Alert['Green'] = 0.0
self.Alert['Blue'] = 0.0 self.Alert['Blue'] = 0.0
self.Alert['Alpha'] = 1.0 self.Alert['Alpha'] = 1.0
self.attackSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.mp3') self.attackSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.ogg')
self.onSound = loader.loadSfx('phase_11/audio/sfx/LB_camera_shutter_2.mp3') self.onSound = loader.loadSfx('phase_11/audio/sfx/LB_camera_shutter_2.ogg')
self.attackTrack = Parallel(SoundInterval(self.attackSound, node=self, volume=0.8), SoundInterval(self.onSound, node=self, volume=0.8)) self.attackTrack = Parallel(SoundInterval(self.attackSound, node=self, volume=0.8), SoundInterval(self.onSound, node=self, volume=0.8))
self.moveStartSound = loader.loadSfx('phase_11/audio/sfx/LB_laser_beam_on_2.mp3') self.moveStartSound = loader.loadSfx('phase_11/audio/sfx/LB_laser_beam_on_2.ogg')
self.moveStartTrack = Parallel(SoundInterval(self.moveStartSound, node=self, volume=0.4)) self.moveStartTrack = Parallel(SoundInterval(self.moveStartSound, node=self, volume=0.4))
self.moveLoopSound = loader.loadSfx('phase_11/audio/sfx/LB_laser_beam_hum_2.mp3') self.moveLoopSound = loader.loadSfx('phase_11/audio/sfx/LB_laser_beam_hum_2.ogg')
self.moveLoopSound.setLoop() self.moveLoopSound.setLoop()
self.moveLoopTrack = Parallel(SoundInterval(self.moveLoopSound, node=self, volume=0.4)) self.moveLoopTrack = Parallel(SoundInterval(self.moveLoopSound, node=self, volume=0.4))
self.moveStopSound = loader.loadSfx('phase_11/audio/sfx/LB_laser_beam_off_2.mp3') self.moveStopSound = loader.loadSfx('phase_11/audio/sfx/LB_laser_beam_off_2.ogg')
self.moveStopTrack = Parallel(SoundInterval(self.moveStopSound, node=self, volume=0.4)) self.moveStopTrack = Parallel(SoundInterval(self.moveStopSound, node=self, volume=0.4))
self.taskName = None self.taskName = None
return return

2
toontown/coghq/DistributedStomper.py
View file

@ -12,7 +12,7 @@ from toontown.toonbase import ToontownGlobals
class DistributedStomper(DistributedCrusherEntity.DistributedCrusherEntity): class DistributedStomper(DistributedCrusherEntity.DistributedCrusherEntity):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedStomper') notify = DirectNotifyGlobal.directNotify.newCategory('DistributedStomper')
stomperSounds = ['phase_4/audio/sfx/CHQ_FACT_stomper_small.mp3', 'phase_9/audio/sfx/CHQ_FACT_stomper_med.mp3', 'phase_9/audio/sfx/CHQ_FACT_stomper_large.mp3'] stomperSounds = ['phase_4/audio/sfx/CHQ_FACT_stomper_small.ogg', 'phase_9/audio/sfx/CHQ_FACT_stomper_med.ogg', 'phase_9/audio/sfx/CHQ_FACT_stomper_large.ogg']
stomperModels = ['phase_9/models/cogHQ/square_stomper'] stomperModels = ['phase_9/models/cogHQ/square_stomper']
def __init__(self, cr): def __init__(self, cr):

2
toontown/coghq/FactoryInterior.py
View file

@ -68,7 +68,7 @@ class FactoryInterior(BattlePlace.BattlePlace):
State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final')
self.parentFSM.getStateNamed('factoryInterior').addChild(self.fsm) self.parentFSM.getStateNamed('factoryInterior').addChild(self.fsm)
BattlePlace.BattlePlace.load(self) BattlePlace.BattlePlace.load(self)
self.music = base.loader.loadMusic('phase_9/audio/bgm/CHQ_FACT_bg.mid') self.music = base.loader.loadMusic('phase_9/audio/bgm/CHQ_FACT_bg.ogg')
def unload(self): def unload(self):
self.parentFSM.getStateNamed('factoryInterior').removeChild(self.fsm) self.parentFSM.getStateNamed('factoryInterior').removeChild(self.fsm)

2
toontown/coghq/LawbotCogHQLoader.py
View file

@ -27,7 +27,7 @@ class LawbotCogHQLoader(CogHQLoader.CogHQLoader):
state = self.fsm.getStateNamed(stateName) state = self.fsm.getStateNamed(stateName)
state.addTransition('factoryExterior') state.addTransition('factoryExterior')
self.musicFile = 'phase_11/audio/bgm/LB_courtyard.mid' self.musicFile = 'phase_11/audio/bgm/LB_courtyard.ogg'
self.cogHQExteriorModelPath = 'phase_11/models/lawbotHQ/LawbotPlaza' self.cogHQExteriorModelPath = 'phase_11/models/lawbotHQ/LawbotPlaza'
self.factoryExteriorModelPath = 'phase_11/models/lawbotHQ/LB_DA_Lobby' self.factoryExteriorModelPath = 'phase_11/models/lawbotHQ/LB_DA_Lobby'
self.cogHQLobbyModelPath = 'phase_11/models/lawbotHQ/LB_CH_Lobby' self.cogHQLobbyModelPath = 'phase_11/models/lawbotHQ/LB_CH_Lobby'

2
toontown/coghq/MintInterior.py
View file

@ -67,7 +67,7 @@ class MintInterior(BattlePlace.BattlePlace):
def load(self): def load(self):
self.parentFSM.getStateNamed('mintInterior').addChild(self.fsm) self.parentFSM.getStateNamed('mintInterior').addChild(self.fsm)
BattlePlace.BattlePlace.load(self) BattlePlace.BattlePlace.load(self)
self.music = base.loader.loadMusic('phase_9/audio/bgm/CHQ_FACT_bg.mid') self.music = base.loader.loadMusic('phase_9/audio/bgm/CHQ_FACT_bg.ogg')
def unload(self): def unload(self):
self.parentFSM.getStateNamed('mintInterior').removeChild(self.fsm) self.parentFSM.getStateNamed('mintInterior').removeChild(self.fsm)

2
toontown/coghq/SellbotCogHQLoader.py
View file

@ -28,7 +28,7 @@ class SellbotCogHQLoader(CogHQLoader.CogHQLoader):
state = self.fsm.getStateNamed(stateName) state = self.fsm.getStateNamed(stateName)
state.addTransition('factoryInterior') state.addTransition('factoryInterior')
self.musicFile = 'phase_9/audio/bgm/encntr_suit_HQ_nbrhood.mid' self.musicFile = 'phase_9/audio/bgm/encntr_suit_HQ_nbrhood.ogg'
self.cogHQExteriorModelPath = 'phase_9/models/cogHQ/SellbotHQExterior' self.cogHQExteriorModelPath = 'phase_9/models/cogHQ/SellbotHQExterior'
self.cogHQLobbyModelPath = 'phase_9/models/cogHQ/SellbotHQLobby' self.cogHQLobbyModelPath = 'phase_9/models/cogHQ/SellbotHQLobby'
self.factoryExteriorModelPath = 'phase_9/models/cogHQ/SellbotFactoryExterior' self.factoryExteriorModelPath = 'phase_9/models/cogHQ/SellbotFactoryExterior'

8
toontown/coghq/SellbotLegFactorySpec.py
View file

@ -894,7 +894,7 @@ GlobalEntities = {1000: {'type': 'levelMgr',
'hpr': Vec3(0, 0, 0), 'hpr': Vec3(0, 0, 0),
'scale': 1, 'scale': 1,
'enabled': 1, 'enabled': 1,
'soundPath': 'phase_9/audio/sfx/CHQ_FACT_whistling_wind.mp3', 'soundPath': 'phase_9/audio/sfx/CHQ_FACT_whistling_wind.ogg',
'volume': 1}, 'volume': 1},
10016: {'type': 'ambientSound', 10016: {'type': 'ambientSound',
'name': 'sndConveyorBelt', 'name': 'sndConveyorBelt',
@ -904,7 +904,7 @@ GlobalEntities = {1000: {'type': 'levelMgr',
'hpr': Vec3(0, 0, 0), 'hpr': Vec3(0, 0, 0),
'scale': 1, 'scale': 1,
'enabled': 1, 'enabled': 1,
'soundPath': 'phase_9/audio/sfx/CHQ_FACT_conveyor_belt.mp3', 'soundPath': 'phase_9/audio/sfx/CHQ_FACT_conveyor_belt.ogg',
'volume': 0.5}, 'volume': 0.5},
10053: {'type': 'ambientSound', 10053: {'type': 'ambientSound',
'name': 'eastWind', 'name': 'eastWind',
@ -914,7 +914,7 @@ GlobalEntities = {1000: {'type': 'levelMgr',
'hpr': Vec3(0, 0, 0), 'hpr': Vec3(0, 0, 0),
'scale': 1, 'scale': 1,
'enabled': 1, 'enabled': 1,
'soundPath': 'phase_9/audio/sfx/CHQ_FACT_whistling_wind.mp3', 'soundPath': 'phase_9/audio/sfx/CHQ_FACT_whistling_wind.ogg',
'volume': 1}, 'volume': 1},
10055: {'type': 'ambientSound', 10055: {'type': 'ambientSound',
'name': 'sndGears', 'name': 'sndGears',
@ -924,7 +924,7 @@ GlobalEntities = {1000: {'type': 'levelMgr',
'hpr': Vec3(0, 0, 0), 'hpr': Vec3(0, 0, 0),
'scale': 1, 'scale': 1,
'enabled': 1, 'enabled': 1,
'soundPath': 'phase_9/audio/sfx/CHQ_FACT_gears_turning.mp3', 'soundPath': 'phase_9/audio/sfx/CHQ_FACT_gears_turning.ogg',
'volume': 1}, 'volume': 1},
10031: {'type': 'battleBlocker', 10031: {'type': 'battleBlocker',
'name': '<unnamed>', 'name': '<unnamed>',

2
toontown/coghq/StageInterior.py
View file

@ -69,7 +69,7 @@ class StageInterior(BattlePlace.BattlePlace):
def load(self): def load(self):
self.parentFSM.getStateNamed('stageInterior').addChild(self.fsm) self.parentFSM.getStateNamed('stageInterior').addChild(self.fsm)
BattlePlace.BattlePlace.load(self) BattlePlace.BattlePlace.load(self)
self.music = base.loader.loadMusic('phase_9/audio/bgm/CHQ_FACT_bg.mid') self.music = base.loader.loadMusic('phase_9/audio/bgm/CHQ_FACT_bg.ogg')
def unload(self): def unload(self):
self.parentFSM.getStateNamed('stageInterior').removeChild(self.fsm) self.parentFSM.getStateNamed('stageInterior').removeChild(self.fsm)

2
toontown/distributed/ToontownClientRepository.py
View file

@ -222,7 +222,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
self.sendSetAvatarIdMsg(0) self.sendSetAvatarIdMsg(0)
self.clearFriendState() self.clearFriendState()
if self.music == None and base.musicManagerIsValid: if self.music == None and base.musicManagerIsValid:
self.music = base.musicManager.getSound('phase_3/audio/bgm/tt_theme.mid') self.music = base.musicManager.getSound('phase_3/audio/bgm/tt_theme.ogg')
if self.music: if self.music:
self.music.setLoop(1) self.music.setLoop(1)
self.music.setVolume(0.9) self.music.setVolume(0.9)

4
toontown/effects/DustCloud.py
View file

@ -4,8 +4,8 @@ from direct.showbase import PythonUtil
from toontown.battle.BattleProps import globalPropPool from toontown.battle.BattleProps import globalPropPool
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
SFX = PythonUtil.Enum('poof, magic') SFX = PythonUtil.Enum('poof, magic')
SFXPATHS = {SFX.poof: 'phase_4/audio/sfx/firework_distance_02.mp3', SFXPATHS = {SFX.poof: 'phase_4/audio/sfx/firework_distance_02.ogg',
SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.mp3'} SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.ogg'}
class DustCloud(NodePath): class DustCloud(NodePath):
dustCloudCount = 0 dustCloudCount = 0

14
toontown/effects/FireworkEffect.py
View file

@ -21,13 +21,13 @@ from toontown.effects.SkullBurst import SkullBurst
from toontown.effects.SkullFlash import SkullFlash from toontown.effects.SkullFlash import SkullFlash
from toontown.effects.TrailExplosion import TrailExplosion from toontown.effects.TrailExplosion import TrailExplosion
from toontown.effects.IceCream import IceCream from toontown.effects.IceCream import IceCream
trailSfxNames = ['phase_4/audio/sfx/firework_whistle_01.mp3', 'phase_4/audio/sfx/firework_whistle_02.mp3'] trailSfxNames = ['phase_4/audio/sfx/firework_whistle_01.ogg', 'phase_4/audio/sfx/firework_whistle_02.ogg']
burstSfxNames = ['phase_4/audio/sfx/firework_explosion_01.mp3', burstSfxNames = ['phase_4/audio/sfx/firework_explosion_01.ogg',
'phase_4/audio/sfx/firework_explosion_02.mp3', 'phase_4/audio/sfx/firework_explosion_02.ogg',
'phase_4/audio/sfx/firework_explosion_03.mp3', 'phase_4/audio/sfx/firework_explosion_03.ogg',
'phase_4/audio/sfx/firework_distance_01.mp3', 'phase_4/audio/sfx/firework_distance_01.ogg',
'phase_4/audio/sfx/firework_distance_02.mp3', 'phase_4/audio/sfx/firework_distance_02.ogg',
'phase_4/audio/sfx/firework_distance_03.mp3'] 'phase_4/audio/sfx/firework_distance_03.ogg']
class FireworkEffect(NodePath): class FireworkEffect(NodePath):

8
toontown/effects/FireworkShowMixin.py
View file

@ -81,22 +81,22 @@ class FireworkShowMixin:
instructionMessage = TTLocalizer.FireworksInstructions instructionMessage = TTLocalizer.FireworksInstructions
startMessage = TTLocalizer.FireworksJuly4Beginning startMessage = TTLocalizer.FireworksJuly4Beginning
endMessage = TTLocalizer.FireworksJuly4Ending endMessage = TTLocalizer.FireworksJuly4Ending
musicFile = 'phase_4/audio/bgm/tt_party2.mid' musicFile = 'phase_4/audio/bgm/tt_party2.ogg'
elif eventId == NEWYEARS_FIREWORKS: elif eventId == NEWYEARS_FIREWORKS:
instructionMessage = TTLocalizer.FireworksInstructions instructionMessage = TTLocalizer.FireworksInstructions
startMessage = TTLocalizer.FireworksNewYearsEveBeginning startMessage = TTLocalizer.FireworksNewYearsEveBeginning
endMessage = TTLocalizer.FireworksNewYearsEveEnding endMessage = TTLocalizer.FireworksNewYearsEveEnding
musicFile = 'phase_4/audio/bgm/tt_s_ara_gen_fireworks_auldLangSyne.mid' musicFile = 'phase_4/audio/bgm/tt_s_ara_gen_fireworks_auldLangSyne.ogg'
elif eventId == PartyGlobals.FireworkShows.Summer: elif eventId == PartyGlobals.FireworkShows.Summer:
instructionMessage = TTLocalizer.FireworksActivityInstructions instructionMessage = TTLocalizer.FireworksActivityInstructions
startMessage = TTLocalizer.FireworksActivityBeginning startMessage = TTLocalizer.FireworksActivityBeginning
endMessage = TTLocalizer.FireworksActivityEnding endMessage = TTLocalizer.FireworksActivityEnding
musicFile = 'phase_4/audio/bgm/tt_summer.mid' musicFile = 'phase_4/audio/bgm/tt_summer.ogg'
elif eventId == COMBO_FIREWORKS: elif eventId == COMBO_FIREWORKS:
instructionMessage = TTLocalizer.FireworksInstructions instructionMessage = TTLocalizer.FireworksInstructions
startMessage = TTLocalizer.FireworksComboBeginning startMessage = TTLocalizer.FireworksComboBeginning
endMessage = TTLocalizer.FireworksComboEnding endMessage = TTLocalizer.FireworksComboEnding
musicFile = 'phase_4/audio/bgm/tt_party2.mid' musicFile = 'phase_4/audio/bgm/tt_party2.ogg'
else: else:
FireworkShowMixin.notify.warning('Invalid fireworks event ID: %d' % eventId) FireworkShowMixin.notify.warning('Invalid fireworks event ID: %d' % eventId)
return None return None

10
toontown/effects/Fireworks.py
View file

@ -85,7 +85,7 @@ def shootFireworkRing(x, y, z, color1, color2, amp):
f.addParticles(p0) f.addParticles(p0)
f.setPos(x, y, z) f.setPos(x, y, z)
f.setHpr(0, random.random() * 180, random.random() * 180) f.setHpr(0, random.random() * 180, random.random() * 180)
sfx = loader.loadSfx('phase_4/audio/sfx/firework_distance_03.mp3') sfx = loader.loadSfx('phase_4/audio/sfx/firework_distance_03.ogg')
t = Sequence(Func(f.start, render, render), Func(sfx.play), Wait(0.5), Func(p0.setBirthRate, 3), Wait(1.5), Func(f.cleanup), name=getNextSequenceName('shootFireworkRing')) t = Sequence(Func(f.start, render, render), Func(sfx.play), Wait(0.5), Func(p0.setBirthRate, 3), Wait(1.5), Func(f.cleanup), name=getNextSequenceName('shootFireworkRing'))
t.start() t.start()
@ -124,14 +124,14 @@ def shootFireworkRocket(x, y, z, color1, color2, amp):
gravityForceGroup.addForce(force0) gravityForceGroup.addForce(force0)
f.addForceGroup(gravityForceGroup) f.addForceGroup(gravityForceGroup)
f.setPos(x, y, z) f.setPos(x, y, z)
sfxName = random.choice(('phase_4/audio/sfx/firework_whistle_01.mp3', 'phase_4/audio/sfx/firework_whistle_02.mp3')) sfxName = random.choice(('phase_4/audio/sfx/firework_whistle_01.ogg', 'phase_4/audio/sfx/firework_whistle_02.ogg'))
sfx = loader.loadSfx(sfxName) sfx = loader.loadSfx(sfxName)
t = Sequence(Func(f.start, render, render), Func(sfx.play), LerpPosInterval(f, 2.0, Vec3(x, y, z + 20 * amp), blendType='easeInOut'), Func(p0.setBirthRate, 3), Wait(0.5), Func(f.cleanup), name=getNextSequenceName('shootFirework')) t = Sequence(Func(f.start, render, render), Func(sfx.play), LerpPosInterval(f, 2.0, Vec3(x, y, z + 20 * amp), blendType='easeInOut'), Func(p0.setBirthRate, 3), Wait(0.5), Func(f.cleanup), name=getNextSequenceName('shootFirework'))
t.start() t.start()
def shootPop(x, y, z, color1, color2, amp): def shootPop(x, y, z, color1, color2, amp):
sfxName = random.choice(('phase_4/audio/sfx/firework_distance_01.mp3', 'phase_4/audio/sfx/firework_distance_02.mp3', 'phase_4/audio/sfx/firework_distance_03.mp3')) sfxName = random.choice(('phase_4/audio/sfx/firework_distance_01.ogg', 'phase_4/audio/sfx/firework_distance_02.ogg', 'phase_4/audio/sfx/firework_distance_03.ogg'))
sfx = loader.loadSfx(sfxName) sfx = loader.loadSfx(sfxName)
t = Sequence(Func(sfx.play), Wait(3), name=getNextSequenceName('shootFireworkRocket')) t = Sequence(Func(sfx.play), Wait(3), name=getNextSequenceName('shootFireworkRocket'))
t.start() t.start()
@ -180,7 +180,7 @@ def shootFireworkCircleGeneric(x, y, z, color1, color2, amp, poolSize):
circleForceGroup.addForce(force1) circleForceGroup.addForce(force1)
f.addForceGroup(circleForceGroup) f.addForceGroup(circleForceGroup)
f.setPos(x, y, z) f.setPos(x, y, z)
sfxName = random.choice(('phase_4/audio/sfx/firework_explosion_01.mp3', 'phase_4/audio/sfx/firework_explosion_02.mp3', 'phase_4/audio/sfx/firework_explosion_03.mp3')) sfxName = random.choice(('phase_4/audio/sfx/firework_explosion_01.ogg', 'phase_4/audio/sfx/firework_explosion_02.ogg', 'phase_4/audio/sfx/firework_explosion_03.ogg'))
sfx = loader.loadSfx(sfxName) sfx = loader.loadSfx(sfxName)
t = Sequence(Func(f.start, render, render), Func(sfx.play), Wait(0.5), Func(p0.setBirthRate, 3), Wait(0.5), Func(p0.renderer.setCenterColor, color2), Func(p0.renderer.setEdgeColor, color2), Wait(1.5), Func(f.cleanup), name=getNextSequenceName('shootFireworkCircle')) t = Sequence(Func(f.start, render, render), Func(sfx.play), Wait(0.5), Func(p0.setBirthRate, 3), Wait(0.5), Func(p0.renderer.setCenterColor, color2), Func(p0.renderer.setEdgeColor, color2), Wait(1.5), Func(f.cleanup), name=getNextSequenceName('shootFireworkCircle'))
t.start() t.start()
@ -220,7 +220,7 @@ def shootFireworkCircleSprite(x, y, z, color, texture, amp):
circleForceGroup.addForce(force1) circleForceGroup.addForce(force1)
f.addForceGroup(circleForceGroup) f.addForceGroup(circleForceGroup)
f.setPos(x, y, z) f.setPos(x, y, z)
sfxName = random.choice(('phase_4/audio/sfx/firework_explosion_01.mp3', 'phase_4/audio/sfx/firework_explosion_02.mp3', 'phase_4/audio/sfx/firework_explosion_03.mp3')) sfxName = random.choice(('phase_4/audio/sfx/firework_explosion_01.ogg', 'phase_4/audio/sfx/firework_explosion_02.ogg', 'phase_4/audio/sfx/firework_explosion_03.ogg'))
sfx = loader.loadSfx(sfxName) sfx = loader.loadSfx(sfxName)
t = Sequence(Func(f.start, render, render), Func(sfx.play), Wait(0.5), Func(p0.setBirthRate, 3), Wait(2.0), Func(f.cleanup), name=getNextSequenceName('shootFireworkSprite')) t = Sequence(Func(f.start, render, render), Func(sfx.play), Wait(0.5), Func(p0.setBirthRate, 3), Wait(2.0), Func(f.cleanup), name=getNextSequenceName('shootFireworkSprite'))
t.start() t.start()

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.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg')
self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3') self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.ogg')
self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.ogg')
self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.ogg')
self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg')
self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3') self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.ogg')
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'))

2
toontown/estate/DistributedGardenPlot.py
View file

@ -331,7 +331,7 @@ class DistributedGardenPlot(DistributedLawnDecor.DistributedLawnDecor):
self.movie.start() self.movie.start()
def generatePlaceItemTrack(self, toon, item): def generatePlaceItemTrack(self, toon, item):
sound = loader.loadSfx('phase_5.5/audio/sfx/burrow.mp3') sound = loader.loadSfx('phase_5.5/audio/sfx/burrow.ogg')
sound.setPlayRate(0.5) sound.setPlayRate(0.5)
placeItemTrack = Parallel() placeItemTrack = Parallel()
placeItemTrack.append(Sequence(ActorInterval(toon, 'start-dig'), Parallel(ActorInterval(toon, 'loop-dig', loop=1, duration=5.13), Sequence(Wait(0.25), SoundInterval(sound, node=toon, duration=0.55), Wait(0.8), SoundInterval(sound, node=toon, duration=0.55), Wait(1.35), SoundInterval(sound, node=toon, duration=0.55))), ActorInterval(toon, 'start-dig', playRate=-1), Func(toon.loop, 'neutral'), Func(toon.detachShovel))) placeItemTrack.append(Sequence(ActorInterval(toon, 'start-dig'), Parallel(ActorInterval(toon, 'loop-dig', loop=1, duration=5.13), Sequence(Wait(0.25), SoundInterval(sound, node=toon, duration=0.55), Wait(0.8), SoundInterval(sound, node=toon, duration=0.55), Wait(1.35), SoundInterval(sound, node=toon, duration=0.55))), ActorInterval(toon, 'start-dig', playRate=-1), Func(toon.loop, 'neutral'), Func(toon.detachShovel)))

2
toontown/estate/DistributedLawnDecor.py
View file

@ -340,7 +340,7 @@ class DistributedLawnDecor(DistributedNode.DistributedNode, NodePath, ShadowCast
self.movie.start() self.movie.start()
def generateDigupTrack(self, toon): def generateDigupTrack(self, toon):
sound = loader.loadSfx('phase_5.5/audio/sfx/burrow.mp3') sound = loader.loadSfx('phase_5.5/audio/sfx/burrow.ogg')
sound.setPlayRate(0.5) sound.setPlayRate(0.5)
pos = self.model.getPos() pos = self.model.getPos()
pos.setZ(pos[2] - 1) pos.setZ(pos[2] - 1)

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.loader.loadSfx('phase_5.5/audio/sfx/mailbox_close_1.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_close_1.ogg')
else: else:
sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_close_2.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_close_2.ogg')
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.loader.loadSfx('phase_5.5/audio/sfx/mailbox_open_1.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_open_1.ogg')
else: else:
sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_open_2.mp3') sfx = base.loader.loadSfx('phase_5.5/audio/sfx/mailbox_open_2.ogg')
sfxTrack = SoundInterval(sfx, node=self.model) sfxTrack = SoundInterval(sfx, node=self.model)
sfxTrack.start() sfxTrack.start()
if isLocalToon: if isLocalToon:

8
toontown/estate/DistributedPhone.py
View file

@ -96,10 +96,10 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
mount = loader.loadModel('phase_5.5/models/estate/phoneMount-mod') mount = loader.loadModel('phase_5.5/models/estate/phoneMount-mod')
mount.setTransparency(0, 1) mount.setTransparency(0, 1)
self.model.reparentTo(mount) self.model.reparentTo(mount)
self.ringSfx = loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.mp3') self.ringSfx = loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.ogg')
self.handleSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_handle2.mp3') self.handleSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_handle2.ogg')
self.hangUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_hang_up.mp3') self.hangUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_hang_up.ogg')
self.pickUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_pickup1.mp3') self.pickUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_pickup1.ogg')
if self.initialScale: if self.initialScale:
mount.setScale(*self.initialScale) mount.setScale(*self.initialScale)
self.usedInitialScale = 1 self.usedInitialScale = 1

2
toontown/estate/DistributedPlantBase.py
View file

@ -195,7 +195,7 @@ class DistributedPlantBase(DistributedLawnDecor.DistributedLawnDecor):
self.waterTrackDict[avId] = track self.waterTrackDict[avId] = track
def generateWaterTrack(self, toon): def generateWaterTrack(self, toon):
sound = loader.loadSfx('phase_5/audio/sfx/firehose_spray.mp3') sound = loader.loadSfx('phase_5/audio/sfx/firehose_spray.ogg')
sound.setPlayRate(0.75) sound.setPlayRate(0.75)
waterTrack = Parallel() waterTrack = Parallel()
waterTrack.append(Sequence(Parallel(ActorInterval(toon, 'water'), SoundInterval(sound, node=toon, volume=0.5)), Func(toon.loop, 'neutral'))) waterTrack.append(Sequence(Parallel(ActorInterval(toon, 'water'), SoundInterval(sound, node=toon, volume=0.5)), Func(toon.loop, 'neutral')))

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.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3') self.hitSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.ogg')
self.rewardSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.rewardSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.ogg')
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)

16
toontown/estate/EstateLoader.py
View file

@ -24,8 +24,8 @@ class EstateLoader(SafeZoneLoader.SafeZoneLoader):
State.State('house', self.enterHouse, self.exitHouse, ['quietZone']), State.State('house', self.enterHouse, self.exitHouse, ['quietZone']),
State.State('quietZone', self.enterQuietZone, self.exitQuietZone, ['house', 'estate']), State.State('quietZone', self.enterQuietZone, self.exitQuietZone, ['house', 'estate']),
State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final')
self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.mid' self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.ogg'
self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.mid' self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg'
self.dnaFile = 'phase_5.5/dna/estate_1.dna' self.dnaFile = 'phase_5.5/dna/estate_1.dna'
self.safeZoneStorageDNAFile = None self.safeZoneStorageDNAFile = None
self.cloudSwitch = 0 self.cloudSwitch = 0
@ -47,12 +47,12 @@ class EstateLoader(SafeZoneLoader.SafeZoneLoader):
def load(self): def load(self):
SafeZoneLoader.SafeZoneLoader.load(self) SafeZoneLoader.SafeZoneLoader.load(self)
self.music = base.loader.loadMusic('phase_4/audio/bgm/TC_nbrhood.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/TC_nbrhood.ogg')
self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.ogg')
self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.ogg')
self.submergeSound = base.loader.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.ogg')
self.birdSound = list(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.birdSound = list(map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.ogg', 'phase_4/audio/sfx/SZ_TC_bird2.ogg', 'phase_4/audio/sfx/SZ_TC_bird3.ogg']))
self.cricketSound = list(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 = list(map(base.loader.loadSfx, ['phase_4/audio/sfx/SZ_TC_bird1.ogg', 'phase_4/audio/sfx/SZ_TC_bird2.ogg', 'phase_4/audio/sfx/SZ_TC_bird3.ogg']))
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 = []

38
toontown/fishing/FishGlobals.py
View file

@ -56,79 +56,79 @@ RodRarityFactor = {0: 1.0 / (GlobalRarityDialBase * 1),
3: 1.0 / (GlobalRarityDialBase * 0.9), 3: 1.0 / (GlobalRarityDialBase * 0.9),
4: 1.0 / (GlobalRarityDialBase * 0.85)} 4: 1.0 / (GlobalRarityDialBase * 0.85)}
MaxRodId = 4 MaxRodId = 4
FishAudioFileDict = {-1: ('Clownfish.mp3', FishAudioFileDict = {-1: ('Clownfish.ogg',
1, 1,
1.5, 1.5,
1.0), 1.0),
0: ('BalloonFish.mp3', 0: ('BalloonFish.ogg',
1, 1,
0, 0,
1.23), 1.23),
2: ('CatFish.mp3', 2: ('CatFish.ogg',
1, 1,
0, 0,
1.26), 1.26),
4: ('Clownfish.mp3', 4: ('Clownfish.ogg',
1, 1,
1.5, 1.5,
1.0), 1.0),
6: ('Frozen_Fish.mp3', 6: ('Frozen_Fish.ogg',
1, 1,
0, 0,
1.0), 1.0),
8: ('Starfish.mp3', 8: ('Starfish.ogg',
0, 0,
0, 0,
1.25), 1.25),
10: ('Holy_Mackerel.mp3', 10: ('Holy_Mackerel.ogg',
1, 1,
0.9, 0.9,
1.0), 1.0),
12: ('Dog_Fish.mp3', 12: ('Dog_Fish.ogg',
1, 1,
0, 0,
1.25), 1.25),
14: ('AmoreEel.mp3', 14: ('AmoreEel.ogg',
1, 1,
0, 0,
1.0), 1.0),
16: ('Nurse_Shark.mp3', 16: ('Nurse_Shark.ogg',
0, 0,
0, 0,
1.0), 1.0),
18: ('King_Crab.mp3', 18: ('King_Crab.ogg',
0, 0,
0, 0,
1.0), 1.0),
20: ('Moon_Fish.mp3', 20: ('Moon_Fish.ogg',
0, 0,
1.0, 1.0,
1.0), 1.0),
22: ('Seahorse.mp3', 22: ('Seahorse.ogg',
1, 1,
0, 0,
1.26), 1.26),
24: ('Pool_Shark.mp3', 24: ('Pool_Shark.ogg',
1, 1,
2.0, 2.0,
1.0), 1.0),
26: ('Bear_Acuda.mp3', 26: ('Bear_Acuda.ogg',
1, 1,
0, 0,
1.0), 1.0),
28: ('CutThroatTrout.mp3', 28: ('CutThroatTrout.ogg',
1, 1,
0, 0,
1.0), 1.0),
30: ('Piano_Tuna.mp3', 30: ('Piano_Tuna.ogg',
0, 0,
0, 0,
1.0), 1.0),
32: ('PBJ_Fish.mp3', 32: ('PBJ_Fish.ogg',
1, 1,
0, 0,
1.25), 1.25),
34: ('DevilRay.mp3', 34: ('DevilRay.ogg',
0, 0,
0, 0,
1.0)} 1.0)}

2
toontown/golf/DistributedGolfCourse.py
View file

@ -108,7 +108,7 @@ class DistributedGolfCourse(DistributedObject.DistributedObject, FSM, DelayDelet
return return
def load(self): def load(self):
self.music = base.loader.loadMusic('phase_6/audio/bgm/GZ_PlayGolf.mid') self.music = base.loader.loadMusic('phase_6/audio/bgm/GZ_PlayGolf.ogg')
def setCourseReady(self, numHoles, holeIds, coursePar): def setCourseReady(self, numHoles, holeIds, coursePar):
self.notify.debug('GOLF COURSE: received setCourseReady') self.notify.debug('GOLF COURSE: received setCourseReady')

26
toontown/golf/DistributedGolfHole.py
View file

@ -302,24 +302,24 @@ class DistributedGolfHole(DistributedPhysicsWorld.DistributedPhysicsWorld, FSM,
self.hardSurfaceNodePath.flattenStrong() self.hardSurfaceNodePath.flattenStrong()
def loadSounds(self): def loadSounds(self):
self.hitBallSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3') self.hitBallSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.ogg')
self.holeInOneSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hole_In_One.mp3') self.holeInOneSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hole_In_One.ogg')
self.holeInTwoPlusSfx = loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3') self.holeInTwoPlusSfx = loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.ogg')
self.ballGoesInStartSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Goes_In_Start.wav') self.ballGoesInStartSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Goes_In_Start.ogg')
self.ballGoesInLoopSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Goes_In_Loop.wav') self.ballGoesInLoopSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Goes_In_Loop.ogg')
self.ballGoesToRestSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Rest_In_Cup.mp3') self.ballGoesToRestSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Rest_In_Cup.ogg')
self.kickedOutSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Sad_Noise_Kicked_Off_Hole.mp3') self.kickedOutSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Sad_Noise_Kicked_Off_Hole.ogg')
self.crowdBuildupSfx = [] self.crowdBuildupSfx = []
self.crowdApplauseSfx = [] self.crowdApplauseSfx = []
self.crowdMissSfx = [] self.crowdMissSfx = []
for i in range(4): for i in range(4):
self.crowdBuildupSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Buildup.mp3')) self.crowdBuildupSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Buildup.ogg'))
self.crowdApplauseSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Applause.mp3')) self.crowdApplauseSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Applause.ogg'))
self.crowdMissSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Miss.mp3')) self.crowdMissSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Miss.ogg'))
self.bumpHardSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Barrier_3.mp3') self.bumpHardSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Barrier_3.ogg')
self.bumpMoverSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.mp3') self.bumpMoverSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.ogg')
self.bumpWindmillSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.mp3') self.bumpWindmillSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.ogg')
def setup(self): def setup(self):
self.notify.debug('setup golf hole') self.notify.debug('setup golf hole')

4
toontown/golf/DistributedPhysicsWorld.py
View file

@ -65,7 +65,7 @@ class DistributedPhysicsWorld(DistributedObject.DistributedObject, PhysicsWorldB
if odeBody == cross: if odeBody == cross:
base.sfxPlayer.setCutoffDistance(240) base.sfxPlayer.setCutoffDistance(240)
self.notify.debug('nodePath = %s' % pandaNodePathGeom) self.notify.debug('nodePath = %s' % pandaNodePathGeom)
windmillSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Windmill_Loop.wav') windmillSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Windmill_Loop.ogg')
windMillSoundInterval = SoundInterval(windmillSfx, node=pandaNodePathGeom, listenerNode=base.camera, seamlessLoop=True, volume=0.5) windMillSoundInterval = SoundInterval(windmillSfx, node=pandaNodePathGeom, listenerNode=base.camera, seamlessLoop=True, volume=0.5)
windMillSoundInterval.loop() windMillSoundInterval.loop()
self.physicsSfxDict[index] = (windmillSfx, windMillSoundInterval) self.physicsSfxDict[index] = (windmillSfx, windMillSoundInterval)
@ -78,7 +78,7 @@ class DistributedPhysicsWorld(DistributedObject.DistributedObject, PhysicsWorldB
odeBody = pair[1] odeBody = pair[1]
if odeBody == box: if odeBody == box:
self.notify.debug('nodePath = %s' % pandaNodePathGeom) self.notify.debug('nodePath = %s' % pandaNodePathGeom)
moverSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Moving_Barrier.mp3') moverSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Moving_Barrier.ogg')
moverSoundInterval = SoundInterval(moverSfx, node=pandaNodePathGeom, listenerNode=base.camera, seamlessLoop=True, volume=0.5) moverSoundInterval = SoundInterval(moverSfx, node=pandaNodePathGeom, listenerNode=base.camera, seamlessLoop=True, volume=0.5)
moverSoundInterval.start() moverSoundInterval.start()
self.physicsSfxDict[index] = (moverSfx, moverSoundInterval, index) self.physicsSfxDict[index] = (moverSfx, moverSoundInterval, index)

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.loader.loadSfx('phase_6/audio/sfx/KART_Applause_%d.mp3' % self.myPlace) self.victory = base.loader.loadSfx('phase_6/audio/sfx/KART_Applause_%d.ogg' % self.myPlace)
self.victory.play() self.victory.play()
for avId in self.avIdList: for avId in self.avIdList:

2
toontown/hood/FishAnimatedProp.py
View file

@ -16,7 +16,7 @@ class FishAnimatedProp(AnimatedProp.AnimatedProp):
node.clearMat() node.clearMat()
self.fish.loadAnims({'jump': 'phase_4/models/props/SZ_fish-jump', self.fish.loadAnims({'jump': 'phase_4/models/props/SZ_fish-jump',
'swim': 'phase_4/models/props/SZ_fish-swim'}) 'swim': 'phase_4/models/props/SZ_fish-swim'})
self.splashSfxList = (loader.loadSfx('phase_4/audio/sfx/TT_splash1.mp3'), loader.loadSfx('phase_4/audio/sfx/TT_splash2.mp3')) self.splashSfxList = (loader.loadSfx('phase_4/audio/sfx/TT_splash1.ogg'), loader.loadSfx('phase_4/audio/sfx/TT_splash2.ogg'))
self.node = self.fish self.node = self.fish
self.geom = self.fish.getGeomNode() self.geom = self.fish.getGeomNode()
self.exitRipples = Ripples(self.geom) self.exitRipples = Ripples(self.geom)

4
toontown/hood/GenericAnimatedProp.py
View file

@ -105,9 +105,9 @@ class GenericAnimatedProp(AnimatedProp.AnimatedProp):
soundfile = origAnimName.replace('tt_a_ara', 'tt_s_ara') soundfile = origAnimName.replace('tt_a_ara', 'tt_s_ara')
fullPath = self.soundPath + '/' + soundfile fullPath = self.soundPath + '/' + soundfile
if origAnimName in self.AnimsUsingWav: if origAnimName in self.AnimsUsingWav:
theSound = loader.loadSfx(fullPath + '.wav') theSound = loader.loadSfx(fullPath + '.ogg')
else: else:
theSound = loader.loadSfx(fullPath + '.mp3') theSound = loader.loadSfx(fullPath + '.ogg')
self.origAnimNameToSound[origAnimName] = theSound self.origAnimNameToSound[origAnimName] = theSound
if theSound: if theSound:
soundDur = theSound.length() soundDur = theSound.length()

14
toontown/makeatoon/MakeAToon.py
View file

@ -251,16 +251,16 @@ class MakeAToon(StateData.StateData):
self.cos.load() self.cos.load()
self.cls.load() self.cls.load()
self.ns.load() self.ns.load()
self.music = base.loader.loadMusic('phase_3/audio/bgm/create_a_toon.mid') self.music = base.loader.loadMusic('phase_3/audio/bgm/create_a_toon.ogg')
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.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3') self.soundBack = base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.ogg')
self.crashSounds = [] self.crashSounds = []
self.crashSounds.append(base.loader.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.ogg'))
self.crashSounds.append(base.loader.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.ogg'))
self.crashSounds.append(base.loader.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.ogg'))
self.crashSounds.append(base.loader.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.ogg'))
self.crashSounds.append(base.loader.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.ogg'))
return return
def unload(self): def unload(self):

4
toontown/minigame/CogThief.py
View file

@ -51,7 +51,7 @@ class CogThief(DirectObject):
self.maxAcceleration = 5.0 self.maxAcceleration = 5.0
self.perceptionRange = 6 self.perceptionRange = 6
self.notify.debug('cogSpeed=%s' % self.cogSpeed) self.notify.debug('cogSpeed=%s' % self.cogSpeed)
self.kaboomSound = loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.kaboomSound = loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.kaboom = loader.loadModel('phase_4/models/minigames/ice_game_kaboom') self.kaboom = loader.loadModel('phase_4/models/minigames/ice_game_kaboom')
self.kaboom.setScale(2.0) self.kaboom.setScale(2.0)
self.kaboom.setBillboardPointEye() self.kaboom.setBillboardPointEye()
@ -61,7 +61,7 @@ class CogThief(DirectObject):
self.splat = globalPropPool.getProp(splatName) self.splat = globalPropPool.getProp(splatName)
self.splat.setBillboardPointEye() self.splat.setBillboardPointEye()
self.splatType = globalPropPool.getPropType(splatName) self.splatType = globalPropPool.getPropType(splatName)
self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.mp3') self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.ogg')
return return
def destroy(self): def destroy(self):

18
toontown/minigame/DistributedCannonGame.py
View file

@ -112,15 +112,15 @@ class DistributedCannonGame(DistributedMinigame):
self.jarImage.reparentTo(hidden) self.jarImage.reparentTo(hidden)
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.loader.loadMusic('phase_4/audio/bgm/MG_cannon_game.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_cannon_game.ogg')
self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg')
self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3') self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.ogg')
self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.ogg')
self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.ogg')
self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg')
self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg')
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)

10
toontown/minigame/DistributedCatchGame.py
View file

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

14
toontown/minigame/DistributedCogThiefGame.py
View file

@ -60,7 +60,7 @@ class DistributedCogThiefGame(DistributedMinigame):
def load(self): def load(self):
self.notify.debug('load') self.notify.debug('load')
DistributedMinigame.load(self) DistributedMinigame.load(self)
self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_CogThief.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_CogThief.ogg')
self.initCogInfo() self.initCogInfo()
for barrelIndex in range(CTGG.NumBarrels): for barrelIndex in range(CTGG.NumBarrels):
barrel = loader.loadModel('phase_4/models/minigames/cogthief_game_gagTank') barrel = loader.loadModel('phase_4/models/minigames/cogthief_game_gagTank')
@ -120,9 +120,9 @@ class DistributedCogThiefGame(DistributedMinigame):
self.loadCogs() self.loadCogs()
self.toonHitTracks = {} self.toonHitTracks = {}
self.toonPieTracks = {} self.toonPieTracks = {}
self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg')
self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg')
self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.ogg')
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 range(self.numPlayers): for i in range(self.numPlayers):
self.sndTable['hitBySuit'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.sndTable['hitBySuit'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg')
self.sndTable['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndTable['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.ogg')
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()
@ -702,7 +702,7 @@ class DistributedCogThiefGame(DistributedMinigame):
animPie = Sequence() animPie = Sequence()
if pieType == 'actor': if pieType == 'actor':
animPie = ActorInterval(pie, pieName, startFrame=48) animPie = ActorInterval(pie, pieName, startFrame=48)
sound = loader.loadSfx('phase_3.5/audio/sfx/AA_pie_throw_only.mp3') sound = loader.loadSfx('phase_3.5/audio/sfx/AA_pie_throw_only.ogg')
t = power / 100.0 t = power / 100.0
dist = 100 - 70 * t dist = 100 - 70 * t
time = 1 + 0.5 * t time = 1 + 0.5 * t

28
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.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') self.sndAmbience = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.ogg')
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')
@ -104,19 +104,19 @@ class DistributedDivingGame(DistributedMinigame):
toonSD = DivingGameToonSD.DivingGameToonSD(avId, self) toonSD = DivingGameToonSD.DivingGameToonSD(avId, self)
self.toonSDs[avId] = toonSD self.toonSDs[avId] = toonSD
toonSD.load() toonSD.load()
crabSoundName = 'King_Crab.mp3' crabSoundName = 'King_Crab.ogg'
crabSoundPath = 'phase_4/audio/sfx/%s' % crabSoundName crabSoundPath = 'phase_4/audio/sfx/%s' % crabSoundName
self.crabSound = loader.loadSfx(crabSoundPath) self.crabSound = loader.loadSfx(crabSoundPath)
treasureSoundName = 'SZ_DD_treasure.mp3' treasureSoundName = 'SZ_DD_treasure.ogg'
treasureSoundPath = 'phase_4/audio/sfx/%s' % treasureSoundName treasureSoundPath = 'phase_4/audio/sfx/%s' % treasureSoundName
self.treasureSound = loader.loadSfx(treasureSoundPath) self.treasureSound = loader.loadSfx(treasureSoundPath)
hitSoundName = 'diving_game_hit.mp3' hitSoundName = 'diving_game_hit.ogg'
hitSoundPath = 'phase_4/audio/sfx/%s' % hitSoundName hitSoundPath = 'phase_4/audio/sfx/%s' % hitSoundName
self.hitSound = loader.loadSfx(hitSoundPath) self.hitSound = loader.loadSfx(hitSoundPath)
self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Target.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Target.ogg')
self.addSound('dropGold', 'diving_treasure_drop_off.mp3', 'phase_4/audio/sfx/') self.addSound('dropGold', 'diving_treasure_drop_off.ogg', 'phase_4/audio/sfx/')
self.addSound('getGold', 'diving_treasure_pick_up.mp3', 'phase_4/audio/sfx/') self.addSound('getGold', 'diving_treasure_pick_up.ogg', 'phase_4/audio/sfx/')
self.swimSound = loader.loadSfx('phase_4/audio/sfx/diving_swim_loop.wav') self.swimSound = loader.loadSfx('phase_4/audio/sfx/diving_swim_loop.ogg')
self.swimSound.setVolume(0.0) self.swimSound.setVolume(0.0)
self.swimSound.setPlayRate(1.0) self.swimSound.setPlayRate(1.0)
self.swimSound.setLoop(True) self.swimSound.setLoop(True)
@ -711,17 +711,17 @@ class DistributedDivingGame(DistributedMinigame):
fish = self.spawners[spawnerId].fishArray[spawnId] fish = self.spawners[spawnerId].fishArray[spawnId]
endX = self.spawners[spawnerId].position.getX() endX = self.spawners[spawnerId].position.getX()
if fish.name == 'clown': if fish.name == 'clown':
fishSoundName = 'Clownfish.mp3' fishSoundName = 'Clownfish.ogg'
elif fish.name == 'pbj': elif fish.name == 'pbj':
fishSoundName = 'PBJ_Fish.mp3' fishSoundName = 'PBJ_Fish.ogg'
elif fish.name == 'balloon': elif fish.name == 'balloon':
fishSoundName = 'BalloonFish.mp3' fishSoundName = 'BalloonFish.ogg'
elif fish.name == 'bear': elif fish.name == 'bear':
fishSoundName = 'Bear_Acuda.mp3' fishSoundName = 'Bear_Acuda.ogg'
elif fish.name == 'nurse': elif fish.name == 'nurse':
fishSoundName = 'Nurse_Shark.mp3' fishSoundName = 'Nurse_Shark.ogg'
elif fish.name == 'piano': elif fish.name == 'piano':
fishSoundName = 'Piano_Tuna.mp3' fishSoundName = 'Piano_Tuna.ogg'
else: else:
fishSoundName = ' ' fishSoundName = ' '
fishSoundPath = 'phase_4/audio/sfx/%s' % fishSoundName fishSoundPath = 'phase_4/audio/sfx/%s' % fishSoundName

22
toontown/minigame/DistributedIceGame.py
View file

@ -114,7 +114,7 @@ class DistributedIceGame(DistributedMinigame.DistributedMinigame, DistributedIce
def load(self): def load(self):
self.notify.debug('load') self.notify.debug('load')
DistributedMinigame.DistributedMinigame.load(self) DistributedMinigame.DistributedMinigame.load(self)
self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_IceGame.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_IceGame.ogg')
self.gameBoard = loader.loadModel('phase_4/models/minigames/ice_game_icerink') self.gameBoard = loader.loadModel('phase_4/models/minigames/ice_game_icerink')
background = loader.loadModel('phase_4/models/minigames/ice_game_2d') background = loader.loadModel('phase_4/models/minigames/ice_game_2d')
background.reparentTo(self.gameBoard) background.reparentTo(self.gameBoard)
@ -168,22 +168,22 @@ class DistributedIceGame(DistributedMinigame.DistributedMinigame, DistributedIce
self.obstacles.append(newObstacle) self.obstacles.append(newObstacle)
index += 1 index += 1
self.countSound = loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') self.countSound = loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg')
self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.mp3') self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.ogg')
self.penaltyGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.penaltyGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.tireSounds = [] self.tireSounds = []
for tireIndex in range(4): for tireIndex in range(4):
tireHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.mp3') tireHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.ogg')
wallHit = loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3') wallHit = loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.ogg')
obstacleHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.mp3') obstacleHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.ogg')
self.tireSounds.append({'tireHit': tireHit, self.tireSounds.append({'tireHit': tireHit,
'wallHit': wallHit, 'wallHit': wallHit,
'obstacleHit': obstacleHit}) 'obstacleHit': obstacleHit})
self.arrowRotateSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_rotate.wav') self.arrowRotateSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_rotate.ogg')
self.arrowUpSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_increase_3sec.mp3') self.arrowUpSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_increase_3sec.ogg')
self.arrowDownSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_decrease_3sec.mp3') self.arrowDownSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_decrease_3sec.ogg')
self.scoreCircleSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_scoring_1.mp3') self.scoreCircleSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_scoring_1.ogg')
def unload(self): def unload(self):
self.notify.debug('unload') self.notify.debug('unload')

8
toontown/minigame/DistributedMazeGame.py
View file

@ -531,7 +531,7 @@ class DistributedMazeGame(DistributedMinigame):
model.removeNode() model.removeNode()
self.treasureModel.setScale(1.6) self.treasureModel.setScale(1.6)
self.treasureModel.setP(-90) self.treasureModel.setP(-90)
self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.ogg')
self.toonHitTracks = {} self.toonHitTracks = {}
self.scorePanels = [] self.scorePanels = []
@ -580,12 +580,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 range(self.numPlayers): for i in range(self.numPlayers):
self.sndTable['hitBySuit'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') self.sndTable['hitBySuit'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg')
self.sndTable['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') self.sndTable['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.ogg')
self.grabSounds = [] self.grabSounds = []
for i in range(5): for i in range(5):
self.grabSounds.append(base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3')) self.grabSounds.append(base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.ogg'))
self.grabSoundIndex = 0 self.grabSoundIndex = 0
for avId in self.avIdList: for avId in self.avIdList:

12
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.loader.loadSfx('phase_4/audio/sfx/MG_pairing_all_matched.mp3') self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_all_matched.ogg')
self.calcBonusTraversal() self.calcBonusTraversal()
self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Pairing.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Pairing.ogg')
self.matchSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match.mp3') self.matchSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match.ogg')
self.matchWithBonusSfx = base.loader.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.ogg')
self.signalSfx = [] self.signalSfx = []
for i in range(4): for i in range(4):
self.signalSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_jumping_signal.mp3')) self.signalSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_jumping_signal.ogg'))
self.bonusMovesSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_bonus_moves.mp3') self.bonusMovesSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_bonus_moves.ogg')
return return
def unload(self): def unload(self):

18
toontown/minigame/DistributedPatternGame.py
View file

@ -18,11 +18,11 @@ from toontown.toonbase import TTLocalizer
class DistributedPatternGame(DistributedMinigame): class DistributedPatternGame(DistributedMinigame):
phase4snd = 'phase_4/audio/sfx/' phase4snd = 'phase_4/audio/sfx/'
ButtonSoundNames = (phase4snd + 'm_match_trumpet.mp3', ButtonSoundNames = (phase4snd + 'm_match_trumpet.ogg',
phase4snd + 'm_match_guitar.mp3', phase4snd + 'm_match_guitar.ogg',
phase4snd + 'm_match_drums.mp3', phase4snd + 'm_match_drums.ogg',
phase4snd + 'm_match_piano.mp3') phase4snd + 'm_match_piano.ogg')
bgm = 'phase_4/audio/bgm/m_match_bg1.mid' bgm = 'phase_4/audio/bgm/m_match_bg1.ogg'
strWatch = TTLocalizer.PatternGameWatch strWatch = TTLocalizer.PatternGameWatch
strGo = TTLocalizer.PatternGameGo strGo = TTLocalizer.PatternGameGo
strRight = TTLocalizer.PatternGameRight strRight = TTLocalizer.PatternGameRight
@ -86,10 +86,10 @@ class DistributedPatternGame(DistributedMinigame):
for soundName in self.ButtonSoundNames: for soundName in self.ButtonSoundNames:
self.buttonSounds.append(base.loader.loadSfx(soundName)) self.buttonSounds.append(base.loader.loadSfx(soundName))
self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.ogg')
self.incorrectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav') self.incorrectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.ogg')
self.perfectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.perfectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg')
self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3') self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.ogg')
self.music = base.loader.loadMusic(self.bgm) self.music = base.loader.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)

14
toontown/minigame/DistributedPhotoGame.py
View file

@ -133,11 +133,11 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase):
self.tripodModel = loader.loadModel('phase_4/models/minigames/toon_cannon') self.tripodModel = loader.loadModel('phase_4/models/minigames/toon_cannon')
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.loader.loadMusic('phase_4/audio/bgm/MG_cannon_game.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_cannon_game.ogg')
self.sndPhotoMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') self.sndPhotoMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.ogg')
self.sndPhotoFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') self.sndPhotoFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg')
self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg')
self.sndFilmTick = base.loader.loadSfx('phase_4/audio/sfx/Photo_instamatic.mp3') self.sndFilmTick = base.loader.loadSfx('phase_4/audio/sfx/Photo_instamatic.ogg')
self.timer = ToontownTimer.ToontownTimer() self.timer = ToontownTimer.ToontownTimer()
self.timer.posInTopRightCorner() self.timer.posInTopRightCorner()
self.timer.hide() self.timer.hide()
@ -161,8 +161,8 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase):
self.blackoutNode.setDepthTest(1) self.blackoutNode.setDepthTest(1)
self.blackoutNode.hide() self.blackoutNode.hide()
self.subjectToon = Toon.Toon() self.subjectToon = Toon.Toon()
self.addSound('zoom', 'Photo_zoom.mp3', 'phase_4/audio/sfx/') self.addSound('zoom', 'Photo_zoom.ogg', 'phase_4/audio/sfx/')
self.addSound('snap', 'Photo_shutter.mp3', 'phase_4/audio/sfx/') self.addSound('snap', 'Photo_shutter.ogg', 'phase_4/audio/sfx/')
return return
def __setupCapture(self): def __setupCapture(self):

12
toontown/minigame/DistributedRaceGame.py
View file

@ -302,11 +302,11 @@ class DistributedRaceGame(DistributedMinigame):
self.dice2, self.dice2,
self.dice3, self.dice3,
self.dice4] self.dice4]
self.music = base.loader.loadMusic('phase_4/audio/bgm/minigame_race.mid') self.music = base.loader.loadMusic('phase_4/audio/bgm/minigame_race.ogg')
self.posBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') self.posBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.ogg')
self.negBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav') self.negBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.ogg')
self.winSting = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') self.winSting = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg')
self.loseSting = base.loader.loadSfx('phase_4/audio/sfx/MG_lose.mp3') self.loseSting = base.loader.loadSfx('phase_4/audio/sfx/MG_lose.ogg')
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))
@ -325,7 +325,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.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.mp3') self.cardSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.ogg')
self.chanceMarkers = [] self.chanceMarkers = []
return return

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