Remove Trap Cat SOS

This commit is contained in:
Daniel 2015-03-29 21:27:49 +03:00
parent 48998e45ce
commit e837ad96f4
3 changed files with 8 additions and 57 deletions

View file

@ -101,18 +101,10 @@ def teleportIn(attack, npc, pos = Point3(0, 0, 0), hpr = Vec3(180.0, 0.0, 0.0)):
d = Func(npc.pose, 'teleport', npc.getNumFrames('teleport') - 1)
e = npc.getTeleportInTrack()
ee = Func(npc.addActive)
if npc.getName() == 'Trap Cat':
f = Func(npc.setChatAbsolute, 'We are team trap! Fear me %s' % attack['toon'].getName() + ' for I am the Notorious T-Cat', CFSpeech | CFTimeout)
else:
f = Func(npc.setChatAbsolute, TTLocalizer.MovieNPCSOSGreeting % attack['toon'].getName(), CFSpeech | CFTimeout)
if npc.getName() == 'Trap Cat':
g = ActorInterval(npc, 'angry')
else:
g = ActorInterval(npc, 'wave')
h = Func(npc.loop, 'neutral')
seq = Sequence(a, b, c, d, e, ee, f, g, h)
if npc.getName() == 'Trap Cat':
seq.append(Wait(3))
seq.append(Func(npc.clearChat))
if npc.getName() == 'Magic Cat':
magicCatTrack = Sequence()
@ -123,32 +115,18 @@ def teleportIn(attack, npc, pos = Point3(0, 0, 0), hpr = Vec3(180.0, 0.0, 0.0)):
def teleportOut(attack, npc):
if npc.getName() == 'Trap Cat':
a = ActorInterval(npc, 'neutral')
else:
if npc.style.getGender() == 'm':
a = ActorInterval(npc, 'bow')
else:
a = ActorInterval(npc, 'curtsy')
if npc.getName() == 'Trap Cat':
b = Func(npc.setChatAbsolute, 'Drat, my hacks failed... Oh well, I will just disconnect you all!', CFSpeech | CFTimeout)
else:
b = Func(npc.setChatAbsolute, TTLocalizer.MovieNPCSOSGoodbye, CFSpeech | CFTimeout)
if npc.getName() == 'Trap Cat':
c = Func(npc.loop, 'neutral')
else:
c = npc.getTeleportOutTrack()
seq = Sequence(a, b, c)
if npc.getName() == 'Trap Cat':
seq.append(Wait(3))
seq.append(Func(npc.removeActive))
seq.append(Func(npc.detachNode))
seq.append(Func(npc.delete))
if npc.getName() == 'Trap Cat':
seq.append(Wait(3))
return seq
def __getPartTrack(particleEffect, startDelay, durationDelay, partExtraArgs):
pEffect = partExtraArgs[0]
parent = partExtraArgs[1]

View file

@ -11583,27 +11583,6 @@ NPCToonDict = {20000: (-1,
10),
'm',
0,
NPC_REGULAR),
# Trap Cat SOS
# 1 Star, Sound SOS, Opera 1 damage. "We are team trap!".
91918: (-1,
lnames[91918],
('dss',
'l',
's',
'm',
20,
0,
20,
2,
66,
3,
12,
3,
12,
11),
'm',
0,
NPC_REGULAR)}
if config.GetBool('want-new-toonhall', 1):
@ -11729,10 +11708,6 @@ HQnpcFriends = {2001: (ToontownBattleGlobals.HEAL_TRACK,
0,
255,
5),
91918: (ToontownBattleGlobals.SOUND_TRACK,
6,
1,
0),
4219: (ToontownBattleGlobals.SOUND_TRACK,
5,
50,

View file

@ -6810,9 +6810,7 @@ NPCToonNames = {20000: 'Tutorial Tom',
7008: 'Ima Cagedtoon',
7009: 'Jimmy Thelock',
7010: 'Little Blinky',
# Start with 91913.
91917: 'Magic Cat',
91918: 'Trap Cat'}
91917: 'Magic Cat'}
zone2TitleDict = {2513: ('Toon Hall', ''),
2514: ('Toontown Bank', ''),
2516: ('Toontown School House', ''),