Fixed explosion animation cycle

Philipp-S · Sep 20, 2020 · 40e6331 · 40e6331
1 parent 3c8e008
commit 40e6331
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/entity.ts b/entity.ts
@@ -69,11 +69,15 @@ class AnimatedBehavior extends Behavior {
     private time: number
     private duration: number
 
-    constructor(cycleDuration: number) {
+    constructor(cycleDuration: number, randomize:boolean) {
         super()
 
-        this.time = Math.random() * cycleDuration
         this.duration = cycleDuration
+        if (randomize) {
+            this.time = Math.random() * cycleDuration
+        } else {
+            this.time = 0
+        }
     }
 
     public update(entity: Entity, deltaTime: number, state:State) : void { 

diff --git a/mob.ts b/mob.ts
@@ -25,7 +25,7 @@ class Bird extends Entity {
         this.collisionRadiusSqare = CONST.MOB_BIRD_RADIUS * CONST.MOB_BIRD_RADIUS 
 
         this.behaviors.push(new SineMovementBehavior(this, CONST.MOB_BIRD_MOVE_RANGE, CONST.MOB_BIRD_MOVE_TIME, "x"))
-        this.behaviors.push(new AnimatedBehavior(CONST.MOB_BIRD_ANIMATION_LENGHT))        
+        this.behaviors.push(new AnimatedBehavior(CONST.MOB_BIRD_ANIMATION_LENGHT, true))        
     }
 }
 
@@ -38,7 +38,7 @@ class Ufo extends Entity {
         this.sprite.drawOrder = CONST.LAYER_MOBS
         this.collisionRadiusSqare = CONST.MOB_UFO_RADIUS * CONST.MOB_UFO_RADIUS 
 
-        this.behaviors.push(new AnimatedBehavior(CONST.MOB_UFO_ANIMATION_LENGHT))        
+        this.behaviors.push(new AnimatedBehavior(CONST.MOB_UFO_ANIMATION_LENGHT, true))        
         this.behaviors.push(new SineMovementBehavior(this, 600, 10, "x"))
         this.behaviors.push(new SineMovementBehavior(this, 200, 4, "y"))
     }

diff --git a/particle.ts b/particle.ts
@@ -8,7 +8,7 @@ class Particle extends Entity {
 
         this.behaviors.push(new SelfDestructBehavior(lifetime))
         if ("setProgress" in this.sprite) {
-            this.behaviors.push(new AnimatedBehavior(lifetime))
+            this.behaviors.push(new AnimatedBehavior(lifetime, false))
         }
 
     }