And the boss is here B-)

amaneureka · May 2, 2016 · a5e508f · a5e508f
1 parent 928c5dd
commit a5e508f
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 37 deletions.
diff --git a/main.html → index.html b/main.html → index.html
diff --git a/js/brain.js b/js/brain.js
@@ -14,10 +14,10 @@ function startGame(tRexGameRunner)
     //      VELOCITY
     //
     //      UP
-    //      DOWN
+    //      NOTHING
     //
-    var perceptron = new Architect.Perceptron(3,5,3,2);
-    var learningRate = 0.4;
+    var perceptron = new Architect.Perceptron(3,20,20,2);
+    var learningRate = 0.03;
 
     var keyEvent = {
         JUMP: 38,
@@ -26,53 +26,87 @@ function startGame(tRexGameRunner)
 
     var jumpDragon = function()
     {
+        console.log("UP");
         tRexGameRunner.onKeyDown({
-            keyCode: keyEvent.JUMP
+            keyCode: keyEvent.JUMP,
+            type: 'touchstart'
         });
         tRexGameRunner.onKeyUp({
-            keyCode: keyEvent.JUMP
+            keyCode: keyEvent.JUMP,
+            type: 'touchend'
         });
     };
 
     var duckDragon = function()
     {
+        console.log("DOWN");
         tRexGameRunner.onKeyDown({
-            keyCode: keyEvent.DUCK
+            keyCode: keyEvent.DUCK,
+            type: 'touchstart'
         });
         tRexGameRunner.onKeyUp({
-            keyCode: keyEvent.DUCK
+            keyCode: keyEvent.DUCK,
+            type: 'touchend'
         });
     };
 
-    var Jumped = false;
-    var LastParams = null;
+    var LastParams = [0,0,1];
+    var LastRealParams = [0,0,1];
     var updateGame = function()
     {
         if (tRexGameRunner.crashed)
         {
-            if (Jumped)//So, we should not jump
+            //if (LastParams != null)
             {
-                perceptron.propagate(learningRate, [0, 1]);
-                if (LastParams != null)
+                var deltaFactor = ((LastParams[1]/LastParams[2]) * 10);
+                var deltaFactor2 = ((LastRealParams[1]/LastRealParams[2]) * 10);
+
+                //if (tRexGameRunner.tRex.xPos < LastParams[0])
+                //    deltaFactor *= -1;
+
+                //if (tRexGameRunner.tRex.xPos >= LastRealParams[0])
+                //    deltaFactor2 *= -1;
+
+                if (tRexGameRunner.tRex.jumpVelocity > 0 || tRexGameRunner.tRex.jumping)
                 {
-                    LastParams[0] = LastParams[0] - 1;
+                    //we hit it on foot :ouch:
+                    //if (LastRealParams != null)
+                    /*{
+                        //try to jump from a little farther
+                        LastRealParams[0] = LastRealParams[0] + deltaFactor2;
+                        perceptron.activate(LastRealParams);
+                        perceptron.propagate(learningRate*2, [0, 1]);
+                    }*/
+
                     perceptron.activate(LastParams);
+                    perceptron.propagate(learningRate, [0, 1]);
+
+                    //try to jump from a little nearer
+                    LastRealParams[0] = LastRealParams[0] + deltaFactor;
+                    perceptron.activate(LastRealParams);
                     perceptron.propagate(learningRate, [1, 0]);
-                    LastParams = null;
+
+                    console.log(":foot: " + deltaFactor + " " + deltaFactor2);
                 }
-                console.log("DON'T JUMP");
-            }
-            else
-            {
-                if (LastParams != null)
+                else
                 {
-                    LastParams[0] = LastParams[0] + 1;
+                    perceptron.activate(LastParams);
+
+                    //umm, we hit it on face :ouch: :ouch:
+                    //try to jump from a distance
+                    LastParams[0] = LastParams[0] + deltaFactor;
                     perceptron.activate(LastParams);
                     perceptron.propagate(learningRate, [1, 0]);
-                    LastParams = null;
+
+                    console.log(":face: " + deltaFactor);
                 }
-                console.log("JUMP");
             }
+
+            // Analytics
+            var distance = tRexGameRunner.distanceRan;
+            console.log("[GAME]:\tSCORE: " + distance)
+
+            //Restart :D !
             tRexGameRunner.restart();
         }
 
@@ -84,24 +118,33 @@ function startGame(tRexGameRunner)
             var params = [];
             params.push(obstacle.xPos);
             params.push(obstacle.size);
-            params.push(tRexGameRunner.currentSpeed);
-
+            params.push(Math.round(tRexGameRunner.currentSpeed * 10));
+            
             var output = perceptron.activate(params);
-            var maxConfidence = Math.max(...output);
-            if (output[0] == maxConfidence)
+            var confidence = output[0] - output[1] - 0.01;
+
+            if (confidence > 0)
             {
-                jumpDragon();
-                Jumped = true;
-                console.log("UP");
+                //Jump jump jump :D !
+                if (!tRexGameRunner.tRex.jumping)
+                {
+                    jumpDragon();
+                    LastParams = params;
+                }
             }
             else
             {
-                Jumped = false;
-                console.log("DOWN");
+                if (tRexGameRunner.tRex.jumping)
+                {
+                    duckDragon();
+                    LastParams = params;
+                }
             }
-            LastParams = params;
+            LastRealParams = params;
         }
-        setTimeout(updateGame, 1000/60);//60fps is perfect
+        //well well, our human mind can retain image upto 25ms i.e. 40fps
+        //obviously no brain is ideal so :p 20ms :D !
+        setTimeout(updateGame, 50);
     };
 
     //Go go go!

diff --git a/js/game.js b/js/game.js
@@ -424,7 +424,7 @@ Runner.prototype = {
         this.containerEl.style.width = this.dimensions.WIDTH + 'px';
         this.containerEl.style.height = this.dimensions.HEIGHT + 'px';
         this.distanceMeter.update(0, Math.ceil(this.distanceRan));
-        this.stop();
+        //this.stop();
       } else {
         this.tRex.draw(0, 0);
       }
@@ -793,7 +793,7 @@ Runner.prototype = {
    */
   onVisibilityChange: function(e) {
     if (document.hidden || document.webkitHidden || e.type == 'blur') {
-      this.stop();
+      //this.stop(); <-- don't pause the game
     } else if (!this.crashed) {
       this.tRex.reset();
       this.play();
@@ -1755,13 +1755,13 @@ Trex.prototype = {
    * @param {boolean} isDucking.
    */
   setDuck: function(isDucking) {
-    if (isDucking && this.status != Trex.status.DUCKING) {
+    /*if (isDucking && this.status != Trex.status.DUCKING) {
       this.update(0, Trex.status.DUCKING);
       this.ducking = true;
     } else if (this.status == Trex.status.DUCKING) {
       this.update(0, Trex.status.RUNNING);
       this.ducking = false;
-    }
+    }*/
   },
 
   /**