From be31bb5a2c9c544445fc241f7f6db2f51440d11e Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Sat, 17 Dec 2022 14:58:59 +0530 Subject: [PATCH] timer green on finish and particle updates --- src/Marble.hx | 2 +- src/MarbleWorld.hx | 2 ++ src/shapes/SuperJump.hx | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Marble.hx b/src/Marble.hx index 5f137275..97a6331b 100644 --- a/src/Marble.hx +++ b/src/Marble.hx @@ -115,7 +115,7 @@ final trailParticleOptions:ParticleEmitterOptions = { lifetimeVariance: 10, acceleration: 0, colors: [new Vector(1, 1, 0, 0), new Vector(1, 1, 0, 1), new Vector(1, 1, 1, 0)], - sizes: [0.4, 0.4, 0.1], + sizes: [0.7, 0.4, 0.1], times: [0, 0.15, 1] } }; diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index 79f51b06..3670ecd6 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -1273,6 +1273,8 @@ class MarbleWorld extends Scheduler { } function determineClockColor(timeToDisplay:Float) { + if (this.finishTime != null) + return 1; if (this.timeState.currentAttemptTime < 3.5 || this.bonusTime > 0) return 1; if (timeToDisplay >= this.mission.qualifyTime) diff --git a/src/shapes/SuperJump.hx b/src/shapes/SuperJump.hx index 721a3e17..a423f180 100644 --- a/src/shapes/SuperJump.hx +++ b/src/shapes/SuperJump.hx @@ -13,8 +13,8 @@ import src.MarbleWorld; final superJumpParticleOptions:src.ParticleSystem.ParticleEmitterOptions = { ejectionPeriod: 10, ambientVelocity: new Vector(0, 0, 0.05), - ejectionVelocity: 0.5, - velocityVariance: 0.125, + ejectionVelocity: 1, + velocityVariance: 0.25, emitterLifetime: 1000, inheritedVelFactor: 0.1, particleOptions: {