zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

battle: Visually improve "Fountain Pen" and "Fill with Lead" suit attacks

Browse source
This commit is contained in:
Joey Z 2014-06-24 18:31:12 -04:00
parent 1b671ff18d
commit d8d9c0c0c1
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources

@ -1 +1 @@
Subproject commit 4469f9f491d02f3a60fedb8fdd0c907f4f591f6e
Subproject commit c72f0da961b6c722650daf163a29465f09bed4ef

11
toontown/battle/MovieSuitAttacks.py
View file

@ -908,14 +908,15 @@ def doFillWithLead(attack):
track = Parallel()
for partNum in range(0, parts.getNumPaths()):
nextPart = parts.getPath(partNum)
track.append(Func(nextPart.setColorScale, Vec4(0, 0, 0, 1)))
track.append(LerpColorScaleInterval(nextPart, 0.2, Point4(0, 0, 0, 1)))
return track
def resetParts(parts):
track = Parallel()
track = Sequence()
for partNum in range(0, parts.getNumPaths()):
nextPart = parts.getPath(partNum)
track.append(LerpColorScaleInterval(nextPart, 0.2, Point4(1, 1, 1, 1)))
track.append(Func(nextPart.clearColorScale))
return track
@ -932,10 +933,11 @@ def doFillWithLead(attack):
colorTrack.append(colorParts(torsoParts))
colorTrack.append(Wait(partIvalDelay))
colorTrack.append(colorParts(legsParts))
colorTrack.append(Wait(2.5))
colorTrack.append(Wait(0.9))
colorTrack.append(resetParts(headParts))
colorTrack.append(resetParts(torsoParts))
colorTrack.append(resetParts(legsParts))
colorTrack.append(Wait(partIvalDelay))
colorTrack.append(Func(battle.movie.clearRestoreColor))
return Parallel(suitTrack, pencilPropTrack, sharpenerPropTrack, sprayTrack, headTrack, torsoTrack, legsTrack, colorTrack, toonTrack)
else:
@ -986,9 +988,10 @@ def doFountainPen(attack):
splashTrack.append(Func(nextPart.setColorScale, Vec4(0, 0, 0, 1)))
splashTrack.append(Func(MovieUtil.removeProp, splash))
splashTrack.append(Wait(2.6))
splashTrack.append(Wait(2.1))
for partNum in range(0, headParts.getNumPaths()):
nextPart = headParts.getPath(partNum)
splashTrack.append(LerpColorScaleInterval(nextPart, 0.1, Point4(1, 1, 1, 1)))
splashTrack.append(Func(nextPart.clearColorScale))
splashTrack.append(Func(battle.movie.clearRestoreColor))