Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-25 04:32:33 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Re-Org and finish Throw Book Cog attacks

Browse source
This commit is contained in:
John Cote 2015-05-10 22:46:41 -04:00
parent 22a7a1d353
commit 7f3c321490
5 changed files with 85 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/battle/MovieCamera.py
View file

@ -476,6 +476,8 @@ def chooseSuitShot(attack, attackDuration):
camTrack.append(defaultCamera(openShotDuration=1.2)) camTrack.append(defaultCamera(openShotDuration=1.2))
elif name == WRITE_OFF: elif name == WRITE_OFF:
camTrack.append(defaultCamera()) camTrack.append(defaultCamera())
elif name == THROW_BOOK:
camTrack.append(defaultCamera(openShotDuration=2.9))
else: else:
notify.warning('unknown attack id in chooseSuitShot: %d using default cam' % name) notify.warning('unknown attack id in chooseSuitShot: %d using default cam' % name)
camTrack.append(defaultCamera()) camTrack.append(defaultCamera())

2
toontown/battle/MovieSuitAttacks.py
View file

@ -1597,6 +1597,7 @@ def doReOrg(attack):
partTrack = getPartTrack(sprayEffect, 1.0, 1.9, [sprayEffect, suit, 0]) partTrack = getPartTrack(sprayEffect, 1.0, 1.9, [sprayEffect, suit, 0])
if dmg > 0: if dmg > 0:
headParts = toon.getHeadParts() headParts = toon.getHeadParts()
if __debug__:
print '***********headParts pos=', headParts[0].getPos() print '***********headParts pos=', headParts[0].getPos()
print '***********headParts hpr=', headParts[0].getHpr() print '***********headParts hpr=', headParts[0].getHpr()
headTracks = Parallel() headTracks = Parallel()
@ -1618,6 +1619,7 @@ def doReOrg(attack):
arms = toon.findAllMatches('**/arms') arms = toon.findAllMatches('**/arms')
sleeves = toon.findAllMatches('**/sleeves') sleeves = toon.findAllMatches('**/sleeves')
hands = toon.findAllMatches('**/hands') hands = toon.findAllMatches('**/hands')
if __debug__:
print '*************arms hpr=', arms[0].getHpr() print '*************arms hpr=', arms[0].getHpr()
for partNum in xrange(0, arms.getNumPaths()): for partNum in xrange(0, arms.getNumPaths()):
chestTracks.append(getChestTrack(arms.getPath(partNum))) chestTracks.append(getChestTrack(arms.getPath(partNum)))

98
toontown/battle/SuitBattleGlobals.py
View file

@ -647,11 +647,27 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky,
80, 80,
85, 85,
95), 95),
(35, (20,
35, 20,
35, 20,
35, 20,
35)), 20)),
('ReOrg',
(5,
8,
11,
13,
15),
(65,
75,
80,
85,
90),
(15,
15,
15,
15,
15)),
('Rolodex', ('Rolodex',
(6, (6,
7, 7,
@ -1335,11 +1351,11 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky,
80, 80,
85, 85,
90), 90),
(30, (25,
30, 25,
30, 25,
30, 25,
30)), 25)),
('HangUp', ('HangUp',
(7, (7,
8, 8,
@ -1367,11 +1383,27 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky,
70, 70,
75, 75,
80), 80),
(30, (25,
30, 25,
30, 25,
30, 25,
30)), 25)),
('ReOrg',
(5,
8,
11,
13,
15),
(65,
75,
80,
85,
90),
(15,
15,
15,
15,
15)),
('RedTape', ('RedTape',
(6, (6,
7, 7,
@ -1383,11 +1415,11 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky,
75, 75,
85, 85,
90), 90),
(25, (20,
25, 20,
25, 20,
25, 20,
25)))}, 20)))},
'm': {'name': TTLocalizer.SuitTheMingler, 'm': {'name': TTLocalizer.SuitTheMingler,
'singularname': TTLocalizer.SuitTheMinglerS, 'singularname': TTLocalizer.SuitTheMinglerS,
'pluralname': TTLocalizer.SuitTheMinglerP, 'pluralname': TTLocalizer.SuitTheMinglerP,
@ -2719,11 +2751,27 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky,
80, 80,
85, 85,
90), 90),
(35, (20,
35, 20,
35, 20,
35, 20,
35)), 20)),
('ReOrg',
(5,
8,
11,
13,
15),
(65,
75,
80,
85,
90),
(15,
15,
15,
15,
15)),
('WriteOff', ('WriteOff',
(6, (6,
7, 7,

2
toontown/suit/Suit.py
View file

@ -73,6 +73,7 @@ hh = (('pen-squirt', 'fountain-pen', 7),
('glower', 'glower', 5), ('glower', 'glower', 5),
('throw-paper', 'throw-paper', 5), ('throw-paper', 'throw-paper', 5),
('magic1', 'magic1', 5), ('magic1', 'magic1', 5),
('magic3', 'magic3', 5),
('roll-o-dex', 'roll-o-dex', 5)) ('roll-o-dex', 'roll-o-dex', 5))
cr = (('pickpocket', 'pickpocket', 5), ('throw-paper', 'throw-paper', 3.5), ('glower', 'glower', 5)) cr = (('pickpocket', 'pickpocket', 5), ('throw-paper', 'throw-paper', 3.5), ('glower', 'glower', 5))
tbc = (('cigar-smoke', 'cigar-smoke', 8), tbc = (('cigar-smoke', 'cigar-smoke', 8),
@ -100,6 +101,7 @@ ms = (('effort', 'effort', 5),
tf = (('phone', 'phone', 5), tf = (('phone', 'phone', 5),
('smile', 'smile', 5), ('smile', 'smile', 5),
('throw-object', 'throw-object', 5), ('throw-object', 'throw-object', 5),
('magic3', 'magic3', 5),
('glower', 'glower', 5)) ('glower', 'glower', 5))
m = (('speak', 'speak', 5), m = (('speak', 'speak', 5),
('magic2', 'magic2', 5), ('magic2', 'magic2', 5),

3
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -2998,6 +2998,9 @@ SuitAttackTaunts = {'Audit': ["I believe your books don't balance.",
'Watch the birdie!', 'Watch the birdie!',
'Keep your eye on the ball!', 'Keep your eye on the ball!',
'Mind if I play through?'], 'Mind if I play through?'],
'ThrowBook': ['I graduated Law School.',
'You should really get a lawyer.',
"I'll see you in court."],
'Tremor': ['Did you feel that?', 'Tremor': ['Did you feel that?',
'Not afraid of a little tremor are you?', 'Not afraid of a little tremor are you?',
'A tremor is only the beginning.', 'A tremor is only the beginning.',