Sync with published result of episode 8.

meth-meth-method · Oct 17, 2017 · 650bbca · 650bbca
1 parent b9799cf
commit 650bbca
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/public/js/Entity.js b/public/js/Entity.js
@@ -11,6 +11,7 @@ export class Trait {
     }
 
     obstruct() {
+
     }
 
     update() {

diff --git a/public/js/entities.js b/public/js/entities.js
@@ -29,10 +29,7 @@ export function createMario() {
             }
 
             if (mario.go.distance > 0) {
-                if (
-                    (mario.vel.x > 0 && mario.go.dir < 0) ||
-                    (mario.vel.x < 0 && mario.go.dir > 0)
-                ) {
+                if ((mario.vel.x > 0 && mario.go.dir < 0) || (mario.vel.x < 0 && mario.go.dir > 0)) {
                     return 'break';
                 }
 

diff --git a/public/js/traits/Go.js b/public/js/traits/Go.js
@@ -19,7 +19,11 @@ export default class Go extends Trait {
         if (this.dir !== 0) {
             entity.vel.x += this.acceleration * deltaTime * this.dir;
 
-            if (!entity.jump || !entity.jump.falling) {
+            if (entity.jump) {
+                if (entity.jump.falling === false) {
+                    this.heading = this.dir;
+                }
+            } else {
                 this.heading = this.dir;
             }
 
@@ -31,7 +35,7 @@ export default class Go extends Trait {
         }
 
         const drag = this.dragFactor * entity.vel.x * absX;
-        entity.vel.x += -drag;
+        entity.vel.x -= drag;
 
         this.distance += absX * deltaTime;
     }

diff --git a/public/js/traits/Jump.js b/public/js/traits/Jump.js
@@ -9,6 +9,7 @@ export default class Jump extends Trait {
         this.engageTime = 0;
         this.requestTime = 0;
         this.gracePeriod = 0.1;
+        this.speedBoost = 0.3;
         this.velocity = 200;
     }
 
@@ -21,8 +22,8 @@ export default class Jump extends Trait {
     }
 
     cancel() {
-        this.requestTime = 0;
         this.engageTime = 0;
+        this.requestTime = 0;
     }
 
     obstruct(entity, side) {
@@ -39,14 +40,15 @@ export default class Jump extends Trait {
                 this.engageTime = this.duration;
                 this.requestTime = 0;
             }
+
             this.requestTime -= deltaTime;
         }
 
         if (this.engageTime > 0) {
-            entity.vel.y = -(this.velocity + Math.abs(entity.vel.x) * 0.3);
+            entity.vel.y = -(this.velocity + Math.abs(entity.vel.x) * this.speedBoost);
             this.engageTime -= deltaTime;
         }
 
-        --this.ready;
+        this.ready--;
     }
 }