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

Add force generate laughing man function and use it for Magic Kitty

Browse source
This commit is contained in:
DenialMC 2015-04-04 11:26:39 +03:00
parent 99c29e64a4
commit edbd2d0584
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/battle/MovieNPCSOS.py
View file

@ -10,7 +10,6 @@ import MovieCamera
import MovieUtil import MovieUtil
from toontown.chat.ChatGlobals import * from toontown.chat.ChatGlobals import *
from toontown.nametag.NametagGlobals import * from toontown.nametag.NametagGlobals import *
from toontown.toon import LaughingManGlobals
from toontown.toon import NPCToons from toontown.toon import NPCToons
from toontown.toonbase import TTLocalizer from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals from toontown.toonbase import ToontownBattleGlobals
@ -93,8 +92,7 @@ def __getSoundTrack(level, delay, duration = None, node = None):
def teleportIn(attack, npc, pos = Point3(0, 0, 0), hpr = Vec3(180.0, 0.0, 0.0)): def teleportIn(attack, npc, pos = Point3(0, 0, 0), hpr = Vec3(180.0, 0.0, 0.0)):
if npc.getName() == 'Magic Cat': if npc.getName() == 'Magic Cat':
LaughingManGlobals.addToonEffect(npc) npc.generateLaughingMan(True)
npc.nametag3d.hide()
a = Func(npc.reparentTo, attack['battle']) a = Func(npc.reparentTo, attack['battle'])
b = Func(npc.setPos, pos) b = Func(npc.setPos, pos)
c = Func(npc.setHpr, hpr) c = Func(npc.setHpr, hpr)

4
toontown/toon/Toon.py
View file

@ -968,8 +968,8 @@ class Toon(Avatar.Avatar, ToonHead):
return swappedTorso return swappedTorso
def generateLaughingMan(self): def generateLaughingMan(self, force=False):
if not self.getHasLaughingMan() and self.getWantLaughingMan(): if force or (not self.getHasLaughingMan() and self.getWantLaughingMan()):
LaughingManGlobals.addToonEffect(self) LaughingManGlobals.addToonEffect(self)
def generateHat(self, fromRTM = False): def generateHat(self, fromRTM = False):