Consider holiday when setting Laughing Man head by DNA

This commit is contained in:
DenialMC 2015-04-04 12:56:55 +03:00
parent b4af78209c
commit 73dbf43edb
2 changed files with 2 additions and 2 deletions

View file

@ -549,7 +549,7 @@ class NewsManager(DistributedObject.DistributedObject):
def setLaughingManHolidayEnd(self):
for currToon in base.cr.toons.values():
currToon.swapToonHead(laughingMan=False)
currToon.swapToonHead(laughingMan=currToon.getWantLaughingMan())
def setTopToonsMarathonStart(self):
base.localAvatar.setSystemMessage(0, TTLocalizer.TopToonsMarathonStart)

View file

@ -828,7 +828,7 @@ class Toon(Avatar.Avatar, ToonHead):
if headStyle > -1:
self.style.head = headStyle
if laughingMan > -1:
self.style.laughingMan = laughingMan
self.style.laughingMan = True if laughingMan else self.getWantLaughingMan()
self.generateToonHead(copy)
self.generateToonColor()
self.parentToonParts()