diff --git a/toontown/toon/TTEmote.py b/toontown/toon/TTEmote.py index 59c9f07b..1eb00db5 100644 --- a/toontown/toon/TTEmote.py +++ b/toontown/toon/TTEmote.py @@ -328,122 +328,6 @@ def doTaunt(toon, volume=1): duration = toon.getDuration('taunt') return (track, duration, None) - -def getSingingNote(toon, note, volume = 1): - sfx = None - filePath = 'phase_3.5/audio/dial/' - filePrefix = 'tt_s_dlg_sng_' - fileSuffix = '.ogg' - speciesName = ToonDNA.getSpeciesName(toon.style.head) - sfx = base.loadSfx(filePath + filePrefix + speciesName + '_' + note + fileSuffix) - - def playSfx(volume = 1): - base.playSfx(sfx, volume=volume, node=toon) - - def playAnim(): - toon.loop('neutral') - - def stopAnim(): - toon.setPlayRate(1, 'neutral') - - track = Sequence(Func(toon.showSurpriseMuzzle), Parallel(Func(playAnim), Func(playSfx, volume))) - exitTrack = Sequence(Func(toon.hideSurpriseMuzzle), Func(stopAnim)) - return (track, 0.1, exitTrack) - - -def playSingingAnim(toon): - pass - - -def stopSinginAnim(toon): - pass - - -def singNote1(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'g1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'g2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'g3') - - -def singNote2(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'a1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'a2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'a3') - - -def singNote3(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'b1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'b2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'b3') - - -def singNote4(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'c1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'c2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'c3') - - -def singNote5(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'd1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'd2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'd3') - - -def singNote6(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'e1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'e2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'e3') - - -def singNote7(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'f1') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'f2') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'f3') - - -def singNote8(toon, volume = 1): - if base.config.GetBool('want-octaves', True): - if toon.style.getTorsoSize() == 'short': - return getSingingNote(toon, 'g2') - elif toon.style.getTorsoSize() == 'medium': - return getSingingNote(toon, 'g3') - elif toon.style.getTorsoSize() == 'long': - return getSingingNote(toon, 'g4') - - -def singNoteEmpty(toon, volume = 0): - track = Sequence() - return (track, 0.1, None) - - def returnToLastAnim(toon): if hasattr(toon, 'playingAnim') and toon.playingAnim: toon.loop(toon.playingAnim)