From 22a7a1d3531b6d03621268166eb65f17d72f6f80 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 10 May 2015 20:54:19 -0400 Subject: [PATCH 1/2] Add ThrowBook Cog attack Assigned only to Big Wig. --- toontown/battle/MovieSuitAttacks.py | 45 +++++++++++++++++++++++++++- toontown/battle/SuitBattleGlobals.py | 35 +++++++++++++++------- 2 files changed, 69 insertions(+), 11 deletions(-) diff --git a/toontown/battle/MovieSuitAttacks.py b/toontown/battle/MovieSuitAttacks.py index 76b2e561..f90d55b8 100644 --- a/toontown/battle/MovieSuitAttacks.py +++ b/toontown/battle/MovieSuitAttacks.py @@ -244,7 +244,7 @@ def doSuitAttack(attack): elif name == TEE_OFF: suitTrack = doTeeOff(attack) elif name == THROW_BOOK: - suitTrack = doDefault(attack) + suitTrack = doThrowBook(attack) elif name == TREMOR: suitTrack = doTremor(attack) elif name == WATERCOOLER: @@ -3215,6 +3215,49 @@ def doEvictionNotice(attack): return Parallel(suitTrack, toonTrack, propTrack) +def doThrowBook(attack): + suit = attack['suit'] + battle = attack['battle'] + target = attack['target'] + toon = target['toon'] + dmg = target['hp'] + suitDelay = 2.0 + propDelay = 0.6 + throwDuration = 1.5 + paper = globalPropPool.getProp('lawbook') + suitTrack = getSuitTrack(attack) + posPoints = [Point3(0.00, -1.00, -1.85), VBase3(180.00, -45.00, -45.00)] + paperTrack = Sequence(getPropAppearTrack(paper, suit.getRightHand(), posPoints, propDelay, Point3(2.25, 2.25, 2.25), scaleUpTime=0.5)) + paperTrack.append(Wait(suitDelay)) + hitPoint = toon.getPos(battle) + hitPoint.setX(hitPoint.getX() + 1.2) + hitPoint.setY(hitPoint.getY() + 1.5) + if dmg > 0: + hitPoint.setZ(hitPoint.getZ() + 1.1) + movePoint = Point3(hitPoint.getX(), hitPoint.getY() - 1.8, hitPoint.getZ() + 0.2) + paperTrack.append(Func(battle.movie.needRestoreRenderProp, paper)) + paperTrack.append(Func(paper.wrtReparentTo, battle)) + paperTrack.append(getThrowTrack(paper, hitPoint, duration=throwDuration, parent=battle)) + paperTrack.append(Wait(0.6)) + paperTrack.append(LerpPosInterval(paper, 0.4, movePoint)) + spinTrack = Sequence(Wait(propDelay + suitDelay + 0.2), LerpHprInterval(paper, throwDuration, Point3(-360, 0, 0))) + sizeTrack = Sequence(Wait(propDelay + suitDelay + 0.2), LerpScaleInterval(paper, throwDuration, Point3(6, 6, 6)), Wait(0.95), LerpScaleInterval(paper, 0.4, MovieUtil.PNT3_NEARZERO)) + propTrack = Sequence(Parallel(paperTrack, spinTrack, sizeTrack), Func(MovieUtil.removeProp, paper), Func(battle.movie.clearRenderProp, paper)) + damageAnims = [] + damageAnims.append(['cringe', + 0.01, + 0.21, + 0.08]) + damageAnims.append(['slip-forward', + 0.01, + 0.6, + 0.85]) + damageAnims.extend(getSplicedLerpAnims('slip-forward', 0.31, 0.95, startTime=1.2)) + damageAnims.append(['slip-forward', 0.01, 1.51]) + toonTrack = getToonTrack(attack, damageDelay=4.35, splicedDamageAnims=damageAnims, dodgeDelay=2.4, dodgeAnimNames=['sidestep'], showDamageExtraTime=0.4, showMissedExtraTime=1.3) + return Parallel(suitTrack, toonTrack, propTrack) + + def doWithdrawal(attack): suit = attack['suit'] battle = attack['battle'] diff --git a/toontown/battle/SuitBattleGlobals.py b/toontown/battle/SuitBattleGlobals.py index 97afd841..b519fcc1 100644 --- a/toontown/battle/SuitBattleGlobals.py +++ b/toontown/battle/SuitBattleGlobals.py @@ -2863,11 +2863,26 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 85, 90, 95), - (50, - 50, - 50, - 50, - 50)), ('ThrowBook', + (33, + 33, + 33, + 33, + 33)), ('ThrowBook', + (14, + 16, + 18, + 20, + 22), + (70, + 75, + 85, + 90, + 95), + (33, + 33, + 33, + 33, + 33)), ('FingerWag', (13, 15, 17, @@ -2878,11 +2893,11 @@ SuitAttributes = {'f': {'name': TTLocalizer.SuitFlunky, 85, 85, 90), - (50, - 50, - 50, - 50, - 50)))}} + (33, + 33, + 33, + 33, + 33)))}} ATK_TGT_UNKNOWN = 1 ATK_TGT_SINGLE = 2 ATK_TGT_GROUP = 3 From 7f3c321490f9e541a79b734c73c58d8b0a062447 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 10 May 2015 22:46:41 -0400 Subject: [PATCH 2/2] 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.',