changed a function name

Thomas · Thomas · commit f5c7830c4a9f · 2014-02-20T15:11:54.000+01:00
diff --git a/2-flappy_bird/flappy_bird.zip b/2-flappy_bird/flappy_bird.zip
diff --git a/2-flappy_bird/flappy_bird/main.js b/2-flappy_bird/flappy_bird/main.js
@@ -26,16 +26,16 @@ game_state.main.prototype = {
         // Add gravity to the bird to make it fall
         this.bird.body.gravity.y = 1000; 
 
-        // Call the 'flap' function when the spacekey is hit
+        // Call the 'jump' function when the spacekey is hit
         var space_key = this.game.input.keyboard.addKey(Phaser.Keyboard.SPACEBAR);
-        space_key.onDown.add(this.flap, this); 
+        space_key.onDown.add(this.jump, this); 
 
         // Create a group of 20 pipes
         this.pipes = game.add.group();
         this.pipes.createMultiple(20, 'pipe');  
 
-        // Timer that calls 'add_row_pipes' ever 1.5 seconds
-        this.timer = this.game.time.events.loop(1500, this.add_row_pipes, this);           
+        // Timer that calls 'add_row_of_pipes' ever 1.5 seconds
+        this.timer = this.game.time.events.loop(1500, this.add_row_of_pipes, this);           
 
         // Add a score label on the top left of the screen
         this.score = 0;
@@ -54,7 +54,7 @@ game_state.main.prototype = {
     },
 
     // Make the bird jump 
-    flap: function() {
+    jump: function() {
         // Add a vertical velocity to the bird
         this.bird.body.velocity.y = -350;
     },
@@ -84,7 +84,7 @@ game_state.main.prototype = {
     },
 
     // Add a row of 6 pipes with a hole somewhere in the middle
-    add_row_pipes: function() {
+    add_row_of_pipes: function() {
         var hole = Math.floor(Math.random()*5)+1;
         
         for (var i = 0; i < 8; i++)
diff --git a/2-flappy_bird/flappy_bird/no_comments.js b/2-flappy_bird/flappy_bird/no_comments.js
@@ -0,0 +1,65 @@
+var game = new Phaser.Game(400, 490, Phaser.AUTO, 'game_div');
+var game_state = {};
+
+game_state.main = function() { };  
+game_state.main.prototype = {
+
+    preload: function() { 
+        this.game.stage.backgroundColor = '#71c5cf';
+        this.game.load.image('bird', 'assets/bird.png');  
+        this.game.load.image('pipe', 'assets/pipe.png');      
+    },
+
+    create: function() { 
+        this.bird = this.game.add.sprite(100, 245, 'bird');
+        this.bird.body.gravity.y = 1000; 
+        
+        var space_key = this.game.input.keyboard.addKey(Phaser.Keyboard.SPACEBAR);
+        space_key.onDown.add(this.jump, this); 
+        
+        this.pipes = game.add.group();
+        this.pipes.createMultiple(20, 'pipe');  
+        this.timer = this.game.time.events.loop(1500, this.add_row_of_pipes, this);           
+
+        this.score = 0;
+        var style = { font: "30px Arial", fill: "#ffffff" };
+        this.label_score = this.game.add.text(20, 20, "0", style);  
+    },
+
+    update: function() {
+        if (this.bird.inWorld == false)
+            this.restart_game(); 
+
+        this.game.physics.overlap(this.bird, this.pipes, this.restart_game, null, this);      
+    },
+
+    jump: function() {
+        this.bird.body.velocity.y = -350;
+    },
+
+    restart_game: function(bird, pipe) {
+        this.game.time.events.remove(this.timer);
+        this.game.state.start('main');
+    },
+
+    add_one_pipe: function(x, y) {
+        var pipe = this.pipes.getFirstDead();
+        pipe.reset(x, y);
+        pipe.body.velocity.x = -200; 
+        pipe.outOfBoundsKill = true;
+    },
+
+    add_row_of_pipes: function() {
+        var hole = Math.floor(Math.random()*5)+1;
+        
+        for (var i = 0; i < 8; i++)
+            if (i != hole && i != hole +1) 
+                this.add_one_pipe(400, i*60+10);   
+    
+        this.score += 1;
+        this.label_score.content = this.score;  
+    },
+};
+
+game.state.add('main', game_state.main);  
+game.state.start('main'); 
