multi-directional kitty move... and restart x position too

courtyenn · May 27, 2016 · 7fd6f23 · 7fd6f23
1 parent f22278c
commit 7fd6f23
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/public/index.html b/public/index.html
@@ -54,7 +54,7 @@ <h1 class="txt-center">PAUSED</h1>
       <h3 class="txt-center">Press 'O' To Continue</h3>
     </div>
     <audio loop="true"></audio>
-    <canvas id="game" class="invisible"></canvas>
+    <canvas id="game" class="invisible">Your browser doesn't support canvas. :(</canvas>
     <button id="mute">MUTE</button>
   </div>
 </div>

diff --git a/public/js/keyHandler.js b/public/js/keyHandler.js
@@ -6,12 +6,14 @@ var KeyHandler = new function(){
     var action = config.action;
     var condition = config.conditionBeforeFiringNextAction;
     var allowMultipleFire = config.allowMultipleFire || false;
+    var releaseAction = config.releaseAction || null;
     if(this.keyMap[key] !== null){
       this.keyMap[key] = {
         keyDownAction: action,
         pressed: false,
         wasPressed: false,
-        allowMultipleFire: allowMultipleFire
+        allowMultipleFire: allowMultipleFire,
+        releaseAction: releaseAction
       };
       if(condition){
         this.keyMap[key].condition = condition;
@@ -25,23 +27,24 @@ var KeyHandler = new function(){
       if(!this.keyMap[key].pressed && this.keyMap[key].allowMultipleFire === false){
         if(this.keyMap[key].condition && this.keyMap[key].condition()){
           this.keyMap[key].keyDownAction();
-          this.keyMap[key].wasPressed = false;
-          this.keyMap[key].pressed = true;
         }
       }
       else if(this.keyMap[key].allowMultipleFire === true){
         this.keyMap[key].keyDownAction();
-        this.keyMap[key].wasPressed = false;
-        this.keyMap[key].pressed = false;
       }
     }
+    this.keyMap[key].wasPressed = false;
+    this.keyMap[key].pressed = true;
   };
 
   this.handleKeyRelease = function(key){
     var key = String.fromCharCode(event.keyCode).toLowerCase();
     if(this.keyMap[key] && this.keyMap[key].pressed){
       this.keyMap[key].wasPressed = true;
       this.keyMap[key].pressed = false;
+      if(this.keyMap[key].releaseAction){
+        this.keyMap[key].releaseAction();
+      }
     }
   }
 

diff --git a/public/js/main.js b/public/js/main.js
@@ -32,6 +32,7 @@ var kitty_jump = (function(){
   var time = 0;
   var player = {
     startY: CANVAS_HEIGHT-100,
+    startX: 30,
     x: 30,
     y: CANVAS_HEIGHT-100,
     yStep: 1,
@@ -49,13 +50,15 @@ var kitty_jump = (function(){
     isJumping: false,
     isFalling: false,
     canJump: true,
+    moveDistance: 0,
     draw: function(){
       if(this.isJumping){
         this.jump();
       }
       else if(this.isFalling) {
         this.fall();
       }
+      this.move();
       context.drawImage(player.image, this.x, this.y);
     },
     shoot: function() {
@@ -114,12 +117,17 @@ var kitty_jump = (function(){
         }
       }
     },
-    move: function(key){
+    move: function(){
+      if(currentGameState !== 300){
+        this.x += this.moveDistance;
+      }
+    },
+    setMove: function(key){
       if(key === 'a'){
-        this.x -= 15;
+        this.moveDistance = -15;
       }
       else if(key === 'd'){
-        this.x += 15;
+        this.moveDistance = 15;
       }
     }
   };
@@ -377,7 +385,6 @@ var kitty_jump = (function(){
 
     I.explode = function() {
       this.active = false;
-      // Extra Credit: Add an explosion graphic
     };
 
     return I;
@@ -553,18 +560,27 @@ var kitty_jump = (function(){
   KeyHandler.keyMap = keyCodes;
   var jumpConfig = {
     key: 'w',
-    action: player.jumpOn.bind(player),
+    action: function(){
+      player.isJumping = true;
+    },
     conditionBeforeFiringNextAction: checkIfPlayerShouldJump
   };
   var moveConfig = {
     key: 'a',
-    action: player.move.bind(player, 'a'),
-    allowMultipleFire: true
+    action: function(){
+      player.moveDistance = -15;
+    },
+    allowMultipleFire: true,
+    releaseAction: function(){
+      player.moveDistance = 0;
+    }
   };
   KeyHandler.setKeyDownAction(jumpConfig);
   KeyHandler.setKeyDownAction(moveConfig);
   moveConfig.key = 'd';
-  moveConfig.action = player.move.bind(player, 'd');
+  moveConfig.action = function(){
+    player.moveDistance = 15;
+  };
   KeyHandler.setKeyDownAction(moveConfig);
 
 }
@@ -607,6 +623,7 @@ function loop(){
 function init(){
   player.lives.count = 9;
   player.y = player.startY;
+  player.x = player.startX;
   player.canJump = true;
   player.isJumping = false;
   player.isFalling = false;