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

john's emote cleanup

Browse source
This commit is contained in:
Zach 2015-05-12 12:47:58 -05:00
parent 2f301cfb7e
commit 8e8a194dfa
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
astron/dclass/united.dc
View file

@ -701,7 +701,7 @@ dclass DistributedToon : DistributedPlayer {
setTunnelOut(int16, int16/10, int16/10, int16/10, int16/10, int16/100, int32/100) ownsend broadcast;
setAnimState(char [0-1024], int16/1000, int16) broadcast ram ownsend airecv;
setEmoteState(int16, int16/1000, int16) broadcast ram ownsend;
setEmoteAccess(uint8[] = [1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) required ownrecv db;
setEmoteAccess(uint8[] = [1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) required ownrecv db;
setCustomMessages(uint16[] = []) required ownrecv db;
setSleepAutoReply(uint32) broadcast clsend ownrecv;
setResistanceMessages(pair16 [] = []) required ownrecv db;

2
toontown/toon/DistributedToonAI.py
View file

@ -116,7 +116,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
self.fishingRod = 0
self.fishingTrophies = []
self.trackArray = []
self.emoteAccess = [0] * 26
self.emoteAccess = [0] * 27
self.maxMoney = 0
self.maxBankMoney = 0
self.gardenSpecials = []

7
toontown/toon/TTEmote.py
View file

@ -319,9 +319,7 @@ def doLaugh(toon, volume = 1):
def doTaunt(toon, volume=1):
duration = toon.getDuration('angry', 'torso')
sfx = None
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),
Func(toon.play, 'taunt'),
@ -331,8 +329,7 @@ def doTaunt(toon, volume=1):
return (track, duration, None)
def doRage(toon, volume=1):
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.blinkEyes),
Func(toon.play, 'good-putt', fromFrame=12),