Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rage emote

Browse source
This commit is contained in:
Zach 2015-05-10 06:25:02 -05:00
parent ad4eab559f
commit 747bcd898b
4 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
otp/otpbase/OTPLocalizerEnglish.py
View file

@ -262,7 +262,8 @@ EmoteList = ['Wave',
'Delighted', 'Delighted',
'Furious', 'Furious',
'Laugh', 'Laugh',
'Taunt'] 'Taunt',
'Rage']
EmoteWhispers = ['%s waves.', EmoteWhispers = ['%s waves.',
'%s is happy.', '%s is happy.',
'%s is sad.', '%s is sad.',
@ -288,7 +289,8 @@ EmoteWhispers = ['%s waves.',
'%s is delighted.', '%s is delighted.',
'%s is furious.', '%s is furious.',
'%s is laughing.', '%s is laughing.',
'%s taunts you.'] '%s taunts you.',
'%s is raging.']
EmoteFuncDict = {'Wave': 0, EmoteFuncDict = {'Wave': 0,
'Happy': 1, 'Happy': 1,
'Sad': 2, 'Sad': 2,
@ -314,7 +316,8 @@ EmoteFuncDict = {'Wave': 0,
'Delighted': 22, 'Delighted': 22,
'Furious': 23, 'Furious': 23,
'Laugh': 24, 'Laugh': 24,
'Taunt': 25} 'Taunt': 25,
'Rage': 26}
SuitBrushOffs = {'f': ["I'm late for a meeting."], SuitBrushOffs = {'f': ["I'm late for a meeting."],
'p': ['Push off.'], 'p': ['Push off.'],
'ym': ['Yes Man says NO.'], 'ym': ['Yes Man says NO.'],

2
toontown/catalog/CatalogEmoteItem.py
View file

@ -3,7 +3,7 @@ from toontown.toonbase import ToontownGlobals
from toontown.toonbase import TTLocalizer from toontown.toonbase import TTLocalizer
from otp.otpbase import OTPLocalizer from otp.otpbase import OTPLocalizer
from direct.interval.IntervalGlobal import * from direct.interval.IntervalGlobal import *
LoyaltyEmoteItems = (20, 21, 22, 23, 24) LoyaltyEmoteItems = (20, 21, 22, 23, 24, 25, 26)
class CatalogEmoteItem(CatalogItem.CatalogItem): class CatalogEmoteItem(CatalogItem.CatalogItem):
sequenceNumber = 0 sequenceNumber = 0

4
toontown/catalog/CatalogGenerator.py
View file

@ -553,7 +553,9 @@ MonthlySchedule = ((7,
CatalogEmoteItem(21, 45), CatalogEmoteItem(21, 45),
CatalogEmoteItem(22, 60), CatalogEmoteItem(22, 60),
CatalogEmoteItem(23, 75), CatalogEmoteItem(23, 75),
CatalogEmoteItem(24, 90))), CatalogEmoteItem(24, 90),
CatalogEmoteItem(25, 115),
CatalogEmoteItem(26, 130))),
(5, (5,
26, 26,
6, 6,

21
toontown/toon/TTEmote.py
View file

@ -318,7 +318,9 @@ def doLaugh(toon, volume = 1):
def doTaunt(toon, volume=1): def doTaunt(toon, volume=1):
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg') duration = toon.getDuration('angry', 'torso')
sfx = None
sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg')
track = Sequence( track = Sequence(
Func(toon.blinkEyes), Func(toon.blinkEyes),
@ -328,6 +330,17 @@ def doTaunt(toon, volume=1):
duration = toon.getDuration('taunt') duration = toon.getDuration('taunt')
return (track, duration, None) return (track, duration, None)
def doRage(toon, volume=1):
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
track = Sequence(
Func(toon.blinkEyes),
Func(toon.play, 'good-putt', fromFrame=12),
Func(base.playSfx, sfx, volume=volume, node=toon)
)
duration = toon.getDuration('rage')
return (track, duration, None)
def returnToLastAnim(toon): def returnToLastAnim(toon):
if hasattr(toon, 'playingAnim') and toon.playingAnim: if hasattr(toon, 'playingAnim') and toon.playingAnim:
toon.loop(toon.playingAnim) toon.loop(toon.playingAnim)
@ -362,7 +375,8 @@ EmoteFunc = [[doWave, 0],
[doDelighted, 0], [doDelighted, 0],
[doFurious, 0], [doFurious, 0],
[doLaugh, 0], [doLaugh, 0],
[doTaunt, 0]] [doTaunt, 0],
[doRage, 0]]
class TTEmote(Emote.Emote): class TTEmote(Emote.Emote):
notify = DirectNotifyGlobal.directNotify.newCategory('TTEmote') notify = DirectNotifyGlobal.directNotify.newCategory('TTEmote')
@ -390,7 +404,8 @@ class TTEmote(Emote.Emote):
22, 22,
23, 23,
24, 24,
25] 25,
26]
self.headEmotes = [2, self.headEmotes = [2,
17, 17,
18, 18,