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

Laughing Man fix

Browse source
This commit is contained in:
John 2015-07-05 13:11:45 +03:00
parent 6586760947
commit 9420973986
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
toontown/toon/Toon.py
View file

@ -830,7 +830,7 @@ class Toon(Avatar.Avatar, ToonHead):
self.loadAnims(HeadAnimDict[self.style.head], 'head', '500')
self.loadAnims(HeadAnimDict[self.style.head], 'head', '250')
def swapToonHead(self, headStyle=-1, laughingMan=-1, copy = 1):
def swapToonHead(self, headStyle=-1, laughingMan=0, copy = 1):
self.stopLookAroundNow()
self.eyelids.request('open')
self.unparentToonParts()
@ -842,7 +842,6 @@ class Toon(Avatar.Avatar, ToonHead):
del self._Actor__commonBundleHandles['head']
if headStyle > -1:
self.style.head = headStyle
laughingMan = laughingMan or self.style.laughingMan or self.getWantLaughingManHoliday()
self.generateToonHead(copy)
self.generateToonColor()
self.parentToonParts()
@ -850,7 +849,7 @@ class Toon(Avatar.Avatar, ToonHead):
self.resetHeight()
self.eyelids.request('open')
self.startLookAround()
if laughingMan:
if laughingMan or self.getWantLaughingMan():
LaughingManGlobals.addToonEffect(self)
def generateToonColor(self):
@ -985,8 +984,8 @@ class Toon(Avatar.Avatar, ToonHead):
return swappedTorso
def generateLaughingMan(self, force=False):
if force or self.getWantLaughingMan():
def generateLaughingMan(self):
if self.getWantLaughingMan():
self.swapToonHead(laughingMan=True)
def generateHat(self, fromRTM = False):

5
toontown/toon/ToonDNA.py
View file

@ -2648,7 +2648,7 @@ class ToonDNA:
self.botTexColor = bottomTextureColor
self.laughingMan = laughingMan
def updateToonProperties(self, head = None, torso = None, legs = None, gender = None, armColor = None, gloveColor = None, legColor = None, headColor = None, topTexture = None, topTextureColor = None, sleeveTexture = None, sleeveTextureColor = None, bottomTexture = None, bottomTextureColor = None, shirt = None, bottom = None, laughingMan = None):
def updateToonProperties(self, head = None, torso = None, legs = None, gender = None, armColor = None, gloveColor = None, legColor = None, headColor = None, topTexture = None, topTextureColor = None, sleeveTexture = None, sleeveTextureColor = None, bottomTexture = None, bottomTextureColor = None, shirt = None, bottom = None, laughingMan = False):
if head:
self.head = head
if torso:
@ -2677,8 +2677,7 @@ class ToonDNA:
self.botTex = bottomTexture
if bottomTextureColor:
self.botTexColor = bottomTextureColor
if laughingMan:
self.laughingMan = laughingMan
self.laughingMan = laughingMan
if shirt:
str, colorIndex = shirt
defn = ShirtStyles[str]

2
toontown/toon/ToonHead.py
View file

@ -197,7 +197,7 @@ class ToonHead(Actor.Actor):
if dna.getAnimal() == 'dog':
self.loop('neutral')
if dna.laughingMan:
LaughingManGlobals.addHeadEffect(self.getGeomNode(), book=True)
LaughingManGlobals.addHeadEffect(self.getGeomNode(), book=forGui)
def fitAndCenterHead(self, maxDim, forGui = 0):
p1 = Point3()