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

parties: Don't start the firework show after a toon joins the party unless it is already in progress.

Browse source
This commit is contained in:
Joey Z 2014-02-06 17:02:34 -05:00
parent 89e9cded40
commit 237756d9fc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toontown/parties/DistributedPartyFireworksActivity.py
View file

@ -126,7 +126,8 @@ class DistributedPartyFireworksActivity(DistributedPartyActivity, FireworkShowMi
timeSinceStart = globalClockDelta.localElapsedTime(showStartTimestamp)
if timeSinceStart > self.rocketActor.getDuration('launch'):
self.rocketActor.hide()
self.startShow(self.eventId, self.showStyle, self.songId, showStartTimestamp)
if timeSinceStart < 60:
self.startShow(self.eventId, self.showStyle, self.songId, showStartTimestamp)
else:
self.rocketActor.play('launch')
self.rocketParticleSeq = Sequence(Wait(RocketSoundDelay), Func(base.playSfx, self.launchSound), Func(self.rocketExplosionEffect.start), Wait(RocketDirectionDelay), LerpHprInterval(self.rocketActor, 4.0, Vec3(0, 0, -60)), Func(self.rocketExplosionEffect.end), Func(self.rocketActor.hide))