diff --git a/dev/lib/game/entities/paddle-player.js b/dev/lib/game/entities/paddle-player.js index 311c6b3..22de6d2 100644 --- a/dev/lib/game/entities/paddle-player.js +++ b/dev/lib/game/entities/paddle-player.js @@ -6,7 +6,7 @@ ig.module( ) .defines(function(){ EntityPaddlePlayer = EntityPaddle.extend({ - animSheet: new ig.AnimationSheet( 'media/paddle-player.png', 30, 96 ), + animSheet: new ig.AnimationSheet('media/paddle-player.png', 30, 120), update: function(){ if (ig.input.state('up')) { diff --git a/dev/lib/game/entities/paddle.js b/dev/lib/game/entities/paddle.js index 2fe2caa..bcb61ed 100644 --- a/dev/lib/game/entities/paddle.js +++ b/dev/lib/game/entities/paddle.js @@ -11,11 +11,11 @@ EntityPaddle = ig.Entity.extend({ name: 'paddle', scores: 0, // TODO: whats this? - size: {x: 30, y: 96}, + size: {x: 30, y: 120}, collides: ig.Entity.COLLIDES.FIXED, type: ig.Entity.TYPE.A, - animSheet: new ig.AnimationSheet( 'media/paddle.png', 30, 96 ), + animSheet: new ig.AnimationSheet('media/paddle.png', 30, 120), maxVel: {x: 0, y: 400}, diff --git a/dev/lib/game/levels/level1.js b/dev/lib/game/levels/level1.js index e6195f3..eef02f0 100755 --- a/dev/lib/game/levels/level1.js +++ b/dev/lib/game/levels/level1.js @@ -1,6 +1,6 @@ ig.module( 'game.levels.level1' ) .requires( 'impact.image','game.entities.paddle-enemy','game.entities.paddle-player','game.entities.ball','game.entities.goal' ) .defines(function(){ -LevelLevel1=/*JSON[*/{"entities":[{"type":"EntityPaddleEnemy","x":32,"y":148},{"type":"EntityPaddlePlayer","x":564,"y":148},{"type":"EntityBall","x":300,"y":184},{"type":"EntityGoal","x":576,"y":48,"settings":{"size":{"x":48,"y":288},"owner":"human"}},{"type":"EntityGoal","x":0,"y":48,"settings":{"size":{"x":48,"y":288},"owner":"ai"}}],"layer":[{"name":"bg","width":3,"height":2,"linkWithCollision":false,"visible":1,"tilesetName":"media/bg.png","repeat":false,"preRender":false,"distance":"1","tilesize":250,"foreground":false,"data":[[1,1,1],[1,1,1]]},{"name":"board","width":13,"height":8,"linkWithCollision":false,"visible":1,"tilesetName":"media/tileset.png","repeat":false,"preRender":false,"distance":"1","tilesize":48,"foreground":false,"data":[[1,2,1,1,1,8,9,10,1,2,2,1,1],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[2,1,1,2,1,1,1,1,2,2,2,2,1]]},{"name":"collision","width":13,"height":8,"linkWithCollision":false,"visible":0,"tilesetName":"","repeat":false,"preRender":false,"distance":1,"tilesize":48,"foreground":false,"data":[[1,1,1,1,1,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,1,1]]}]}/*]JSON*/; +LevelLevel1=/*JSON[*/{"entities":[{"type":"EntityPaddleEnemy","x":32,"y":132},{"type":"EntityPaddlePlayer","x":560,"y":128},{"type":"EntityBall","x":300,"y":184},{"type":"EntityGoal","x":576,"y":48,"settings":{"size":{"x":48,"y":288},"owner":"human"}},{"type":"EntityGoal","x":0,"y":48,"settings":{"size":{"x":48,"y":288},"owner":"ai"}}],"layer":[{"name":"bg","width":3,"height":2,"linkWithCollision":false,"visible":1,"tilesetName":"media/bg.png","repeat":false,"preRender":false,"distance":"1","tilesize":250,"foreground":false,"data":[[1,1,1],[1,1,1]]},{"name":"board","width":13,"height":8,"linkWithCollision":false,"visible":1,"tilesetName":"media/tileset.png","repeat":false,"preRender":false,"distance":"1","tilesize":48,"foreground":false,"data":[[1,2,1,1,1,8,9,10,1,2,2,1,1],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[5,0,0,0,0,0,0,0,0,0,0,0,5],[2,1,1,2,1,1,1,1,2,2,2,2,1]]},{"name":"collision","width":13,"height":8,"linkWithCollision":false,"visible":0,"tilesetName":"","repeat":false,"preRender":false,"distance":1,"tilesize":48,"foreground":false,"data":[[1,1,1,1,1,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,1,1]]}]}/*]JSON*/; LevelLevel1Resources=[new ig.Image('media/bg.png'), new ig.Image('media/tileset.png')]; }); \ No newline at end of file diff --git a/dev/media/paddle-player.png b/dev/media/paddle-player.png index 2e5dd84..acdc7dd 100644 Binary files a/dev/media/paddle-player.png and b/dev/media/paddle-player.png differ diff --git a/dev/media/paddle.png b/dev/media/paddle.png index 859dbff..72d82e4 100644 Binary files a/dev/media/paddle.png and b/dev/media/paddle.png differ diff --git a/dev/media/paddle2-player.png b/dev/media/paddle2-player.png deleted file mode 100644 index a03e611..0000000 Binary files a/dev/media/paddle2-player.png and /dev/null differ diff --git a/dev/media/paddle2.png b/dev/media/paddle2.png deleted file mode 100644 index 6fbf18c..0000000 Binary files a/dev/media/paddle2.png and /dev/null differ