entityjs 0.3.1 → 0.3.2

data/templates/platform/tests/displays/hero_test.js

@@ -0,0 +1,73 @@
+module('hero', lazy('hero'));
+
+test('has flicks', function(){
+  
+  expectFlicker(hero, 'idle');
+  expectFlicker(hero, 'run');
+  expectFlicker(hero, 'jump');
+  expectFlicker(hero, 'ladder');
+  
+});
+
+test('has components', function(){
+  ok(hero.has('hero.png tsprite update force flicker body'));
+});
+
+test('flickers idle when not moving', function(){
+  
+  hero.flicker('run');
+  
+  stub(hero, 'isIdle', true);
+  
+  hero.update();
+  
+  ok(hero.flickering('idle'));
+  
+});
+
+test('moves right', function(){
+  
+  expectCall(hero, 'flicker');
+  
+  keypress('d', function(){
+    hero.update();
+  });
+  
+  
+});
+
+test('moves left', function(){
+  
+  expectCall(hero, 'flicker');
+  
+  keypress('a', function(){
+    hero.update();
+  });
+  
+});
+
+test('jumps when w pressed', function(){
+  
+  //setup requrements for jumping
+  hero.ground = true;
+  hero.jump = false;
+  
+  expectCall(hero, 'forceJump');
+  
+  keypress('w', function(){
+    hero.update();
+  });
+  
+});
+
+test('resets jump when hitting the y axis', function(){
+  
+  hero.ground = false;
+  hero.jump = true;
+  
+  hero.jumpReset(false, true, 10, 999);
+  
+  ok(hero.ground);
+  ok(!hero.jump);
+  
+});

data/templates/platform/tests/{display → displays}/tile_test.js

@@ -2,6 +2,6 @@ module('tile', lazy('tile'));
 
 test('valid', function(){
   
-  ok(e.has('tsprite tiles.png'))
+  ok(tile.has('tsprite tiles.png'))
   
 });

data/templates/platform/tests/displays/tsprite_test.js

@@ -0,0 +1,8 @@
+module('tsprite', lazy('tsprite'));
+
+test('valid', function(){
+  
+  eq(tsprite.sizeX, re.tile.sizeX)
+  eq(tsprite.sizeY, re.tile.sizeY)
+  
+});

data/templates/platform/tests/items/coin_test.js

@@ -2,27 +2,27 @@ module('coin', lazy('coin'));
 
 test('valid', function(){
   
-  expectListener(e, 'update');
+  expectEvent(coin, 'update');
   
-  expectFlicker(e, 'glow');
+  expectFlicker(coin, 'glow');
   
 });
 
 test('touch should collect', function(){
   
-  expectCall(e, 'collect');
+  expectCall(coin, 'collect');
   
-  e.touch();
+  coin.touch();
   
-})
+});
 
 test('collect should dispose and stuff', function(){
   
-  expectCall(e.sfx, 'play');
-  expectCall(e, 'dispose');
+  expectCall(coin.sfx, 'play');
+  expectCall(coin, 'dispose');
   
-  expectTrigger(e, 'collect');
+  expectTrigger(coin, 'collect');
   
-  e.collect();
+  coin.collect();
   
-})
+});

data/templates/platform/tests/items/item_test.js

@@ -2,35 +2,35 @@ module('item', lazy('item'));
 
 test('has components', function(){
   
-  ok(e.has('tsprite update items.png'))
+  ok(item.has('tsprite update items.png'))
   
 });
 
 test('update method', function(){
   
   //touching default to false
-  ok(!e.touching)
+  ok(!item.touching)
   
-  expectListener(e, 'update');
+  expectEvent(item, 'update');
   
 });
 
 test('hitting hero should call touch', function(){
   
-  expectCall(e, 'touch');
+  expectCall(item, 'touch');
   
   //fake hitBody and always return true
-  stub(e.hero, 'hitBody', function(){ return true; });
+  stub(item.hero, 'hitBody', true);
   
-  e.item_update();
+  item.item_update();
   
   //should call untouch afterwards
   
   //force hitbody to always return false now...
-  stub(e.hero, 'hitBody', function(){ return false; });
+  stub(item.hero, 'hitBody', false);
   
-  expectCall(e, 'untouch');
+  expectCall(item, 'untouch');
   
-  e.item_update();
+  item.item_update();
   
 });

