set player on platform at start; player falls; configurable jump accelleration and graavity; game_loop is pausable;

Author: Austin Putman, austinfromboston & Cooper Quintin, cooperq

.gitignore

@@ -1,2 +1,3 @@
 **swp
 .DS_Store
+.idea

client/index.html

@@ -13,7 +13,7 @@
 	<script type="text/javascript">
   $(function(){
     game = new Game();
-    player = new Player( {name: prompt('What is your name?') });
+    player = new Player( {name: prompt('What is your name?'), position: {x:400 , y: 460}});
 	});
 	</script>
   </head>

client/js/avatar.js

@@ -6,7 +6,7 @@ Avatar = function(options){
     right: false
   };
   this.velocity = {x:0, y:0};
-  this.position = {x:0,y:0};
+  this.position = options.position || {x:0, y:0};
   this.dom_element = $('<div id="avatar-'+this.id+'" class="avatar"><div class="avatar-name">'+this.name+'</div></div>') 
 };
 
@@ -20,12 +20,14 @@ Avatar.prototype = {
   },
 
   accelerate_up: function(){
-    this.velocity.y++;
+    this.velocity.y += AVATAR_JUMP_ACCEL;
   },
 
   update_position : function(){
     if(this.move.left) this.accelerate_left();
     if(this.move.right) this.accelerate_right();
+    //deal with gravity
+    this.velocity.y += GRAVITY;
 
     this.position.x += this.velocity.x;
     this.position.y += this.velocity.y;

client/js/config.js

@@ -1,5 +1,7 @@
 ONE_GAME_TICK = 50;
+GRAVITY=.3;
 AVATAR_RUN_ACCEL = 3;
+AVATAR_JUMP_ACCEL = -10;
 AVATAR_FRICTION = 0.5;
 
 Config = {

client/js/game.js

@@ -17,13 +17,18 @@ var Game = function() {
   self.build_display = function(){
     //load level
     $('#level-container').html(self.current_level.html);
-    self.next_tick();
+    //self.next_tick();
   };
   self.next_tick = function(){
     self.update_sprites();
     self.refresh_display();
   };
-  setInterval(function() { self.next_tick(); }, ONE_GAME_TICK);
+
+  var loopTimer = setInterval(function() { self.next_tick(); }, ONE_GAME_TICK);
+
+  self.pause = function() {
+    clearInterval(loopTimer);
+  };
 
   return self;
 }

client/js/player.js

@@ -1,8 +1,9 @@
 var Player = function( options ) {
   options = options || {};
 	options.name = options.name || "anonymous";
+  
 
-  this.avatar = new Avatar({name:options.name});
+  this.avatar = new Avatar(options);
 
   this.initialize_keyboard_bindings();
 

client/spec/avatar_spec.js

@@ -1,14 +1,24 @@
 describe('Avatar', function() {
   var player, avatar;
+  beforeEach(function() {
+    game = new Game();
+    player = new Player('fred');
+    avatar = player.avatar;
+  });
 
   describe('accelerate_up', function() {
-    beforeEach(function() {
-      player = new Player('fred');
-      avatar = player.avatar;
-    });
-    it('should add 1 to the velocity.y', function() {
+    it('should subtract 1 from the velocity.y', function() {
       avatar.accelerate_up();
-      expect(avatar.velocity.y).toEqual(1);
+      expect(avatar.velocity.y).toEqual(AVATAR_JUMP_ACCEL);
+    });
+  });
+  describe('gravity', function() {
+    it("every game tick should add to velocity.y", function() {
+      expect(avatar.velocity.y).toEqual(0);
+      jasmine.Clock.tick(ONE_GAME_TICK);
+      expect(avatar.velocity.y).toEqual(GRAVITY);
+      jasmine.Clock.tick(ONE_GAME_TICK);
+      expect(avatar.velocity.y).toEqual(GRAVITY * 2);
     });
   });
 });

client/spec/game_spec.js

@@ -42,13 +42,25 @@ describe("Game", function() {
     expect(game.next_tick.calls.length).toBe(4);
   });
 
+  it('should be possible to stop the game loop', function() {
+    spyOn(game, 'next_tick').andCallThrough();
+    jasmine.Clock.tick(ONE_GAME_TICK );    
+    jasmine.Clock.tick(ONE_GAME_TICK );    
+    expect(game.next_tick.calls.length).toBe(2);
+    game.pause();
+    jasmine.Clock.tick(ONE_GAME_TICK );    
+    jasmine.Clock.tick(ONE_GAME_TICK );    
+    expect(game.next_tick.calls.length).toBe(2);
+  });
+
 
   describe('on next_tick', function(){
     describe('refresh_display',function(){
       describe("moves the .avatar div", function(){
         beforeEach(function(){
           game = new Game();
           player = new Player();
+          game.next_tick();
         });    
 
         it('should move left when player presses left', function(){

client/spec/player_spec.js

@@ -23,6 +23,12 @@ describe("Player", function() {
     it('should start in position 0', function() {
       expect(player.avatar.position.x).toEqual(0);
     });
+
+    it("should be possible to define the initial position", function() {
+        player = new Player({position: {x:360, y:550}});
+        expect(player.avatar.position.x).toEqual(360);
+        expect(player.avatar.position.y).toEqual(550);
+   });
 
     it("should display the player's name in #hello div", function() {
       $('#jasmine_content').html('<div id="hello"></div>');
@@ -70,20 +76,18 @@ describe("Player", function() {
 
     });
 
-    describe("on_up_arrow", function() {
+    describe("on up arrow", function() {
       beforeEach(function() {
-        var event = jQuery.Event('keydown');
-        event.keyCode = Config.key_codes.up;
-        $game_container.trigger(event);
+        simulate_up_key_press();
       });
 
       it('should change velocity on keydown', function(){
-        expect(player.avatar.velocity.y).toEqual(1);
+        expect(player.avatar.velocity.y).toEqual(AVATAR_JUMP_ACCEL);
       });
 
       it('should move up', function(){
         game.next_tick();
-        expect(player.avatar.position.y).toEqual(1);
+        expect(player.avatar.position.y).toEqual(AVATAR_JUMP_ACCEL + GRAVITY);
       });
 
     });