diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py index 00a0751..3c2145f 100644 --- a/otp/distributed/OTPClientRepository.py +++ b/otp/distributed/OTPClientRepository.py @@ -502,7 +502,7 @@ class OTPClientRepository(ClientRepositoryBase): whisper = WhisperPopup(message, OTPGlobals.getInterfaceFont(), WhisperPopup.WTSystem) whisper.manage(base.marginManager) 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: base.playSfx(self.systemMessageSfx) diff --git a/toontown/battle/DistributedBattleBldg.py b/toontown/battle/DistributedBattleBldg.py index 50394e7..13ce44b 100644 --- a/toontown/battle/DistributedBattleBldg.py +++ b/toontown/battle/DistributedBattleBldg.py @@ -37,9 +37,9 @@ class DistributedBattleBldg(DistributedBattleBase.DistributedBattleBase): def setBossBattle(self, value): self.bossBattle = value 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: - 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) def getBossBattleTaunt(self): diff --git a/toontown/battle/Fanfare.py b/toontown/battle/Fanfare.py index d5e4e30..524a486 100644 --- a/toontown/battle/Fanfare.py +++ b/toontown/battle/Fanfare.py @@ -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) 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)) - crabHorn = globalBattleSoundCache.getSound('King_Crab.mp3') - drumroll = globalBattleSoundCache.getSound('SZ_MM_drumroll.mp3') - fanfare = globalBattleSoundCache.getSound('SZ_MM_fanfare.mp3') + crabHorn = globalBattleSoundCache.getSound('King_Crab.ogg') + drumroll = globalBattleSoundCache.getSound('SZ_MM_drumroll.ogg') + fanfare = globalBattleSoundCache.getSound('SZ_MM_fanfare.ogg') crabHorn.setTime(1.5) partyBall.setTransparency(1) partyBall.setColorScale(1, 1, 1, 1) diff --git a/toontown/battle/Movie.py b/toontown/battle/Movie.py index 248b9dc..e402c62 100644 --- a/toontown/battle/Movie.py +++ b/toontown/battle/Movie.py @@ -357,9 +357,9 @@ class Movie(DirectObject.DirectObject): self.tutorialTom.setName(TTLocalizer.NPCToonNames[20000]) self.tutorialTom.uniqueName = uniqueName if base.config.GetString('language', 'english') == 'japanese': - self.tomDialogue03 = base.loader.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward01.mp3') - self.tomDialogue04 = base.loader.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward02.mp3') - self.tomDialogue05 = base.loader.loadSfx('phase_3.5/audio/dial/CC_tom_movie_tutorial_reward03.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.ogg') + 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) else: self.tomDialogue03 = None diff --git a/toontown/battle/MovieDrop.py b/toontown/battle/MovieDrop.py index 60d39a0..b9b7629 100644 --- a/toontown/battle/MovieDrop.py +++ b/toontown/battle/MovieDrop.py @@ -10,8 +10,8 @@ from .MovieUtil import calcAvgSuitPos from direct.showutil import Effects import functools 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') -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') +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.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 tSuitDodges = 2.45 + tDropShadow tObjectAppears = 3.0 + tDropShadow @@ -99,12 +99,12 @@ def __getSoundTrack(level, hitSuit, node = None): soundEffect = globalBattleSoundCache.getSound(missSoundFiles[level]) soundTrack = Sequence() if soundEffect: - buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') + buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.ogg') fallingSound = None buttonDelay = tButtonPressed - 0.3 fallingDuration = 1.5 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(SoundInterval(buttonSound, duration=0.67, node=node)) if fallingSound: @@ -407,7 +407,7 @@ def __createSuitTrack(drop, delay, level, alreadyDodged, alreadyTeased, target, suitTrack.append(updateHealthBar) suitGettingHit = Parallel(suitReact) 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)) suitTrack.append(suitGettingHit) bonusTrack = None diff --git a/toontown/battle/MovieFire.py b/toontown/battle/MovieFire.py index 6a0a968..26100cb 100644 --- a/toontown/battle/MovieFire.py +++ b/toontown/battle/MovieFire.py @@ -12,7 +12,7 @@ from . import MovieCamera from . import MovieUtil from .MovieUtil import calcAvgSuitPos 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 tPieHitsSuit = 3.0 tSuitDodges = 2.45 @@ -216,7 +216,7 @@ def __pieMissGroupLerpCallback(t, missDict): 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)) return throwTrack @@ -311,13 +311,13 @@ def __throwPie(throw, delay, hitCount, showCannon = 1): smoke.setScale(0.5) smoke.hide() 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) - 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) - 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) - 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) 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))) diff --git a/toontown/battle/MovieHeal.py b/toontown/battle/MovieHeal.py index 0bd14e7..7b65695 100644 --- a/toontown/battle/MovieHeal.py +++ b/toontown/battle/MovieHeal.py @@ -15,7 +15,7 @@ from . import MovieNPCSOS from toontown.effects import Splash from direct.task import Task 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) healHpr = Vec3(180.0, 0, 0) runHealTime = 1.0 diff --git a/toontown/battle/MovieLure.py b/toontown/battle/MovieLure.py index d17c052..378b0aa 100644 --- a/toontown/battle/MovieLure.py +++ b/toontown/battle/MovieLure.py @@ -123,7 +123,7 @@ def __createFishingPoleMultiTrack(lure, dollar, dollarName): tracks.append(suitTrack) else: 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 @@ -181,9 +181,9 @@ def __createMagnetMultiTrack(lure, magnet, pos, hpr, scale, isSmallMagnet = 1, n tracks.append(Sequence(Wait(3.7), Func(MovieUtil.indicateMissed, suit))) 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: - 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 @@ -236,7 +236,7 @@ def __createHypnoGogglesMultiTrack(lure, npcs = []): else: 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 @@ -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))) suitTrack = ActorInterval(suit, 'slip-backward') 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)) elif trapName == 'rake' or trapName == 'rake-react': hpr = trapProp.getHpr(parent) @@ -333,7 +333,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp): rakeAnimDuration = 3.125 suitTrack = ActorInterval(suit, 'rake-react', duration=rakeAnimDuration) 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)) elif trapName == 'marbles': slidePos = trapProp.getPos(parent) @@ -342,7 +342,7 @@ def __createSuitDamageTrack(battle, suit, hp, lure, trapProp): animTrack = ActorInterval(trapProp, 'marbles', startTime=3.1) suitTrack = ActorInterval(suit, 'slip-backward') 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)) elif trapName == 'quicksand': 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)) 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)) - 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)) elif trapName == 'trapdoor': 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)) 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)) - 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)) elif trapName == 'tnt': tntTrack = ActorInterval(trapProp, 'tnt') 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)) 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') - soundTrack = Sequence(SoundInterval(globalBattleSoundCache.getSound('TL_dynamite.mp3'), duration=2.0, node=suit), SoundInterval(explosionSound, duration=0.6, node=suit)) + explosionSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg') + 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)) elif trapName == 'traintrack': trainInterval = createIncomingTrainInterval(battle, suit, hp, lure, trapProp) @@ -472,7 +472,7 @@ def createSuitReactionToTrain(battle, suit, hp, lure, trapProp): updateHealthBar = Func(suit.updateHealthBar, hp) anim = 'flatten' 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(Wait(timeToGetHit + TRAIN_MATERIALIZE_TIME)) 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(LerpColorScaleInterval(train, TRAIN_MATERIALIZE_TIME, Point4(1, 1, 1, 0))) retval.append(trainIval) - trainSoundTrack = getSoundTrack('TL_train.mp3', node=toon) + trainSoundTrack = getSoundTrack('TL_train.ogg', node=toon) retval.append(trainSoundTrack) return retval @@ -613,6 +613,6 @@ def __createSlideshowMultiTrack(lure, npcs = []): else: 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('AA_drop_trigger_box.mp3', delay=slideshowDelay, node=toon)) + tracks.append(getSoundTrack('TL_presentation.ogg', delay=2.3, node=toon)) + tracks.append(getSoundTrack('AA_drop_trigger_box.ogg', delay=slideshowDelay, node=toon)) return tracks diff --git a/toontown/battle/MovieNPCSOS.py b/toontown/battle/MovieNPCSOS.py index 02ad2e4..49c7270 100644 --- a/toontown/battle/MovieNPCSOS.py +++ b/toontown/battle/MovieNPCSOS.py @@ -12,7 +12,7 @@ from toontown.toonbase import TTLocalizer from toontown.toonbase import ToontownBattleGlobals from toontown.toon import NPCToons 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) def __cogsMiss(attack, level, hp): diff --git a/toontown/battle/MoviePetSOS.py b/toontown/battle/MoviePetSOS.py index bb8cc44..82671bf 100644 --- a/toontown/battle/MoviePetSOS.py +++ b/toontown/battle/MoviePetSOS.py @@ -11,7 +11,7 @@ from toontown.toonbase import TTLocalizer from toontown.toonbase import ToontownBattleGlobals from toontown.pets import Pet, PetTricks 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) def doPetSOSs(PetSOSs): diff --git a/toontown/battle/MovieSound.py b/toontown/battle/MovieSound.py index c4c8e92..9d1248f 100644 --- a/toontown/battle/MovieSound.py +++ b/toontown/battle/MovieSound.py @@ -10,9 +10,9 @@ from . import MovieUtil from . import MovieNPCSOS from toontown.toonbase import ToontownBattleGlobals 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') -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') -hitSoundFiles = ('AA_sound_Opera_Singer_Cog_Glass.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.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.ogg',) tSound = 2.45 tSuitReact = 2.8 DISTANCE_TO_WALK_BACK = MovieUtil.SUIT_LURE_DISTANCE * 0.75 diff --git a/toontown/battle/MovieSquirt.py b/toontown/battle/MovieSquirt.py index f3afc7d..3cee1ae 100644 --- a/toontown/battle/MovieSquirt.py +++ b/toontown/battle/MovieSquirt.py @@ -13,8 +13,8 @@ from toontown.toonbase import ToontownBattleGlobals import random import functools 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') -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') +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.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, 0.3, 0.1, diff --git a/toontown/battle/MovieSuitAttacks.py b/toontown/battle/MovieSuitAttacks.py index d092685..a3a2472 100644 --- a/toontown/battle/MovieSuitAttacks.py +++ b/toontown/battle/MovieSuitAttacks.py @@ -595,10 +595,10 @@ def getAllyToonsDodgeParallel(target): toonDodgeList = PoMR if toonDodgeList is leftToons: sidestepAnim = 'sidestep-left' - soundEffect = globalBattleSoundCache.getSound('AV_side_step.mp3') + soundEffect = globalBattleSoundCache.getSound('AV_side_step.ogg') else: sidestepAnim = 'sidestep-right' - soundEffect = globalBattleSoundCache.getSound('AV_jump_to_side.mp3') + soundEffect = globalBattleSoundCache.getSound('AV_jump_to_side.ogg') toonTracks = Parallel() for t in toonDodgeList: 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(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']) - 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) @@ -826,7 +826,7 @@ def doPoundKey(attack): 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])) 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) @@ -843,7 +843,7 @@ def doShred(attack): 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)) 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) @@ -995,7 +995,7 @@ def doFountainPen(attack): penSpill.setPos(getPenTip()) 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) - 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) @@ -1054,7 +1054,7 @@ def doRubOut(attack): 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: hideTrack.append(Wait(2.2)) hideTrack.append(Func(battle.movie.needRestoreColor)) @@ -1108,7 +1108,7 @@ def doFingerWag(attack): particleEffect.setPos(0.167, 1.9, suit.getHeight() - 1.8) particleEffect.setP(-110) 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) @@ -1137,7 +1137,7 @@ def doWriteOff(attack): pencilPropTrack.append(LerpScaleInterval(pencil, 0.5, MovieUtil.PNT3_NEARZERO)) pencilPropTrack.append(Func(MovieUtil.removeProp, pencil)) 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) @@ -1170,7 +1170,7 @@ def doRubberStamp(attack): propTrack.append(LerpScaleInterval(stamp, 0.5, MovieUtil.PNT3_NEARZERO)) propTrack.append(Func(MovieUtil.removeProp, stamp)) 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) @@ -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)) signPropAnimTrack = ActorInterval(sign, 'smile', duration=4, startTime=0) 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)) @@ -1221,9 +1221,9 @@ def doSynergy(attack): dodgeAnims.extend(getSplicedLerpAnims('jump', 0.31, 1.3, startTime=0.6)) dodgeAnims.append(['jump', 0, 0.91]) 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: - 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) else: return Parallel(suitTrack, partTrack, waterfallTrack, synergySoundTrack, toonTracks) @@ -1256,7 +1256,7 @@ def doTeeOff(attack): ballPropTrack.append(Func(battle.movie.clearRenderProp, ball)) dodgeDelay = suitTrack.getDuration() - 4.35 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) @@ -1310,7 +1310,7 @@ def doBrainStorm(attack): 0.4, 0.8], ['duck', 1e-06, 1.6]] 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) @@ -1366,7 +1366,7 @@ def doBuzzWord(attack): 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) - 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) @@ -1401,7 +1401,7 @@ def doDemotion(attack): damageAnims.extend(getSplicedLerpAnims('cringe', 0.3, 0.6, startTime=1.2)) damageAnims.append(['cringe', 2.6, 1.5]) 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: return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3) else: @@ -1462,7 +1462,7 @@ def doCanned(attack): throwTrack.append(Func(battle.movie.clearRestoreHips)) scaleTrack = Sequence(Wait(propDelay + suitDelay), LerpScaleInterval(can, throwDuration, scaleUpPoint)) 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: land = toon.getPos(battle) land.setZ(land.getZ() + 0.7) @@ -1479,7 +1479,7 @@ def doCanned(attack): throwTrack.append(LerpScaleInterval(can, 0.3, MovieUtil.PNT3_NEARZERO)) 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))) - 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)) damageAnims = [['struggle', propDelay + suitDelay + throwDuration, @@ -1575,7 +1575,7 @@ def doPinkSlip(attack): 0.3, 0.7], ['slip-forward', 0.01]] 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) @@ -1736,7 +1736,7 @@ def doGlowerPower(attack): damageAnims = [['slip-backward', 0.01, 0.35]] 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) @@ -1863,8 +1863,8 @@ def doHeadShrink(attack): 0.4]) toonTrack = getToonTrack(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, dodgeAnimNames=['sidestep']) if dmg > 0: - shrinkSound = globalBattleSoundCache.getSound('SA_head_shrink_only.mp3') - growSound = globalBattleSoundCache.getSound('SA_head_grow_back_only.mp3') + shrinkSound = globalBattleSoundCache.getSound('SA_head_shrink_only.ogg') + 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)) return Parallel(suitTrack, sprayTrack, cloudTrack, dropTrack, toonTrack, shrinkTrack, soundTrack) else: @@ -1919,7 +1919,7 @@ def doRolodex(attack): suitTrack = getSuitTrack(attack) 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']) - 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) @@ -1969,7 +1969,7 @@ def doEvilEye(attack): 0.01, 1.4], ['cringe', 0.01, 0.3]] 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) @@ -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 + 9, z + 0.2))) 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: propTrack.append(LerpPosInterval(ball, 0.5, Point3(x, y + 2, z))) 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 - 6, z + 0.2))) 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(Func(MovieUtil.removeProp, ball)) propTrack.append(Func(battle.movie.clearRenderProp, ball)) @@ -2063,9 +2063,9 @@ def doPowerTie(attack): tiePropTrack.append(Func(tie.setBillboardPointEye)) 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']) - 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: - 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) else: return Parallel(suitTrack, toonTrack, tiePropTrack, throwSound) @@ -2100,7 +2100,7 @@ def doDoubleTalk(attack): 0.4, 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) - 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) @@ -2222,7 +2222,7 @@ def doHotAir(attack): 1.2]) damageAnims.append(['slip-forward', 0.01, 1.0]) 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: return Parallel(suitTrack, toonTrack, sprayTrack, soundTrack, baseFlameTrack, flameTrack, flecksTrack, colorTrack) else: @@ -2241,7 +2241,7 @@ def doPickPocket(attack): toonTrack = getToonTrack(attack, 0.6, ['cringe'], 0.01, ['sidestep']) multiTrackList = Parallel(suitTrack, toonTrack) 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(soundTrack) return multiTrackList @@ -2279,7 +2279,7 @@ def doFilibuster(attack): 0.8]) 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: return Parallel(suitTrack, toonTrack, soundTrack, sprayTrack, sprayTrack2, sprayTrack3, sprayTrack4) else: @@ -2370,7 +2370,7 @@ def doTremor(attack): damageAnims = [['slip-forward'], ['slip-forward', 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) - 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) @@ -2399,7 +2399,7 @@ def doHangUp(attack): 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])) 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) @@ -2451,7 +2451,7 @@ def doRedTape(attack): tubeTracks.append(Func(battle.movie.clearRestoreHips)) 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: return Parallel(suitTrack, toonTrack, propTrack, soundTrack, tubeTracks) else: @@ -2538,7 +2538,7 @@ def doParadigmShift(attack): dodgeAnims.append(['jump', 0, 0.91]) toonTracks = getToonTracks(attack, damageDelay=damageDelay, splicedDamageAnims=damageAnims, dodgeDelay=dodgeDelay, splicedDodgeAnims=dodgeAnims, showDamageExtraTime=2.7) 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) else: 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(Func(MovieUtil.removeProp, check)) 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) @@ -2683,7 +2683,7 @@ def doWatercooler(attack): 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)) 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) @@ -2759,7 +2759,7 @@ def doFired(attack): 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']) - 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: return Parallel(suitTrack, baseFlameTrack, flameTrack, flecksTrack, toonTrack, colorTrack, soundTrack) else: @@ -2800,7 +2800,7 @@ def doAudit(attack): 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) 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) @@ -2985,7 +2985,7 @@ def doLiquidate(attack): cloudPropTrack.append(Func(battle.movie.clearRenderProp, cloud)) damageAnims = [['melt'], ['jump', 1.5, 0.4]] 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: puddle = globalPropPool.getProp('quicksand') puddle.setColor(Vec4(0.0, 0.0, 1.0, 1)) @@ -3242,7 +3242,7 @@ def doWithdrawal(attack): 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: colorTrack = Sequence() colorTrack.append(Wait(1.6)) @@ -3323,7 +3323,7 @@ def doJargon(attack): damageAnims.append(['conked', 0.0001, 0.4]) 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) - 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) @@ -3351,7 +3351,7 @@ def doMumboJumbo(attack): partTrack4 = getPartTrack(particleEffect4, 3.3, 1.7, [particleEffect4, toon, 0]) partTrack5 = getPartTrack(particleEffect5, 3.3, 1.7, [particleEffect5, toon, 0]) 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: return Parallel(suitTrack, toonTrack, soundTrack, partTrack, partTrack2, partTrack3, partTrack4, partTrack5) else: @@ -3392,7 +3392,7 @@ def doGuiltTrip(attack): partTrack2 = getPowerTrack(powerBar2) waterfallTrack = getPartTrack(waterfallEffect, 0.6, 0.6, [waterfallEffect, suit, 0]) 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) diff --git a/toontown/battle/MovieThrow.py b/toontown/battle/MovieThrow.py index 0a558ed..07c7eee 100644 --- a/toontown/battle/MovieThrow.py +++ b/toontown/battle/MovieThrow.py @@ -12,7 +12,7 @@ from . import MovieCamera from . import MovieUtil from .MovieUtil import calcAvgSuitPos 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 tPieHitsSuit = 3.0 tSuitDodges = 2.45 @@ -234,17 +234,17 @@ def __pieMissGroupLerpCallback(t, missDict): def __getWeddingCakeSoundTrack(level, hitSuit, node = None): throwTrack = Sequence() if hitSuit: - throwSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake.mp3') + throwSound = globalBattleSoundCache.getSound('AA_throw_wedding_cake.ogg') songTrack = Sequence() songTrack.append(Wait(1.0)) 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.append(Wait(tPieHitsSuit)) splatTrack.append(SoundInterval(splatSound, node=node)) throwTrack.append(Parallel(songTrack, splatTrack)) 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(SoundInterval(throwSound, node=node)) return throwTrack @@ -253,7 +253,7 @@ def __getWeddingCakeSoundTrack(level, hitSuit, node = None): def __getSoundTrack(level, hitSuit, node = None): if level == UBER_GAG_LEVEL_INDEX: 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)) if hitSuit: hitSound = globalBattleSoundCache.getSound(hitSoundFiles[level]) diff --git a/toontown/battle/MovieToonVictory.py b/toontown/battle/MovieToonVictory.py index 03e3f26..66fa420 100644 --- a/toontown/battle/MovieToonVictory.py +++ b/toontown/battle/MovieToonVictory.py @@ -79,7 +79,7 @@ def doToonVictory(localToonActive, toons, rewardToonIds, rewardDicts, deathList, track.append(Func(NametagGlobals.setOnscreenChatForced, 1)) camTrack = Sequence() endTrack = Sequence() - danceSound = globalBattleSoundCache.getSound('ENC_Win.mp3') + danceSound = globalBattleSoundCache.getSound('ENC_Win.ogg') toonList = [] countToons = 0 uberListNew = [] diff --git a/toontown/battle/MovieTrap.py b/toontown/battle/MovieTrap.py index 07d6d80..f58f772 100644 --- a/toontown/battle/MovieTrap.py +++ b/toontown/battle/MovieTrap.py @@ -188,7 +188,7 @@ def __createThrownTrapMultiTrack(trap, propList, propName, propPos = None, propH slideTrack = Parallel(moveTrack, animTrack) motionTrack = Sequence(throwingTrack, slideTrack) 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) throwTrack.append(Wait(0.25)) 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) hprTrack = LerpHprInterval(thrownProp, 0.9, hpr=Point3(0, 90, 0)) 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(Parallel(throwingTrack, hprTrack, scaleTrack, soundTrack)) 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)) animTrack = ActorInterval(thrownProp, propName, startTime=throwDelay + 0.9) 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(Parallel(moveTrack, animTrack, scaleTrack, soundTrack)) elif trapName == 'rake': @@ -224,7 +224,7 @@ def __createThrownTrapMultiTrack(trap, propList, propName, propPos = None, propH throwingTrack = createThrowingTrack(thrownProp, trapPoint, duration=throwDuration, parent=suit) 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)) - 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(Parallel(throwingTrack, hprTrack, scaleTrack, soundTrack)) else: @@ -343,10 +343,10 @@ def __createPlacedTrapMultiTrack(trap, prop, propName, propPos = None, propHpr = toonTrack.append(Func(toon.loop, 'neutral')) toonTrack.append(Func(toon.setHpr, battle, origHpr)) if propName == 'quicksand': - propSound = globalBattleSoundCache.getSound('TL_quicksand.mp3') + propSound = globalBattleSoundCache.getSound('TL_quicksand.ogg') else: - propSound = globalBattleSoundCache.getSound('TL_trap_door.mp3') - buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') + propSound = globalBattleSoundCache.getSound('TL_trap_door.ogg') + 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)) 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.setHpr, battle, origHpr)) if propName == 'quicksand': - propSound = globalBattleSoundCache.getSound('TL_quicksand.mp3') + propSound = globalBattleSoundCache.getSound('TL_quicksand.ogg') elif propName == 'traintrack': - propSound = globalBattleSoundCache.getSound('TL_train_track_appear.mp3') + propSound = globalBattleSoundCache.getSound('TL_train_track_appear.ogg') else: - propSound = globalBattleSoundCache.getSound('TL_trap_door.mp3') - buttonSound = globalBattleSoundCache.getSound('AA_drop_trigger_box.mp3') + propSound = globalBattleSoundCache.getSound('TL_trap_door.ogg') + 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))) return Parallel(trapTracks, toonTrack, soundTrack) diff --git a/toontown/battle/MovieUtil.py b/toontown/battle/MovieUtil.py index 7e5d48a..da0c663 100644 --- a/toontown/battle/MovieUtil.py +++ b/toontown/battle/MovieUtil.py @@ -262,8 +262,8 @@ def createSuitReviveTrack(suit, toon, battle, npcs = []): suitTrack.append(Func(removeReviveSuit, suit, deathSuit, name='remove-death-suit')) suitTrack.append(Func(notify.debug, 'after removeDeathSuit')) suitTrack.append(Func(suit.loop, 'neutral')) - spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') - deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.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.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)) BattleParticles.loadParticles() 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(removeDeathSuit, suit, deathSuit, name='remove-death-suit')) suitTrack.append(Func(notify.debug, 'after removeDeathSuit')) - spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') - deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.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.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)) BattleParticles.loadParticles() smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall') diff --git a/toontown/building/DistributedBossElevator.py b/toontown/building/DistributedBossElevator.py index 4254ad4..2ef5e94 100644 --- a/toontown/building/DistributedBossElevator.py +++ b/toontown/building/DistributedBossElevator.py @@ -18,10 +18,10 @@ class DistributedBossElevator(DistributedElevatorExt.DistributedElevatorExt): def __init__(self, cr): DistributedElevatorExt.DistributedElevatorExt.__init__(self, cr) self.elevatorPoints = BigElevatorPoints - self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - self.finalOpenSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') - self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - self.finalCloseSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.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.ogg') + 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.ogg') self.type = ELEVATOR_VP self.countdownTime = ElevatorData[self.type]['countdown'] diff --git a/toontown/building/DistributedBuilding.py b/toontown/building/DistributedBuilding.py index a7e324b..a2ca79c 100644 --- a/toontown/building/DistributedBuilding.py +++ b/toontown/building/DistributedBuilding.py @@ -346,20 +346,20 @@ class DistributedBuilding(DistributedObject.DistributedObject): if base.config.GetBool('want-qa-regression', 0): self.notify.info('QA-REGRESSION: COGBUILDING: Cog Take Over') if self.cogDropSound == None: - self.cogDropSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_drop.mp3') - self.cogLandSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_land.mp3') - self.cogSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_settle.mp3') - self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') + self.cogDropSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_drop.ogg') + self.cogLandSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_land.ogg') + self.cogSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_settle.ogg') + self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg') return def loadAnimToToonSfx(self): if base.config.GetBool('want-qa-regression', 0): self.notify.info('QA-REGRESSION: COGBUILDING: Toon Take Over') if self.cogWeakenSound == None: - self.cogWeakenSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_weaken.mp3') - self.toonGrowSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_grow.mp3') - self.toonSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_settle.mp3') - self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') + self.cogWeakenSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'cogbldg_weaken.ogg') + self.toonGrowSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_grow.ogg') + self.toonSettleSound = base.loader.loadSfx(self.TAKEOVER_SFX_PREFIX + 'toonbldg_settle.ogg') + self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.ogg') return def unloadSfx(self): diff --git a/toontown/building/DistributedDoor.py b/toontown/building/DistributedDoor.py index 95896d8..05b0c7c 100644 --- a/toontown/building/DistributedDoor.py +++ b/toontown/building/DistributedDoor.py @@ -23,8 +23,8 @@ class DistributedDoor(DistributedObject.DistributedObject, DelayDeletable): def __init__(self, cr): DistributedObject.DistributedObject.__init__(self, cr) - self.openSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Open_1.mp3') - self.closeSfx = base.loader.loadSfx('phase_3.5/audio/sfx/Door_Close_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.ogg') self.nametag = None self.fsm = ClassicFSM.ClassicFSM('DistributedDoor_right', [State.State('off', self.enterOff, self.exitOff, ['closing', 'closed', diff --git a/toontown/building/DistributedElevator.py b/toontown/building/DistributedElevator.py index 5aef868..d853ca3 100644 --- a/toontown/building/DistributedElevator.py +++ b/toontown/building/DistributedElevator.py @@ -26,9 +26,9 @@ class DistributedElevator(DistributedObject.DistributedObject): self.deferredSlots = [] self.localToonOnBoard = 0 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.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.finalCloseSfx = None self.elevatorPoints = ElevatorPoints diff --git a/toontown/building/DistributedElevatorFSM.py b/toontown/building/DistributedElevatorFSM.py index 5e7ab88..0d9c945 100644 --- a/toontown/building/DistributedElevatorFSM.py +++ b/toontown/building/DistributedElevatorFSM.py @@ -39,9 +39,9 @@ class DistributedElevatorFSM(DistributedObject.DistributedObject, FSM): self.deferredSlots = [] self.localToonOnBoard = 0 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.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.finalCloseSfx = None self.elevatorPoints = ElevatorPoints diff --git a/toontown/building/DistributedKnockKnockDoor.py b/toontown/building/DistributedKnockKnockDoor.py index baa9a67..d760b50 100644 --- a/toontown/building/DistributedKnockKnockDoor.py +++ b/toontown/building/DistributedKnockKnockDoor.py @@ -60,8 +60,8 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp) def knockKnockTrack(self, avatar, duration): if avatar == None: return - self.rimshot = base.loader.loadSfx('phase_5/audio/sfx/AA_heal_telljoke.mp3') - self.knockSfx = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_3.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.ogg') joke = KnockKnockJokes[self.propId % len(KnockKnockJokes)] place = base.cr.playGame.getPlace() if place: diff --git a/toontown/building/DistributedSuitInterior.py b/toontown/building/DistributedSuitInterior.py index a89b0bb..ec00d18 100644 --- a/toontown/building/DistributedSuitInterior.py +++ b/toontown/building/DistributedSuitInterior.py @@ -18,8 +18,8 @@ class DistributedSuitInterior(DistributedObject.DistributedObject): DistributedObject.DistributedObject.__init__(self, cr) self.toons = [] self.activeIntervals = {} - self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') - self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.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.ogg') self.suits = [] self.reserveSuits = [] self.joiningReserves = [] @@ -53,8 +53,8 @@ class DistributedSuitInterior(DistributedObject.DistributedObject): 120, 12, 38] - self.waitMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_toon_winning_indoor.mid') - self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.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.ogg') self.fsm = ClassicFSM.ClassicFSM('DistributedSuitInterior', [State.State('WaitForAllToonsInside', self.enterWaitForAllToonsInside, self.exitWaitForAllToonsInside, ['Elevator']), State.State('Elevator', self.enterElevator, self.exitElevator, ['Battle']), State.State('Battle', self.enterBattle, self.exitBattle, ['Resting', 'Reward', 'ReservesJoining']), diff --git a/toontown/building/DistributedToonHallInterior.py b/toontown/building/DistributedToonHallInterior.py index d2c3f88..fe245bc 100644 --- a/toontown/building/DistributedToonHallInterior.py +++ b/toontown/building/DistributedToonHallInterior.py @@ -216,19 +216,19 @@ class DistributedToonHallInterior(DistributedToonInterior): self.sillyMeter.makeSubpart('arrow', ['uvj_progressBar*', 'def_springA']) self.sillyMeter.makeSubpart('meter', ['def_pivot'], ['uvj_progressBar*', 'def_springA']) 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.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.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.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.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.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.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.audio3d.setDropOffFactor(0.1) self.accept('SillyMeterPhase', self.selectPhase) diff --git a/toontown/char/Char.py b/toontown/char/Char.py index d779346..8e8b6f8 100644 --- a/toontown/char/Char.py +++ b/toontown/char/Char.py @@ -398,7 +398,7 @@ class Char(Avatar.Avatar): chatterType = chatterTypes[categoryIndex] for fileIndex in audioIndexArray[categoryIndex]: 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, chatterType, fileIndex))) @@ -413,7 +413,7 @@ class Char(Avatar.Avatar): self.unloadDialogue() language = base.config.GetString('language', 'english') 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): self.dialogueArray.append(dialogueFile) @@ -428,7 +428,7 @@ class Char(Avatar.Avatar): 5]) self.loadChatterDialogue('mickey', chatterIndexArray, 'phase_3/audio/dial', language) 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): self.dialogueArray.append(dialogueFile) @@ -443,7 +443,7 @@ class Char(Avatar.Avatar): 5]) self.loadChatterDialogue('mickey', chatterIndexArray, 'phase_3/audio/dial', language) 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): self.dialogueArray.append(dialogueFile) @@ -467,7 +467,7 @@ class Char(Avatar.Avatar): 17], [1, 2, 3]) self.loadChatterDialogue('minnie', chatterIndexArray, 'phase_3/audio/dial', language) 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): self.dialogueArray.append(dialogueFile) @@ -489,7 +489,7 @@ class Char(Avatar.Avatar): 4]) self.loadChatterDialogue('daisy', chatterIndexArray, 'phase_8/audio/dial', language) 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): self.dialogueArray.append(dialogueFile) @@ -511,7 +511,7 @@ class Char(Avatar.Avatar): 4]) self.loadChatterDialogue('goofy', chatterIndexArray, 'phase_6/audio/dial', language) 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): self.dialogueArray.append(dialogueFile) @@ -533,32 +533,32 @@ class Char(Avatar.Avatar): 4]) self.loadChatterDialogue('donald', chatterIndexArray, 'phase_6/audio/dial', language) 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): self.dialogueArray.append(dialogueFile) 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): self.dialogueArray.append(dialogueFile) 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): self.dialogueArray.append(dialogueFile) 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): self.dialogueArray.append(dialogueFile) 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): self.dialogueArray.append(dialogueFile) 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): self.dialogueArray.append(dialogueFile) diff --git a/toontown/chat/ToontownChatManager.py b/toontown/chat/ToontownChatManager.py index 8de7fa6..70cf67c 100644 --- a/toontown/chat/ToontownChatManager.py +++ b/toontown/chat/ToontownChatManager.py @@ -34,7 +34,7 @@ class ToontownChatManager(ChatManager.ChatManager): 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.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.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() diff --git a/toontown/cogdominium/CogdoBarrelRoomConsts.py b/toontown/cogdominium/CogdoBarrelRoomConsts.py index 75c2260..669399c 100644 --- a/toontown/cogdominium/CogdoBarrelRoomConsts.py +++ b/toontown/cogdominium/CogdoBarrelRoomConsts.py @@ -51,7 +51,7 @@ StomperProps = [{'path': '**/stomper_GRP_01/stomper_cylinder_01', {'path': '**/stomper_GRP_12/stomper_cylinder_034', 'motion': 'up'}] 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 BarrelRoomModel = 'phase_5/models/cogdominium/tt_m_ara_cbr_barrelRoom' BarrelRoomModelPos = (0, 0, 0) @@ -89,8 +89,8 @@ BarrelCollParams = (0, 0, 2, 2.0) -BarrelBumpSound = 'phase_4/audio/sfx/Golf_Hit_Barrier_2.mp3' -BarrelGrabSound = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' +BarrelBumpSound = 'phase_4/audio/sfx/Golf_Hit_Barrier_2.ogg' +BarrelGrabSound = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' StateHidden, StateAvailable, StateUsed, StateCrushed = list(range(4)) def numBarrels(): diff --git a/toontown/cogdominium/CogdoElevatorMovie.py b/toontown/cogdominium/CogdoElevatorMovie.py index a5413b7..ed13921 100644 --- a/toontown/cogdominium/CogdoElevatorMovie.py +++ b/toontown/cogdominium/CogdoElevatorMovie.py @@ -77,7 +77,7 @@ class CogdoElevatorMovie(CogdoGameMovie): self.clipPlane = self.toonHead.attachNewNode(PlaneNode('clip')) self.clipPlane.node().setPlane(Plane(0, 0, 1, 0)) 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.reparentTo(render) dialogue = TTLocalizer.CogdoElevatorRewardLaff diff --git a/toontown/cogdominium/CogdoExecutiveSuiteMovies.py b/toontown/cogdominium/CogdoExecutiveSuiteMovies.py index 410e8df..35a072b 100644 --- a/toontown/cogdominium/CogdoExecutiveSuiteMovies.py +++ b/toontown/cogdominium/CogdoExecutiveSuiteMovies.py @@ -82,7 +82,7 @@ class CogdoExecutiveSuiteIntro(CogdoGameMovie): self.clipPlane = self.toonHead.attachNewNode(PlaneNode('clip')) self.clipPlane.node().setPlane(Plane(0, 0, 1, 0)) 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.reparentTo(render) dialogue = TTLocalizer.CogdoExecutiveSuiteIntroMessage diff --git a/toontown/cogdominium/CogdoFlyingGameGlobals.py b/toontown/cogdominium/CogdoFlyingGameGlobals.py index 19250c2..bf0759d 100644 --- a/toontown/cogdominium/CogdoFlyingGameGlobals.py +++ b/toontown/cogdominium/CogdoFlyingGameGlobals.py @@ -172,33 +172,33 @@ Dev.Invincibility = False Dev.NoLegalEagleAttacks = False Audio = VariableContainer() Audio.Cutoff = 75.0 -Audio.MusicFiles = {'normal': 'phase_4/audio/bgm/MG_cannon_game.mid', - 'end': 'phase_4/audio/bgm/FF_safezone.mid', - 'waiting': 'phase_4/audio/bgm/m_match_bg2.mid', - 'invul': 'phase_4/audio/bgm/MG_CogThief.mid', - 'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.mid'} -Audio.SfxFiles = {'propeller': 'phase_4/audio/sfx/TB_propeller.wav', - 'propeller_damaged': 'phase_5/audio/sfx/tt_s_ara_cfg_propellers_damaged.mp3', - 'fan': 'phase_4/audio/sfx/target_wind_float_loop.wav', - 'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.mp3', - 'getLaff': 'phase_4/audio/sfx/avatar_emotion_laugh.mp3', - 'getRedTape': 'phase_5/audio/sfx/SA_red_tape.mp3', - 'invulBuff': 'phase_4/audio/sfx/ring_get.mp3', - 'invulDebuff': 'phase_4/audio/sfx/ring_miss.mp3', - 'refuel': 'phase_5/audio/sfx/LB_receive_evidence.mp3', - 'bladeBreak': 'phase_5/audio/sfx/tt_s_ara_cfg_propellerBreaks.mp3', - 'popupHelpText': 'phase_3/audio/sfx/GUI_balloon_popup.mp3', - 'collide': 'phase_3.5/audio/sfx/AV_collision.mp3', - 'whirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_whirlwind.mp3', - 'toonInWhirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_toonInWhirlwind.mp3', - 'death': 'phase_5/audio/sfx/tt_s_ara_cfg_toonFalls.mp3', - 'legalEagleScream': 'phase_5/audio/sfx/tt_s_ara_cfg_eagleCry.mp3', - 'toonHit': 'phase_5/audio/sfx/tt_s_ara_cfg_toonHit.mp3', - 'lose': 'phase_4/audio/sfx/MG_lose.mp3', - 'win': 'phase_4/audio/sfx/MG_win.mp3', - 'refuelSpin': 'phase_4/audio/sfx/clock12.mp3', - 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.mp3', - 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.mp3'} +Audio.MusicFiles = {'normal': 'phase_4/audio/bgm/MG_cannon_game.ogg', + 'end': 'phase_4/audio/bgm/FF_safezone.ogg', + 'waiting': 'phase_4/audio/bgm/m_match_bg2.ogg', + 'invul': 'phase_4/audio/bgm/MG_CogThief.ogg', + 'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.ogg'} +Audio.SfxFiles = {'propeller': 'phase_4/audio/sfx/TB_propeller.ogg', + 'propeller_damaged': 'phase_5/audio/sfx/tt_s_ara_cfg_propellers_damaged.ogg', + 'fan': 'phase_4/audio/sfx/target_wind_float_loop.ogg', + 'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.ogg', + 'getLaff': 'phase_4/audio/sfx/avatar_emotion_laugh.ogg', + 'getRedTape': 'phase_5/audio/sfx/SA_red_tape.ogg', + 'invulBuff': 'phase_4/audio/sfx/ring_get.ogg', + 'invulDebuff': 'phase_4/audio/sfx/ring_miss.ogg', + 'refuel': 'phase_5/audio/sfx/LB_receive_evidence.ogg', + 'bladeBreak': 'phase_5/audio/sfx/tt_s_ara_cfg_propellerBreaks.ogg', + 'popupHelpText': 'phase_3/audio/sfx/GUI_balloon_popup.ogg', + 'collide': 'phase_3.5/audio/sfx/AV_collision.ogg', + 'whirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_whirlwind.ogg', + 'toonInWhirlwind': 'phase_5/audio/sfx/tt_s_ara_cfg_toonInWhirlwind.ogg', + 'death': 'phase_5/audio/sfx/tt_s_ara_cfg_toonFalls.ogg', + 'legalEagleScream': 'phase_5/audio/sfx/tt_s_ara_cfg_eagleCry.ogg', + 'toonHit': 'phase_5/audio/sfx/tt_s_ara_cfg_toonHit.ogg', + 'lose': 'phase_4/audio/sfx/MG_lose.ogg', + 'win': 'phase_4/audio/sfx/MG_win.ogg', + 'refuelSpin': 'phase_4/audio/sfx/clock12.ogg', + 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.ogg', + 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'} Level = VariableContainer() Level.GatherableTypes = PythonUtil.Enum(('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup')) Level.ObstacleTypes = PythonUtil.Enum(('Whirlwind', 'Fan', 'Minion')) diff --git a/toontown/cogdominium/CogdoGameExit.py b/toontown/cogdominium/CogdoGameExit.py index af7d0ce..586881e 100644 --- a/toontown/cogdominium/CogdoGameExit.py +++ b/toontown/cogdominium/CogdoGameExit.py @@ -15,8 +15,8 @@ class CogdoGameExit(NodePath): self._model.reparentTo(self) self._leftDoor = self._model.find('**/left_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._closeSfx = closeSfx or base.loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_close.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.ogg') self._elevatorPoints = [] for point in ElevatorConstants.ElevatorPoints: self._elevatorPoints.append(point[0]) diff --git a/toontown/cogdominium/CogdoMazeGameGlobals.py b/toontown/cogdominium/CogdoMazeGameGlobals.py index 030b9b8..221c24b 100644 --- a/toontown/cogdominium/CogdoMazeGameGlobals.py +++ b/toontown/cogdominium/CogdoMazeGameGlobals.py @@ -171,24 +171,24 @@ WaterCoolerCollisionName = 'WaterCooler_Collision' WaterCoolerShowEventName = 'CogdoMazeWaterCooler_Show' WaterCoolerHideEventName = 'CogdoMazeWaterCooler_Hide' AudioCutoff = 75.0 -MusicFiles = {'normal': 'phase_9/audio/bgm/CHQ_FACT_bg.mid', - 'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.mid'} -SfxFiles = {'toonHitByDrop': 'phase_5/audio/sfx/tt_s_ara_cmg_toonHit.mp3', - 'toonHit': 'phase_4/audio/sfx/MG_cannon_hit_dirt.mp3', - 'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.mp3', - 'drop': 'phase_5/audio/sfx/tt_s_ara_cmg_itemHitsFloor.mp3', - 'throw': 'phase_3.5/audio/sfx/AA_pie_throw_only.mp3', - 'splat': 'phase_5/audio/sfx/SA_watercooler_spray_only.mp3', - 'cogSpin': 'phase_3.5/audio/sfx/Cog_Death.mp3', - 'cogDeath': 'phase_3.5/audio/sfx/ENC_cogfall_apart.mp3', - 'bossCogAngry': 'phase_5/audio/sfx/tt_s_ara_cmg_bossCogAngry.mp3', - 'cogStomp': 'phase_5/audio/sfx/tt_s_ara_cmg_cogStomp.mp3', - 'quake': 'phase_5/audio/sfx/tt_s_ara_cmg_groundquake.mp3', - 'waterCoolerFill': 'phase_5/audio/sfx/tt_s_ara_cmg_waterCoolerFill.mp3', - 'lose': 'phase_4/audio/sfx/MG_lose.mp3', - 'win': 'phase_4/audio/sfx/MG_win.mp3', - 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.mp3', - 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.mp3'} +MusicFiles = {'normal': 'phase_9/audio/bgm/CHQ_FACT_bg.ogg', + 'timeRunningOut': 'phase_7/audio/bgm/encntr_suit_winning_indoor.ogg'} +SfxFiles = {'toonHitByDrop': 'phase_5/audio/sfx/tt_s_ara_cmg_toonHit.ogg', + 'toonHit': 'phase_4/audio/sfx/MG_cannon_hit_dirt.ogg', + 'getMemo': 'phase_4/audio/sfx/MG_maze_pickup.ogg', + 'drop': 'phase_5/audio/sfx/tt_s_ara_cmg_itemHitsFloor.ogg', + 'throw': 'phase_3.5/audio/sfx/AA_pie_throw_only.ogg', + 'splat': 'phase_5/audio/sfx/SA_watercooler_spray_only.ogg', + 'cogSpin': 'phase_3.5/audio/sfx/Cog_Death.ogg', + 'cogDeath': 'phase_3.5/audio/sfx/ENC_cogfall_apart.ogg', + 'bossCogAngry': 'phase_5/audio/sfx/tt_s_ara_cmg_bossCogAngry.ogg', + 'cogStomp': 'phase_5/audio/sfx/tt_s_ara_cmg_cogStomp.ogg', + 'quake': 'phase_5/audio/sfx/tt_s_ara_cmg_groundquake.ogg', + 'waterCoolerFill': 'phase_5/audio/sfx/tt_s_ara_cmg_waterCoolerFill.ogg', + 'lose': 'phase_4/audio/sfx/MG_lose.ogg', + 'win': 'phase_4/audio/sfx/MG_win.ogg', + 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.ogg', + 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'} MessageLabelPos = (0.0, 0.0, -0.4) MemoGuiPos = (-0.85, 0, -0.9) MemoGuiTextScale = 0.1 diff --git a/toontown/cogdominium/DistCogdoCrane.py b/toontown/cogdominium/DistCogdoCrane.py index 0ffbf9a..eee7525 100644 --- a/toontown/cogdominium/DistCogdoCrane.py +++ b/toontown/cogdominium/DistCogdoCrane.py @@ -70,11 +70,11 @@ class DistCogdoCrane(DistributedObject.DistributedObject, FSM.FSM): self.heldObject = None self.craneAdviceLabel = None self.magnetAdviceLabel = None - self.atLimitSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3') - self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav') + 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.ogg') + 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.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 return diff --git a/toontown/cogdominium/DistCogdoCraneMoneyBag.py b/toontown/cogdominium/DistCogdoCraneMoneyBag.py index 00bf41a..995fb95 100644 --- a/toontown/cogdominium/DistCogdoCraneMoneyBag.py +++ b/toontown/cogdominium/DistCogdoCraneMoneyBag.py @@ -18,10 +18,10 @@ class DistCogdoCraneMoneyBag(DistCogdoCraneObject): DistCogdoCraneObject.__init__(self, cr) NodePath.__init__(self, 'object') self.index = None - self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.mp3') - self.hitMagnetSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe.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.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.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) return diff --git a/toontown/cogdominium/DistCogdoCraneObject.py b/toontown/cogdominium/DistCogdoCraneObject.py index dff1cc2..cbf520d 100644 --- a/toontown/cogdominium/DistCogdoCraneObject.py +++ b/toontown/cogdominium/DistCogdoCraneObject.py @@ -26,9 +26,9 @@ class DistCogdoCraneObject(DistributedSmoothNode.DistributedSmoothNode, FSM.FSM) self.physicsActivated = 0 self.toMagnetSoundInterval = 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.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.lerpInterval = None return diff --git a/toontown/cogdominium/DistributedCogdoInterior.py b/toontown/cogdominium/DistributedCogdoInterior.py index 0ba64e4..703a2b1 100644 --- a/toontown/cogdominium/DistributedCogdoInterior.py +++ b/toontown/cogdominium/DistributedCogdoInterior.py @@ -35,8 +35,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): DistributedObject.DistributedObject.__init__(self, cr) self.toons = [] self.activeIntervals = {} - self.openSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_open.mp3') - self.closeSfx = base.loader.loadSfx('phase_5/audio/sfx/elevator_door_close.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.ogg') self.suits = [] self.reserveSuits = [] self.joiningReserves = [] @@ -77,8 +77,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.penthouseOutroTrack = None self.penthouseOutroChatDoneTrack = None self.penthouseIntroTrack = None - self.waitMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_toon_winning_indoor.mid') - self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.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.ogg') self.fsm = ClassicFSM.ClassicFSM('DistributedCogdoInterior', [State.State('WaitForAllToonsInside', self.enterWaitForAllToonsInside, self.exitWaitForAllToonsInside, ['Elevator']), State.State('Elevator', self.enterElevator, self.exitElevator, ['Game']), State.State('Game', self.enterGame, self.exitGame, ['Resting', 'Failed', 'BattleIntro']), @@ -174,8 +174,8 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): def handleAnnounceGenerate(self, obj): self.ignore(self.announceGenerateName) - self.cageDoorSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_door.mp3') - self.cageLowerSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_lower.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.ogg') self.sendUpdate('setAvatarJoined', []) def disable(self): diff --git a/toontown/coghq/BossbotCogHQLoader.py b/toontown/coghq/BossbotCogHQLoader.py index 4f11ce7..17dc20a 100644 --- a/toontown/coghq/BossbotCogHQLoader.py +++ b/toontown/coghq/BossbotCogHQLoader.py @@ -24,7 +24,7 @@ class BossbotCogHQLoader(CogHQLoader.CogHQLoader): state = self.fsm.getStateNamed(stateName) 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.factoryExteriorModelPath = 'phase_11/models/lawbotHQ/LB_DA_Lobby' self.cogHQLobbyModelPath = 'phase_12/models/bossbotHQ/CogGolfCourtyard' diff --git a/toontown/coghq/CashbotCogHQLoader.py b/toontown/coghq/CashbotCogHQLoader.py index 4cf468a..91f0478 100644 --- a/toontown/coghq/CashbotCogHQLoader.py +++ b/toontown/coghq/CashbotCogHQLoader.py @@ -20,7 +20,7 @@ class CashbotCogHQLoader(CogHQLoader.CogHQLoader): state = self.fsm.getStateNamed(stateName) 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.cogHQLobbyModelPath = 'phase_10/models/cogHQ/VaultLobby' self.geom = None diff --git a/toontown/coghq/CogHQLoader.py b/toontown/coghq/CogHQLoader.py index 2c3b2ca..2b99995 100644 --- a/toontown/coghq/CogHQLoader.py +++ b/toontown/coghq/CogHQLoader.py @@ -29,7 +29,7 @@ class CogHQLoader(StateData.StateData): def load(self, zoneId): self.parentFSMState.addChild(self.fsm) 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.load() Suit.loadSuits(3) diff --git a/toontown/coghq/CountryClubInterior.py b/toontown/coghq/CountryClubInterior.py index 2d02b25..7ed9f85 100644 --- a/toontown/coghq/CountryClubInterior.py +++ b/toontown/coghq/CountryClubInterior.py @@ -72,7 +72,7 @@ class CountryClubInterior(BattlePlace.BattlePlace): def load(self): self.parentFSM.getStateNamed('countryClubInterior').addChild(self.fsm) 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) def unload(self): diff --git a/toontown/coghq/DistributedBanquetTable.py b/toontown/coghq/DistributedBanquetTable.py index d92776d..bb92986 100644 --- a/toontown/coghq/DistributedBanquetTable.py +++ b/toontown/coghq/DistributedBanquetTable.py @@ -173,11 +173,11 @@ class DistributedBanquetTable(DistributedObject.DistributedObject, FSM.FSM, Banq self.tableGeom = self.tableGroup.find('**/Geometry') self.setupDiners() self.setupChairCols() - self.squirtSfx = loader.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.mp3') - self.hitBossSfx = loader.loadSfx('phase_5/audio/sfx/SA_watercooler_spray_only.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.ogg') 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.pitcherMoveSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.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.ogg') def setupDiners(self): 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)) 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)) - spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') - deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.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.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)) intervalName = 'dinerDie-%d-%d' % (self.index, chairIndex) deathIval = Parallel(ival, deathSoundTrack) diff --git a/toontown/coghq/DistributedBarrelBase.py b/toontown/coghq/DistributedBarrelBase.py index 42aa7ff..9bef264 100644 --- a/toontown/coghq/DistributedBarrelBase.py +++ b/toontown/coghq/DistributedBarrelBase.py @@ -11,8 +11,8 @@ class DistributedBarrelBase(BasicEntities.DistributedNodePathEntity, BarrelBase. def __init__(self, cr): self.rewardPerGrabMax = 0 BasicEntities.DistributedNodePathEntity.__init__(self, cr) - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' - self.rejectSoundPath = 'phase_4/audio/sfx/ring_miss.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' + self.rejectSoundPath = 'phase_4/audio/sfx/ring_miss.ogg' self.animTrack = None self.shadow = 0 self.barrelScale = 0.5 diff --git a/toontown/coghq/DistributedButton.py b/toontown/coghq/DistributedButton.py index 0c8b3d8..0d6de82 100644 --- a/toontown/coghq/DistributedButton.py +++ b/toontown/coghq/DistributedButton.py @@ -89,7 +89,7 @@ class DistributedButton(DistributedSwitch.DistributedSwitch): DistributedSwitch.DistributedSwitch.exitTrigger(self, args) 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 halfDur = duration * 0.5 pos = Vec3(0.0, 0.0, -0.2) @@ -99,7 +99,7 @@ class DistributedButton(DistributedSwitch.DistributedSwitch): def switchCountdownTrack(self): 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( SoundInterval(countDownSfx), Sequence( @@ -123,7 +123,7 @@ class DistributedButton(DistributedSwitch.DistributedSwitch): return track 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 halfDur = duration * 0.5 pos = Vec3(0.0) diff --git a/toontown/coghq/DistributedCashbotBossCrane.py b/toontown/coghq/DistributedCashbotBossCrane.py index 15e888d..0eb63cd 100644 --- a/toontown/coghq/DistributedCashbotBossCrane.py +++ b/toontown/coghq/DistributedCashbotBossCrane.py @@ -72,11 +72,11 @@ class DistributedCashbotBossCrane(DistributedObject.DistributedObject, FSM.FSM): self.closeButton = None self.craneAdviceLabel = None self.magnetAdviceLabel = None - self.atLimitSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.magnetOnSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_on.mp3') - self.magnetLoopSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_CFO_magnet_loop.wav') + 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.ogg') + 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.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 return diff --git a/toontown/coghq/DistributedCashbotBossObject.py b/toontown/coghq/DistributedCashbotBossObject.py index 2eeefa6..9e41c72 100644 --- a/toontown/coghq/DistributedCashbotBossObject.py +++ b/toontown/coghq/DistributedCashbotBossObject.py @@ -26,9 +26,9 @@ class DistributedCashbotBossObject(DistributedSmoothNode.DistributedSmoothNode, self.physicsActivated = 0 self.toMagnetSoundInterval = 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.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.lerpInterval = None return diff --git a/toontown/coghq/DistributedCashbotBossSafe.py b/toontown/coghq/DistributedCashbotBossSafe.py index 36e22ae..b7c39e4 100644 --- a/toontown/coghq/DistributedCashbotBossSafe.py +++ b/toontown/coghq/DistributedCashbotBossSafe.py @@ -17,10 +17,10 @@ class DistributedCashbotBossSafe(DistributedCashbotBossObject.DistributedCashbot DistributedCashbotBossObject.DistributedCashbotBossObject.__init__(self, cr) NodePath.__init__(self, 'object') self.index = None - self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.mp3') - self.hitMagnetSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_safe.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.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.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) return diff --git a/toontown/coghq/DistributedCashbotBossTreasure.py b/toontown/coghq/DistributedCashbotBossTreasure.py index a1c5e18..f5fa0d7 100644 --- a/toontown/coghq/DistributedCashbotBossTreasure.py +++ b/toontown/coghq/DistributedCashbotBossTreasure.py @@ -13,7 +13,7 @@ class DistributedCashbotBossTreasure(DistributedSZTreasure.DistributedSZTreasure def __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): newModel = Models[hoodId] diff --git a/toontown/coghq/DistributedCogHQDoor.py b/toontown/coghq/DistributedCogHQDoor.py index 96d45f7..7634fbd 100644 --- a/toontown/coghq/DistributedCogHQDoor.py +++ b/toontown/coghq/DistributedCogHQDoor.py @@ -15,8 +15,8 @@ class DistributedCogHQDoor(DistributedDoor.DistributedDoor): def __init__(self, cr): DistributedDoor.DistributedDoor.__init__(self, cr) - self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_open.mp3') - self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_door_close.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.ogg') def wantsNametag(self): return 0 diff --git a/toontown/coghq/DistributedCrate.py b/toontown/coghq/DistributedCrate.py index 8ab9a3e..4ab8a23 100644 --- a/toontown/coghq/DistributedCrate.py +++ b/toontown/coghq/DistributedCrate.py @@ -34,8 +34,8 @@ class DistributedCrate(DistributedCrushableEntity.DistributedCrushableEntity): self.stuckToCrate = 0 self.upPressed = 0 self.isPushing = 0 - self.creakSound = loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_crate_effort.mp3') - self.pushSound = loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_crate_sliding.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.ogg') return def disable(self): diff --git a/toontown/coghq/DistributedDoorEntity.py b/toontown/coghq/DistributedDoorEntity.py index 4382c19..b225a20 100644 --- a/toontown/coghq/DistributedDoorEntity.py +++ b/toontown/coghq/DistributedDoorEntity.py @@ -58,7 +58,7 @@ class DistributedDoorEntityLock(DistributedDoorEntityBase.LockBase, FourState.Fo def enterState1(self): FourState.FourState.enterState1(self) 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))))) def enterState2(self): @@ -73,8 +73,8 @@ class DistributedDoorEntityLock(DistributedDoorEntityBase.LockBase, FourState.Fo def enterState3(self): FourState.FourState.enterState3(self) - unlockSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_unlock.mp3') - slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_arms_retracting.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.ogg') 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))))) @@ -366,15 +366,15 @@ class DistributedDoorEntity(DistributedDoorEntityBase.DistributedDoorEntityBase, if not self.level.complexVis() or self.isOuterDoorOpen and (not self.isVisBlocker or self.isVisReady): print('openInnerDoors stage Two') duration = self.duration - slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.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.ogg') 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))) def closeInnerDoors(self): duration = self.duration - slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.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.ogg') 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))) @@ -391,8 +391,8 @@ class DistributedDoorEntity(DistributedDoorEntityBase.DistributedDoorEntityBase, else: self.okToUnblockVis() duration = self.duration - slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.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.ogg') 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))) @@ -420,8 +420,8 @@ class DistributedDoorEntity(DistributedDoorEntityBase.DistributedDoorEntityBase, def enterState3(self): FourState.FourState.enterState3(self) duration = self.duration - slideSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - finalSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.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.ogg') self.setTrack(Sequence(Wait(duration * 0.1), Func(self.closeInnerDoors), Wait(duration * 0.4), diff --git a/toontown/coghq/DistributedFoodBelt.py b/toontown/coghq/DistributedFoodBelt.py index c2b09cf..39bf161 100644 --- a/toontown/coghq/DistributedFoodBelt.py +++ b/toontown/coghq/DistributedFoodBelt.py @@ -166,7 +166,7 @@ class DistributedFoodBelt(DistributedObject.DistributedObject, FSM.FSM, FoodBelt joint = self.beltActor.find('**/uvj_WakeWhiteTide1') mesh.setTexProjector(mesh.findTextureStage('default'), joint, self.beltActor) 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.beltSoundInterval = SoundInterval(self.beltSound, node=self.beltModel, listenerNode=base.localAvatar, seamlessLoop=True, volume=0.25, cutOff=100) diff --git a/toontown/coghq/DistributedGolfGreenGame.py b/toontown/coghq/DistributedGolfGreenGame.py index a5d2ff7..8dd18b2 100644 --- a/toontown/coghq/DistributedGolfGreenGame.py +++ b/toontown/coghq/DistributedGolfGreenGame.py @@ -277,14 +277,14 @@ class DistributedGolfGreenGame(BattleBlocker.BattleBlocker): self.invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons') self.model = model self.model1 = model1 - self.soundFire = base.loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3') - self.soundLand = base.loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3') - self.soundBurst = base.loader.loadSfx('phase_5/audio/sfx/Toon_bodyfall_synergy.mp3') - self.soundBomb = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') - self.soundLose = base.loader.loadSfx('phase_11/audio/sfx/LB_capacitor_discharge_3.mp3') - self.soundWin = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match_bonus_both.mp3') - self.soundDone = base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_back.mp3') - self.soundMove = base.loader.loadSfx('phase_3.5/audio/sfx/SA_shred.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.ogg') + 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.ogg') + 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.ogg') + 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.ogg') background = model.find('**/bg') itemBoard = model.find('**/item_board') self.focusPoint = self.baseNode.attachNewNode('GolfGreenGameFrame') diff --git a/toontown/coghq/DistributedGolfSpot.py b/toontown/coghq/DistributedGolfSpot.py index 462e2ff..05de779 100644 --- a/toontown/coghq/DistributedGolfSpot.py +++ b/toontown/coghq/DistributedGolfSpot.py @@ -107,7 +107,7 @@ class DistributedGolfSpot(DistributedObject.DistributedObject, FSM.FSM): cn.setIntoCollideMask(ToontownGlobals.WallBitmask) self.trigger = self.root.attachNewNode(cn) 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): if self.swingInterval: @@ -738,10 +738,10 @@ class DistributedGolfSpot(DistributedObject.DistributedObject, FSM.FSM): if flyBallCode == ToontownGlobals.PieCodeBossCog: self.notify.debug('changing color to %s' % 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 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) if flyBallCode == ToontownGlobals.PieCodeBossCog and localAvatar.doId == throwerId: vol = 1.0 diff --git a/toontown/coghq/DistributedLaserField.py b/toontown/coghq/DistributedLaserField.py index 3a1409f..acd3561 100644 --- a/toontown/coghq/DistributedLaserField.py +++ b/toontown/coghq/DistributedLaserField.py @@ -56,9 +56,9 @@ class DistributedLaserField(BattleBlocker.BattleBlocker): self.gridGame = 'some game' self.gridGameText = ' ' 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.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)) return diff --git a/toontown/coghq/DistributedLawbotBossGavel.py b/toontown/coghq/DistributedLawbotBossGavel.py index 8c5f50d..f3522d0 100644 --- a/toontown/coghq/DistributedLawbotBossGavel.py +++ b/toontown/coghq/DistributedLawbotBossGavel.py @@ -36,7 +36,7 @@ class DistributedLawbotBossGavel(DistributedObject.DistributedObject, FSM.FSM): self.name = 'gavel-%s' % self.doId self.loadModel(self.modelPath, self.modelFindString) 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] self.nodePath.setPosHpr(*tempTuple) self.origHpr = Point3(tempTuple[3], tempTuple[4], tempTuple[5]) diff --git a/toontown/coghq/DistributedLawbotCannon.py b/toontown/coghq/DistributedLawbotCannon.py index f384bc8..4d844c7 100644 --- a/toontown/coghq/DistributedLawbotCannon.py +++ b/toontown/coghq/DistributedLawbotCannon.py @@ -129,10 +129,10 @@ class DistributedLawbotCannon(DistributedObject.DistributedObject): self.cannon.reparentTo(self.nodePath) self.kartColNode = CollisionNode(self.uniqueName('KartColNode')) self.kartNode = self.nodePath.attachNewNode(self.kartColNode) - self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') - self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndHitChair = base.loader.loadSfx('phase_11/audio/sfx/LB_toon_jury.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.ogg') + 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.ogg') self.cannon.hide() self.flashingLabel = None return diff --git a/toontown/coghq/DistributedLawbotChair.py b/toontown/coghq/DistributedLawbotChair.py index c1c9d50..b6c5f07 100644 --- a/toontown/coghq/DistributedLawbotChair.py +++ b/toontown/coghq/DistributedLawbotChair.py @@ -93,11 +93,11 @@ class DistributedLawbotChair(DistributedObject.DistributedObject, FSM.FSM): def loadSounds(self): 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: - 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: - 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 def unloadSounds(self): diff --git a/toontown/coghq/DistributedLift.py b/toontown/coghq/DistributedLift.py index 9e2d506..a79737a 100644 --- a/toontown/coghq/DistributedLift.py +++ b/toontown/coghq/DistributedLift.py @@ -17,7 +17,7 @@ class DistributedLift(BasicEntities.DistributedNodePathEntity): def generateInit(self): self.notify.debug('generateInit') 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.enterInitialState() diff --git a/toontown/coghq/DistributedMoleField.py b/toontown/coghq/DistributedMoleField.py index 0c3dcce..7467505 100644 --- a/toontown/coghq/DistributedMoleField.py +++ b/toontown/coghq/DistributedMoleField.py @@ -111,11 +111,11 @@ class DistributedMoleField(DistributedNodePathEntity, MoleFieldBase.MoleFieldBas self.numMoles = len(self.moleHills) self.centerNode = self.attachNewNode('center') self.centerCenterNode() - self.soundBomb = base.loader.loadSfx('phase_12/audio/sfx/Mole_Surprise.mp3') - self.soundBomb2 = base.loader.loadSfx('phase_3.5/audio/dial/AV_pig_howl.mp3') - self.soundCog = base.loader.loadSfx('phase_12/audio/sfx/Mole_Stomp.mp3') - self.soundUp = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') - self.soundDown = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.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.ogg') + self.soundCog = base.loader.loadSfx('phase_12/audio/sfx/Mole_Stomp.ogg') + 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.ogg') upInterval = SoundInterval(self.soundUp, loop=0) downInterval = SoundInterval(self.soundDown, loop=0) self.soundIUpDown = Sequence(upInterval, downInterval) diff --git a/toontown/coghq/DistributedSecurityCamera.py b/toontown/coghq/DistributedSecurityCamera.py index 198c049..cdfe652 100644 --- a/toontown/coghq/DistributedSecurityCamera.py +++ b/toontown/coghq/DistributedSecurityCamera.py @@ -83,15 +83,15 @@ class DistributedSecurityCamera(BasicEntities.DistributedNodePathEntity): self.Alert['Green'] = 0.0 self.Alert['Blue'] = 0.0 self.Alert['Alpha'] = 1.0 - self.attackSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.mp3') - self.onSound = loader.loadSfx('phase_11/audio/sfx/LB_camera_shutter_2.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.ogg') 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.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.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.taskName = None return diff --git a/toontown/coghq/DistributedStomper.py b/toontown/coghq/DistributedStomper.py index 9284b02..5b7f3ac 100644 --- a/toontown/coghq/DistributedStomper.py +++ b/toontown/coghq/DistributedStomper.py @@ -12,7 +12,7 @@ from toontown.toonbase import ToontownGlobals class DistributedStomper(DistributedCrusherEntity.DistributedCrusherEntity): 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'] def __init__(self, cr): diff --git a/toontown/coghq/FactoryInterior.py b/toontown/coghq/FactoryInterior.py index 2adcc17..43d4d8d 100644 --- a/toontown/coghq/FactoryInterior.py +++ b/toontown/coghq/FactoryInterior.py @@ -68,7 +68,7 @@ class FactoryInterior(BattlePlace.BattlePlace): State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') self.parentFSM.getStateNamed('factoryInterior').addChild(self.fsm) 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): self.parentFSM.getStateNamed('factoryInterior').removeChild(self.fsm) diff --git a/toontown/coghq/LawbotCogHQLoader.py b/toontown/coghq/LawbotCogHQLoader.py index 38f8b51..c4eeadd 100644 --- a/toontown/coghq/LawbotCogHQLoader.py +++ b/toontown/coghq/LawbotCogHQLoader.py @@ -27,7 +27,7 @@ class LawbotCogHQLoader(CogHQLoader.CogHQLoader): state = self.fsm.getStateNamed(stateName) 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.factoryExteriorModelPath = 'phase_11/models/lawbotHQ/LB_DA_Lobby' self.cogHQLobbyModelPath = 'phase_11/models/lawbotHQ/LB_CH_Lobby' diff --git a/toontown/coghq/MintInterior.py b/toontown/coghq/MintInterior.py index c15f3e9..da57194 100644 --- a/toontown/coghq/MintInterior.py +++ b/toontown/coghq/MintInterior.py @@ -67,7 +67,7 @@ class MintInterior(BattlePlace.BattlePlace): def load(self): self.parentFSM.getStateNamed('mintInterior').addChild(self.fsm) 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): self.parentFSM.getStateNamed('mintInterior').removeChild(self.fsm) diff --git a/toontown/coghq/SellbotCogHQLoader.py b/toontown/coghq/SellbotCogHQLoader.py index 96bcb55..2467ad8 100644 --- a/toontown/coghq/SellbotCogHQLoader.py +++ b/toontown/coghq/SellbotCogHQLoader.py @@ -28,7 +28,7 @@ class SellbotCogHQLoader(CogHQLoader.CogHQLoader): state = self.fsm.getStateNamed(stateName) 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.cogHQLobbyModelPath = 'phase_9/models/cogHQ/SellbotHQLobby' self.factoryExteriorModelPath = 'phase_9/models/cogHQ/SellbotFactoryExterior' diff --git a/toontown/coghq/SellbotLegFactorySpec.py b/toontown/coghq/SellbotLegFactorySpec.py index d80eb1f..9d8c471 100644 --- a/toontown/coghq/SellbotLegFactorySpec.py +++ b/toontown/coghq/SellbotLegFactorySpec.py @@ -894,7 +894,7 @@ GlobalEntities = {1000: {'type': 'levelMgr', 'hpr': Vec3(0, 0, 0), 'scale': 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}, 10016: {'type': 'ambientSound', 'name': 'sndConveyorBelt', @@ -904,7 +904,7 @@ GlobalEntities = {1000: {'type': 'levelMgr', 'hpr': Vec3(0, 0, 0), 'scale': 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}, 10053: {'type': 'ambientSound', 'name': 'eastWind', @@ -914,7 +914,7 @@ GlobalEntities = {1000: {'type': 'levelMgr', 'hpr': Vec3(0, 0, 0), 'scale': 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}, 10055: {'type': 'ambientSound', 'name': 'sndGears', @@ -924,7 +924,7 @@ GlobalEntities = {1000: {'type': 'levelMgr', 'hpr': Vec3(0, 0, 0), 'scale': 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}, 10031: {'type': 'battleBlocker', 'name': '', diff --git a/toontown/coghq/StageInterior.py b/toontown/coghq/StageInterior.py index 90f2e60..2bb4902 100644 --- a/toontown/coghq/StageInterior.py +++ b/toontown/coghq/StageInterior.py @@ -69,7 +69,7 @@ class StageInterior(BattlePlace.BattlePlace): def load(self): self.parentFSM.getStateNamed('stageInterior').addChild(self.fsm) 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): self.parentFSM.getStateNamed('stageInterior').removeChild(self.fsm) diff --git a/toontown/distributed/ToontownClientRepository.py b/toontown/distributed/ToontownClientRepository.py index aef882c..a77dd00 100644 --- a/toontown/distributed/ToontownClientRepository.py +++ b/toontown/distributed/ToontownClientRepository.py @@ -222,7 +222,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository): self.sendSetAvatarIdMsg(0) self.clearFriendState() 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: self.music.setLoop(1) self.music.setVolume(0.9) diff --git a/toontown/effects/DustCloud.py b/toontown/effects/DustCloud.py index 08b4a6d..2cf8d2d 100644 --- a/toontown/effects/DustCloud.py +++ b/toontown/effects/DustCloud.py @@ -4,8 +4,8 @@ from direct.showbase import PythonUtil from toontown.battle.BattleProps import globalPropPool from direct.directnotify import DirectNotifyGlobal SFX = PythonUtil.Enum('poof, magic') -SFXPATHS = {SFX.poof: 'phase_4/audio/sfx/firework_distance_02.mp3', - SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.mp3'} +SFXPATHS = {SFX.poof: 'phase_4/audio/sfx/firework_distance_02.ogg', + SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.ogg'} class DustCloud(NodePath): dustCloudCount = 0 diff --git a/toontown/effects/FireworkEffect.py b/toontown/effects/FireworkEffect.py index 564a61a..80aa298 100644 --- a/toontown/effects/FireworkEffect.py +++ b/toontown/effects/FireworkEffect.py @@ -21,13 +21,13 @@ from toontown.effects.SkullBurst import SkullBurst from toontown.effects.SkullFlash import SkullFlash from toontown.effects.TrailExplosion import TrailExplosion from toontown.effects.IceCream import IceCream -trailSfxNames = ['phase_4/audio/sfx/firework_whistle_01.mp3', 'phase_4/audio/sfx/firework_whistle_02.mp3'] -burstSfxNames = ['phase_4/audio/sfx/firework_explosion_01.mp3', - 'phase_4/audio/sfx/firework_explosion_02.mp3', - 'phase_4/audio/sfx/firework_explosion_03.mp3', - 'phase_4/audio/sfx/firework_distance_01.mp3', - 'phase_4/audio/sfx/firework_distance_02.mp3', - 'phase_4/audio/sfx/firework_distance_03.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.ogg', + 'phase_4/audio/sfx/firework_explosion_02.ogg', + 'phase_4/audio/sfx/firework_explosion_03.ogg', + 'phase_4/audio/sfx/firework_distance_01.ogg', + 'phase_4/audio/sfx/firework_distance_02.ogg', + 'phase_4/audio/sfx/firework_distance_03.ogg'] class FireworkEffect(NodePath): diff --git a/toontown/effects/FireworkShowMixin.py b/toontown/effects/FireworkShowMixin.py index 3bcfadb..7e79c49 100644 --- a/toontown/effects/FireworkShowMixin.py +++ b/toontown/effects/FireworkShowMixin.py @@ -81,22 +81,22 @@ class FireworkShowMixin: instructionMessage = TTLocalizer.FireworksInstructions startMessage = TTLocalizer.FireworksJuly4Beginning endMessage = TTLocalizer.FireworksJuly4Ending - musicFile = 'phase_4/audio/bgm/tt_party2.mid' + musicFile = 'phase_4/audio/bgm/tt_party2.ogg' elif eventId == NEWYEARS_FIREWORKS: instructionMessage = TTLocalizer.FireworksInstructions startMessage = TTLocalizer.FireworksNewYearsEveBeginning 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: instructionMessage = TTLocalizer.FireworksActivityInstructions startMessage = TTLocalizer.FireworksActivityBeginning endMessage = TTLocalizer.FireworksActivityEnding - musicFile = 'phase_4/audio/bgm/tt_summer.mid' + musicFile = 'phase_4/audio/bgm/tt_summer.ogg' elif eventId == COMBO_FIREWORKS: instructionMessage = TTLocalizer.FireworksInstructions startMessage = TTLocalizer.FireworksComboBeginning endMessage = TTLocalizer.FireworksComboEnding - musicFile = 'phase_4/audio/bgm/tt_party2.mid' + musicFile = 'phase_4/audio/bgm/tt_party2.ogg' else: FireworkShowMixin.notify.warning('Invalid fireworks event ID: %d' % eventId) return None diff --git a/toontown/effects/Fireworks.py b/toontown/effects/Fireworks.py index 68531fb..c7aadb2 100644 --- a/toontown/effects/Fireworks.py +++ b/toontown/effects/Fireworks.py @@ -85,7 +85,7 @@ def shootFireworkRing(x, y, z, color1, color2, amp): f.addParticles(p0) f.setPos(x, y, z) 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.start() @@ -124,14 +124,14 @@ def shootFireworkRocket(x, y, z, color1, color2, amp): gravityForceGroup.addForce(force0) f.addForceGroup(gravityForceGroup) 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) 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() 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) t = Sequence(Func(sfx.play), Wait(3), name=getNextSequenceName('shootFireworkRocket')) t.start() @@ -180,7 +180,7 @@ def shootFireworkCircleGeneric(x, y, z, color1, color2, amp, poolSize): circleForceGroup.addForce(force1) f.addForceGroup(circleForceGroup) 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) 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() @@ -220,7 +220,7 @@ def shootFireworkCircleSprite(x, y, z, color, texture, amp): circleForceGroup.addForce(force1) f.addForceGroup(circleForceGroup) 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) 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() diff --git a/toontown/estate/DistributedCannon.py b/toontown/estate/DistributedCannon.py index cc060f9..005ecfa 100644 --- a/toontown/estate/DistributedCannon.py +++ b/toontown/estate/DistributedCannon.py @@ -290,14 +290,14 @@ class DistributedCannon(DistributedObject.DistributedObject): self.splash = Splash.Splash(render) self.dustCloud = DustCloud.DustCloud(render) self.dustCloud.setBillboardPointEye() - self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') - self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3') - self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') - self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') - self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') - self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.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.ogg') + 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.ogg') + 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.ogg') + self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg') + self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.ogg') self.collSphere = CollisionSphere(0, 0, 0, self.getSphereRadius()) self.collSphere.setTangible(1) self.collNode = CollisionNode(self.uniqueName('CannonSphere')) diff --git a/toontown/estate/DistributedGardenPlot.py b/toontown/estate/DistributedGardenPlot.py index 2363f95..9b7bead 100644 --- a/toontown/estate/DistributedGardenPlot.py +++ b/toontown/estate/DistributedGardenPlot.py @@ -331,7 +331,7 @@ class DistributedGardenPlot(DistributedLawnDecor.DistributedLawnDecor): self.movie.start() 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) 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))) diff --git a/toontown/estate/DistributedLawnDecor.py b/toontown/estate/DistributedLawnDecor.py index bf755bd..88734fc 100644 --- a/toontown/estate/DistributedLawnDecor.py +++ b/toontown/estate/DistributedLawnDecor.py @@ -340,7 +340,7 @@ class DistributedLawnDecor(DistributedNode.DistributedNode, NodePath, ShadowCast self.movie.start() 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) pos = self.model.getPos() pos.setZ(pos[2] - 1) diff --git a/toontown/estate/DistributedMailbox.py b/toontown/estate/DistributedMailbox.py index 3c545fd..9585a40 100644 --- a/toontown/estate/DistributedMailbox.py +++ b/toontown/estate/DistributedMailbox.py @@ -170,9 +170,9 @@ class DistributedMailbox(DistributedObject.DistributedObject): return elif mode == MailboxGlobals.MAILBOX_MOVIE_EXIT: 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: - 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.start() DistributedMailbox.notify.debug('setMovie: exit') @@ -190,9 +190,9 @@ class DistributedMailbox(DistributedObject.DistributedObject): elif mode == MailboxGlobals.MAILBOX_MOVIE_READY: DistributedMailbox.notify.debug('setMovie: ready') 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: - 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.start() if isLocalToon: diff --git a/toontown/estate/DistributedPhone.py b/toontown/estate/DistributedPhone.py index 6617595..cf93dfd 100644 --- a/toontown/estate/DistributedPhone.py +++ b/toontown/estate/DistributedPhone.py @@ -96,10 +96,10 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem): mount = loader.loadModel('phase_5.5/models/estate/phoneMount-mod') mount.setTransparency(0, 1) self.model.reparentTo(mount) - self.ringSfx = loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.mp3') - self.handleSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_handle2.mp3') - self.hangUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_hang_up.mp3') - self.pickUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_pickup1.mp3') + self.ringSfx = loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.ogg') + self.handleSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_handle2.ogg') + self.hangUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_hang_up.ogg') + self.pickUpSfx = loader.loadSfx('phase_5.5/audio/sfx/telephone_pickup1.ogg') if self.initialScale: mount.setScale(*self.initialScale) self.usedInitialScale = 1 diff --git a/toontown/estate/DistributedPlantBase.py b/toontown/estate/DistributedPlantBase.py index 15db1f8..f0920fe 100644 --- a/toontown/estate/DistributedPlantBase.py +++ b/toontown/estate/DistributedPlantBase.py @@ -195,7 +195,7 @@ class DistributedPlantBase(DistributedLawnDecor.DistributedLawnDecor): self.waterTrackDict[avId] = track 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) waterTrack = Parallel() waterTrack.append(Sequence(Parallel(ActorInterval(toon, 'water'), SoundInterval(sound, node=toon, volume=0.5)), Func(toon.loop, 'neutral'))) diff --git a/toontown/estate/DistributedTarget.py b/toontown/estate/DistributedTarget.py index 613924b..c27592f 100644 --- a/toontown/estate/DistributedTarget.py +++ b/toontown/estate/DistributedTarget.py @@ -51,8 +51,8 @@ class DistributedTarget(DistributedObject.DistributedObject): self.geom.setPos(0, 0, 40) self.geom.setScale(3) self.geom.stash() - self.hitSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3') - self.rewardSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') + 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.ogg') self.scoreText = TextNode('scoreText') self.scoreText.setTextColor(1, 0, 0, 1) self.scoreText.setAlign(self.scoreText.ACenter) diff --git a/toontown/estate/EstateLoader.py b/toontown/estate/EstateLoader.py index 0375bac..a790976 100644 --- a/toontown/estate/EstateLoader.py +++ b/toontown/estate/EstateLoader.py @@ -24,8 +24,8 @@ class EstateLoader(SafeZoneLoader.SafeZoneLoader): State.State('house', self.enterHouse, self.exitHouse, ['quietZone']), State.State('quietZone', self.enterQuietZone, self.exitQuietZone, ['house', 'estate']), State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') - self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.mid' - self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.mid' + self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.ogg' + self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg' self.dnaFile = 'phase_5.5/dna/estate_1.dna' self.safeZoneStorageDNAFile = None self.cloudSwitch = 0 @@ -47,12 +47,12 @@ class EstateLoader(SafeZoneLoader.SafeZoneLoader): def load(self): SafeZoneLoader.SafeZoneLoader.load(self) - self.music = base.loader.loadMusic('phase_4/audio/bgm/TC_nbrhood.mid') - self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') - self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') - self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') - 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.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.music = base.loader.loadMusic('phase_4/audio/bgm/TC_nbrhood.ogg') + 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.ogg') + 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.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.ogg', 'phase_4/audio/sfx/SZ_TC_bird2.ogg', 'phase_4/audio/sfx/SZ_TC_bird3.ogg'])) if base.goonsEnabled: invModel = loader.loadModel('phase_3.5/models/gui/inventory_icons') self.invModels = [] diff --git a/toontown/fishing/FishGlobals.py b/toontown/fishing/FishGlobals.py index 62f1b6c..b726fac 100644 --- a/toontown/fishing/FishGlobals.py +++ b/toontown/fishing/FishGlobals.py @@ -56,79 +56,79 @@ RodRarityFactor = {0: 1.0 / (GlobalRarityDialBase * 1), 3: 1.0 / (GlobalRarityDialBase * 0.9), 4: 1.0 / (GlobalRarityDialBase * 0.85)} MaxRodId = 4 -FishAudioFileDict = {-1: ('Clownfish.mp3', +FishAudioFileDict = {-1: ('Clownfish.ogg', 1, 1.5, 1.0), - 0: ('BalloonFish.mp3', + 0: ('BalloonFish.ogg', 1, 0, 1.23), - 2: ('CatFish.mp3', + 2: ('CatFish.ogg', 1, 0, 1.26), - 4: ('Clownfish.mp3', + 4: ('Clownfish.ogg', 1, 1.5, 1.0), - 6: ('Frozen_Fish.mp3', + 6: ('Frozen_Fish.ogg', 1, 0, 1.0), - 8: ('Starfish.mp3', + 8: ('Starfish.ogg', 0, 0, 1.25), - 10: ('Holy_Mackerel.mp3', + 10: ('Holy_Mackerel.ogg', 1, 0.9, 1.0), - 12: ('Dog_Fish.mp3', + 12: ('Dog_Fish.ogg', 1, 0, 1.25), - 14: ('AmoreEel.mp3', + 14: ('AmoreEel.ogg', 1, 0, 1.0), - 16: ('Nurse_Shark.mp3', + 16: ('Nurse_Shark.ogg', 0, 0, 1.0), - 18: ('King_Crab.mp3', + 18: ('King_Crab.ogg', 0, 0, 1.0), - 20: ('Moon_Fish.mp3', + 20: ('Moon_Fish.ogg', 0, 1.0, 1.0), - 22: ('Seahorse.mp3', + 22: ('Seahorse.ogg', 1, 0, 1.26), - 24: ('Pool_Shark.mp3', + 24: ('Pool_Shark.ogg', 1, 2.0, 1.0), - 26: ('Bear_Acuda.mp3', + 26: ('Bear_Acuda.ogg', 1, 0, 1.0), - 28: ('CutThroatTrout.mp3', + 28: ('CutThroatTrout.ogg', 1, 0, 1.0), - 30: ('Piano_Tuna.mp3', + 30: ('Piano_Tuna.ogg', 0, 0, 1.0), - 32: ('PBJ_Fish.mp3', + 32: ('PBJ_Fish.ogg', 1, 0, 1.25), - 34: ('DevilRay.mp3', + 34: ('DevilRay.ogg', 0, 0, 1.0)} diff --git a/toontown/golf/DistributedGolfCourse.py b/toontown/golf/DistributedGolfCourse.py index a347885..6ee34e5 100644 --- a/toontown/golf/DistributedGolfCourse.py +++ b/toontown/golf/DistributedGolfCourse.py @@ -108,7 +108,7 @@ class DistributedGolfCourse(DistributedObject.DistributedObject, FSM, DelayDelet return 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): self.notify.debug('GOLF COURSE: received setCourseReady') diff --git a/toontown/golf/DistributedGolfHole.py b/toontown/golf/DistributedGolfHole.py index 4cbb1c0..9cbb809 100644 --- a/toontown/golf/DistributedGolfHole.py +++ b/toontown/golf/DistributedGolfHole.py @@ -302,24 +302,24 @@ class DistributedGolfHole(DistributedPhysicsWorld.DistributedPhysicsWorld, FSM, self.hardSurfaceNodePath.flattenStrong() def loadSounds(self): - self.hitBallSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hit_Ball.mp3') - self.holeInOneSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Hole_In_One.mp3') - self.holeInTwoPlusSfx = loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3') - self.ballGoesInStartSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Goes_In_Start.wav') - self.ballGoesInLoopSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Goes_In_Loop.wav') - self.ballGoesToRestSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Ball_Rest_In_Cup.mp3') - self.kickedOutSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Sad_Noise_Kicked_Off_Hole.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.ogg') + 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.ogg') + 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.ogg') + self.kickedOutSfx = loader.loadSfx('phase_6/audio/sfx/Golf_Sad_Noise_Kicked_Off_Hole.ogg') self.crowdBuildupSfx = [] self.crowdApplauseSfx = [] self.crowdMissSfx = [] for i in range(4): - self.crowdBuildupSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Buildup.mp3')) - self.crowdApplauseSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Applause.mp3')) - self.crowdMissSfx.append(loader.loadSfx('phase_6/audio/sfx/Golf_Crowd_Miss.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.ogg')) + 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.bumpMoverSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.mp3') - self.bumpWindmillSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.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.ogg') + self.bumpWindmillSfx = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.ogg') def setup(self): self.notify.debug('setup golf hole') diff --git a/toontown/golf/DistributedPhysicsWorld.py b/toontown/golf/DistributedPhysicsWorld.py index b682852..08e5180 100644 --- a/toontown/golf/DistributedPhysicsWorld.py +++ b/toontown/golf/DistributedPhysicsWorld.py @@ -65,7 +65,7 @@ class DistributedPhysicsWorld(DistributedObject.DistributedObject, PhysicsWorldB if odeBody == cross: base.sfxPlayer.setCutoffDistance(240) 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.loop() self.physicsSfxDict[index] = (windmillSfx, windMillSoundInterval) @@ -78,7 +78,7 @@ class DistributedPhysicsWorld(DistributedObject.DistributedObject, PhysicsWorldB odeBody = pair[1] if odeBody == box: 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.start() self.physicsSfxDict[index] = (moverSfx, moverSoundInterval, index) diff --git a/toontown/golf/GolfRewardDialog.py b/toontown/golf/GolfRewardDialog.py index d0f259f..2158651 100644 --- a/toontown/golf/GolfRewardDialog.py +++ b/toontown/golf/GolfRewardDialog.py @@ -186,7 +186,7 @@ class GolfRewardDialog: self.trophy.hide() self.rankLabel['text'] = text 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() for avId in self.avIdList: diff --git a/toontown/hood/FishAnimatedProp.py b/toontown/hood/FishAnimatedProp.py index 2d71609..edd8e82 100644 --- a/toontown/hood/FishAnimatedProp.py +++ b/toontown/hood/FishAnimatedProp.py @@ -16,7 +16,7 @@ class FishAnimatedProp(AnimatedProp.AnimatedProp): node.clearMat() self.fish.loadAnims({'jump': 'phase_4/models/props/SZ_fish-jump', '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.geom = self.fish.getGeomNode() self.exitRipples = Ripples(self.geom) diff --git a/toontown/hood/GenericAnimatedProp.py b/toontown/hood/GenericAnimatedProp.py index d2f009e..014b4af 100644 --- a/toontown/hood/GenericAnimatedProp.py +++ b/toontown/hood/GenericAnimatedProp.py @@ -105,9 +105,9 @@ class GenericAnimatedProp(AnimatedProp.AnimatedProp): soundfile = origAnimName.replace('tt_a_ara', 'tt_s_ara') fullPath = self.soundPath + '/' + soundfile if origAnimName in self.AnimsUsingWav: - theSound = loader.loadSfx(fullPath + '.wav') + theSound = loader.loadSfx(fullPath + '.ogg') else: - theSound = loader.loadSfx(fullPath + '.mp3') + theSound = loader.loadSfx(fullPath + '.ogg') self.origAnimNameToSound[origAnimName] = theSound if theSound: soundDur = theSound.length() diff --git a/toontown/makeatoon/MakeAToon.py b/toontown/makeatoon/MakeAToon.py index dcd61a1..6593e41 100644 --- a/toontown/makeatoon/MakeAToon.py +++ b/toontown/makeatoon/MakeAToon.py @@ -251,16 +251,16 @@ class MakeAToon(StateData.StateData): self.cos.load() self.cls.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.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.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_glassBoing.mp3')) - 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_woodBoing.mp3')) - 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_boing.ogg')) + 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.ogg')) + 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.ogg')) return def unload(self): diff --git a/toontown/minigame/CogThief.py b/toontown/minigame/CogThief.py index 1623e6f..c352163 100644 --- a/toontown/minigame/CogThief.py +++ b/toontown/minigame/CogThief.py @@ -51,7 +51,7 @@ class CogThief(DirectObject): self.maxAcceleration = 5.0 self.perceptionRange = 6 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.setScale(2.0) self.kaboom.setBillboardPointEye() @@ -61,7 +61,7 @@ class CogThief(DirectObject): self.splat = globalPropPool.getProp(splatName) self.splat.setBillboardPointEye() self.splatType = globalPropPool.getPropType(splatName) - self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.mp3') + self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.ogg') return def destroy(self): diff --git a/toontown/minigame/DistributedCannonGame.py b/toontown/minigame/DistributedCannonGame.py index b3621de..329b60b 100644 --- a/toontown/minigame/DistributedCannonGame.py +++ b/toontown/minigame/DistributedCannonGame.py @@ -112,15 +112,15 @@ class DistributedCannonGame(DistributedMinigame): 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.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.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') - self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndHitTower = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_tower.mp3') - self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') - self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.mp3') - self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') - self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') + 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.ogg') + 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.ogg') + 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.ogg') + self.sndWhizz = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.ogg') + self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg') + self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg') guiModel = 'phase_4/models/gui/cannon_game_gui' cannonGui = loader.loadModel(guiModel) self.aimPad = DirectFrame(image=cannonGui.find('**/CannonFire_PAD'), relief=None, pos=(0.7, 0, -0.553333), scale=0.8) diff --git a/toontown/minigame/DistributedCatchGame.py b/toontown/minigame/DistributedCatchGame.py index 4a9346e..6d94f96 100644 --- a/toontown/minigame/DistributedCatchGame.py +++ b/toontown/minigame/DistributedCatchGame.py @@ -96,11 +96,11 @@ class DistributedCatchGame(DistributedMinigame): model.setZ(-self.ObjRadius) model.flattenMedium() - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.mid') - self.sndGoodCatch = base.loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3') - self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndAnvilLand = base.loader.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3') - self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.ogg') + 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.ogg') + 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.ogg') self.toonSDs = {} avId = self.localAvId toonSD = CatchGameToonSD.CatchGameToonSD(avId, self) diff --git a/toontown/minigame/DistributedCogThiefGame.py b/toontown/minigame/DistributedCogThiefGame.py index e1f5f7e..19cd3cf 100644 --- a/toontown/minigame/DistributedCogThiefGame.py +++ b/toontown/minigame/DistributedCogThiefGame.py @@ -60,7 +60,7 @@ class DistributedCogThiefGame(DistributedMinigame): def load(self): self.notify.debug('load') 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() for barrelIndex in range(CTGG.NumBarrels): barrel = loader.loadModel('phase_4/models/minigames/cogthief_game_gagTank') @@ -120,9 +120,9 @@ class DistributedCogThiefGame(DistributedMinigame): self.loadCogs() self.toonHitTracks = {} self.toonPieTracks = {} - self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndRewardTick = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') - self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.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.ogg') + self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.ogg') self.timer = ToontownTimer.ToontownTimer() self.timer.posInTopRightCorner() self.timer.hide() @@ -187,8 +187,8 @@ class DistributedCogThiefGame(DistributedMinigame): self.sndTable = {'hitBySuit': [None] * self.numPlayers, 'falling': [None] * 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['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.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.ogg') base.playMusic(self.music, looping=1, volume=0.8) self.introTrack = self.getIntroTrack() @@ -702,7 +702,7 @@ class DistributedCogThiefGame(DistributedMinigame): animPie = Sequence() if pieType == 'actor': 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 dist = 100 - 70 * t time = 1 + 0.5 * t diff --git a/toontown/minigame/DistributedDivingGame.py b/toontown/minigame/DistributedDivingGame.py index 9153dc6..48a8064 100644 --- a/toontown/minigame/DistributedDivingGame.py +++ b/toontown/minigame/DistributedDivingGame.py @@ -70,7 +70,7 @@ class DistributedDivingGame(DistributedMinigame): DistributedMinigame.load(self) loadBase = 'phase_4/models/minigames/' 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.boatModel = self.environModel.find('**/boat') self.skyModel = self.environModel.find('**/sky') @@ -104,19 +104,19 @@ class DistributedDivingGame(DistributedMinigame): toonSD = DivingGameToonSD.DivingGameToonSD(avId, self) self.toonSDs[avId] = toonSD toonSD.load() - crabSoundName = 'King_Crab.mp3' + crabSoundName = 'King_Crab.ogg' crabSoundPath = 'phase_4/audio/sfx/%s' % crabSoundName self.crabSound = loader.loadSfx(crabSoundPath) - treasureSoundName = 'SZ_DD_treasure.mp3' + treasureSoundName = 'SZ_DD_treasure.ogg' treasureSoundPath = 'phase_4/audio/sfx/%s' % treasureSoundName self.treasureSound = loader.loadSfx(treasureSoundPath) - hitSoundName = 'diving_game_hit.mp3' + hitSoundName = 'diving_game_hit.ogg' hitSoundPath = 'phase_4/audio/sfx/%s' % hitSoundName self.hitSound = loader.loadSfx(hitSoundPath) - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Target.mid') - self.addSound('dropGold', 'diving_treasure_drop_off.mp3', 'phase_4/audio/sfx/') - self.addSound('getGold', 'diving_treasure_pick_up.mp3', 'phase_4/audio/sfx/') - self.swimSound = loader.loadSfx('phase_4/audio/sfx/diving_swim_loop.wav') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Target.ogg') + self.addSound('dropGold', 'diving_treasure_drop_off.ogg', '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.ogg') self.swimSound.setVolume(0.0) self.swimSound.setPlayRate(1.0) self.swimSound.setLoop(True) @@ -711,17 +711,17 @@ class DistributedDivingGame(DistributedMinigame): fish = self.spawners[spawnerId].fishArray[spawnId] endX = self.spawners[spawnerId].position.getX() if fish.name == 'clown': - fishSoundName = 'Clownfish.mp3' + fishSoundName = 'Clownfish.ogg' elif fish.name == 'pbj': - fishSoundName = 'PBJ_Fish.mp3' + fishSoundName = 'PBJ_Fish.ogg' elif fish.name == 'balloon': - fishSoundName = 'BalloonFish.mp3' + fishSoundName = 'BalloonFish.ogg' elif fish.name == 'bear': - fishSoundName = 'Bear_Acuda.mp3' + fishSoundName = 'Bear_Acuda.ogg' elif fish.name == 'nurse': - fishSoundName = 'Nurse_Shark.mp3' + fishSoundName = 'Nurse_Shark.ogg' elif fish.name == 'piano': - fishSoundName = 'Piano_Tuna.mp3' + fishSoundName = 'Piano_Tuna.ogg' else: fishSoundName = ' ' fishSoundPath = 'phase_4/audio/sfx/%s' % fishSoundName diff --git a/toontown/minigame/DistributedIceGame.py b/toontown/minigame/DistributedIceGame.py index c3f336d..b7dbb64 100644 --- a/toontown/minigame/DistributedIceGame.py +++ b/toontown/minigame/DistributedIceGame.py @@ -114,7 +114,7 @@ class DistributedIceGame(DistributedMinigame.DistributedMinigame, DistributedIce def load(self): self.notify.debug('load') 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') background = loader.loadModel('phase_4/models/minigames/ice_game_2d') background.reparentTo(self.gameBoard) @@ -168,22 +168,22 @@ class DistributedIceGame(DistributedMinigame.DistributedMinigame, DistributedIce self.obstacles.append(newObstacle) index += 1 - self.countSound = loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') - self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.mp3') - self.penaltyGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.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.ogg') + self.penaltyGrabSound = loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.ogg') self.tireSounds = [] for tireIndex in range(4): - tireHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.mp3') - wallHit = loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.mp3') - obstacleHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.mp3') + tireHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_1.ogg') + wallHit = loader.loadSfx('phase_4/audio/sfx/MG_maze_pickup.ogg') + obstacleHit = loader.loadSfx('phase_4/audio/sfx/Golf_Hit_Barrier_2.ogg') self.tireSounds.append({'tireHit': tireHit, 'wallHit': wallHit, 'obstacleHit': obstacleHit}) - self.arrowRotateSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_rotate.wav') - self.arrowUpSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_increase_3sec.mp3') - self.arrowDownSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_force_decrease_3sec.mp3') - self.scoreCircleSound = loader.loadSfx('phase_4/audio/sfx/MG_sfx_ice_scoring_1.mp3') + 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.ogg') + 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.ogg') def unload(self): self.notify.debug('unload') diff --git a/toontown/minigame/DistributedMazeGame.py b/toontown/minigame/DistributedMazeGame.py index 91d881d..019ac30 100644 --- a/toontown/minigame/DistributedMazeGame.py +++ b/toontown/minigame/DistributedMazeGame.py @@ -531,7 +531,7 @@ class DistributedMazeGame(DistributedMinigame): model.removeNode() self.treasureModel.setScale(1.6) 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.scorePanels = [] @@ -580,12 +580,12 @@ class DistributedMazeGame(DistributedMinigame): self.sndTable = {'hitBySuit': [None] * self.numPlayers, 'falling': [None] * 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['falling'][i] = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_whizz.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.ogg') self.grabSounds = [] 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 for avId in self.avIdList: diff --git a/toontown/minigame/DistributedPairingGame.py b/toontown/minigame/DistributedPairingGame.py index bb98cc2..2913d62 100644 --- a/toontown/minigame/DistributedPairingGame.py +++ b/toontown/minigame/DistributedPairingGame.py @@ -117,16 +117,16 @@ class DistributedPairingGame(DistributedMinigame): self.__textGen = TextNode('ringGame') self.__textGen.setFont(ToontownGlobals.getSignFont()) 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.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Pairing.mid') - self.matchSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match.mp3') - self.matchWithBonusSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_match_bonus_both.mp3') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Pairing.ogg') + 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.ogg') self.signalSfx = [] 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 def unload(self): diff --git a/toontown/minigame/DistributedPatternGame.py b/toontown/minigame/DistributedPatternGame.py index 98186ea..a49f908 100644 --- a/toontown/minigame/DistributedPatternGame.py +++ b/toontown/minigame/DistributedPatternGame.py @@ -18,11 +18,11 @@ from toontown.toonbase import TTLocalizer class DistributedPatternGame(DistributedMinigame): phase4snd = 'phase_4/audio/sfx/' - ButtonSoundNames = (phase4snd + 'm_match_trumpet.mp3', - phase4snd + 'm_match_guitar.mp3', - phase4snd + 'm_match_drums.mp3', - phase4snd + 'm_match_piano.mp3') - bgm = 'phase_4/audio/bgm/m_match_bg1.mid' + ButtonSoundNames = (phase4snd + 'm_match_trumpet.ogg', + phase4snd + 'm_match_guitar.ogg', + phase4snd + 'm_match_drums.ogg', + phase4snd + 'm_match_piano.ogg') + bgm = 'phase_4/audio/bgm/m_match_bg1.ogg' strWatch = TTLocalizer.PatternGameWatch strGo = TTLocalizer.PatternGameGo strRight = TTLocalizer.PatternGameRight @@ -86,10 +86,10 @@ class DistributedPatternGame(DistributedMinigame): for soundName in self.ButtonSoundNames: self.buttonSounds.append(base.loader.loadSfx(soundName)) - self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') - self.incorrectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav') - self.perfectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') - self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.mp3') + 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.ogg') + self.perfectSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg') + self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_A.ogg') 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.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) diff --git a/toontown/minigame/DistributedPhotoGame.py b/toontown/minigame/DistributedPhotoGame.py index 6ad90bc..a8c65dd 100644 --- a/toontown/minigame/DistributedPhotoGame.py +++ b/toontown/minigame/DistributedPhotoGame.py @@ -133,11 +133,11 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase): 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.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.sndPhotoMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.sndPhotoFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.mp3') - self.sndWin = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') - self.sndFilmTick = base.loader.loadSfx('phase_4/audio/sfx/Photo_instamatic.mp3') + 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.ogg') + 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.ogg') + self.sndFilmTick = base.loader.loadSfx('phase_4/audio/sfx/Photo_instamatic.ogg') self.timer = ToontownTimer.ToontownTimer() self.timer.posInTopRightCorner() self.timer.hide() @@ -161,8 +161,8 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase): self.blackoutNode.setDepthTest(1) self.blackoutNode.hide() self.subjectToon = Toon.Toon() - self.addSound('zoom', 'Photo_zoom.mp3', 'phase_4/audio/sfx/') - self.addSound('snap', 'Photo_shutter.mp3', 'phase_4/audio/sfx/') + self.addSound('zoom', 'Photo_zoom.ogg', 'phase_4/audio/sfx/') + self.addSound('snap', 'Photo_shutter.ogg', 'phase_4/audio/sfx/') return def __setupCapture(self): diff --git a/toontown/minigame/DistributedRaceGame.py b/toontown/minigame/DistributedRaceGame.py index 8b863fe..0f6a953 100644 --- a/toontown/minigame/DistributedRaceGame.py +++ b/toontown/minigame/DistributedRaceGame.py @@ -302,11 +302,11 @@ class DistributedRaceGame(DistributedMinigame): self.dice2, self.dice3, self.dice4] - self.music = base.loader.loadMusic('phase_4/audio/bgm/minigame_race.mid') - self.posBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') - self.negBuzzer = base.loader.loadSfx('phase_4/audio/sfx/MG_neg_buzzer.wav') - self.winSting = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') - self.loseSting = base.loader.loadSfx('phase_4/audio/sfx/MG_lose.mp3') + self.music = base.loader.loadMusic('phase_4/audio/bgm/minigame_race.ogg') + 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.ogg') + self.winSting = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg') + self.loseSting = base.loader.loadSfx('phase_4/audio/sfx/MG_lose.ogg') self.diceButtonList = [] for i in range(1, 5): 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.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.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 = [] return diff --git a/toontown/minigame/DistributedRingGame.py b/toontown/minigame/DistributedRingGame.py index c21790b..7204497 100644 --- a/toontown/minigame/DistributedRingGame.py +++ b/toontown/minigame/DistributedRingGame.py @@ -81,9 +81,9 @@ class DistributedRingGame(DistributedMinigame): self.notify.debug('load') DistributedMinigame.load(self) self.defineConstants() - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.mid') - self.sndAmbience = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') - self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.mp3') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.ogg') + self.sndAmbience = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.ogg') + self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.ogg') loadBase = 'phase_4/models/minigames/' self.environModel = loader.loadModel(loadBase + 'swimming_game.bam') self.environModel.setPos(0, self.ENVIRON_LENGTH / 2.0, self.SEA_FLOOR_Z) @@ -167,8 +167,8 @@ class DistributedRingGame(DistributedMinigame): self.sndTable = {'gotRing': [None] * self.numPlayers, 'missedRing': [None] * self.numPlayers} for i in range(0, self.numPlayers): - self.sndTable['gotRing'][i] = base.loader.loadSfx('phase_4/audio/sfx/ring_get.mp3') - self.sndTable['missedRing'][i] = base.loader.loadSfx('phase_4/audio/sfx/ring_miss.mp3') + self.sndTable['gotRing'][i] = base.loader.loadSfx('phase_4/audio/sfx/ring_get.ogg') + self.sndTable['missedRing'][i] = base.loader.loadSfx('phase_4/audio/sfx/ring_miss.ogg') self.__addToonDropShadow(self.getAvatar(self.localAvId)) self.__spawnUpdateEnvironTask() diff --git a/toontown/minigame/DistributedTagGame.py b/toontown/minigame/DistributedTagGame.py index c344966..6981270 100644 --- a/toontown/minigame/DistributedTagGame.py +++ b/toontown/minigame/DistributedTagGame.py @@ -50,8 +50,8 @@ class DistributedTagGame(DistributedMinigame): self.itText.hide() self.sky = loader.loadModel('phase_3.5/models/props/TT_sky') self.ground = loader.loadModel('phase_4/models/minigames/tag_arena') - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.mid') - self.tagSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.mp3') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_toontag.ogg') + self.tagSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg') self.itPointer = loader.loadModel('phase_4/models/minigames/bboard-pointer') self.tracks = [] self.IT = None diff --git a/toontown/minigame/DistributedTagTreasure.py b/toontown/minigame/DistributedTagTreasure.py index d22bb61..45254a7 100644 --- a/toontown/minigame/DistributedTagTreasure.py +++ b/toontown/minigame/DistributedTagTreasure.py @@ -5,7 +5,7 @@ class DistributedTagTreasure(DistributedTreasure.DistributedTreasure): def __init__(self, cr): DistributedTreasure.DistributedTreasure.__init__(self, cr) self.modelPath = 'phase_4/models/props/icecream' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' self.accept('minigameOffstage', self.handleMinigameOffstage) def handleEnterSphere(self, collEntry): diff --git a/toontown/minigame/DistributedTargetGame.py b/toontown/minigame/DistributedTargetGame.py index ec15eeb..47046e2 100644 --- a/toontown/minigame/DistributedTargetGame.py +++ b/toontown/minigame/DistributedTargetGame.py @@ -266,7 +266,7 @@ class DistributedTargetGame(DistributedMinigame): score3Label, score4Label] self.scoreboard.hide() - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Diving.mid') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Diving.ogg') self.sndAmbience = None self.skyListLow = [] self.skyListMid = [] @@ -360,25 +360,25 @@ class DistributedTargetGame(DistributedMinigame): self.umbrella.instanceTo(hand) self.remoteUmbrellas = {} - self.addSound('wind1', 'target_cloud.mp3', 'phase_4/audio/sfx/') - self.addSound('trampoline', 'target_trampoline_2.mp3', 'phase_4/audio/sfx/') - self.addSound('launch', 'target_launch.mp3', 'phase_4/audio/sfx/') - self.addSound('miss', 'target_Lose.mp3', 'phase_4/audio/sfx/') - self.addSound('score', 'target_happydance.mp3', 'phase_4/audio/sfx/') - self.addSound('impact', 'target_impact_grunt1.mp3', 'phase_4/audio/sfx/') - self.addSound('umbrella', 'target_chute.mp3', 'phase_4/audio/sfx/') - self.addSound('bounce', 'target_impact_only.mp3', 'phase_4/audio/sfx/') - self.flySound = loader.loadSfx('phase_4/audio/sfx/target_wind_fly_loop.wav') + self.addSound('wind1', 'target_cloud.ogg', 'phase_4/audio/sfx/') + self.addSound('trampoline', 'target_trampoline_2.ogg', 'phase_4/audio/sfx/') + self.addSound('launch', 'target_launch.ogg', 'phase_4/audio/sfx/') + self.addSound('miss', 'target_Lose.ogg', 'phase_4/audio/sfx/') + self.addSound('score', 'target_happydance.ogg', 'phase_4/audio/sfx/') + self.addSound('impact', 'target_impact_grunt1.ogg', 'phase_4/audio/sfx/') + self.addSound('umbrella', 'target_chute.ogg', 'phase_4/audio/sfx/') + self.addSound('bounce', 'target_impact_only.ogg', 'phase_4/audio/sfx/') + self.flySound = loader.loadSfx('phase_4/audio/sfx/target_wind_fly_loop.ogg') self.flySound.setVolume(0.0) self.flySound.setPlayRate(1.0) self.flySound.setLoop(True) self.flySound.play() - self.rubberSound = loader.loadSfx('phase_4/audio/sfx/target_stretching_aim_loop.mp3') + self.rubberSound = loader.loadSfx('phase_4/audio/sfx/target_stretching_aim_loop.ogg') self.rubberSound.setVolume(0.0) self.rubberSound.setPlayRate(1.0) self.rubberSound.setLoop(True) self.rubberSound.play() - self.flutterSound = loader.loadSfx('phase_4/audio/sfx/target_wind_float_clothloop.wav') + self.flutterSound = loader.loadSfx('phase_4/audio/sfx/target_wind_float_clothloop.ogg') self.flutterSound.setVolume(1.0) self.flutterSound.setPlayRate(1.0) self.flutterSound.setLoop(True) diff --git a/toontown/minigame/DistributedTravelGame.py b/toontown/minigame/DistributedTravelGame.py index 275bbaf..89d6973 100644 --- a/toontown/minigame/DistributedTravelGame.py +++ b/toontown/minigame/DistributedTravelGame.py @@ -109,12 +109,12 @@ class DistributedTravelGame(DistributedMinigame): self.minigameLabels = [] self.minigameIcons = [] self.bonusLabels = [] - self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3') - self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3') - self.turntableRotateSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_turntble_rotate_2.mp3') - self.wonGameSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_bonus.mp3') - self.lostGameSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus_2.mp3') - self.noWinnerSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus.mp3') + self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.ogg') + self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.ogg') + self.turntableRotateSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_turntble_rotate_2.ogg') + self.wonGameSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_bonus.ogg') + self.lostGameSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus_2.ogg') + self.noWinnerSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_no_bonus.ogg') self.boardIndex = 0 self.avNames = [] self.disconnectedAvIds = [] @@ -235,7 +235,7 @@ class DistributedTravelGame(DistributedMinigame): turnTable.removeNode() self.loadGui() self.introMovie = self.getIntroMovie() - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Travel.mid') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Travel.ogg') self.flashWinningBeansTrack = None return diff --git a/toontown/minigame/DistributedTugOfWarGame.py b/toontown/minigame/DistributedTugOfWarGame.py index df005a6..e8b7a12 100644 --- a/toontown/minigame/DistributedTugOfWarGame.py +++ b/toontown/minigame/DistributedTugOfWarGame.py @@ -25,7 +25,7 @@ from . import MinigamePowerMeter from direct.task.Task import Task class DistributedTugOfWarGame(DistributedMinigame): - bgm = 'phase_4/audio/bgm/MG_tug_o_war.mid' + bgm = 'phase_4/audio/bgm/MG_tug_o_war.ogg' toonAnimNames = ['neutral', 'tug-o-war', 'slip-forward', @@ -122,9 +122,9 @@ class DistributedTugOfWarGame(DistributedMinigame): ropeModel.removeNode() self.sky = loader.loadModel('phase_3.5/models/props/TT_sky') self.dropShadow = loader.loadModel('phase_3/models/props/drop_shadow') - self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.wav') - self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') - self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3') + self.correctSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pos_buzzer.ogg') + self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.ogg') + self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.ogg') self.music = base.loader.loadMusic(self.bgm) self.roundText = DirectLabel(text=' ', text_fg=(0, 1, 0, 1), frameColor=(1, 1, 1, 0), text_font=ToontownGlobals.getSignFont(), pos=(0.014, 0, -.84), scale=0.2) self.powerMeter = MinigamePowerMeter.MinigamePowerMeter(17) diff --git a/toontown/minigame/DistributedVineGame.py b/toontown/minigame/DistributedVineGame.py index 5b0e5a9..874c6e2 100644 --- a/toontown/minigame/DistributedVineGame.py +++ b/toontown/minigame/DistributedVineGame.py @@ -95,7 +95,7 @@ class DistributedVineGame(DistributedMinigame): self.notify.debug('load') DistributedMinigame.load(self) self.defineConstants() - self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Vine.mid') + self.music = base.loader.loadMusic('phase_4/audio/bgm/MG_Vine.ogg') self.gameAssets = loader.loadModel('phase_4/models/minigames/vine_game') self.gameBoard = self.gameAssets.find('**/background') self.gameBoard.reparentTo(render) @@ -107,14 +107,14 @@ class DistributedVineGame(DistributedMinigame): self.gameBoard.hide(VineGameGlobals.RadarCameraBitmask) self.treasureModel = self.gameAssets.find('**/bananas') self.setupVineCourse() - self.grabSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.mp3') - self.jumpSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.mp3') - self.catchSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_catch.mp3') - self.spiderHitSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_spider_hit.mp3') - self.batHitVineSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit.mp3') - self.batHitMidairSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit_midair.mp3') - self.winSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_finish.mp3') - self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3') + self.grabSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bananas.ogg') + self.jumpSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.ogg') + self.catchSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_catch.ogg') + self.spiderHitSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_spider_hit.ogg') + self.batHitVineSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit.ogg') + self.batHitMidairSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_hit_midair.ogg') + self.winSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_finish.ogg') + self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.ogg') self.loadBats() self.createBatIvals() bothPlatform = loader.loadModel('phase_4/models/minigames/vine_game_shelf') diff --git a/toontown/minigame/DivingFishSpawn.py b/toontown/minigame/DivingFishSpawn.py index 5a093ac..46ffd15 100644 --- a/toontown/minigame/DivingFishSpawn.py +++ b/toontown/minigame/DivingFishSpawn.py @@ -85,7 +85,7 @@ class DivingFishSpawn(DirectObject): fish.loop('anim') fish.setScale(1.4) cSphere = CollisionSphere(0, 0, 0, 1) - fishSoundName = 'Piano_Tuna.mp3' + fishSoundName = 'Piano_Tuna.ogg' if self.direction == -1: fish.setH(0) else: diff --git a/toontown/minigame/IceTreasure.py b/toontown/minigame/IceTreasure.py index 61466b7..dafae7b 100644 --- a/toontown/minigame/IceTreasure.py +++ b/toontown/minigame/IceTreasure.py @@ -36,7 +36,7 @@ class IceTreasure(DirectObject): sparks = BattleParticles.createParticleEffect(file='icetnt') self.sparksEffect = sparks sparks.start(self.tip) - 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.penaltyGrabSound.setVolume(0.75) kaboomAttachPoint = self.nodePath.attachNewNode('kaboomAttach') kaboomAttachPoint.setZ(3) diff --git a/toontown/minigame/PairingGameCard.py b/toontown/minigame/PairingGameCard.py index 913b8bf..0a5f91a 100644 --- a/toontown/minigame/PairingGameCard.py +++ b/toontown/minigame/PairingGameCard.py @@ -59,8 +59,8 @@ class PairingGameCard(PlayingCardNodePath): self.setR(0) self.setScale(2.5) self.flipIval = None - self.turnUpSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_up.mp3') - self.turnDownSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_down.mp3') + self.turnUpSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_up.ogg') + self.turnDownSound = base.loader.loadSfx('phase_4/audio/sfx/MG_pairing_card_flip_face_down.ogg') return def unload(self): diff --git a/toontown/minigame/Purchase.py b/toontown/minigame/Purchase.py index 43fa689..f562e22 100644 --- a/toontown/minigame/Purchase.py +++ b/toontown/minigame/Purchase.py @@ -142,9 +142,9 @@ class Purchase(PurchaseBase): self.convertingVotesToBeansLabel.hide() self.rewardDoubledJellybeanLabel = DirectLabel(text=TTLocalizer.PartyRewardDoubledJellybean, text_fg=(1.0, 0.125, 0.125, 1.0), text_shadow=(0, 0, 0, 1), relief=None, pos=(0.0, 0, -0.67), scale=0.08) self.rewardDoubledJellybeanLabel.hide() - self.countSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') - self.overMaxSound = base.loader.loadSfx('phase_3.5/audio/sfx/AV_collision.mp3') - self.celebrateSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.mp3') + self.countSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg') + self.overMaxSound = base.loader.loadSfx('phase_3.5/audio/sfx/AV_collision.ogg') + self.celebrateSound = base.loader.loadSfx('phase_4/audio/sfx/MG_win.ogg') return def unload(self): diff --git a/toontown/minigame/PurchaseBase.py b/toontown/minigame/PurchaseBase.py index c4547f8..9dab1c8 100644 --- a/toontown/minigame/PurchaseBase.py +++ b/toontown/minigame/PurchaseBase.py @@ -22,7 +22,7 @@ class PurchaseBase(StateData.StateData): def load(self, purchaseModels = None): if purchaseModels == None: purchaseModels = loader.loadModel('phase_4/models/gui/purchase_gui') - self.music = base.loader.loadMusic('phase_4/audio/bgm/FF_safezone.mid') + self.music = base.loader.loadMusic('phase_4/audio/bgm/FF_safezone.ogg') self.jarImage = purchaseModels.find('**/Jar') self.jarImage.reparentTo(hidden) self.frame = DirectFrame(relief=None) diff --git a/toontown/minigame/ToonBlitzAssetMgr.py b/toontown/minigame/ToonBlitzAssetMgr.py index e35ee0f..c49525f 100644 --- a/toontown/minigame/ToonBlitzAssetMgr.py +++ b/toontown/minigame/ToonBlitzAssetMgr.py @@ -46,16 +46,16 @@ class ToonBlitzAssetMgr(DirectObject): dropPlane.addSolid(plane) dropPlane.setCollideMask(ToontownGlobals.FloorBitmask) self.world.attachNewNode(dropPlane) - self.gameMusic = base.loader.loadMusic('phase_4/audio/bgm/MG_TwoDGame.mid') - self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3') - self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.soundJump = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.mp3') - self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.mp3') - self.watergunSound = base.loader.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.mp3') - self.splashSound = base.loader.loadSfx('phase_4/audio/sfx/Seltzer_squirt_2dgame_hit.mp3') - self.threeSparkles = loader.loadSfx('phase_4/audio/sfx/threeSparkles.mp3') - self.sparkleSound = loader.loadSfx('phase_4/audio/sfx/sparkly.mp3') - self.headCollideSound = loader.loadSfx('phase_3.5/audio/sfx/AV_collision.mp3') + self.gameMusic = base.loader.loadMusic('phase_4/audio/bgm/MG_TwoDGame.ogg') + self.treasureGrabSound = loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.ogg') + self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg') + self.soundJump = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_jump.ogg') + self.fallSound = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_fall.ogg') + self.watergunSound = base.loader.loadSfx('phase_4/audio/sfx/AA_squirt_seltzer_miss.ogg') + self.splashSound = base.loader.loadSfx('phase_4/audio/sfx/Seltzer_squirt_2dgame_hit.ogg') + self.threeSparkles = loader.loadSfx('phase_4/audio/sfx/threeSparkles.ogg') + self.sparkleSound = loader.loadSfx('phase_4/audio/sfx/sparkly.ogg') + self.headCollideSound = loader.loadSfx('phase_3.5/audio/sfx/AV_collision.ogg') self.faceStartPos = Vec3(-0.8, 0, -0.87) self.faceEndPos = Vec3(0.8, 0, -0.87) self.aspect2dRoot = aspect2d.attachNewNode('TwoDGuiAspect2dRoot') diff --git a/toontown/minigame/TwoDEnemy.py b/toontown/minigame/TwoDEnemy.py index 9e7dc30..fec60a8 100644 --- a/toontown/minigame/TwoDEnemy.py +++ b/toontown/minigame/TwoDEnemy.py @@ -118,7 +118,7 @@ class TwoDEnemy(DirectObject): self.propTrack = Sequence(ActorInterval(self.suit.prop, 'propeller', startFrame=8, endFrame=25, playRate=2.0)) self.animTrack = Sequence(ActorInterval(self.suit, 'landing', startFrame=8, endFrame=28, playRate=0.5), ActorInterval(self.suit, 'landing', startFrame=8, endFrame=28, playRate=-0.5)) self.moveIval = Sequence(Func(setIsGoingUp, True), getForwardIval('easeInOut'), Func(setIsGoingUp, False), getBackwardIval('easeInOut')) - self.suitSound = base.loader.loadSfx('phase_4/audio/sfx/TB_propeller.wav') + self.suitSound = base.loader.loadSfx('phase_4/audio/sfx/TB_propeller.ogg') else: self.isMovingLeftRight = True self.moveIval = Sequence(Func(self.setHeading, finalPos, initPos), getForwardIval('noBlend'), Func(self.setHeading, initPos, finalPos), getBackwardIval('noBlend')) @@ -229,8 +229,8 @@ class TwoDEnemy(DirectObject): self.collNodePath.reparentTo(self.deathSuit) treasureSpawnPoint = Point3(self.suit.getX(), self.suit.getY(), self.suit.getZ() + self.suit.height / 2.0) gearPoint = Point3(0, 0, self.suit.height / 2.0 + 2.0) - spinningSound = base.loader.loadSfx('phase_3.5/audio/sfx/Cog_Death.mp3') - deathSound = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.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.ogg') smallGears = BattleParticles.createParticleEffect(file='gearExplosionSmall') singleGear = BattleParticles.createParticleEffect('GearExplosion', numParticles=1) smallGearExplosion = BattleParticles.createParticleEffect('GearExplosion', numParticles=10) diff --git a/toontown/minigame/TwoDGameToonSD.py b/toontown/minigame/TwoDGameToonSD.py index cc9f23e..0f7958d 100644 --- a/toontown/minigame/TwoDGameToonSD.py +++ b/toontown/minigame/TwoDGameToonSD.py @@ -65,7 +65,7 @@ class TwoDGameToonSD(StateData.StateData): self.toon.pose(anim, 0) self.battleMgr = TwoDBattleMgr.TwoDBattleMgr(self.game, self.toon) - self.squishSound = base.loader.loadSfx('phase_3.5/audio/dial/AV_' + self.toon.style.getAnimal() + '_exclaim.mp3') + self.squishSound = base.loader.loadSfx('phase_3.5/audio/dial/AV_' + self.toon.style.getAnimal() + '_exclaim.ogg') def destroy(self): if self.fallBackIval != None: diff --git a/toontown/minigame/TwoDStomper.py b/toontown/minigame/TwoDStomper.py index d7fe278..3b9c7d5 100644 --- a/toontown/minigame/TwoDStomper.py +++ b/toontown/minigame/TwoDStomper.py @@ -60,7 +60,7 @@ class TwoDStomper(DirectObject): self.headStartZ, self.headEndZ = typeAttribs[2] self.shaftStartScaleZ, self.shaftEndScaleZ = typeAttribs[3] self.numCollSolids = typeAttribs[4] - self.stompSound = loader.loadSfx('phase_4/audio/sfx/CHQ_FACT_stomper_small.mp3') + self.stompSound = loader.loadSfx('phase_4/audio/sfx/CHQ_FACT_stomper_small.ogg') self.model.setPos(self.pos) self.model.setScale(self.scale) self.model.find('**/block').setScale(1.0 / self.scale) diff --git a/toontown/minigame/VineBat.py b/toontown/minigame/VineBat.py index 0b688b3..3e2f280 100644 --- a/toontown/minigame/VineBat.py +++ b/toontown/minigame/VineBat.py @@ -50,8 +50,8 @@ class VineBat(NodePath, DirectObject): self.collNodePath = self.attachNewNode(self.collNode) self.collNodePath.hide() self.accept('enter' + self.sphereName, self.__handleEnterSphere) - self.screechSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_shriek_3.mp3') - self.flySfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_flying_lp.wav') + self.screechSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_shriek_3.ogg') + self.flySfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_vine_game_bat_flying_lp.ogg') self.oldCutoffDistance = base.sfxPlayer.getCutoffDistance() base.sfxPlayer.setCutoffDistance(240) self.soundInterval = SoundInterval(self.flySfx, node=self, listenerNode=base.localAvatar, seamlessLoop=True, volume=0.5, cutOff=240) diff --git a/toontown/minigame/VoteResultsTrolleyPanel.py b/toontown/minigame/VoteResultsTrolleyPanel.py index 54fef55..27bd011 100644 --- a/toontown/minigame/VoteResultsTrolleyPanel.py +++ b/toontown/minigame/VoteResultsTrolleyPanel.py @@ -102,12 +102,12 @@ class VoteResultsTrolleyPanel(DirectFrame): self.upArrowSfx = [] self.downArrowSfx = [] for i in range(5): - self.upArrowSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_blue_arrow.mp3')) - self.downArrowSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_red_arrow.mp3')) + self.upArrowSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_blue_arrow.ogg')) + self.downArrowSfx.append(base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_red_arrow.ogg')) - self.winVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_win_vote.mp3') - self.noVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_square_no_vote_1.mp3') - self.loseVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_lose_vote.mp3') + self.winVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_win_vote.ogg') + self.noVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_square_no_vote_1.ogg') + self.loseVoteSfx = base.loader.loadSfx('phase_4/audio/sfx/MG_sfx_travel_game_lose_vote.ogg') self.localAvatarWon = False self.localAvatarLost = False localIndex = self.avIdList.index(base.localAvatar.doId) diff --git a/toontown/parties/Cannon.py b/toontown/parties/Cannon.py index eda45e6..9126f95 100644 --- a/toontown/parties/Cannon.py +++ b/toontown/parties/Cannon.py @@ -52,8 +52,8 @@ class Cannon: self.shadowNode = self.cannonNode.find('**/square_drop_shadow') self.smokeNode = loader.loadModel('phase_4/models/props/test_clouds') self.smokeNode.setBillboardPointEye() - self.sndCannonMove = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_adjust.mp3') - self.sndCannonFire = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_fire_alt.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.ogg') self.collSphere = CollisionSphere(0, 0, 0, self.getSphereRadius()) self.collSphere.setTangible(1) self.collNode = CollisionNode(self.getCollisionName()) diff --git a/toontown/parties/Decoration.py b/toontown/parties/Decoration.py index ecccb64..8382974 100644 --- a/toontown/parties/Decoration.py +++ b/toontown/parties/Decoration.py @@ -131,7 +131,7 @@ class Decoration(NodePath): st = random.randint(0, 10) animIval = ActorInterval(self.hydra, 'dance') animIvalDur = animIval.getDuration() - self.decSfx = loader.loadSfx('phase_13/audio/sfx/tt_s_ara_pty_propsShow_dance.mp3') + self.decSfx = loader.loadSfx('phase_13/audio/sfx/tt_s_ara_pty_propsShow_dance.ogg') soundIval = SoundInterval(self.decSfx, node=self.hydra, listenerNode=base.localAvatar, volume=PartyGlobals.DECORATION_VOLUME, cutOff=PartyGlobals.DECORATION_CUTOFF, duration=animIvalDur) self.animSeq = Parallel(animIval, soundIval) self.animSeq.loop(st) @@ -148,7 +148,7 @@ class Decoration(NodePath): st = random.randint(0, 10) animIval = ActorInterval(self.tubeCog, 'wave') animIvalDur = animIval.getDuration() - self.decSfx = loader.loadSfx('phase_13/audio/sfx/tt_s_ara_pty_tubeCogVictory_wave.mp3') + self.decSfx = loader.loadSfx('phase_13/audio/sfx/tt_s_ara_pty_tubeCogVictory_wave.ogg') soundIval = SoundInterval(self.decSfx, node=self.tubeCog, listenerNode=base.localAvatar, volume=PartyGlobals.DECORATION_VOLUME, cutOff=PartyGlobals.DECORATION_CUTOFF, duration=animIvalDur) self.animSeq = Parallel(animIval, soundIval) self.animSeq.loop() diff --git a/toontown/parties/DistributedPartyCannonActivity.py b/toontown/parties/DistributedPartyCannonActivity.py index c1f2213..e313564 100644 --- a/toontown/parties/DistributedPartyCannonActivity.py +++ b/toontown/parties/DistributedPartyCannonActivity.py @@ -100,12 +100,12 @@ class DistributedPartyCannonActivity(DistributedPartyActivity): self.splash = Splash.Splash(render) self.dustCloud = DustCloud.DustCloud(render) self.dustCloud.setBillboardPointEye() - self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') - self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.mp3') - self.sndBounce1 = base.loader.loadSfx('phase_13/audio/sfx/bounce1.mp3') - self.sndBounce2 = base.loader.loadSfx('phase_13/audio/sfx/bounce2.mp3') - self.sndBounce3 = base.loader.loadSfx('phase_13/audio/sfx/bounce3.mp3') + self.sndHitGround = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg') + self.sndHitWater = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.ogg') + self.sndHitHouse = base.loader.loadSfx('phase_5/audio/sfx/AA_drop_sandbag.ogg') + self.sndBounce1 = base.loader.loadSfx('phase_13/audio/sfx/bounce1.ogg') + self.sndBounce2 = base.loader.loadSfx('phase_13/audio/sfx/bounce2.ogg') + self.sndBounce3 = base.loader.loadSfx('phase_13/audio/sfx/bounce3.ogg') self.onstage() self.sign.reparentTo(hidden) self.sign.setPos(-6.0, 10.0, 0.0) diff --git a/toontown/parties/DistributedPartyCatchActivity.py b/toontown/parties/DistributedPartyCatchActivity.py index fd7abd2..fdaa025 100644 --- a/toontown/parties/DistributedPartyCatchActivity.py +++ b/toontown/parties/DistributedPartyCatchActivity.py @@ -173,10 +173,10 @@ class DistributedPartyCatchActivity(DistributedPartyActivity, DistributedPartyCa self.dropObjModels = {} if loadModels: self.__loadDropModels() - self.sndGoodCatch = base.loader.loadSfx('phase_4/audio/sfx/SZ_DD_treasure.mp3') - self.sndOof = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') - self.sndAnvilLand = base.loader.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3') - self.sndPerfect = base.loader.loadSfx('phase_4/audio/sfx/ring_perfect.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.ogg') + 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.ogg') self.__textGen = TextNode('partyCatchActivity') self.__textGen.setFont(ToontownGlobals.getSignFont()) self.__textGen.setAlign(TextNode.ACenter) diff --git a/toontown/parties/DistributedPartyFireworksActivity.py b/toontown/parties/DistributedPartyFireworksActivity.py index 04f8f14..8dddb0b 100644 --- a/toontown/parties/DistributedPartyFireworksActivity.py +++ b/toontown/parties/DistributedPartyFireworksActivity.py @@ -61,7 +61,7 @@ class DistributedPartyFireworksActivity(DistributedPartyActivity, FireworkShowMi effectsLocator = self.rocketActor.find('**/joint1') self.rocketExplosionEffect = RocketExplosion(effectsLocator, rocketLocator) self.rocketParticleSeq = None - self.launchSound = base.loader.loadSfx('phase_13/audio/sfx/rocket_launch.mp3') + self.launchSound = base.loader.loadSfx('phase_13/audio/sfx/rocket_launch.ogg') self.activityFSM = FireworksActivityFSM(self) self.activityFSM.request('Idle') return diff --git a/toontown/parties/DistributedPartyTrampolineActivity.py b/toontown/parties/DistributedPartyTrampolineActivity.py index 767dd13..7113938 100644 --- a/toontown/parties/DistributedPartyTrampolineActivity.py +++ b/toontown/parties/DistributedPartyTrampolineActivity.py @@ -175,9 +175,9 @@ class DistributedPartyTrampolineActivity(DistributedPartyActivity): return def loadSounds(self): - self.jellyBeanSound = base.loader.loadSfx('phase_4/audio/sfx/sparkly.mp3') - self.boingSound = base.loader.loadSfx('phase_4/audio/sfx/target_trampoline_2.mp3') - self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3') + self.jellyBeanSound = base.loader.loadSfx('phase_4/audio/sfx/sparkly.ogg') + self.boingSound = base.loader.loadSfx('phase_4/audio/sfx/target_trampoline_2.ogg') + self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.ogg') def loadIntervals(self): diff --git a/toontown/parties/DistributedPartyTugOfWarActivity.py b/toontown/parties/DistributedPartyTugOfWarActivity.py index 027342a..7d2ed16 100644 --- a/toontown/parties/DistributedPartyTugOfWarActivity.py +++ b/toontown/parties/DistributedPartyTugOfWarActivity.py @@ -222,8 +222,8 @@ class DistributedPartyTugOfWarActivity(DistributedPartyTeamActivity): return def loadSounds(self): - self.splashSound = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.mp3') - self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.mp3') + self.splashSound = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_splash.ogg') + self.whistleSound = base.loader.loadSfx('phase_4/audio/sfx/AA_sound_whistle.ogg') def loadIntervals(self): self.updateIdealRateInterval = Sequence() diff --git a/toontown/parties/JellybeanRewardGui.py b/toontown/parties/JellybeanRewardGui.py index 607be4e..5a38040 100644 --- a/toontown/parties/JellybeanRewardGui.py +++ b/toontown/parties/JellybeanRewardGui.py @@ -38,8 +38,8 @@ class JellybeanRewardGui(DirectFrame): publicPartyGui.find('**/startButton_inactive')), geom_pos=(-0.39, 0.0, 0.125), command=self._close) publicPartyGui.removeNode() del publicPartyGui - self.countSound = base.loader.loadSfx('phase_13/audio/sfx/tick_counter_short.mp3') - self.overMaxSound = base.loader.loadSfx('phase_13/audio/sfx/tick_counter_overflow.mp3') + self.countSound = base.loader.loadSfx('phase_13/audio/sfx/tick_counter_short.ogg') + self.overMaxSound = base.loader.loadSfx('phase_13/audio/sfx/tick_counter_overflow.ogg') return def showReward(self, earnedAmount, jarAmount, message): diff --git a/toontown/parties/PartyCog.py b/toontown/parties/PartyCog.py index 7907ff5..d428c34 100644 --- a/toontown/parties/PartyCog.py +++ b/toontown/parties/PartyCog.py @@ -102,8 +102,8 @@ class PartyCog(FSM): self.splat = globalPropPool.getProp(splatName) self.splat.setBillboardPointEye() self.splatType = globalPropPool.getPropType(splatName) - self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.mp3') - self.upSound = globalBattleSoundCache.getSound('AV_jump_to_side.mp3') + self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.ogg') + self.upSound = globalBattleSoundCache.getSound('AV_jump_to_side.ogg') self.hole = loader.loadModel('phase_13/models/parties/cogPinataHole') self.hole.setTransparency(True) self.hole.setP(-90.0) diff --git a/toontown/parties/PartyCogActivity.py b/toontown/parties/PartyCogActivity.py index 247284d..e08dd23 100644 --- a/toontown/parties/PartyCogActivity.py +++ b/toontown/parties/PartyCogActivity.py @@ -511,7 +511,7 @@ class PartyCogActivity(DirectObject): animPie = Sequence() if pieType == 'actor': 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 dist = lerp(PartyGlobals.CogActivityPieMinDist, PartyGlobals.CogActivityPieMaxDist, t) time = lerp(1.0, 1.5, t) diff --git a/toontown/parties/PartyCogActivityPlayer.py b/toontown/parties/PartyCogActivityPlayer.py index 3a60bd3..343f9c6 100644 --- a/toontown/parties/PartyCogActivityPlayer.py +++ b/toontown/parties/PartyCogActivityPlayer.py @@ -40,7 +40,7 @@ class PartyCogActivityPlayer: self.splat = globalPropPool.getProp(splatName) self.splat.setBillboardPointEye() self.splatType = globalPropPool.getPropType(splatName) - self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.mp3') + self.pieHitSound = globalBattleSoundCache.getSound('AA_wholepie_only.ogg') return def destroy(self): diff --git a/toontown/parties/PartyGlobals.py b/toontown/parties/PartyGlobals.py index 4ab0b96..9018cf6 100644 --- a/toontown/parties/PartyGlobals.py +++ b/toontown/parties/PartyGlobals.py @@ -738,66 +738,66 @@ JUKEBOX_TIMEOUT = 30.0 MUSIC_PATH = 'phase_%s/audio/bgm/' MUSIC_MIN_LENGTH_SECONDS = 50.0 MUSIC_GAP = 2.5 -PhaseToMusicData = {3.5: {'TC_SZ.mid': [TTLocalizer.MusicTcSz, 57]}, - 3: {'create_a_toon.mid': [TTLocalizer.MusicCreateAToon, 175], - 'tt_theme.mid': [TTLocalizer.MusicTtTheme, 51]}, - 4: {'TC_nbrhood.mid': [TTLocalizer.MusicTcNbrhood, 59], - 'MG_TwoDGame.mid': [TTLocalizer.MusicMgTwodgame, 60], - 'MG_Vine.mid': [TTLocalizer.MusicMgVine, 32], - 'FF_safezone.mid': [TTLocalizer.MusicFfSafezone, 47]}, - 6: {'DD_SZ.mid': [TTLocalizer.MusicDdSz, 33], - 'GS_SZ.mid': [TTLocalizer.MusicGsSz, 60], - 'OZ_SZ.mid': [TTLocalizer.MusicOzSz, 31], - 'GZ_SZ.mid': [TTLocalizer.MusicGzSz, 59], - 'MM_SZ.mid': [TTLocalizer.MusicMmSz, 76]}, - 8: {'DG_SZ.mid': [TTLocalizer.MusicDgSz, 48], - 'DL_SZ.mid': [TTLocalizer.MusicDlSz, 33], - 'TB_SZ.mid': [TTLocalizer.MusicTbSz, 54]}, - 9: {'encntr_hall_of_fame.mid': [TTLocalizer.MusicEncntrHallOfFame, 51], - 'encntr_head_suit_theme.mid': [TTLocalizer.MusicEncntrHeadSuitTheme, 29]}, - 11: {'LB_juryBG.mid': [TTLocalizer.MusicLbJurybg, 30]}, - 13: {'party_original_theme.mid': [TTLocalizer.MusicPartyOriginalTheme, 56], - 'party_generic_theme_jazzy.mid': [TTLocalizer.MusicPartyGenericThemeJazzy, 64]}} -PhaseToMusicData40 = {3.5: {'encntr_general_bg.mid': [TTLocalizer.MusicEncntrGeneralBg, 30], - 'TC_SZ.mid': [TTLocalizer.MusicTcSz, 57]}, - 3: {'create_a_toon.mid': [TTLocalizer.MusicCreateAToon, 175], - 'tt_theme.mid': [TTLocalizer.MusicTtTheme, 51]}, - 4: {'minigame_race.mid': [TTLocalizer.MusicMinigameRace, 77], - 'TC_nbrhood.mid': [TTLocalizer.MusicTcNbrhood, 59], - 'MG_TwoDGame.mid': [TTLocalizer.MusicMgTwodgame, 60], - 'MG_CogThief.mid': [TTLocalizer.MusicMgCogthief, 61], - 'MG_Vine.mid': [TTLocalizer.MusicMgVine, 32], - 'MG_IceGame.mid': [TTLocalizer.MusicMgIcegame, 56], - 'FF_safezone.mid': [TTLocalizer.MusicFfSafezone, 47]}, - 6: {'DD_SZ.mid': [TTLocalizer.MusicDdSz, 33], - 'GZ_PlayGolf.mid': [TTLocalizer.MusicGzPlaygolf, 61], - 'GS_SZ.mid': [TTLocalizer.MusicGsSz, 60], - 'OZ_SZ.mid': [TTLocalizer.MusicOzSz, 31], - 'GS_Race_CC.mid': [TTLocalizer.MusicGsRaceCc, 58], - 'GS_Race_SS.mid': [TTLocalizer.MusicGsRaceSs, 61], - 'GS_Race_RR.mid': [TTLocalizer.MusicGsRaceRr, 60], - 'GZ_SZ.mid': [TTLocalizer.MusicGzSz, 59], - 'MM_SZ.mid': [TTLocalizer.MusicMmSz, 76], - 'DD_nbrhood.mid': [TTLocalizer.MusicDdNbrhood, 67], - 'GS_KartShop.mid': [TTLocalizer.MusicGsKartshop, 32]}, - 7: {'encntr_general_bg_indoor.mid': [TTLocalizer.MusicEncntrGeneralBgIndoor, 31], - 'encntr_suit_winning_indoor.mid': [TTLocalizer.MusicEncntrGeneralSuitWinningIndoor, 36]}, - 8: {'DL_nbrhood.mid': [TTLocalizer.MusicDlNbrhood, 30], - 'DG_SZ.mid': [TTLocalizer.MusicDgSz, 48], - 'DL_SZ.mid': [TTLocalizer.MusicDlSz, 33], - 'TB_SZ.mid': [TTLocalizer.MusicTbSz, 54]}, - 9: {'encntr_hall_of_fame.mid': [TTLocalizer.MusicEncntrHallOfFame, 51], - 'CHQ_FACT_bg.mid': [TTLocalizer.MusicChqFactBg, 50], - 'encntr_suit_winning.mid': [TTLocalizer.MusicEncntrSuitWinning, 31], - 'encntr_head_suit_theme.mid': [TTLocalizer.MusicEncntrHeadSuitTheme, 29]}, - 11: {'LB_juryBG.mid': [TTLocalizer.MusicLbJurybg, 30], - 'LB_courtyard.mid': [TTLocalizer.MusicLbCourtyard, 32]}, - 12: {'Bossbot_Factory_v1.mid': [TTLocalizer.MusicBossbotFactoryV1, 30], - 'BossBot_CEO_v1.mid': [TTLocalizer.MusicBossbotCeoV1, 31]}, - 13: {'party_original_theme.mid': [TTLocalizer.MusicPartyOriginalTheme, 56], - 'party_polka_dance.mid': [TTLocalizer.MusicPartyPolkaDance, 63], - 'party_waltz_dance.mid': [TTLocalizer.MusicPartyWaltzDance, 63], - 'party_generic_theme_jazzy.mid': [TTLocalizer.MusicPartyGenericThemeJazzy, 64]}} +PhaseToMusicData = {3.5: {'TC_SZ.ogg': [TTLocalizer.MusicTcSz, 57]}, + 3: {'create_a_toon.ogg': [TTLocalizer.MusicCreateAToon, 175], + 'tt_theme.ogg': [TTLocalizer.MusicTtTheme, 51]}, + 4: {'TC_nbrhood.ogg': [TTLocalizer.MusicTcNbrhood, 59], + 'MG_TwoDGame.ogg': [TTLocalizer.MusicMgTwodgame, 60], + 'MG_Vine.ogg': [TTLocalizer.MusicMgVine, 32], + 'FF_safezone.ogg': [TTLocalizer.MusicFfSafezone, 47]}, + 6: {'DD_SZ.ogg': [TTLocalizer.MusicDdSz, 33], + 'GS_SZ.ogg': [TTLocalizer.MusicGsSz, 60], + 'OZ_SZ.ogg': [TTLocalizer.MusicOzSz, 31], + 'GZ_SZ.ogg': [TTLocalizer.MusicGzSz, 59], + 'MM_SZ.ogg': [TTLocalizer.MusicMmSz, 76]}, + 8: {'DG_SZ.ogg': [TTLocalizer.MusicDgSz, 48], + 'DL_SZ.ogg': [TTLocalizer.MusicDlSz, 33], + 'TB_SZ.ogg': [TTLocalizer.MusicTbSz, 54]}, + 9: {'encntr_hall_of_fame.ogg': [TTLocalizer.MusicEncntrHallOfFame, 51], + 'encntr_head_suit_theme.ogg': [TTLocalizer.MusicEncntrHeadSuitTheme, 29]}, + 11: {'LB_juryBG.ogg': [TTLocalizer.MusicLbJurybg, 30]}, + 13: {'party_original_theme.ogg': [TTLocalizer.MusicPartyOriginalTheme, 56], + 'party_generic_theme_jazzy.ogg': [TTLocalizer.MusicPartyGenericThemeJazzy, 64]}} +PhaseToMusicData40 = {3.5: {'encntr_general_bg.ogg': [TTLocalizer.MusicEncntrGeneralBg, 30], + 'TC_SZ.ogg': [TTLocalizer.MusicTcSz, 57]}, + 3: {'create_a_toon.ogg': [TTLocalizer.MusicCreateAToon, 175], + 'tt_theme.ogg': [TTLocalizer.MusicTtTheme, 51]}, + 4: {'minigame_race.ogg': [TTLocalizer.MusicMinigameRace, 77], + 'TC_nbrhood.ogg': [TTLocalizer.MusicTcNbrhood, 59], + 'MG_TwoDGame.ogg': [TTLocalizer.MusicMgTwodgame, 60], + 'MG_CogThief.ogg': [TTLocalizer.MusicMgCogthief, 61], + 'MG_Vine.ogg': [TTLocalizer.MusicMgVine, 32], + 'MG_IceGame.ogg': [TTLocalizer.MusicMgIcegame, 56], + 'FF_safezone.ogg': [TTLocalizer.MusicFfSafezone, 47]}, + 6: {'DD_SZ.ogg': [TTLocalizer.MusicDdSz, 33], + 'GZ_PlayGolf.ogg': [TTLocalizer.MusicGzPlaygolf, 61], + 'GS_SZ.ogg': [TTLocalizer.MusicGsSz, 60], + 'OZ_SZ.ogg': [TTLocalizer.MusicOzSz, 31], + 'GS_Race_CC.ogg': [TTLocalizer.MusicGsRaceCc, 58], + 'GS_Race_SS.ogg': [TTLocalizer.MusicGsRaceSs, 61], + 'GS_Race_RR.ogg': [TTLocalizer.MusicGsRaceRr, 60], + 'GZ_SZ.ogg': [TTLocalizer.MusicGzSz, 59], + 'MM_SZ.ogg': [TTLocalizer.MusicMmSz, 76], + 'DD_nbrhood.ogg': [TTLocalizer.MusicDdNbrhood, 67], + 'GS_KartShop.ogg': [TTLocalizer.MusicGsKartshop, 32]}, + 7: {'encntr_general_bg_indoor.ogg': [TTLocalizer.MusicEncntrGeneralBgIndoor, 31], + 'encntr_suit_winning_indoor.ogg': [TTLocalizer.MusicEncntrGeneralSuitWinningIndoor, 36]}, + 8: {'DL_nbrhood.ogg': [TTLocalizer.MusicDlNbrhood, 30], + 'DG_SZ.ogg': [TTLocalizer.MusicDgSz, 48], + 'DL_SZ.ogg': [TTLocalizer.MusicDlSz, 33], + 'TB_SZ.ogg': [TTLocalizer.MusicTbSz, 54]}, + 9: {'encntr_hall_of_fame.ogg': [TTLocalizer.MusicEncntrHallOfFame, 51], + 'CHQ_FACT_bg.ogg': [TTLocalizer.MusicChqFactBg, 50], + 'encntr_suit_winning.ogg': [TTLocalizer.MusicEncntrSuitWinning, 31], + 'encntr_head_suit_theme.ogg': [TTLocalizer.MusicEncntrHeadSuitTheme, 29]}, + 11: {'LB_juryBG.ogg': [TTLocalizer.MusicLbJurybg, 30], + 'LB_courtyard.ogg': [TTLocalizer.MusicLbCourtyard, 32]}, + 12: {'Bossbot_Factory_v1.ogg': [TTLocalizer.MusicBossbotFactoryV1, 30], + 'BossBot_CEO_v1.ogg': [TTLocalizer.MusicBossbotCeoV1, 31]}, + 13: {'party_original_theme.ogg': [TTLocalizer.MusicPartyOriginalTheme, 56], + 'party_polka_dance.ogg': [TTLocalizer.MusicPartyPolkaDance, 63], + 'party_waltz_dance.ogg': [TTLocalizer.MusicPartyWaltzDance, 63], + 'party_generic_theme_jazzy.ogg': [TTLocalizer.MusicPartyGenericThemeJazzy, 64]}} def countMusic(): numMusic = 0 diff --git a/toontown/parties/PartyLoader.py b/toontown/parties/PartyLoader.py index a752862..c9ac2f6 100644 --- a/toontown/parties/PartyLoader.py +++ b/toontown/parties/PartyLoader.py @@ -20,8 +20,8 @@ class PartyLoader(SafeZoneLoader.SafeZoneLoader): State.State('party', self.enterParty, self.exitParty, ['quietZone']), State.State('quietZone', self.enterQuietZone, self.exitQuietZone, ['planning', 'party']), State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') - self.musicFile = 'phase_13/audio/bgm/party_original_theme.mid' - self.activityMusicFile = 'phase_13/audio/bgm/party_waltz_dance.mid' + self.musicFile = 'phase_13/audio/bgm/party_original_theme.ogg' + self.activityMusicFile = 'phase_13/audio/bgm/party_waltz_dance.ogg' self.dnaFile = 'phase_13/dna/party_sz.dna' self.safeZoneStorageDNAFile = None self.cloudSwitch = 0 @@ -40,11 +40,11 @@ class PartyLoader(SafeZoneLoader.SafeZoneLoader): self.oldClear = base.win.getClearColor() base.win.setClearColor(Vec4(0.47, 0.69, 0.3, 1.0)) SafeZoneLoader.SafeZoneLoader.load(self) - self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') - self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') - self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') - 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.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.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.ogg') + 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.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.ogg', 'phase_4/audio/sfx/SZ_TC_bird2.ogg', 'phase_4/audio/sfx/SZ_TC_bird3.ogg'])) def unload(self): self.ignoreAll() diff --git a/toontown/pets/DistributedPet.py b/toontown/pets/DistributedPet.py index 5af2ccb..47d77e6 100644 --- a/toontown/pets/DistributedPet.py +++ b/toontown/pets/DistributedPet.py @@ -236,11 +236,11 @@ class DistributedPet(DistributedSmoothNode.DistributedSmoothNode, Pet.Pet, PetBa self.addActive() self.startBlink() if not self.swallowSfx: - self.swallowSfx = loader.loadSfx('phase_5.5/audio/sfx/beg_eat_swallow.mp3') + self.swallowSfx = loader.loadSfx('phase_5.5/audio/sfx/beg_eat_swallow.ogg') if not self.callSfx: - self.callSfx = loader.loadSfx('phase_5.5/audio/sfx/call_pet.mp3') + self.callSfx = loader.loadSfx('phase_5.5/audio/sfx/call_pet.ogg') if not self.petSfx: - self.petSfx = loader.loadSfx('phase_5.5/audio/sfx/pet_the_pet.mp3') + self.petSfx = loader.loadSfx('phase_5.5/audio/sfx/pet_the_pet.ogg') self.handleMoodChange() self.accept(self.mood.getDominantMoodChangeEvent(), self.handleMoodChange) self.accept(self.mood.getMoodChangeEvent(), self.moodComponentChanged) diff --git a/toontown/pets/Pet.py b/toontown/pets/Pet.py index 2cc2ca8..aec1233 100644 --- a/toontown/pets/Pet.py +++ b/toontown/pets/Pet.py @@ -494,12 +494,12 @@ class Pet(Avatar.Avatar): def getTeleportInSoundInterval(self): if not self.soundTeleportIn: - self.soundTeleportIn = loader.loadSfx('phase_5/audio/sfx/teleport_reappear.mp3') + self.soundTeleportIn = loader.loadSfx('phase_5/audio/sfx/teleport_reappear.ogg') return SoundInterval(self.soundTeleportIn) def getTeleportOutSoundInterval(self): if not self.soundTeleportOut: - self.soundTeleportOut = loader.loadSfx('phase_5/audio/sfx/teleport_disappear.mp3') + self.soundTeleportOut = loader.loadSfx('phase_5/audio/sfx/teleport_disappear.ogg') return SoundInterval(self.soundTeleportOut) def enterWalk(self): diff --git a/toontown/pets/PetTricks.py b/toontown/pets/PetTricks.py index 4341e8b..9d46ba2 100644 --- a/toontown/pets/PetTricks.py +++ b/toontown/pets/PetTricks.py @@ -50,13 +50,13 @@ TrickHeals = {Tricks.JUMP: (5, 10), Tricks.DANCE: (10, 20), Tricks.SPEAK: (11, 22), Tricks.BALK: (0, 0)} -TrickSounds = {Tricks.BACKFLIP: 'phase_5/audio/sfx/backflip.mp3', - Tricks.ROLLOVER: 'phase_5/audio/sfx/rollover.mp3', - Tricks.PLAYDEAD: 'phase_5/audio/sfx/play_dead.mp3', - Tricks.BEG: 'phase_5/audio/sfx/beg.mp3', - Tricks.DANCE: 'phase_5/audio/sfx/heal_dance.mp3', - Tricks.JUMP: 'phase_5/audio/sfx/jump.mp3', - Tricks.SPEAK: 'phase_5/audio/sfx/speak_v1.mp3'} +TrickSounds = {Tricks.BACKFLIP: 'phase_5/audio/sfx/backflip.ogg', + Tricks.ROLLOVER: 'phase_5/audio/sfx/rollover.ogg', + Tricks.PLAYDEAD: 'phase_5/audio/sfx/play_dead.ogg', + Tricks.BEG: 'phase_5/audio/sfx/beg.ogg', + Tricks.DANCE: 'phase_5/audio/sfx/heal_dance.ogg', + Tricks.JUMP: 'phase_5/audio/sfx/jump.ogg', + Tricks.SPEAK: 'phase_5/audio/sfx/speak_v1.ogg'} def getSoundIval(trickId): sounds = TrickSounds.get(trickId, None) diff --git a/toontown/quest/QuestParser.py b/toontown/quest/QuestParser.py index ac39940..36d4e54 100644 --- a/toontown/quest/QuestParser.py +++ b/toontown/quest/QuestParser.py @@ -877,7 +877,7 @@ class NPCMoviePlayer(DirectObject.DirectObject): def parseAddInventory(self, line): token, track, level, number = line inventory = self.getVar('inventory') - countSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') + countSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg') return Sequence(Func(base.playSfx, countSound), Func(inventory.buttonBoing, track, level), Func(inventory.addItems, track, level, number), Func(inventory.updateGUI, track, level)) def parseSetInventory(self, line): diff --git a/toontown/racing/DistributedRace.py b/toontown/racing/DistributedRace.py index d5bfc5b..d3cb3e5 100644 --- a/toontown/racing/DistributedRace.py +++ b/toontown/racing/DistributedRace.py @@ -35,9 +35,9 @@ class DistributedRace(DistributedObject.DistributedObject): WinEvent = 'RaceWinEvent' BGM_BaseDir = 'phase_6/audio/bgm/' SFX_BaseDir = 'phase_6/audio/sfx/' - SFX_StartBoop = SFX_BaseDir + 'KART_raceStart1.mp3' - SFX_StartBoop2 = SFX_BaseDir + 'KART_raceStart2.mp3' - SFX_Applause = SFX_BaseDir + 'KART_Applause_%d.mp3' + SFX_StartBoop = SFX_BaseDir + 'KART_raceStart1.ogg' + SFX_StartBoop2 = SFX_BaseDir + 'KART_raceStart2.ogg' + SFX_Applause = SFX_BaseDir + 'KART_Applause_%d.ogg' def __init__(self, cr): self.qbox = loader.loadModel('phase_6/models/karting/qbox') @@ -70,8 +70,8 @@ class DistributedRace(DistributedObject.DistributedObject): self.hasFog = False self.dummyNode = None self.fog = None - self.bananaSound = base.loader.loadSfx('phase_6/audio/sfx/KART_tossBanana.mp3') - self.anvilFall = base.loader.loadSfx('phase_6/audio/sfx/KART_Gag_Hit_Anvil.mp3') + self.bananaSound = base.loader.loadSfx('phase_6/audio/sfx/KART_tossBanana.ogg') + self.anvilFall = base.loader.loadSfx('phase_6/audio/sfx/KART_Gag_Hit_Anvil.ogg') self.accept('leaveRace', self.leaveRace) self.toonsToLink = [] self.curveTs = [] diff --git a/toontown/racing/DistributedStartingBlock.py b/toontown/racing/DistributedStartingBlock.py index baf99c3..a0350ab 100644 --- a/toontown/racing/DistributedStartingBlock.py +++ b/toontown/racing/DistributedStartingBlock.py @@ -32,7 +32,7 @@ class DistributedStartingBlock(DistributedObject.DistributedObject, FSM): cameraPos = Point3(0, -23, 10) cameraHpr = Point3(0, -10, 0) SFX_BaseDir = 'phase_6/audio/sfx/' - SFX_KartAppear = SFX_BaseDir + 'KART_Appear.mp3' + SFX_KartAppear = SFX_BaseDir + 'KART_Appear.ogg' defaultTransitions = {'Off': ['EnterMovie'], 'EnterMovie': ['Off', 'Waiting', 'ExitMovie'], 'Waiting': ['ExitMovie', 'Off'], diff --git a/toontown/racing/DistributedVehicle.py b/toontown/racing/DistributedVehicle.py index 72f0a23..63c4406 100644 --- a/toontown/racing/DistributedVehicle.py +++ b/toontown/racing/DistributedVehicle.py @@ -65,14 +65,14 @@ class DistributedVehicle(DistributedSmoothNode.DistributedSmoothNode, Kart.Kart, 'windResistance': 0.2, 'particleColor': Vec4(1.0, 1.0, 1.0, 1.0)}} SFX_BaseDir = 'phase_6/audio/sfx/' - SFX_WallHits = [SFX_BaseDir + 'KART_Hitting_Wood_Fence.mp3', - SFX_BaseDir + 'KART_Hitting_Wood_Fence_1.mp3', - SFX_BaseDir + 'KART_Hitting_Metal_Fence.mp3', - SFX_BaseDir + 'KART_Hitting_Wall.mp3'] - SFX_SkidLoop_Grass = SFX_BaseDir + 'KART_Skidding_On_Grass.wav' - SFX_SkidLoop_Asphalt = SFX_BaseDir + 'KART_Skidding_On_Asphalt.wav' - SFX_TurboStart = SFX_BaseDir + 'KART_turboStart.mp3' - SFX_TurboLoop = SFX_BaseDir + 'KART_turboLoop.wav' + SFX_WallHits = [SFX_BaseDir + 'KART_Hitting_Wood_Fence.ogg', + SFX_BaseDir + 'KART_Hitting_Wood_Fence_1.ogg', + SFX_BaseDir + 'KART_Hitting_Metal_Fence.ogg', + SFX_BaseDir + 'KART_Hitting_Wall.ogg'] + SFX_SkidLoop_Grass = SFX_BaseDir + 'KART_Skidding_On_Grass.ogg' + SFX_SkidLoop_Asphalt = SFX_BaseDir + 'KART_Skidding_On_Asphalt.ogg' + SFX_TurboStart = SFX_BaseDir + 'KART_turboStart.ogg' + SFX_TurboLoop = SFX_BaseDir + 'KART_turboLoop.ogg' AvId2kart = {} @classmethod diff --git a/toontown/racing/Kart.py b/toontown/racing/Kart.py index a0fb717..a4d551d 100644 --- a/toontown/racing/Kart.py +++ b/toontown/racing/Kart.py @@ -21,8 +21,8 @@ class Kart(NodePath, ShadowCaster.ShadowCaster): {'node': 'wheel*Node4'}] ShadowScale = 2.5 SFX_BaseDir = 'phase_6/audio/sfx/' - SFX_KartStart = SFX_BaseDir + 'KART_Engine_start_%d.mp3' - SFX_KartLoop = SFX_BaseDir + 'KART_Engine_loop_%d.wav' + SFX_KartStart = SFX_BaseDir + 'KART_Engine_start_%d.ogg' + SFX_KartLoop = SFX_BaseDir + 'KART_Engine_loop_%d.ogg' def __init__(self): NodePath.__init__(self) diff --git a/toontown/racing/RaceGUI.py b/toontown/racing/RaceGUI.py index f055201..90fe4ff 100644 --- a/toontown/racing/RaceGUI.py +++ b/toontown/racing/RaceGUI.py @@ -102,11 +102,11 @@ class RaceGUI: self.raceTimeDelta = 0 self.raceModeReady = False self.resultModeReady = False - self.gagCycleSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.mp3') + self.gagCycleSound = base.loader.loadSfx('phase_3.5/audio/sfx/tick_counter.ogg') if hasattr(self.gagCycleSound, 'setPlayRate'): self.gagCycleSound.setPlayRate(0.2) self.gagCycleSound.setLoop(1) - self.gagAcquireSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3') + self.gagAcquireSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.ogg') self.disable() return diff --git a/toontown/racing/RaceGag.py b/toontown/racing/RaceGag.py index 37c80a5..4810f73 100644 --- a/toontown/racing/RaceGag.py +++ b/toontown/racing/RaceGag.py @@ -25,7 +25,7 @@ class RaceGag(DirectObject.DirectObject): self.slot = slot self.type = 0 self.accept('imIn-' + self.name, self.hitGag) - self.pickupSound = base.loader.loadSfx('phase_6/audio/sfx/KART_getGag.mp3') + self.pickupSound = base.loader.loadSfx('phase_6/audio/sfx/KART_getGag.ogg') self.fadeout = None return diff --git a/toontown/racing/RaceGlobals.py b/toontown/racing/RaceGlobals.py index 51b046e..61f0453 100644 --- a/toontown/racing/RaceGlobals.py +++ b/toontown/racing/RaceGlobals.py @@ -255,7 +255,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Speedway_1_Gags, Speedway_1_Boosts, 1.0, - 'GS_Race_SS.mid', + 'GS_Race_SS.ogg', (0.01, 0.015)), RT_Speedway_1_rev: (TrackPath + 'RT_SpeedwayA', 240.0, @@ -264,7 +264,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Speedway_1_rev_Gags, Speedway_1_Rev_Boosts, 1.0, - 'GS_Race_SS.mid', + 'GS_Race_SS.ogg', (0.01, 0.015)), RT_Speedway_2: (TrackPath + 'RT_SpeedwayB', 335.0, @@ -273,7 +273,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Speedway_2_Gags, Speedway_2_Boosts, 1.0, - 'GS_Race_SS.mid', + 'GS_Race_SS.ogg', (0.01, 0.015)), RT_Speedway_2_rev: (TrackPath + 'RT_SpeedwayB', 335.0, @@ -282,7 +282,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Speedway_2_Gags, Speedway_2_Rev_Boosts, 1.0, - 'GS_Race_SS.mid', + 'GS_Race_SS.ogg', (0.01, 0.015)), RT_Rural_1: (TrackPath + 'RT_RuralB', 360.0, @@ -291,7 +291,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Rural_1_Gags, Rural_1_Boosts, 0.75, - 'GS_Race_RR.mid', + 'GS_Race_RR.ogg', (0.003, 0.004)), RT_Rural_1_rev: (TrackPath + 'RT_RuralB', 360.0, @@ -300,7 +300,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Rural_1_Gags, Rural_1_Rev_Boosts, 0.75, - 'GS_Race_RR.mid', + 'GS_Race_RR.ogg', (0.003, 0.004)), RT_Rural_2: (TrackPath + 'RT_RuralB2', 480.0, @@ -309,7 +309,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Rural_2_Gags, Rural_2_Boosts, 0.75, - 'GS_Race_RR.mid', + 'GS_Race_RR.ogg', (0.003, 0.004)), RT_Rural_2_rev: (TrackPath + 'RT_RuralB2', 480.0, @@ -318,7 +318,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Rural_2_Gags, Rural_2_Rev_Boosts, 0.75, - 'GS_Race_RR.mid', + 'GS_Race_RR.ogg', (0.003, 0.004)), RT_Urban_1: (TrackPath + 'RT_UrbanA', 480.0, @@ -327,7 +327,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Urban_1_Gags, Urban_1_Boosts, 1.0, - 'GS_Race_CC.mid', + 'GS_Race_CC.ogg', (0.002, 0.003)), RT_Urban_1_rev: (TrackPath + 'RT_UrbanA', 480.0, @@ -336,7 +336,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Urban_1_rev_Gags, Urban_1_Rev_Boosts, 1.0, - 'GS_Race_CC.mid', + 'GS_Race_CC.ogg', (0.002, 0.003)), RT_Urban_2: (TrackPath + 'RT_UrbanB', 480.0, @@ -345,7 +345,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Urban_2_Gags, Urban_2_Boosts, 1.0, - 'GS_Race_CC.mid', + 'GS_Race_CC.ogg', (0.002, 0.003)), RT_Urban_2_rev: (TrackPath + 'RT_UrbanB', 480.0, @@ -354,7 +354,7 @@ TrackDict = {RT_Speedway_1: (TrackPath + 'RT_SpeedwayA', RT_Urban_2_Gags, Urban_2_Rev_Boosts, 1.0, - 'GS_Race_CC.mid', + 'GS_Race_CC.ogg', (0.002, 0.003))} TrackIds = list(TrackDict.keys()) TrackIds.sort() diff --git a/toontown/safezone/BRSafeZoneLoader.py b/toontown/safezone/BRSafeZoneLoader.py index ae08b1f..06a7540 100644 --- a/toontown/safezone/BRSafeZoneLoader.py +++ b/toontown/safezone/BRSafeZoneLoader.py @@ -10,16 +10,16 @@ class BRSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) self.playgroundClass = BRPlayground.BRPlayground - self.musicFile = 'phase_8/audio/bgm/TB_nbrhood.mid' - self.activityMusicFile = 'phase_8/audio/bgm/TB_SZ_activity.mid' + self.musicFile = 'phase_8/audio/bgm/TB_nbrhood.ogg' + self.activityMusicFile = 'phase_8/audio/bgm/TB_SZ_activity.ogg' self.dnaFile = 'phase_8/dna/the_burrrgh_sz.dna' self.safeZoneStorageDNAFile = 'phase_8/dna/storage_BR_sz.dna' def load(self): SafeZoneLoader.SafeZoneLoader.load(self) - self.wind1Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_1.mp3') - self.wind2Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_2.mp3') - self.wind3Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_3.mp3') + self.wind1Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_1.ogg') + self.wind2Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_2.ogg') + self.wind3Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_TB_wind_3.ogg') self.snow = BattleParticles.loadParticleFile('snowdisk.ptf') self.snow.setPos(0, 0, 5) self.snowRender = self.geom.attachNewNode('snowRender') diff --git a/toontown/safezone/DDSafeZoneLoader.py b/toontown/safezone/DDSafeZoneLoader.py index b9ccc14..3c952c9 100644 --- a/toontown/safezone/DDSafeZoneLoader.py +++ b/toontown/safezone/DDSafeZoneLoader.py @@ -11,17 +11,17 @@ class DDSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) self.playgroundClass = DDPlayground.DDPlayground - self.musicFile = 'phase_6/audio/bgm/DD_nbrhood.mid' - self.activityMusicFile = 'phase_6/audio/bgm/DD_SZ_activity.mid' + self.musicFile = 'phase_6/audio/bgm/DD_nbrhood.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/DD_SZ_activity.ogg' self.dnaFile = 'phase_6/dna/donalds_dock_sz.dna' self.safeZoneStorageDNAFile = 'phase_6/dna/storage_DD_sz.dna' def load(self): SafeZoneLoader.SafeZoneLoader.load(self) - self.seagullSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_Seagull.mp3') - self.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') - self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') - self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.mp3') + self.seagullSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_Seagull.ogg') + 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.ogg') + self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.ogg') water = self.geom.find('**/water') water.setTransparency(1) water.setColor(1, 1, 1, 0.8) @@ -35,10 +35,10 @@ class DDSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): else: wheel.hide() self.boat.stash() - self.dockSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_dockcreak.mp3') - self.foghornSound = base.loader.loadSfx('phase_5/audio/sfx/SZ_DD_foghorn.mp3') - self.bellSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_shipbell.mp3') - self.waterSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_waterlap.mp3') + self.dockSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_dockcreak.ogg') + self.foghornSound = base.loader.loadSfx('phase_5/audio/sfx/SZ_DD_foghorn.ogg') + self.bellSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_shipbell.ogg') + self.waterSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_DD_waterlap.ogg') def unload(self): SafeZoneLoader.SafeZoneLoader.unload(self) diff --git a/toontown/safezone/DGSafeZoneLoader.py b/toontown/safezone/DGSafeZoneLoader.py index 0777d36..08e106c 100644 --- a/toontown/safezone/DGSafeZoneLoader.py +++ b/toontown/safezone/DGSafeZoneLoader.py @@ -7,17 +7,17 @@ class DGSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) self.playgroundClass = DGPlayground.DGPlayground - self.musicFile = 'phase_8/audio/bgm/DG_nbrhood.mid' - self.activityMusicFile = 'phase_8/audio/bgm/DG_SZ.mid' + self.musicFile = 'phase_8/audio/bgm/DG_nbrhood.ogg' + self.activityMusicFile = 'phase_8/audio/bgm/DG_SZ.ogg' self.dnaFile = 'phase_8/dna/daisys_garden_sz.dna' self.safeZoneStorageDNAFile = 'phase_8/dna/storage_DG_sz.dna' def load(self): SafeZoneLoader.SafeZoneLoader.load(self) - self.bird1Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_01.mp3') - self.bird2Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_02.mp3') - self.bird3Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_03.mp3') - self.bird4Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_04.mp3') + self.bird1Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_01.ogg') + self.bird2Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_02.ogg') + self.bird3Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_03.ogg') + self.bird4Sound = base.loader.loadSfx('phase_8/audio/sfx/SZ_DG_bird_04.ogg') def unload(self): SafeZoneLoader.SafeZoneLoader.unload(self) diff --git a/toontown/safezone/DLSafeZoneLoader.py b/toontown/safezone/DLSafeZoneLoader.py index 0376775..9f29487 100644 --- a/toontown/safezone/DLSafeZoneLoader.py +++ b/toontown/safezone/DLSafeZoneLoader.py @@ -7,7 +7,7 @@ class DLSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) self.playgroundClass = DLPlayground.DLPlayground - self.musicFile = 'phase_8/audio/bgm/DL_nbrhood.mid' - self.activityMusicFile = 'phase_8/audio/bgm/DL_SZ_activity.mid' + self.musicFile = 'phase_8/audio/bgm/DL_nbrhood.ogg' + self.activityMusicFile = 'phase_8/audio/bgm/DL_SZ_activity.ogg' self.dnaFile = 'phase_8/dna/donalds_dreamland_sz.dna' self.safeZoneStorageDNAFile = 'phase_8/dna/storage_DL_sz.dna' diff --git a/toontown/safezone/DistributedBRTreasure.py b/toontown/safezone/DistributedBRTreasure.py index faa8802..66848e6 100644 --- a/toontown/safezone/DistributedBRTreasure.py +++ b/toontown/safezone/DistributedBRTreasure.py @@ -5,4 +5,4 @@ class DistributedBRTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_8/models/props/snowflake_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedCheckers.py b/toontown/safezone/DistributedCheckers.py index 4caeec4..632c2a4 100644 --- a/toontown/safezone/DistributedCheckers.py +++ b/toontown/safezone/DistributedCheckers.py @@ -87,9 +87,9 @@ class DistributedCheckers(DistributedNode.DistributedNode): 29, 30, 31]] - self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3') - self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') - self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.mp3') + self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.ogg') + self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.ogg') + self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.ogg') self.accept('stoppedAsleep', self.handleSleep) self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin') x = self.boardNode.find('**/locator*') diff --git a/toontown/safezone/DistributedChineseCheckers.py b/toontown/safezone/DistributedChineseCheckers.py index 304f080..2b6ee01 100644 --- a/toontown/safezone/DistributedChineseCheckers.py +++ b/toontown/safezone/DistributedChineseCheckers.py @@ -134,9 +134,9 @@ class DistributedChineseCheckers(DistributedNode.DistributedNode): 45, 55]] self.nonOpposingPositions = [] - self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3') - self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') - self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.mp3') + self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.ogg') + self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.ogg') + self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.ogg') self.accept('stoppedAsleep', self.handleSleep) from direct.fsm import ClassicFSM, State self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin') diff --git a/toontown/safezone/DistributedDDTreasure.py b/toontown/safezone/DistributedDDTreasure.py index 686cd9f..43b5d80 100644 --- a/toontown/safezone/DistributedDDTreasure.py +++ b/toontown/safezone/DistributedDDTreasure.py @@ -5,4 +5,4 @@ class DistributedDDTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_6/models/props/starfish_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedDGTreasure.py b/toontown/safezone/DistributedDGTreasure.py index 224e2d2..87a7262 100644 --- a/toontown/safezone/DistributedDGTreasure.py +++ b/toontown/safezone/DistributedDGTreasure.py @@ -5,4 +5,4 @@ class DistributedDGTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_8/models/props/flower_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedDLTreasure.py b/toontown/safezone/DistributedDLTreasure.py index b630e16..deefb18 100644 --- a/toontown/safezone/DistributedDLTreasure.py +++ b/toontown/safezone/DistributedDLTreasure.py @@ -5,4 +5,4 @@ class DistributedDLTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_8/models/props/zzz_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedEFlyingTreasure.py b/toontown/safezone/DistributedEFlyingTreasure.py index 74ba8db..70b44be 100644 --- a/toontown/safezone/DistributedEFlyingTreasure.py +++ b/toontown/safezone/DistributedEFlyingTreasure.py @@ -10,7 +10,7 @@ class DistributedEFlyingTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_5.5/models/props/popsicle_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' self.scale = 2 self.delT = math.pi * 2.0 * random.random() self.shadow = 0 diff --git a/toontown/safezone/DistributedETreasure.py b/toontown/safezone/DistributedETreasure.py index 3aebfa4..89b6a8e 100644 --- a/toontown/safezone/DistributedETreasure.py +++ b/toontown/safezone/DistributedETreasure.py @@ -5,4 +5,4 @@ class DistributedETreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_4/models/props/icecream' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedFindFour.py b/toontown/safezone/DistributedFindFour.py index d77b673..15bc53d 100644 --- a/toontown/safezone/DistributedFindFour.py +++ b/toontown/safezone/DistributedFindFour.py @@ -110,9 +110,9 @@ class DistributedFindFour(DistributedNode.DistributedNode): self.clockNode.hide() self.tintConstant = Vec4(0.25, 0.25, 0.25, 0) self.ghostConstant = Vec4(0, 0, 0, 0.5) - self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.mp3') - self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') - self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.mp3') + self.knockSound = base.loader.loadSfx('phase_5/audio/sfx/GUI_knock_1.ogg') + self.clickSound = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.ogg') + self.moveSound = base.loader.loadSfx('phase_6/audio/sfx/CC_move.ogg') self.accept('stoppedAsleep', self.handleSleep) from direct.fsm import ClassicFSM, State self.fsm = ClassicFSM.ClassicFSM('ChineseCheckers', [State.State('waitingToBegin', self.enterWaitingToBegin, self.exitWaitingToBegin, ['playing', 'gameOver']), State.State('playing', self.enterPlaying, self.exitPlaying, ['gameOver']), State.State('gameOver', self.enterGameOver, self.exitGameOver, ['waitingToBegin'])], 'waitingToBegin', 'waitingToBegin') diff --git a/toontown/safezone/DistributedFishingSpot.py b/toontown/safezone/DistributedFishingSpot.py index 94caf40..7db9a56 100644 --- a/toontown/safezone/DistributedFishingSpot.py +++ b/toontown/safezone/DistributedFishingSpot.py @@ -295,7 +295,7 @@ class DistributedFishingSpot(DistributedObject.DistributedObject): self.ripples.setScale(0.4) self.ripples.hide() if self.splashSounds == None: - self.splashSounds = (base.loader.loadSfx('phase_4/audio/sfx/TT_splash1.mp3'), base.loader.loadSfx('phase_4/audio/sfx/TT_splash2.mp3')) + self.splashSounds = (base.loader.loadSfx('phase_4/audio/sfx/TT_splash1.ogg'), base.loader.loadSfx('phase_4/audio/sfx/TT_splash2.ogg')) return def __placeAvatar(self): diff --git a/toontown/safezone/DistributedGolfKart.py b/toontown/safezone/DistributedGolfKart.py index bb00e6b..0dfc8f1 100644 --- a/toontown/safezone/DistributedGolfKart.py +++ b/toontown/safezone/DistributedGolfKart.py @@ -41,8 +41,8 @@ class DistributedGolfKart(DistributedObject.DistributedObject): State.State('waitCountdown', self.enterWaitCountdown, self.exitWaitCountdown, ['waitEmpty', 'leaving']), State.State('leaving', self.enterLeaving, self.exitLeaving, ['entering'])], 'off', 'off') self.fsm.enterInitialState() - self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3') - self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3') + self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.ogg') + self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.ogg') self.__toonTracks = {} self.avIds = [0, 0, diff --git a/toontown/safezone/DistributedMMPiano.py b/toontown/safezone/DistributedMMPiano.py index 8d9e8aa..d44e753 100644 --- a/toontown/safezone/DistributedMMPiano.py +++ b/toontown/safezone/DistributedMMPiano.py @@ -30,8 +30,8 @@ class DistributedMMPiano(DistributedObject.DistributedObject): self.accept('enterlarge_round_keyboard_collisions', self.__handleOnFloor) self.accept('exitlarge_round_keyboard_collisions', self.__handleOffFloor) self.accept('entero7', self.__handleChangeDirectionButton) - self.speedUpSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3') - self.changeDirectionSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_cymbal.mp3') + self.speedUpSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.ogg') + self.changeDirectionSound = base.loader.loadSfx('phase_6/audio/sfx/SZ_MM_cymbal.ogg') self.__setupSpin() DistributedObject.DistributedObject.generate(self) diff --git a/toontown/safezone/DistributedMMTreasure.py b/toontown/safezone/DistributedMMTreasure.py index b72eab1..c3ec8f1 100644 --- a/toontown/safezone/DistributedMMTreasure.py +++ b/toontown/safezone/DistributedMMTreasure.py @@ -5,4 +5,4 @@ class DistributedMMTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_6/models/props/music_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedOZTreasure.py b/toontown/safezone/DistributedOZTreasure.py index 6d02f6f..cfe9016 100644 --- a/toontown/safezone/DistributedOZTreasure.py +++ b/toontown/safezone/DistributedOZTreasure.py @@ -5,4 +5,4 @@ class DistributedOZTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_6/models/props/acorn_treasure' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedPartyGate.py b/toontown/safezone/DistributedPartyGate.py index 815f76a..4488220 100644 --- a/toontown/safezone/DistributedPartyGate.py +++ b/toontown/safezone/DistributedPartyGate.py @@ -32,7 +32,7 @@ class DistributedPartyGate(DistributedObject.DistributedObject): si = '0%d' % i else: si = '%d' % i - self.clockSounds.append(base.loader.loadSfx('phase_4/audio/sfx/clock%s.mp3' % si)) + self.clockSounds.append(base.loader.loadSfx('phase_4/audio/sfx/clock%s.ogg' % si)) def generate(self): DistributedObject.DistributedObject.generate(self) diff --git a/toontown/safezone/DistributedPicnicBasket.py b/toontown/safezone/DistributedPicnicBasket.py index 20c7f12..d599905 100644 --- a/toontown/safezone/DistributedPicnicBasket.py +++ b/toontown/safezone/DistributedPicnicBasket.py @@ -383,7 +383,7 @@ class DistributedPicnicBasket(DistributedObject.DistributedObject): basketTrack = Sequence( Func(self.basket.show), SoundInterval( - globalBattleSoundCache.getSound('GUI_balloon_popup.mp3'), + globalBattleSoundCache.getSound('GUI_balloon_popup.ogg'), node=self.basket), Func(self.basket.reparentTo, self.tablecloth), Func(self.basket.setPos, 0, 0, 0.2), @@ -450,7 +450,7 @@ class DistributedPicnicBasket(DistributedObject.DistributedObject): scale=Point3(0.1, 0.1, 0.1), duration=0.2), SoundInterval( - globalBattleSoundCache.getSound('GUI_balloon_popup.mp3'), + globalBattleSoundCache.getSound('GUI_balloon_popup.ogg'), node=self.basket), Wait(0.2), LerpPosInterval( @@ -472,7 +472,7 @@ class DistributedPicnicBasket(DistributedObject.DistributedObject): foodTrack = Sequence( Func(self.food[seat].show), SoundInterval( - globalBattleSoundCache.getSound('GUI_balloon_popup.mp3'), + globalBattleSoundCache.getSound('GUI_balloon_popup.ogg'), node=self.food[seat]), Func(self.food[seat].reparentTo, self.tablecloth), Func(self.food[seat].setHpr, 45, 0, 0), @@ -539,7 +539,7 @@ class DistributedPicnicBasket(DistributedObject.DistributedObject): scale=Point3(0.1, 0.1, 0.1), duration=0.2), SoundInterval( - globalBattleSoundCache.getSound('GUI_balloon_popup.mp3'), + globalBattleSoundCache.getSound('GUI_balloon_popup.ogg'), node=self.food[seat]), Wait(0.2), LerpPosInterval( diff --git a/toontown/safezone/DistributedPicnicTable.py b/toontown/safezone/DistributedPicnicTable.py index faed7ea..8d4bfc3 100644 --- a/toontown/safezone/DistributedPicnicTable.py +++ b/toontown/safezone/DistributedPicnicTable.py @@ -57,8 +57,8 @@ class DistributedPicnicTable(DistributedNode.DistributedNode): None, None] self.haveAnimated = [] - self.winSound = base.loader.loadSfx('phase_6/audio/sfx/KART_Applause_1.mp3') - self.happyDance = base.loader.loadSfx('phase_5/audio/sfx/AA_heal_happydance.mp3') + self.winSound = base.loader.loadSfx('phase_6/audio/sfx/KART_Applause_1.ogg') + self.happyDance = base.loader.loadSfx('phase_5/audio/sfx/AA_heal_happydance.ogg') self.accept('stoppedAsleep', self.handleSleep) base.localAvatar.startSleepWatch(self.handleSleep) self.__toonTracks = {} diff --git a/toontown/safezone/DistributedTTTreasure.py b/toontown/safezone/DistributedTTTreasure.py index 8d3e765..1b18acb 100644 --- a/toontown/safezone/DistributedTTTreasure.py +++ b/toontown/safezone/DistributedTTTreasure.py @@ -5,4 +5,4 @@ class DistributedTTTreasure(DistributedSZTreasure.DistributedSZTreasure): def __init__(self, cr): DistributedSZTreasure.DistributedSZTreasure.__init__(self, cr) self.modelPath = 'phase_4/models/props/icecream' - self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.mp3' + self.grabSoundPath = 'phase_4/audio/sfx/SZ_DD_treasure.ogg' diff --git a/toontown/safezone/DistributedTreasure.py b/toontown/safezone/DistributedTreasure.py index 05c2752..7025ff4 100644 --- a/toontown/safezone/DistributedTreasure.py +++ b/toontown/safezone/DistributedTreasure.py @@ -16,7 +16,7 @@ class DistributedTreasure(DistributedObject.DistributedObject): self.dropShadow = None self.modelFindString = None self.grabSoundPath = None - self.rejectSoundPath = 'phase_4/audio/sfx/ring_miss.mp3' + self.rejectSoundPath = 'phase_4/audio/sfx/ring_miss.ogg' self.playSoundForRemoteToons = 1 self.scale = 1.0 self.shadow = 1 diff --git a/toontown/safezone/DistributedTrolley.py b/toontown/safezone/DistributedTrolley.py index 010b0de..1687a8a 100644 --- a/toontown/safezone/DistributedTrolley.py +++ b/toontown/safezone/DistributedTrolley.py @@ -29,8 +29,8 @@ class DistributedTrolley(DistributedObject.DistributedObject): State.State('waitCountdown', self.enterWaitCountdown, self.exitWaitCountdown, ['waitEmpty', 'leaving']), State.State('leaving', self.enterLeaving, self.exitLeaving, ['entering'])], 'off', 'off') self.fsm.enterInitialState() - self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.mp3') - self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.mp3') + self.trolleyAwaySfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_away.ogg') + self.trolleyBellSfx = base.loader.loadSfx('phase_4/audio/sfx/SZ_trolley_bell.ogg') self.__toonTracks = {} def generate(self): diff --git a/toontown/safezone/GSSafeZoneLoader.py b/toontown/safezone/GSSafeZoneLoader.py index 19b175d..ce21cb9 100644 --- a/toontown/safezone/GSSafeZoneLoader.py +++ b/toontown/safezone/GSSafeZoneLoader.py @@ -16,8 +16,8 @@ class GSSafeZoneLoader(SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) - self.musicFile = 'phase_6/audio/bgm/GS_SZ.mid' - self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.mid' + self.musicFile = 'phase_6/audio/bgm/GS_SZ.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.ogg' self.dnaFile = 'phase_6/dna/goofy_speedway_sz.dna' self.safeZoneStorageDNAFile = 'phase_6/dna/storage_GS_sz.dna' del self.fsm @@ -36,7 +36,7 @@ class GSSafeZoneLoader(SafeZoneLoader): holidayIds = base.cr.newsManager.getDecorationHolidayId() if ToontownGlobals.CRASHED_LEADERBOARD in holidayIds: self.startSmokeEffect() - 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'])) def unload(self): del self.birdSound diff --git a/toontown/safezone/GZSafeZoneLoader.py b/toontown/safezone/GZSafeZoneLoader.py index 6be9c98..94e255d 100644 --- a/toontown/safezone/GZSafeZoneLoader.py +++ b/toontown/safezone/GZSafeZoneLoader.py @@ -17,8 +17,8 @@ class GZSafeZoneLoader(SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) - self.musicFile = 'phase_6/audio/bgm/GZ_SZ.mid' - self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.mid' + self.musicFile = 'phase_6/audio/bgm/GZ_SZ.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.ogg' self.dnaFile = 'phase_6/dna/golf_zone_sz.dna' self.safeZoneStorageDNAFile = 'phase_6/dna/storage_GZ_sz.dna' del self.fsm @@ -31,7 +31,7 @@ class GZSafeZoneLoader(SafeZoneLoader): def load(self): SafeZoneLoader.load(self) - 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'])) def unload(self): del self.birdSound diff --git a/toontown/safezone/MMSafeZoneLoader.py b/toontown/safezone/MMSafeZoneLoader.py index 994a771..21c347d 100644 --- a/toontown/safezone/MMSafeZoneLoader.py +++ b/toontown/safezone/MMSafeZoneLoader.py @@ -8,8 +8,8 @@ class MMSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) self.playgroundClass = MMPlayground.MMPlayground - self.musicFile = 'phase_6/audio/bgm/MM_nbrhood.mid' - self.activityMusicFile = 'phase_6/audio/bgm/MM_SZ_activity.mid' + self.musicFile = 'phase_6/audio/bgm/MM_nbrhood.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/MM_SZ_activity.ogg' self.dnaFile = 'phase_6/dna/minnies_melody_land_sz.dna' self.safeZoneStorageDNAFile = 'phase_6/dna/storage_MM_sz.dna' diff --git a/toontown/safezone/OZSafeZoneLoader.py b/toontown/safezone/OZSafeZoneLoader.py index 0e3df16..abaf077 100644 --- a/toontown/safezone/OZSafeZoneLoader.py +++ b/toontown/safezone/OZSafeZoneLoader.py @@ -23,8 +23,8 @@ class OZSafeZoneLoader(SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) - self.musicFile = 'phase_6/audio/bgm/OZ_SZ.mid' - self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.mid' + self.musicFile = 'phase_6/audio/bgm/OZ_SZ.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.ogg' self.dnaFile = 'phase_6/dna/outdoor_zone_sz.dna' self.safeZoneStorageDNAFile = 'phase_6/dna/storage_OZ_sz.dna' self.__toonTracks = {} @@ -40,10 +40,10 @@ class OZSafeZoneLoader(SafeZoneLoader): self.done = 0 self.geyserTrack = None SafeZoneLoader.load(self) - 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.underwaterSound = base.loader.loadSfx('phase_4/audio/sfx/AV_ambient_water.mp3') - self.swimSound = base.loader.loadSfx('phase_4/audio/sfx/AV_swim_single_stroke.mp3') - self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.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.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.ogg') + self.submergeSound = base.loader.loadSfx('phase_5.5/audio/sfx/AV_jump_in_water.ogg') geyserPlacer = self.geom.find('**/geyser*') waterfallPlacer = self.geom.find('**/waterfall*') binMgr = CullBinManager.getGlobalPtr() @@ -58,9 +58,9 @@ class OZSafeZoneLoader(SafeZoneLoader): pool.setColorScale(1.0, 1.0, 1.0, 1.0) pool.setBin('water', 50, 1) self.geyserModel = loader.loadModel('phase_6/models/golf/golf_geyser_model') - self.geyserSound = loader.loadSfx('phase_6/audio/sfx/OZ_Geyser.mp3') + self.geyserSound = loader.loadSfx('phase_6/audio/sfx/OZ_Geyser.ogg') self.geyserSoundInterval = SoundInterval(self.geyserSound, node=geyserPlacer, listenerNode=base.camera, seamlessLoop=False, volume=1.0, cutOff=120) - self.geyserSoundNoToon = loader.loadSfx('phase_6/audio/sfx/OZ_Geyser_No_Toon.mp3') + self.geyserSoundNoToon = loader.loadSfx('phase_6/audio/sfx/OZ_Geyser_No_Toon.ogg') self.geyserSoundNoToonInterval = SoundInterval(self.geyserSoundNoToon, node=geyserPlacer, listenerNode=base.camera, seamlessLoop=False, volume=1.0, cutOff=120) if self.geyserModel: self.geyserActor = Actor.Actor(self.geyserModel) @@ -81,7 +81,7 @@ class OZSafeZoneLoader(SafeZoneLoader): self.geyserPlacer = geyserPlacer self.startGeyser() base.sfxPlayer.setCutoffDistance(160) - self.geyserPoolSfx = loader.loadSfx('phase_6/audio/sfx/OZ_Geyser_BuildUp_Loop.wav') + self.geyserPoolSfx = loader.loadSfx('phase_6/audio/sfx/OZ_Geyser_BuildUp_Loop.ogg') self.geyserPoolSoundInterval = SoundInterval(self.geyserPoolSfx, node=self.geyserPlacer, listenerNode=base.camera, seamlessLoop=True, volume=1.0, cutOff=120) self.geyserPoolSoundInterval.loop() self.bubbles = Bubbles.Bubbles(self.geyserPlacer, render) diff --git a/toontown/safezone/TTSafeZoneLoader.py b/toontown/safezone/TTSafeZoneLoader.py index 0e18af7..4c71d23 100644 --- a/toontown/safezone/TTSafeZoneLoader.py +++ b/toontown/safezone/TTSafeZoneLoader.py @@ -9,14 +9,14 @@ class TTSafeZoneLoader(SafeZoneLoader.SafeZoneLoader): def __init__(self, hood, parentFSM, doneEvent): SafeZoneLoader.SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent) self.playgroundClass = TTPlayground.TTPlayground - self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.mid' - self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.mid' + self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.ogg' + self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg' self.dnaFile = 'phase_4/dna/toontown_central_sz.dna' self.safeZoneStorageDNAFile = 'phase_4/dna/storage_TT_sz.dna' def load(self): SafeZoneLoader.SafeZoneLoader.load(self) - 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'])) def unload(self): del self.birdSound diff --git a/toontown/safezone/Train.py b/toontown/safezone/Train.py index a38a677..04d2881 100644 --- a/toontown/safezone/Train.py +++ b/toontown/safezone/Train.py @@ -15,8 +15,8 @@ from direct.actor import Actor class Train(DirectObject): notify = directNotify.newCategory('Train') nameId = 0 - Sfx_TrainPass = 'phase_10/audio/sfx/CBHQ_TRAIN_pass.mp3' - Sfx_TrainStopStart = 'phase_10/audio/sfx/CBHQ_TRAIN_stopstart.mp3' + Sfx_TrainPass = 'phase_10/audio/sfx/CBHQ_TRAIN_pass.ogg' + Sfx_TrainStopStart = 'phase_10/audio/sfx/CBHQ_TRAIN_stopstart.ogg' LocomotiveFile = 'phase_10/models/cogHQ/CashBotLocomotive' CarFiles = ['phase_10/models/cogHQ/CashBotBoxCar', 'phase_10/models/cogHQ/CashBotTankCar', 'phase_10/models/cogHQ/CashBotFlatCar'] CarLength = 88 diff --git a/toontown/shtiker/OptionsPage.py b/toontown/shtiker/OptionsPage.py index 41afdfe..a340d7f 100644 --- a/toontown/shtiker/OptionsPage.py +++ b/toontown/shtiker/OptionsPage.py @@ -491,8 +491,8 @@ class CodesTabPage(DirectFrame): self.resultPanelSuccessGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_success') self.resultPanelFailureGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_failure') self.resultPanelErrorGui = cdrGui.find('**/tt_t_gui_sbk_cdrResultPanel_error') - self.successSfx = base.loader.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrSuccess.mp3') - self.failureSfx = base.loader.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrFailure.mp3') + self.successSfx = base.loader.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrSuccess.ogg') + self.failureSfx = base.loader.loadSfx('phase_3.5/audio/sfx/tt_s_gui_sbk_cdrFailure.ogg') self.instructionPanel = DirectFrame(parent=self, relief=None, image=instructionGui, image_scale=0.8, text=TTLocalizer.CdrInstructions, text_pos=TTLocalizer.OPCodesInstructionPanelTextPos, text_align=TextNode.ACenter, text_scale=TTLocalizer.OPCodesResultPanelTextScale, text_wordwrap=TTLocalizer.OPCodesInstructionPanelTextWordWrap, pos=(-0.429, 0, -0.05)) self.codeBox = DirectFrame(parent=self, relief=None, image=codeBoxGui, pos=(0.433, 0, 0.35)) self.flippyFrame = DirectFrame(parent=self, relief=None, image=flippyGui, pos=(0.44, 0, -0.353)) diff --git a/toontown/shtiker/ShtikerBook.py b/toontown/shtiker/ShtikerBook.py index ffab316..7c5ed23 100644 --- a/toontown/shtiker/ShtikerBook.py +++ b/toontown/shtiker/ShtikerBook.py @@ -130,9 +130,9 @@ class ShtikerBook(DirectFrame, StateData.StateData): self.nextArrow = DirectButton(parent=self, relief=None, image=(bookModel.find('**/arrow_button'), bookModel.find('**/arrow_down'), bookModel.find('**/arrow_rollover')), scale=(0.1, 0.1, 0.1), pos=(0.838, 0, -0.661), command=self.__pageChange, extraArgs=[1]) self.prevArrow = DirectButton(parent=self, relief=None, image=(bookModel.find('**/arrow_button'), bookModel.find('**/arrow_down'), bookModel.find('**/arrow_rollover')), scale=(-0.1, 0.1, 0.1), pos=(-0.838, 0, -0.661), command=self.__pageChange, extraArgs=[-1]) bookModel.removeNode() - self.openSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_open.mp3') - self.closeSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_delete.mp3') - self.pageSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.mp3') + self.openSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_open.ogg') + self.closeSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_delete.ogg') + self.pageSound = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_stickerbook_turn.ogg') return def unload(self): diff --git a/toontown/suit/BossCog.py b/toontown/suit/BossCog.py index a4e6361..c9a5b4b 100644 --- a/toontown/suit/BossCog.py +++ b/toontown/suit/BossCog.py @@ -81,22 +81,22 @@ class BossCog(Avatar.Avatar): self.initializeNametag3d() def generateBossCog(self): - self.throwSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_frisbee_gears.mp3') - self.swingSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_swipe.mp3') - self.spinSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_spin.mp3') - self.rainGearsSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_raining_gears.mp3') - self.swishSfx = loader.loadSfx('phase_5/audio/sfx/General_throw_miss.mp3') - self.boomSfx = loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') - self.deathSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_big_death.mp3') - self.upSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_raise_up.mp3') - self.downSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_collapse.mp3') - self.reelSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_reeling_backwards.mp3') - self.birdsSfx = loader.loadSfx('phase_4/audio/sfx/SZ_TC_bird1.mp3') - self.dizzyAlert = loader.loadSfx('phase_5/audio/sfx/AA_sound_aoogah.mp3') - self.grunt = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_grunt.mp3') - self.murmur = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_murmur.mp3') - self.statement = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_statement.mp3') - self.question = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_question.mp3') + self.throwSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_frisbee_gears.ogg') + self.swingSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_swipe.ogg') + self.spinSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_spin.ogg') + self.rainGearsSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_raining_gears.ogg') + self.swishSfx = loader.loadSfx('phase_5/audio/sfx/General_throw_miss.ogg') + self.boomSfx = loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg') + self.deathSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_big_death.ogg') + self.upSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_raise_up.ogg') + self.downSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_collapse.ogg') + self.reelSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_reeling_backwards.ogg') + self.birdsSfx = loader.loadSfx('phase_4/audio/sfx/SZ_TC_bird1.ogg') + self.dizzyAlert = loader.loadSfx('phase_5/audio/sfx/AA_sound_aoogah.ogg') + self.grunt = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_grunt.ogg') + self.murmur = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_murmur.ogg') + self.statement = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_statement.ogg') + self.question = loader.loadSfx('phase_9/audio/sfx/Boss_COG_VO_question.ogg') self.dialogArray = [self.grunt, self.murmur, self.statement, @@ -279,8 +279,8 @@ class BossCog(Avatar.Avatar): self.closedHpr = closedHpr self.uniqueName = uniqueName self.ival = 0 - self.openSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_open.mp3') - self.closeSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_close.mp3') + self.openSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_open.ogg') + self.closeSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_door_close.ogg') self.request('Closed') def filterOpening(self, request, args): diff --git a/toontown/suit/DistributedBossCog.py b/toontown/suit/DistributedBossCog.py index ce11274..5525f20 100644 --- a/toontown/suit/DistributedBossCog.py +++ b/toontown/suit/DistributedBossCog.py @@ -549,10 +549,10 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog): self.rightDoor = self.elevatorModel.find('**/right-door') if self.rightDoor.isEmpty(): self.rightDoor = self.elevatorModel.find('**/right_door') - self.openSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - self.finalOpenSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.mp3') - self.closeSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_sliding.mp3') - self.finalCloseSfx = base.loader.loadSfx('phase_9/audio/sfx/CHQ_FACT_door_open_final.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.ogg') + 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.ogg') self.openDoors = ElevatorUtils.getOpenInterval(self, self.leftDoor, self.rightDoor, self.openSfx, self.finalOpenSfx, self.elevatorType) self.closeDoors = ElevatorUtils.getCloseInterval(self, self.leftDoor, self.rightDoor, self.closeSfx, self.finalCloseSfx, self.elevatorType) self.closeDoors.start() @@ -908,11 +908,11 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog): self.zapLocalToon(ToontownGlobals.BossCogAreaAttack) def loadEnvironment(self): - self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.mid') - self.stingMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') - self.battleOneMusic = base.loader.loadMusic('phase_3.5/audio/bgm/encntr_general_bg.mid') - self.battleThreeMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') - self.epilogueMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_hall_of_fame.mid') + self.elevatorMusic = base.loader.loadMusic('phase_7/audio/bgm/tt_elevator.ogg') + self.stingMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg') + self.battleOneMusic = base.loader.loadMusic('phase_3.5/audio/bgm/encntr_general_bg.ogg') + self.battleThreeMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg') + self.epilogueMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_hall_of_fame.ogg') def unloadEnvironment(self): pass diff --git a/toontown/suit/DistributedBossbotBoss.py b/toontown/suit/DistributedBossbotBoss.py index 4e082d4..f49698d 100644 --- a/toontown/suit/DistributedBossbotBoss.py +++ b/toontown/suit/DistributedBossbotBoss.py @@ -113,9 +113,9 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): self.rightHandJoint = self.find('**/joint17') self.setPosHpr(*ToontownGlobals.BossbotBossBattleOnePosHpr) self.reparentTo(render) - self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.mp3') - self.warningSfx = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_grunt.mp3') - self.swingClubSfx = loader.loadSfx('phase_5/audio/sfx/SA_hardball.mp3') + self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.ogg') + self.warningSfx = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_grunt.ogg') + self.swingClubSfx = loader.loadSfx('phase_5/audio/sfx/SA_hardball.ogg') self.moveBossTaskName = 'CEOMoveTask' return @@ -165,12 +165,12 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): planeNode.setCollideMask(ToontownGlobals.PieBitmask) self.geom.attachNewNode(planeNode) self.geom.reparentTo(render) - self.promotionMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') - self.betweenPhaseMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_toon_winning.mid') - self.phaseTwoMusic = base.loader.loadMusic('phase_12/audio/bgm/BossBot_CEO_v1.mid') - self.phaseFourMusic = base.loader.loadMusic('phase_12/audio/bgm/BossBot_CEO_v2.mid') - self.pickupFoodSfx = loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.mp3') - self.explodeSfx = loader.loadSfx('phase_4/audio/sfx/firework_distance_02.mp3') + self.promotionMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg') + self.betweenPhaseMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_toon_winning.ogg') + self.phaseTwoMusic = base.loader.loadMusic('phase_12/audio/bgm/BossBot_CEO_v1.ogg') + self.phaseFourMusic = base.loader.loadMusic('phase_12/audio/bgm/BossBot_CEO_v2.ogg') + self.pickupFoodSfx = loader.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.ogg') + self.explodeSfx = loader.loadSfx('phase_4/audio/sfx/firework_distance_02.ogg') def unloadEnvironment(self): self.notify.debug('----- unloadEnvironment') diff --git a/toontown/suit/DistributedCashbotBoss.py b/toontown/suit/DistributedCashbotBoss.py index 415e20a..30f7f5a 100644 --- a/toontown/suit/DistributedCashbotBoss.py +++ b/toontown/suit/DistributedCashbotBoss.py @@ -488,8 +488,8 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): loco = loader.loadModel('phase_10/models/cogHQ/CashBotLocomotive') car1 = loader.loadModel('phase_10/models/cogHQ/CashBotBoxCar') car2 = loader.loadModel('phase_10/models/cogHQ/CashBotTankCar') - trainPassingSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_TRAIN_pass.mp3') - boomSfx = loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.mp3') + trainPassingSfx = base.loader.loadSfx('phase_10/audio/sfx/CBHQ_TRAIN_pass.ogg') + boomSfx = loader.loadSfx('phase_3.5/audio/sfx/ENC_cogfall_apart.ogg') rollThroughDoor = self.rollBossToPoint(fromPos=Point3(120, -280, 0), fromHpr=None, toPos=Point3(120, -250, 0), toHpr=None, reverse=0) rollTrack = Sequence(Func(self.getGeomNode().setH, 180), rollThroughDoor[0], Func(self.getGeomNode().setH, 0)) g = 80.0 / 300.0 diff --git a/toontown/suit/DistributedCashbotBossGoon.py b/toontown/suit/DistributedCashbotBossGoon.py index 07bb339..c32fba6 100644 --- a/toontown/suit/DistributedCashbotBossGoon.py +++ b/toontown/suit/DistributedCashbotBossGoon.py @@ -25,12 +25,12 @@ class DistributedCashbotBossGoon(DistributedGoon.DistributedGoon, DistributedCas DistributedGoon.DistributedGoon.__init__(self, cr) self.target = None self.arrivalTime = None - self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.mp3') - self.hitMagnetSfx = loader.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.mp3') + self.flyToMagnetSfx = loader.loadSfx('phase_5/audio/sfx/TL_rake_throw_only.ogg') + self.hitMagnetSfx = loader.loadSfx('phase_4/audio/sfx/AA_drop_anvil_miss.ogg') self.toMagnetSoundInterval = Sequence(SoundInterval(self.flyToMagnetSfx, duration=ToontownGlobals.CashbotBossToMagnetTime, node=self), SoundInterval(self.hitMagnetSfx, node=self)) - self.hitFloorSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_flowerpot.mp3') + self.hitFloorSfx = loader.loadSfx('phase_5/audio/sfx/AA_drop_flowerpot.ogg') self.hitFloorSoundInterval = SoundInterval(self.hitFloorSfx, duration=1.0, node=self) - self.wiggleSfx = loader.loadSfx('phase_5/audio/sfx/SA_finger_wag.mp3') + self.wiggleSfx = loader.loadSfx('phase_5/audio/sfx/SA_finger_wag.ogg') return def generate(self): diff --git a/toontown/suit/DistributedGoon.py b/toontown/suit/DistributedGoon.py index ad13f32..03887e5 100644 --- a/toontown/suit/DistributedGoon.py +++ b/toontown/suit/DistributedGoon.py @@ -41,9 +41,9 @@ class DistributedGoon(DistributedCrushableEntity.DistributedCrushableEntity, Goo self.animMultiplier = 1.0 self.isDead = 0 self.isStunned = 0 - self.collapseSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_hunker_down.mp3') - self.recoverSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_rattle_shake.mp3') - self.attackSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.mp3') + self.collapseSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_hunker_down.ogg') + self.recoverSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_rattle_shake.ogg') + self.attackSound = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.ogg') return def announceGenerate(self): diff --git a/toontown/suit/DistributedLawbotBoss.py b/toontown/suit/DistributedLawbotBoss.py index 60dd74e..bb7ca2b 100644 --- a/toontown/suit/DistributedLawbotBoss.py +++ b/toontown/suit/DistributedLawbotBoss.py @@ -93,15 +93,15 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): nameInfo = TTLocalizer.BossCogNameWithDept % {'name': self._name, 'dept': SuitDNA.getDeptFullname(self.style.dept)} self.setDisplayName(nameInfo) - self.piesRestockSfx = loader.loadSfx('phase_5/audio/sfx/LB_receive_evidence.mp3') - self.rampSlideSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_ramp_slide.mp3') - self.evidenceHitSfx = loader.loadSfx('phase_11/audio/sfx/LB_evidence_hit.mp3') - self.warningSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.mp3') - self.juryMovesSfx = loader.loadSfx('phase_11/audio/sfx/LB_jury_moves.wav') - self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.mp3') + self.piesRestockSfx = loader.loadSfx('phase_5/audio/sfx/LB_receive_evidence.ogg') + self.rampSlideSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_ramp_slide.ogg') + self.evidenceHitSfx = loader.loadSfx('phase_11/audio/sfx/LB_evidence_hit.ogg') + self.warningSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.ogg') + self.juryMovesSfx = loader.loadSfx('phase_11/audio/sfx/LB_jury_moves.ogg') + self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.ogg') self.strafeSfx = [] for i in range(10): - self.strafeSfx.append(loader.loadSfx('phase_3.5/audio/sfx/SA_shred.mp3')) + self.strafeSfx.append(loader.loadSfx('phase_3.5/audio/sfx/SA_shred.ogg')) render.setTag('pieCode', str(ToontownGlobals.PieCodeNotBossCog)) insidesA = CollisionPolygon(Point3(4.0, -2.0, 5.0), Point3(-4.0, -2.0, 5.0), Point3(-4.0, -2.0, 0.5), Point3(4.0, -2.0, 0.5)) @@ -392,9 +392,9 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): elevatorModel = loader.loadModel('phase_11/models/lawbotHQ/LB_Elevator') elevatorModel.reparentTo(self.elevatorEntrance) self.setupElevator(elevatorModel) - self.promotionMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') - self.betweenBattleMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_toon_winning.mid') - self.battleTwoMusic = base.loader.loadMusic('phase_11/audio/bgm/LB_juryBG.mid') + self.promotionMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg') + self.betweenBattleMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_toon_winning.ogg') + self.battleTwoMusic = base.loader.loadMusic('phase_11/audio/bgm/LB_juryBG.ogg') floor = self.geom.find('**/MidVaultFloor1') if floor.isEmpty(): floor = self.geom.find('**/CR3_Floor') diff --git a/toontown/suit/DistributedSellbotBoss.py b/toontown/suit/DistributedSellbotBoss.py index 2601817..c8082ec 100644 --- a/toontown/suit/DistributedSellbotBoss.py +++ b/toontown/suit/DistributedSellbotBoss.py @@ -77,14 +77,14 @@ class DistributedSellbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): nameInfo = TTLocalizer.BossCogNameWithDept % {'name': self._name, 'dept': SuitDNA.getDeptFullname(self.style.dept)} self.setDisplayName(nameInfo) - self.cageDoorSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_door.mp3') - self.cageLandSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_SOS_cage_land.mp3') - self.cageLowerSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_lower.mp3') - self.piesRestockSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_SOS_pies_restock.mp3') - self.rampSlideSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_ramp_slide.mp3') + self.cageDoorSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_door.ogg') + self.cageLandSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_SOS_cage_land.ogg') + self.cageLowerSfx = loader.loadSfx('phase_5/audio/sfx/CHQ_SOS_cage_lower.ogg') + self.piesRestockSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_SOS_pies_restock.ogg') + self.rampSlideSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_ramp_slide.ogg') self.strafeSfx = [] for i in range(10): - self.strafeSfx.append(loader.loadSfx('phase_3.5/audio/sfx/SA_shred.mp3')) + self.strafeSfx.append(loader.loadSfx('phase_3.5/audio/sfx/SA_shred.ogg')) render.setTag('pieCode', str(ToontownGlobals.PieCodeNotBossCog)) insidesA = CollisionPolygon(Point3(4.0, -2.0, 5.0), Point3(-4.0, -2.0, 5.0), Point3(-4.0, -2.0, 0.5), Point3(4.0, -2.0, 0.5)) @@ -551,9 +551,9 @@ class DistributedSellbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): self.rope.ropeNode.setUvScale(0.8) self.rope.setTexture(self.cage.findTexture('hq_chain')) self.rope.setTransparency(1) - self.promotionMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') - self.betweenBattleMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_toon_winning.mid') - self.battleTwoMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.mid') + self.promotionMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg') + self.betweenBattleMusic = base.loader.loadMusic('phase_9/audio/bgm/encntr_toon_winning.ogg') + self.battleTwoMusic = base.loader.loadMusic('phase_7/audio/bgm/encntr_suit_winning_indoor.ogg') self.geom.reparentTo(render) def unloadEnvironment(self): diff --git a/toontown/suit/DistributedSuitBase.py b/toontown/suit/DistributedSuitBase.py index 13a366c..e2f75a3 100644 --- a/toontown/suit/DistributedSuitBase.py +++ b/toontown/suit/DistributedSuitBase.py @@ -156,9 +156,9 @@ class DistributedSuitBase(DistributedAvatar.DistributedAvatar, Suit.Suit, SuitBa if self.prop == None: self.prop = BattleProps.globalPropPool.getProp('propeller') 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: - 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 base.config.GetBool('want-new-cogs', 0): head = self.find('**/to_head') if head.isEmpty(): diff --git a/toontown/suit/GoonDeath.py b/toontown/suit/GoonDeath.py index 97c60a7..70ad3db 100644 --- a/toontown/suit/GoonDeath.py +++ b/toontown/suit/GoonDeath.py @@ -19,5 +19,5 @@ def createGoonExplosion(parent, explosionPoint, scale): explosion = createExplosionTrack(parent, deathNode, scale) smallGearExplosion = BattleParticles.createParticleEffect('GearExplosion', numParticles=10) bigGearExplosion = BattleParticles.createParticleEffect('WideGearExplosion', numParticles=30) - 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') return Parallel(explosion, SoundInterval(deathSound), ParticleInterval(smallGearExplosion, deathNode, worldRelative=0, duration=4.3, cleanup=True), ParticleInterval(bigGearExplosion, deathNode, worldRelative=0, duration=1.0, cleanup=True), name='gears2MTrack') diff --git a/toontown/suit/Suit.py b/toontown/suit/Suit.py index 94fa922..bdda76c 100644 --- a/toontown/suit/Suit.py +++ b/toontown/suit/Suit.py @@ -254,7 +254,7 @@ def loadDialog(level): 'COG_VO_statement', 'COG_VO_question'] for file in SuitDialogFiles: - SuitDialogArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + SuitDialogArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) SuitDialogArray.append(SuitDialogArray[2]) SuitDialogArray.append(SuitDialogArray[2]) @@ -265,10 +265,10 @@ def loadSkelDialog(): if len(SkelSuitDialogArray) > 0: return else: - grunt = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_grunt.mp3') - murmur = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_murmur.mp3') - statement = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_statement.mp3') - question = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_question.mp3') + grunt = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_grunt.ogg') + murmur = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_murmur.ogg') + statement = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_statement.ogg') + question = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_question.ogg') SkelSuitDialogArray = [grunt, murmur, statement, diff --git a/toontown/toon/LocalToon.py b/toontown/toon/LocalToon.py index 900cfb9..f109299 100644 --- a/toontown/toon/LocalToon.py +++ b/toontown/toon/LocalToon.py @@ -79,11 +79,11 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): chatMgr = ToontownChatManager.ToontownChatManager(cr, self) talkAssistant = TTTalkAssistant.TTTalkAssistant() LocalAvatar.LocalAvatar.__init__(self, cr, chatMgr, talkAssistant, passMessagesThrough=True) - self.soundRun = base.loader.loadSfx('phase_3.5/audio/sfx/AV_footstep_runloop.wav') - self.soundWalk = base.loader.loadSfx('phase_3.5/audio/sfx/AV_footstep_walkloop.wav') - self.soundWhisper = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_whisper_3.mp3') - self.soundPhoneRing = base.loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.mp3') - self.soundSystemMessage = base.loader.loadSfx('phase_3/audio/sfx/clock03.mp3') + self.soundRun = base.loader.loadSfx('phase_3.5/audio/sfx/AV_footstep_runloop.ogg') + self.soundWalk = base.loader.loadSfx('phase_3.5/audio/sfx/AV_footstep_walkloop.ogg') + self.soundWhisper = base.loader.loadSfx('phase_3.5/audio/sfx/GUI_whisper_3.ogg') + self.soundPhoneRing = base.loader.loadSfx('phase_3.5/audio/sfx/telephone_ring.ogg') + self.soundSystemMessage = base.loader.loadSfx('phase_3/audio/sfx/clock03.ogg') self.positionExaminer = PositionExaminer.PositionExaminer() friendsGui = loader.loadModel('phase_3.5/models/gui/friendslist_gui') friendsButtonNormal = friendsGui.find('**/FriendsBox_Closed') @@ -1409,7 +1409,7 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): changeString = TTLocalizer.GardeningNoSkill else: changeString = '+%s %s' % (change, TTLocalizer.GardeningWaterSkill) - self.waterTrack = Sequence(Wait(0.0), Func(self.changeButtonText, self.wateringCanButtonFake, changeString), SoundInterval(globalBattleSoundCache.getSound('GUI_balloon_popup.mp3'), node=self), Wait(1.0), Func(self.hideWateringCanButtonFake, 1)) + self.waterTrack = Sequence(Wait(0.0), Func(self.changeButtonText, self.wateringCanButtonFake, changeString), SoundInterval(globalBattleSoundCache.getSound('GUI_balloon_popup.ogg'), node=self), Wait(1.0), Func(self.hideWateringCanButtonFake, 1)) self.waterTrack.start() def levelShovel(self, change = 1): @@ -1423,7 +1423,7 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): plant = base.cr.doId2do.get(self.shovelRelatedDoId) if plant: self.holdShovelText = plant.getShovelAction() - self.shovelTrack = Sequence(Wait(0.0), Func(self.changeButtonText, self.shovelButtonFake, changeString), SoundInterval(globalBattleSoundCache.getSound('GUI_balloon_popup.mp3'), node=self), Wait(1.0), Func(self.hideShovelButtonFake, 1)) + self.shovelTrack = Sequence(Wait(0.0), Func(self.changeButtonText, self.shovelButtonFake, changeString), SoundInterval(globalBattleSoundCache.getSound('GUI_balloon_popup.ogg'), node=self), Wait(1.0), Func(self.hideShovelButtonFake, 1)) self.shovelTrack.start() def setGuiConflict(self, con): diff --git a/toontown/toon/TTEmote.py b/toontown/toon/TTEmote.py index 4516685..7f863b7 100644 --- a/toontown/toon/TTEmote.py +++ b/toontown/toon/TTEmote.py @@ -13,7 +13,7 @@ EmoteClear = -1 def doVictory(toon, volume = 1): duration = toon.getDuration('victory', 'legs') - sfx = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_Win.mp3') + sfx = base.loader.loadSfx('phase_3.5/audio/sfx/ENC_Win.ogg') sfxDuration = duration - 1.0 sfxTrack = SoundInterval(sfx, loop=1, duration=sfxDuration, node=toon, volume=volume) track = Sequence(Func(toon.play, 'victory'), sfxTrack, duration=0) @@ -34,9 +34,9 @@ def doAnnoyed(toon, volume = 1): duration = toon.getDuration('angry', 'torso') sfx = None if toon.style.getAnimal() == 'bear': - sfx = base.loader.loadSfx('phase_3.5/audio/dial/AV_bear_exclaim.mp3') + sfx = base.loader.loadSfx('phase_3.5/audio/dial/AV_bear_exclaim.ogg') else: - sfx = base.loader.loadSfx('phase_3.5/audio/sfx/avatar_emotion_angry.mp3') + sfx = base.loader.loadSfx('phase_3.5/audio/sfx/avatar_emotion_angry.ogg') def playSfx(): base.playSfx(sfx, volume=volume, node=toon) @@ -105,7 +105,7 @@ def doOk(toon, volume = 1): def doShrug(toon, volume = 1): - sfx = base.loader.loadSfx('phase_3.5/audio/sfx/avatar_emotion_shrug.mp3') + sfx = base.loader.loadSfx('phase_3.5/audio/sfx/avatar_emotion_shrug.ogg') def playSfx(): base.playSfx(sfx, volume=volume, node=toon) @@ -122,7 +122,7 @@ def doWave(toon, volume = 1): def doApplause(toon, volume = 1): - sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_applause.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_applause.ogg') def playSfx(): base.playSfx(sfx, volume=1, node=toon) @@ -133,7 +133,7 @@ def doApplause(toon, volume = 1): def doConfused(toon, volume = 1): - sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_confused.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_confused.ogg') def playSfx(): base.playSfx(sfx, node=toon, volume=volume) @@ -144,7 +144,7 @@ def doConfused(toon, volume = 1): def doSlipForward(toon, volume = 1): - sfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg') def playSfx(): base.playSfx(sfx, volume=volume, node=toon) @@ -156,7 +156,7 @@ def doSlipForward(toon, volume = 1): def doBored(toon, volume = 1): - sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_bored.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_bored.ogg') def playSfx(): base.playSfx(sfx, volume=volume, node=toon) @@ -178,7 +178,7 @@ def doBow(toon, volume = 1): def doSlipBackward(toon, volume = 1): - sfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/MG_cannon_hit_dirt.ogg') def playSfx(): base.playSfx(sfx, volume=volume, node=toon) @@ -216,7 +216,7 @@ def doNothing(toon, volume = 1): def doSurprise(toon, volume = 1): sfx = None - sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_surprise.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_surprise.ogg') def playSfx(volume = 1): base.playSfx(sfx, volume=volume, node=toon) @@ -237,7 +237,7 @@ def doSurprise(toon, volume = 1): def doUpset(toon, volume = 1): sfx = None - sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_very_sad_1.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_very_sad_1.ogg') def playSfx(volume = 1): base.playSfx(sfx, volume=volume, node=toon) @@ -258,7 +258,7 @@ def doUpset(toon, volume = 1): def doDelighted(toon, volume = 1): sfx = None - sfx = base.loader.loadSfx('phase_4/audio/sfx/delighted_06.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/delighted_06.ogg') def playSfx(volume = 1): base.playSfx(sfx, volume=volume, node=toon) @@ -280,7 +280,7 @@ def doDelighted(toon, volume = 1): def doFurious(toon, volume = 1): duration = toon.getDuration('angry', 'torso') sfx = None - sfx = base.loader.loadSfx('phase_4/audio/sfx/furious_03.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/furious_03.ogg') def playSfx(volume = 1): base.playSfx(sfx, volume=volume, node=toon) @@ -292,7 +292,7 @@ def doFurious(toon, volume = 1): def doLaugh(toon, volume = 1): sfx = None - sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_laugh.mp3') + sfx = base.loader.loadSfx('phase_4/audio/sfx/avatar_emotion_laugh.ogg') def playSfx(volume = 1): base.playSfx(sfx, volume=volume, node=toon) @@ -313,7 +313,7 @@ def getSingingNote(toon, note, volume = 1): sfx = None filePath = 'phase_3.5/audio/dial/' filePrefix = 'tt_s_dlg_sng_' - fileSuffix = '.mp3' + fileSuffix = '.ogg' speciesName = ToonDNA.getSpeciesName(toon.style.head) sfx = base.loader.loadSfx(filePath + filePrefix + speciesName + '_' + note + fileSuffix) diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index ee0de52..3b33df7 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -395,47 +395,47 @@ def loadDialog(): DogDialogueFiles = ('AV_dog_short', 'AV_dog_med', 'AV_dog_long', 'AV_dog_question', 'AV_dog_exclaim', 'AV_dog_howl') global DogDialogueArray for file in DogDialogueFiles: - DogDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + DogDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) catDialogueFiles = ('AV_cat_short', 'AV_cat_med', 'AV_cat_long', 'AV_cat_question', 'AV_cat_exclaim', 'AV_cat_howl') global CatDialogueArray for file in catDialogueFiles: - CatDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + CatDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) horseDialogueFiles = ('AV_horse_short', 'AV_horse_med', 'AV_horse_long', 'AV_horse_question', 'AV_horse_exclaim', 'AV_horse_howl') global HorseDialogueArray for file in horseDialogueFiles: - HorseDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + HorseDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) rabbitDialogueFiles = ('AV_rabbit_short', 'AV_rabbit_med', 'AV_rabbit_long', 'AV_rabbit_question', 'AV_rabbit_exclaim', 'AV_rabbit_howl') global RabbitDialogueArray for file in rabbitDialogueFiles: - RabbitDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + RabbitDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) mouseDialogueFiles = ('AV_mouse_short', 'AV_mouse_med', 'AV_mouse_long', 'AV_mouse_question', 'AV_mouse_exclaim', 'AV_mouse_howl') global MouseDialogueArray for file in mouseDialogueFiles: - MouseDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + MouseDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) duckDialogueFiles = ('AV_duck_short', 'AV_duck_med', 'AV_duck_long', 'AV_duck_question', 'AV_duck_exclaim', 'AV_duck_howl') global DuckDialogueArray for file in duckDialogueFiles: - DuckDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + DuckDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) monkeyDialogueFiles = ('AV_monkey_short', 'AV_monkey_med', 'AV_monkey_long', 'AV_monkey_question', 'AV_monkey_exclaim', 'AV_monkey_howl') global MonkeyDialogueArray for file in monkeyDialogueFiles: - MonkeyDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + MonkeyDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) bearDialogueFiles = ('AV_bear_short', 'AV_bear_med', 'AV_bear_long', 'AV_bear_question', 'AV_bear_exclaim', 'AV_bear_howl') global BearDialogueArray for file in bearDialogueFiles: - BearDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + BearDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) pigDialogueFiles = ('AV_pig_short', 'AV_pig_med', 'AV_pig_long', 'AV_pig_question', 'AV_pig_exclaim', 'AV_pig_howl') global PigDialogueArray for file in pigDialogueFiles: - PigDialogueArray.append(base.loader.loadSfx(loadPath + file + '.mp3')) + PigDialogueArray.append(base.loader.loadSfx(loadPath + file + '.ogg')) def unloadDialog(): @@ -508,7 +508,7 @@ class Toon(Avatar.Avatar, ToonHead): self.jar = None self.setTag('pieCode', str(ToontownGlobals.PieCodeToon)) self.setFont(ToontownGlobals.getToonFont()) - self.soundChatBubble = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.mp3') + self.soundChatBubble = base.loader.loadSfx('phase_3/audio/sfx/GUI_balloon_popup.ogg') self.swimBobSeq = None self.animFSM = ClassicFSM('Toon', [State('off', self.enterOff, self.exitOff), State('neutral', self.enterNeutral, self.exitNeutral), @@ -1760,7 +1760,7 @@ class Toon(Avatar.Avatar, ToonHead): def getSoundTeleport(self): if not self.soundTeleport: - self.soundTeleport = base.loader.loadSfx('phase_3.5/audio/sfx/AV_teleport.mp3') + self.soundTeleport = base.loader.loadSfx('phase_3.5/audio/sfx/AV_teleport.ogg') return self.soundTeleport def getTeleportOutTrack(self, autoFinishTrack = 1): @@ -1873,7 +1873,7 @@ class Toon(Avatar.Avatar, ToonHead): pass def getDiedInterval(self, autoFinishTrack = 1): - sound = loader.loadSfx('phase_5/audio/sfx/ENC_Lose.mp3') + sound = loader.loadSfx('phase_5/audio/sfx/ENC_Lose.ogg') if hasattr(self, 'uniqueName'): trackName = self.uniqueName('died') else: @@ -2129,7 +2129,7 @@ class Toon(Avatar.Avatar, ToonHead): def enterSquish(self, animMultiplier = 1, ts = 0, callback = None, extraArgs = []): Emote.globalEmote.disableAll(self) - sound = loader.loadSfx('phase_9/audio/sfx/toon_decompress.mp3') + sound = loader.loadSfx('phase_9/audio/sfx/toon_decompress.ogg') lerpTime = 0.1 node = self.getGeomNode().getChild(0) origScale = node.getScale() @@ -2881,7 +2881,7 @@ class Toon(Avatar.Avatar, ToonHead): animPie = Sequence() if pieType == 'actor': 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 dist = 100 - 70 * t time = 1 + 0.5 * t @@ -2909,10 +2909,10 @@ class Toon(Avatar.Avatar, ToonHead): splat.setColor(*color) vol = 1.0 if pieName == 'lawbook': - sound = loader.loadSfx('phase_11/audio/sfx/LB_evidence_miss.mp3') + sound = loader.loadSfx('phase_11/audio/sfx/LB_evidence_miss.ogg') vol = 0.25 else: - sound = loader.loadSfx('phase_4/audio/sfx/AA_wholepie_only.mp3') + sound = loader.loadSfx('phase_4/audio/sfx/AA_wholepie_only.ogg') ival = Parallel(Func(splat.reparentTo, render), Func(splat.setPos, x, y, z), SoundInterval(sound, node=splat, volume=vol), Sequence(ActorInterval(splat, splatName), Func(splat.detachNode))) return ival @@ -2969,7 +2969,7 @@ class Toon(Avatar.Avatar, ToonHead): def enterFlattened(self, animMultiplier = 1, ts = 0, callback = None, extraArgs = []): Emote.globalEmote.disableAll(self) - sound = loader.loadSfx('phase_9/audio/sfx/toon_decompress.mp3') + sound = loader.loadSfx('phase_9/audio/sfx/toon_decompress.ogg') lerpTime = 0.1 node = self.getGeomNode().getChild(0) self.origScale = node.getScale() diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py index dc670b0..74a27e5 100644 --- a/toontown/toonbase/ToonBase.py +++ b/toontown/toonbase/ToonBase.py @@ -147,7 +147,7 @@ class ToonBase(OTPBase.OTPBase): self.canScreenShot = 1 self.glitchCount = 0 self.walking = 0 - self.resetMusic = self.loader.loadMusic('phase_3/audio/bgm/MIDI_Events_16channels.mid') + self.resetMusic = self.loader.loadMusic('phase_3/audio/bgm/MIDI_Events_16channels.ogg') self.oldX = max(1, base.win.getXSize()) self.oldY = max(1, base.win.getYSize()) self.aspectRatio = float(self.oldX) / self.oldY diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py index ea60287..0610d55 100644 --- a/toontown/toonbase/ToontownStart.py +++ b/toontown/toonbase/ToontownStart.py @@ -57,21 +57,21 @@ backgroundNodePath.setScale(render2d, VBase3(1)) backgroundNodePath.find('**/fg').setBin('fixed', 20) backgroundNodePath.find('**/bg').setBin('fixed', 10) base.graphicsEngine.renderFrame() -DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3')) -DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3')) +DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.ogg')) +DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.ogg')) DirectGuiGlobals.setDefaultDialogGeom(loader.loadModel('phase_3/models/gui/dialog_box_gui')) from . import TTLocalizer from otp.otpbase import OTPGlobals OTPGlobals.setDefaultProductPrefix(TTLocalizer.ProductPrefix) if base.musicManagerIsValid: - music = base.musicManager.getSound('phase_3/audio/bgm/tt_theme.mid') + music = base.musicManager.getSound('phase_3/audio/bgm/tt_theme.ogg') if music: music.setLoop(1) music.setVolume(0.9) music.play() print('ToontownStart: Loading default gui sounds') - DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3')) - DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3')) + DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.ogg')) + DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.ogg')) else: music = None from . import ToontownLoader diff --git a/toontown/town/BRTownLoader.py b/toontown/town/BRTownLoader.py index 1c4931c..9ee86a3 100644 --- a/toontown/town/BRTownLoader.py +++ b/toontown/town/BRTownLoader.py @@ -7,8 +7,8 @@ class BRTownLoader(TownLoader.TownLoader): def __init__(self, hood, parentFSM, doneEvent): TownLoader.TownLoader.__init__(self, hood, parentFSM, doneEvent) self.streetClass = BRStreet.BRStreet - self.musicFile = 'phase_8/audio/bgm/TB_SZ.mid' - self.activityMusicFile = 'phase_8/audio/bgm/TB_SZ_activity.mid' + self.musicFile = 'phase_8/audio/bgm/TB_SZ.ogg' + self.activityMusicFile = 'phase_8/audio/bgm/TB_SZ_activity.ogg' self.townStorageDNAFile = 'phase_8/dna/storage_BR_town.dna' def load(self, zoneId): diff --git a/toontown/town/DDTownLoader.py b/toontown/town/DDTownLoader.py index 937c260..3b52e65 100644 --- a/toontown/town/DDTownLoader.py +++ b/toontown/town/DDTownLoader.py @@ -7,8 +7,8 @@ class DDTownLoader(TownLoader.TownLoader): def __init__(self, hood, parentFSM, doneEvent): TownLoader.TownLoader.__init__(self, hood, parentFSM, doneEvent) self.streetClass = DDStreet.DDStreet - self.musicFile = 'phase_6/audio/bgm/DD_SZ.mid' - self.activityMusicFile = 'phase_6/audio/bgm/DD_SZ_activity.mid' + self.musicFile = 'phase_6/audio/bgm/DD_SZ.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/DD_SZ_activity.ogg' self.townStorageDNAFile = 'phase_6/dna/storage_DD_town.dna' def load(self, zoneId): diff --git a/toontown/town/DGTownLoader.py b/toontown/town/DGTownLoader.py index 0ba4c39..9eb6890 100644 --- a/toontown/town/DGTownLoader.py +++ b/toontown/town/DGTownLoader.py @@ -7,8 +7,8 @@ class DGTownLoader(TownLoader.TownLoader): def __init__(self, hood, parentFSM, doneEvent): TownLoader.TownLoader.__init__(self, hood, parentFSM, doneEvent) self.streetClass = DGStreet.DGStreet - self.musicFile = 'phase_8/audio/bgm/DG_SZ.mid' - self.activityMusicFile = 'phase_8/audio/bgm/DG_SZ.mid' + self.musicFile = 'phase_8/audio/bgm/DG_SZ.ogg' + self.activityMusicFile = 'phase_8/audio/bgm/DG_SZ.ogg' self.townStorageDNAFile = 'phase_8/dna/storage_DG_town.dna' def load(self, zoneId): diff --git a/toontown/town/DLTownLoader.py b/toontown/town/DLTownLoader.py index 061fe45..6febe6f 100644 --- a/toontown/town/DLTownLoader.py +++ b/toontown/town/DLTownLoader.py @@ -7,8 +7,8 @@ class DLTownLoader(TownLoader.TownLoader): def __init__(self, hood, parentFSM, doneEvent): TownLoader.TownLoader.__init__(self, hood, parentFSM, doneEvent) self.streetClass = DLStreet.DLStreet - self.musicFile = 'phase_8/audio/bgm/DL_SZ.mid' - self.activityMusicFile = 'phase_8/audio/bgm/DL_SZ_activity.mid' + self.musicFile = 'phase_8/audio/bgm/DL_SZ.ogg' + self.activityMusicFile = 'phase_8/audio/bgm/DL_SZ_activity.ogg' self.townStorageDNAFile = 'phase_8/dna/storage_DL_town.dna' def load(self, zoneId): diff --git a/toontown/town/MMTownLoader.py b/toontown/town/MMTownLoader.py index 2bcd621..a46659e 100644 --- a/toontown/town/MMTownLoader.py +++ b/toontown/town/MMTownLoader.py @@ -7,8 +7,8 @@ class MMTownLoader(TownLoader.TownLoader): def __init__(self, hood, parentFSM, doneEvent): TownLoader.TownLoader.__init__(self, hood, parentFSM, doneEvent) self.streetClass = MMStreet.MMStreet - self.musicFile = 'phase_6/audio/bgm/MM_SZ.mid' - self.activityMusicFile = 'phase_6/audio/bgm/MM_SZ_activity.mid' + self.musicFile = 'phase_6/audio/bgm/MM_SZ.ogg' + self.activityMusicFile = 'phase_6/audio/bgm/MM_SZ_activity.ogg' self.townStorageDNAFile = 'phase_6/dna/storage_MM_town.dna' def load(self, zoneId): diff --git a/toontown/town/TTTownLoader.py b/toontown/town/TTTownLoader.py index 9ad48fe..b929c0a 100644 --- a/toontown/town/TTTownLoader.py +++ b/toontown/town/TTTownLoader.py @@ -7,8 +7,8 @@ class TTTownLoader(TownLoader.TownLoader): def __init__(self, hood, parentFSM, doneEvent): TownLoader.TownLoader.__init__(self, hood, parentFSM, doneEvent) self.streetClass = TTStreet.TTStreet - self.musicFile = 'phase_3.5/audio/bgm/TC_SZ.mid' - self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.mid' + self.musicFile = 'phase_3.5/audio/bgm/TC_SZ.ogg' + self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg' self.townStorageDNAFile = 'phase_5/dna/storage_TT_town.dna' def load(self, zoneId): diff --git a/toontown/town/TownLoader.py b/toontown/town/TownLoader.py index c67b080..8bc0f94 100644 --- a/toontown/town/TownLoader.py +++ b/toontown/town/TownLoader.py @@ -53,7 +53,7 @@ class TownLoader(StateData.StateData): self.canonicalBranchZone = ZoneUtil.getCanonicalBranchZone(zoneId) self.music = base.loader.loadMusic(self.musicFile) self.activityMusic = base.loader.loadMusic(self.activityMusicFile) - self.battleMusic = base.loader.loadMusic('phase_3.5/audio/bgm/encntr_general_bg.mid') + self.battleMusic = base.loader.loadMusic('phase_3.5/audio/bgm/encntr_general_bg.ogg') self.townBattle = TownBattle.TownBattle(self.townBattleDoneEvent) self.townBattle.load()