data/templates/platform/tests/items/spring_test.js

@@ -2,7 +2,7 @@ module('spring', lazy('spring'));
 
 test('flicker animation', function(){
   
-  expectFlicker(e, 'bounce');
+  expectFlicker(spring, 'bounce');
   
 });
 
@@ -14,8 +14,8 @@ test('bounce on touch and key press', function(){
     return true;
   });
   
-  expectCall(e, 'flicker');
+  expectCall(spring, 'flicker');
   
-  e.touch();
+  spring.touch();
   
 });

data/templates/platform/tests/scenes/load_test.js

@@ -2,10 +2,11 @@ module('load');
 
 test('load stuff', function(){
   
-  stub(re.scene('home'), 'enter', function(){start()});
+  stub(re.scene('home'), 'enter', function(){start();});
   
   re.scene('load').enter();
   
   stop();
   
+  expect(0)
 });

data/templates/platform/tests/{util → utils}/counter_test.js

@@ -2,8 +2,8 @@ module('counter', lazy('counter'));
 
 test('add value', function(){
   
-  e.add(1);
+  counter.add(1);
   
-  eq(e.add(), 1);
+  eq(counter.add(), 1);
   
 })

data/templates/platform/tests/{util → utils}/level_test.js

@@ -26,4 +26,7 @@ test('teardown level', function(){
   
   //todo write tests...
   //ok(re('hero').length == 0)
+  
+  //stops qunit from complaining
+  expect(0)
 });

data/templates/pong/config.yml

@@ -0,0 +1,22 @@
+# Configure your game settings
+
+width: 400
+height: 300
+canvas-id: game-canvas
+
+#files to ignore in /scripts
+scripts-ignore:
+  
+#specify files to be loaded first in /scripts
+order:
+  
+#components to ignore in the entityjs source
+#reduce file size by ignoring unused components
+entity-ignore:
+  socket
+  wait
+  group
+
+#ignore tests in /tests
+tests-ignore:
+  

data/templates/pong/readme.txt

@@ -0,0 +1,3 @@
+----------------- Pong ---------------
+
+A simple pong example game.

data/templates/pong/scripts/controls/ai.js

@@ -0,0 +1,30 @@
+re.c('ai')
+.requires('paddle update point')
+.defines({
+  
+  update:function(){
+    
+    var ball = re('ball')[0];
+    
+    if(this.distance(ball.posX, this.posY) > 150) return;
+    
+    if(ball.posY + ball.hsizeY > this.posY + this.hsizeY){
+      this.posY += this.speed;
+    } else if(ball.posY - ball.hsizeY < this.posY - this.hsizeX){
+      this.posY -= this.speed;
+    }
+    
+    this.checkBounds();
+  }
+  
+})
+.init(function(){
+  
+  this.on('update', this.update);
+  
+})
+.dispose(function(){
+  
+  this.off();
+  
+});

data/templates/pong/scripts/controls/arena.js

@@ -0,0 +1,33 @@
+re.c('arena')
+.defines({
+  
+  startRound:function(){
+    this.ball = re.e('ball');
+    this.ball.reset();
+  },
+  
+  stopRound:function(){
+    //reset players
+    if(this.ball) this.ball.dispose();
+    return this;
+  },
+  
+  restartRound:function(){
+    this.stopRound();
+    this.startRound();
+  }
+  
+})
+.init(function(){
+  
+  //player
+  re.e('player').alignRight(-10);
+  
+  //ai or player 2
+  this.paddle2 = re.e('paddle ai');
+  
+})
+.dispose(function(){
+  re('paddle').dispose();
+  this.stopRound();
+});

data/templates/pong/scripts/controls/hitmap.js

