Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-10-31 08:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "No tussling zone."

Browse source 
This reverts commit 1e1a7e25fc.
This commit is contained in:
Zach 2015-05-12 00:12:55 -05:00
parent eacdc7f4d3
commit b491ff1cfe
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
otp/otpbase/OTPLocalizerEnglish.py
View file

@ -2177,8 +2177,7 @@ CustomSCStrings = {10: 'Oh, well.',
14008: 'Cannon Pinball rocks!',
14009: 'Your Estate rocks!',
14010: 'Your Garden is cool!',
14011: 'Your Estate is cool!',
14012: 'Wanna tussle m8?'}
14011: 'Your Estate is cool!'}
SCMenuCommonCogIndices = (20000, 20004)
SCMenuCustomCogIndices = {'bf': (20005, 20014),
'nc': (20015, 20024),

5
toontown/toon/TTEmote.py
View file

@ -320,10 +320,9 @@ def doLaugh(toon, volume = 1):
def doTaunt(toon, volume=1):
duration = toon.getDuration('angry', 'torso')
sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg')
track = Sequence(
Func(toon.setChatAbsolute, OTPLocalizer.CustomSCStrings[14012], CFSpeech|CFTimeout),
Func(toon.blinkEyes),
Func(toon.play, 'taunt'),
Func(base.playSfx, sfx, volume=volume, node=toon)
@ -332,7 +331,7 @@ def doTaunt(toon, volume=1):
return (track, duration, None)
def doRage(toon, volume=1):
sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg')
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
track = Sequence(
Func(toon.blinkEyes),