Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

No more taunt.

Browse source
This commit is contained in:
Loudrob 2015-08-23 11:00:22 -04:00
parent a4d30bc355
commit ccf64c323b
4 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
otp/otpbase/OTPLocalizerEnglish.py
View file

@ -292,7 +292,6 @@ EmoteList = ['Wave',
'Delighted', 'Delighted',
'Furious', 'Furious',
'Laugh', 'Laugh',
'Taunt',
'Rage'] 'Rage']
EmoteWhispers = ['%s waves.', EmoteWhispers = ['%s waves.',
'%s is happy.', '%s is happy.',
@ -319,7 +318,6 @@ 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 is raging.'] '%s is raging.']
EmoteFuncDict = {'Wave': 0, EmoteFuncDict = {'Wave': 0,
'Happy': 1, 'Happy': 1,
@ -346,8 +344,7 @@ EmoteFuncDict = {'Wave': 0,
'Delighted': 22, 'Delighted': 22,
'Furious': 23, 'Furious': 23,
'Laugh': 24, 'Laugh': 24,
'Taunt': 25, 'Rage': 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.'],

3
toontown/catalog/CatalogGenerator.py
View file

@ -535,13 +535,12 @@ MonthlySchedule = ((7,
CatalogClothingItem(1606, 0, True), CatalogClothingItem(1606, 0, True),
CatalogClothingItem(1603, 0, True), CatalogClothingItem(1603, 0, True),
CatalogClothingItem(1600, 0, True), CatalogClothingItem(1600, 0, True),
CatalogEmoteItem(25, True),
CatalogEmoteItem(26, True),
CatalogEmoteItem(20, True), CatalogEmoteItem(20, True),
CatalogEmoteItem(21, True), CatalogEmoteItem(21, True),
CatalogEmoteItem(22, True), CatalogEmoteItem(22, True),
CatalogEmoteItem(23, True), CatalogEmoteItem(23, True),
CatalogEmoteItem(24, True), CatalogEmoteItem(24, True),
CatalogEmoteItem(25, True),
CatalogClothingItem(1821, 0, True))), CatalogClothingItem(1821, 0, True))),
(5, (5,
26, 26,

16
toontown/toon/TTEmote.py
View file

@ -316,18 +316,6 @@ def doLaugh(toon, volume = 1):
exitTrack = Sequence(Func(toon.hideLaughMuzzle), Func(toon.blinkEyes), Func(stopAnim)) exitTrack = Sequence(Func(toon.hideLaughMuzzle), Func(toon.blinkEyes), Func(stopAnim))
return (track, 2, exitTrack) return (track, 2, exitTrack)
def doTaunt(toon, volume=1):
duration = toon.getDuration('angry', 'torso')
sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
track = Sequence(
Func(toon.blinkEyes),
Func(toon.play, 'taunt'),
Func(base.playSfx, sfx, volume=volume, node=toon)
)
duration = toon.getDuration('taunt')
return (track, duration, None)
def doRage(toon, volume=1): def doRage(toon, volume=1):
sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg') sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg')
track = Sequence( track = Sequence(
@ -372,7 +360,6 @@ EmoteFunc = [[doWave, 0],
[doDelighted, 0], [doDelighted, 0],
[doFurious, 0], [doFurious, 0],
[doLaugh, 0], [doLaugh, 0],
[doTaunt, 0],
[doRage, 0]] [doRage, 0]]
class TTEmote(Emote.Emote): class TTEmote(Emote.Emote):
@ -401,8 +388,7 @@ class TTEmote(Emote.Emote):
22, 22,
23, 23,
24, 24,
25, 25]
26]
self.headEmotes = [2, self.headEmotes = [2,
17, 17,
18, 18,

3
toontown/toon/Toon.py
View file

@ -124,8 +124,7 @@ Phase4AnimList = (('sit', 'sit'),
('scientistJealous', 'scientistJealous'), ('scientistJealous', 'scientistJealous'),
('scientistEmcee', 'scientistEmcee'), ('scientistEmcee', 'scientistEmcee'),
('scientistWork', 'scientistWork'), ('scientistWork', 'scientistWork'),
('scientistGame', 'scientistGame'), ('scientistGame', 'scientistGame'))
('taunt', 'taunt'))
Phase5AnimList = (('water-gun', 'water-gun'), Phase5AnimList = (('water-gun', 'water-gun'),
('hold-bottle', 'hold-bottle'), ('hold-bottle', 'hold-bottle'),
('firehose', 'firehose'), ('firehose', 'firehose'),