From 7f3c321490f9e541a79b734c73c58d8b0a062447 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 10 May 2015 22:46:41 -0400 Subject: [PATCH] Add Re-Org and finish Throw Book Cog attacks --- toontown/battle/MovieCamera.py | 2 + toontown/battle/MovieSuitAttacks.py | 8 +- toontown/battle/SuitBattleGlobals.py | 98 ++++++++++++++++++------- toontown/suit/Suit.py | 2 + toontown/toonbase/TTLocalizerEnglish.py | 3 + 5 files changed, 85 insertions(+), 28 deletions(-) diff --git a/toontown/battle/MovieCamera.py b/toontown/battle/MovieCamera.py index d02b0c79..ea89edb0 100644 --- a/toontown/battle/MovieCamera.py +++ b/toontown/battle/MovieCamera.py @@ -476,6 +476,8 @@ def chooseSuitShot(attack, attackDuration): camTrack.append(defaultCamera(openShotDuration=1.2)) elif name == WRITE_OFF: camTrack.append(defaultCamera()) + elif name == THROW_BOOK: + camTrack.append(defaultCamera(openShotDuration=2.9)) else: notify.warning('unknown attack id in chooseSuitShot: %d using default cam' % name) camTrack.append(defaultCamera()) diff --git a/toontown/battle/MovieSuitAttacks.py b/toontown/battle/MovieSuitAttacks.py index f90d55b8..be813541 100644 --- a/toontown/battle/MovieSuitAttacks.py +++ b/toontown/battle/MovieSuitAttacks.py @@ -1597,8 +1597,9 @@ def doReOrg(attack): partTrack = getPartTrack(sprayEffect, 1.0, 1.9, [sprayEffect, suit, 0]) if dmg > 0: headParts = toon.getHeadParts() - print '***********headParts pos=', headParts[0].getPos() - print '***********headParts hpr=', headParts[0].getHpr() + if __debug__: + print '***********headParts pos=', headParts[0].getPos() + print '***********headParts hpr=', headParts[0].getHpr() headTracks = Parallel() for partNum in xrange(0, headParts.getNumPaths()): part = headParts.getPath(partNum) @@ -1618,7 +1619,8 @@ def doReOrg(attack): arms = toon.findAllMatches('**/arms') sleeves = toon.findAllMatches('**/sleeves') hands = toon.findAllMatches('**/hands') - print '*************arms hpr=', arms[0].getHpr() + if __debug__: + print '*************arms hpr=', arms[0].getHpr() for partNum in xrange(0, arms.getNumPaths()): chestTracks.append(getChestTrack(arms.getPath(partNum))) chestTracks.append(getChestTrack(sleeves.getPath(partNum))) diff --git a/toontown/battle/SuitBattleGlobals.py b/toontown/battle/SuitBattleGlobals.py index b519fcc1..1df43709 100644 --- a/toontown/battle/SuitBattleGlobals.py +++ b/toontown/battle/SuitBattleGlobals.py @@ -647,11 +647,27 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 80, 85, 95), - (35, - 35, - 35, - 35, - 35)), + (20, + 20, + 20, + 20, + 20)), + ('ReOrg', + (5, + 8, + 11, + 13, + 15), + (65, + 75, + 80, + 85, + 90), + (15, + 15, + 15, + 15, + 15)), ('Rolodex', (6, 7, @@ -1335,11 +1351,11 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 80, 85, 90), - (30, - 30, - 30, - 30, - 30)), + (25, + 25, + 25, + 25, + 25)), ('HangUp', (7, 8, @@ -1367,11 +1383,27 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 70, 75, 80), - (30, - 30, - 30, - 30, - 30)), + (25, + 25, + 25, + 25, + 25)), + ('ReOrg', + (5, + 8, + 11, + 13, + 15), + (65, + 75, + 80, + 85, + 90), + (15, + 15, + 15, + 15, + 15)), ('RedTape', (6, 7, @@ -1383,11 +1415,11 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 75, 85, 90), - (25, - 25, - 25, - 25, - 25)))}, + (20, + 20, + 20, + 20, + 20)))}, 'm': {'name': TTLocalizer.SuitTheMingler, 'singularname': TTLocalizer.SuitTheMinglerS, 'pluralname': TTLocalizer.SuitTheMinglerP, @@ -2719,11 +2751,27 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 80, 85, 90), - (35, - 35, - 35, - 35, - 35)), + (20, + 20, + 20, + 20, + 20)), + ('ReOrg', + (5, + 8, + 11, + 13, + 15), + (65, + 75, + 80, + 85, + 90), + (15, + 15, + 15, + 15, + 15)), ('WriteOff', (6, 7, diff --git a/toontown/suit/Suit.py b/toontown/suit/Suit.py index 2d337f98..f8ea21ae 100644 --- a/toontown/suit/Suit.py +++ b/toontown/suit/Suit.py @@ -73,6 +73,7 @@ hh = (('pen-squirt', 'fountain-pen', 7), ('glower', 'glower', 5), ('throw-paper', 'throw-paper', 5), ('magic1', 'magic1', 5), + ('magic3', 'magic3', 5), ('roll-o-dex', 'roll-o-dex', 5)) cr = (('pickpocket', 'pickpocket', 5), ('throw-paper', 'throw-paper', 3.5), ('glower', 'glower', 5)) tbc = (('cigar-smoke', 'cigar-smoke', 8), @@ -100,6 +101,7 @@ ms = (('effort', 'effort', 5), tf = (('phone', 'phone', 5), ('smile', 'smile', 5), ('throw-object', 'throw-object', 5), + ('magic3', 'magic3', 5), ('glower', 'glower', 5)) m = (('speak', 'speak', 5), ('magic2', 'magic2', 5), diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index efebb2eb..be08923e 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -2998,6 +2998,9 @@ SuitAttackTaunts = {'Audit': ["I believe your books don't balance.", 'Watch the birdie!', 'Keep your eye on the ball!', '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?', 'Not afraid of a little tremor are you?', 'A tremor is only the beginning.',