@@ -0,0 +1,54 @@
+re.c('hitmap')
+.defines({
+  
+  //things to note:
+  //paddle and ball are centered to make calculations easier
+  checkHit:function(obj){
+    var res = {
+      posX:obj.posX,
+      posY:obj.posY
+    };
+    
+    //check collisions against top and bottom
+    if(obj.posY - obj.hsizeY < 0){
+      res.hitY = 1;
+      res.posY = obj.hsizeY;
+    } else if(obj.posY + obj.hsizeY > re.sys.sizeY){
+      res.hitY = 1;
+      res.posY = re.sys.sizeY - obj.hsizeY;
+    }
+    
+    //check hits against right and left
+    if(obj.posX - obj.hsizeX < 0){
+      res.hitX = 1;
+      this.trigger('score:left');
+    } else if(obj.posX + obj.hsizeX > re.sys.sizeX){
+      res.hitX = 1;
+      this.trigger('score:right');
+    }
+    
+    //check hits on paddles
+    re('paddle').each(function(){
+      
+      if(this.hit(obj)){
+        res.hitX = 1;
+        
+        var push = obj.hsizeX + this.hsizeX + 1;
+        
+        if(this.posX > obj.posX){
+          push *= -1;
+        }
+        res.posX = this.posX + push;
+        
+      }
+      
+    });
+    
+    //if everythings ok, move forward
+    if(!res.hitX) res.posX += obj.velX;
+    if(!res.hitY) res.posY += obj.velY;
+    
+    return res;
+  }
+  
+});

data/templates/pong/scripts/controls/player.js

@@ -0,0 +1,24 @@
+re.c('player')
+.requires('update paddle')
+.defines({
+  
+  upKey:'w',
+  downKey:'s',
+  
+  update:function(){
+    
+    if(re.pressed(this.upKey)){
+      this.posY -= this.speed;
+    } else if(re.pressed(this.downKey)){
+      this.posY += this.speed;
+    }
+    
+    this.checkBounds();
+  }
+  
+})
+.init(function(){
+  
+  this.on('update', this.update);
+  
+});

data/templates/pong/scripts/controls/twoarena.js

@@ -0,0 +1,14 @@
+re.c('twoarena')
+.requires('arena')
+.init(function(){
+  
+  //remove ai and add player controls
+  this.paddle2
+  .removeComp('ai')
+  .comp('player')
+  .attr({
+    upKey:'up',
+    downKey:'down'
+  });
+  
+});

data/templates/pong/scripts/displays/ball.js

@@ -0,0 +1,29 @@
+re.c('ball')
+.requires('rect align force limit')
+.defines({
+  color:'#fff',
+  sizeX:6,
+  sizeY:6,
+  
+  hsizeX:3,
+  hsizeY:3,
+  
+  regX:3,
+  regY:3,
+  
+  resX:1.1,
+  resY:1.1,
+  
+  friX:1,
+  friY:1,
+  
+  initVel:4,
+  
+  reset:function(){
+    this.alignHor();
+    this.alignVer();
+    this.velX = re.random(this.initVel * 0.5, this.initVel) * re.random([-1, 1]);
+    this.velY = re.random(this.initVel * 0.5, this.initVel) * re.random([-1, 1]);
+  }
+  
+});

data/templates/pong/scripts/displays/counter.js

@@ -0,0 +1,22 @@
+re.c('counter')
+.requires('text align')
+.defines({
+  
+  count:-1,
+  maxCount:5,
+  
+  up:function(){
+    this.count++;
+    
+    this.text(this.count);
+    
+    if(this.count >= this.maxCount){
+      this.trigger('max', this.name);
+    }
+  }
+  
+})
+.init(function(){
+  //setup text
+  this.up();
+})

data/templates/pong/scripts/displays/paddle.js

@@ -0,0 +1,22 @@
+re.c('paddle')
+.requires('rect align limit hit')
+.defines({
+  color:'#fff',
+  sizeX:6,
+  sizeY:30,
+  
+  hsizeX:3,
+  hsizeY:15,
+  
+  regX:3,
+  regY:15,
+  
+  alignVer:0,
+  alignLeft:10,
+  speed:10,
+  
+  checkBounds:function(){
+    this.limit('posY', this.hsizeY, re.sys.sizeY - this.hsizeY);
+  }
+  
+});

data/templates/pong/scripts/init.js

@@ -0,0 +1,9 @@
+re.ready(function(){
+  
+  re.sys.init(re.canvas)
+  .attr('clearColor', '#000')
+  .start();
+  
+  re.scene('home').enter();
+  
+});

