mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-24 04:02:40 -06:00
Remove Trap Cat SOS
This commit is contained in:
parent
48998e45ce
commit
e837ad96f4
3 changed files with 8 additions and 57 deletions
|
@ -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)
|
d = Func(npc.pose, 'teleport', npc.getNumFrames('teleport') - 1)
|
||||||
e = npc.getTeleportInTrack()
|
e = npc.getTeleportInTrack()
|
||||||
ee = Func(npc.addActive)
|
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)
|
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')
|
g = ActorInterval(npc, 'wave')
|
||||||
h = Func(npc.loop, 'neutral')
|
h = Func(npc.loop, 'neutral')
|
||||||
seq = Sequence(a, b, c, d, e, ee, f, g, h)
|
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))
|
seq.append(Func(npc.clearChat))
|
||||||
if npc.getName() == 'Magic Cat':
|
if npc.getName() == 'Magic Cat':
|
||||||
magicCatTrack = Sequence()
|
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):
|
def teleportOut(attack, npc):
|
||||||
if npc.getName() == 'Trap Cat':
|
|
||||||
a = ActorInterval(npc, 'neutral')
|
|
||||||
else:
|
|
||||||
if npc.style.getGender() == 'm':
|
if npc.style.getGender() == 'm':
|
||||||
a = ActorInterval(npc, 'bow')
|
a = ActorInterval(npc, 'bow')
|
||||||
else:
|
else:
|
||||||
a = ActorInterval(npc, 'curtsy')
|
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)
|
b = Func(npc.setChatAbsolute, TTLocalizer.MovieNPCSOSGoodbye, CFSpeech | CFTimeout)
|
||||||
if npc.getName() == 'Trap Cat':
|
|
||||||
c = Func(npc.loop, 'neutral')
|
|
||||||
else:
|
|
||||||
c = npc.getTeleportOutTrack()
|
c = npc.getTeleportOutTrack()
|
||||||
seq = Sequence(a, b, c)
|
seq = Sequence(a, b, c)
|
||||||
if npc.getName() == 'Trap Cat':
|
|
||||||
seq.append(Wait(3))
|
|
||||||
seq.append(Func(npc.removeActive))
|
seq.append(Func(npc.removeActive))
|
||||||
seq.append(Func(npc.detachNode))
|
seq.append(Func(npc.detachNode))
|
||||||
seq.append(Func(npc.delete))
|
seq.append(Func(npc.delete))
|
||||||
if npc.getName() == 'Trap Cat':
|
|
||||||
seq.append(Wait(3))
|
|
||||||
return seq
|
return seq
|
||||||
|
|
||||||
|
|
||||||
def __getPartTrack(particleEffect, startDelay, durationDelay, partExtraArgs):
|
def __getPartTrack(particleEffect, startDelay, durationDelay, partExtraArgs):
|
||||||
pEffect = partExtraArgs[0]
|
pEffect = partExtraArgs[0]
|
||||||
parent = partExtraArgs[1]
|
parent = partExtraArgs[1]
|
||||||
|
|
|
@ -11583,27 +11583,6 @@ NPCToonDict = {20000: (-1,
|
||||||
10),
|
10),
|
||||||
'm',
|
'm',
|
||||||
0,
|
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)}
|
NPC_REGULAR)}
|
||||||
|
|
||||||
if config.GetBool('want-new-toonhall', 1):
|
if config.GetBool('want-new-toonhall', 1):
|
||||||
|
@ -11729,10 +11708,6 @@ HQnpcFriends = {2001: (ToontownBattleGlobals.HEAL_TRACK,
|
||||||
0,
|
0,
|
||||||
255,
|
255,
|
||||||
5),
|
5),
|
||||||
91918: (ToontownBattleGlobals.SOUND_TRACK,
|
|
||||||
6,
|
|
||||||
1,
|
|
||||||
0),
|
|
||||||
4219: (ToontownBattleGlobals.SOUND_TRACK,
|
4219: (ToontownBattleGlobals.SOUND_TRACK,
|
||||||
5,
|
5,
|
||||||
50,
|
50,
|
||||||
|
|
|
@ -6810,9 +6810,7 @@ NPCToonNames = {20000: 'Tutorial Tom',
|
||||||
7008: 'Ima Cagedtoon',
|
7008: 'Ima Cagedtoon',
|
||||||
7009: 'Jimmy Thelock',
|
7009: 'Jimmy Thelock',
|
||||||
7010: 'Little Blinky',
|
7010: 'Little Blinky',
|
||||||
# Start with 91913.
|
91917: 'Magic Cat'}
|
||||||
91917: 'Magic Cat',
|
|
||||||
91918: 'Trap Cat'}
|
|
||||||
zone2TitleDict = {2513: ('Toon Hall', ''),
|
zone2TitleDict = {2513: ('Toon Hall', ''),
|
||||||
2514: ('Toontown Bank', ''),
|
2514: ('Toontown Bank', ''),
|
||||||
2516: ('Toontown School House', ''),
|
2516: ('Toontown School House', ''),
|
||||||
|
|
Loading…
Reference in a new issue