data/templates/pong/scripts/scenes/game.js

@@ -0,0 +1,61 @@
+re.scene('game')
+.enter(function(twoPlayer){
+  
+  re.hitmap = re.e('hitmap');
+  
+  //setup counters
+  
+  //counter for player 1
+  var p1 = re.e('counter')
+  .alignHor(40)
+  .on('max', function(){
+    var message = 'You win!';
+    if(twoPlayer) message = 'Player 1 wins!';
+    
+    re.scene('over').enter(message);
+  });
+  
+  //counter for player 2
+  var p2 = re.e('counter')
+  .alignHor(-60)
+  .on('max', function(){
+    var message = 'You lose!';
+    
+    if(twoPlayer) message = 'Player 2 wins!';
+    
+    re.scene('over').enter(message);
+  });
+  
+  //setup arena playing field
+  var arena = re.e((twoPlayer)?'twoarena':'arena');
+  
+  //setup hitmap
+  re.hitmap
+  .on('score:left', function(){
+    arena.restartRound();
+    p1.up();
+  })
+  .on('score:right', function(){
+    arena.restartRound();
+    p2.up();
+  });
+  
+  //exit game
+  re.e('keyboard')
+  .on('keyup:q', function(){
+    re.scene('home').enter();
+  });
+  
+  //start game
+  arena.startRound();
+  
+})
+.exit(function(){
+  
+  re('arena').dispose();
+  re('counter').dispose();
+  
+  re.hitmap.dispose();
+  delete re.hitmap;
+  
+});

data/templates/pong/scripts/scenes/home.js

@@ -0,0 +1,55 @@
+re.scene('home')
+.enter(function(){
+  
+  //default text color to white
+  re.c('text')
+  .defines('textColor', '#fff')
+  .requires('align');
+  
+  //prevent default for all keys used in game
+  re.preventDefault('left right up down');
+  
+  re.e('text')
+  .attr({
+    font:'30px sans-serif',
+    text:'Pong',
+    alignHor:0,
+    alignVer:-100
+  });
+  
+  re.e('text keyboard')
+  .attr({
+    text:'Press z to start!',
+    alignHor:0,
+    alignVer:0
+  })
+  .on('keyup:z', function(){
+    
+    re.scene('game').enter(false);
+  })
+  .on('keyup:x', function(){
+    re.scene('game').enter(true);
+  });
+  
+  re.e('text')
+  .attr({
+    text:'Press x for two player',
+    alignHor:0,
+    alignVer:25
+  });
+  
+  //credits
+  re.e('text')
+  .attr({
+    text:'http://www.entityjs.com',
+    alignBottom:-5,
+    alignLeft:5
+  });
+  
+})
+.exit(function(){
+  
+  //remove all draw objects
+  re('draw').dispose();
+
+});

data/templates/pong/scripts/scenes/over.js

@@ -0,0 +1,29 @@
+re.scene('over')
+.enter(function(message){
+  
+  re.e('text')
+  .attr({
+    font:'30px sans-serif',
+    text:message,
+    alignVer:-60,
+    alignHor:0
+  })
+  
+  re.e('text keyboard')
+  .attr({
+    text:'Press Z to continue',
+    alignVer:-20,
+    alignHor:0
+  })
+  .on('keyup:z', function(){
+    
+    re.scene('home').enter();
+    
+  });
+  
+})
+.exit(function(){
+  
+  re('text').dispose();
+  
+});

data/templates/pong/tests/controls/ai_test.js

@@ -0,0 +1,34 @@
+module('controls/ai', {
+  setup:function(){
+    ai = f('ai');
+    ball = f('ball');
+  },
+  teardown:function(){
+    ai.dispose();
+    ball.dispose();
+  }
+});
+
+test('move towards ball', function(){
+  
+  ball.posX = 50;
+  ball.posY = ai.posY + 40;
+  
+  expectValueUp(ai, 'posY');
+  
+  ai.update();
+  
+});
+
+test('move towards ball', function(){
+  
+  ball.posX = 50;
+  ball.posY = 10;
+  
+  ai.posY = 40;
+  
+  expectValueDown(ai, 'posY');
+  
+  ai.update();
+  
+});