From 1586ec2bf4c6cb5b1c742ce81e325f14f2664d61 Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Sat, 12 Jul 2014 16:39:26 -0400 Subject: [PATCH 01/13] fixed a couple lines --- final/tower_man.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/final/tower_man.js b/final/tower_man.js index 0d425f4..dc90842 100644 --- a/final/tower_man.js +++ b/final/tower_man.js @@ -141,8 +141,8 @@ } Q.TileLayer.extend("TowerManMap",{ - init: function(p) { - this._super(p,{ + init: function() { + this._super({ type: SPRITE_TILES, dataAsset: 'level.json', sheet: 'tiles', From 6fe89981aa4926ee80aedadb6a58af5033ad10b3 Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Sat, 12 Jul 2014 17:04:14 -0400 Subject: [PATCH 02/13] Changed the colors. Added alternate sprites --- final/images/sprites.png | Bin 491 -> 257 bytes final/images/sprites2.png | Bin 0 -> 399 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 final/images/sprites2.png diff --git a/final/images/sprites.png b/final/images/sprites.png index 0521f2f144c4527db70a9e0e413e9b6b0158471c..4d384d1a5e894324b989bfe6ace7b3f4880ade60 100644 GIT binary patch delta 229 zcmV#7=7oIbEK8tCpPy0Eh+5E&zZW!0g#kKD+<`hBqp|ZU6wWZ$1FP?*T-X<=$Ga zC;)(bKzmaI&jSF21H1zO{{xu4DV48k002HdlAqi8+P7-id0qg3SitN80LTICy*|Sm z0RR9100000!~#SlF8$H^rz&ke4Y8;BaKtywharwMKa3dB{15^F005x;C5)H_5z{bY fABfn9L}XT8)1PvX|C@k(00000NkvXXu0mjfcD`S_ delta 465 zcmV;?0WSW50_y{iB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru-3T8I5hJ4*XlMWc0c%M_K~#9!?V8Pz!Y~X*t;{yC zWpJk!I$(086s{UNNG*G(3`+1`k_!{ragf)Becy}^5EH*avVSE1h^mG)jpMlby?6g% z{v4m1s>Wc;t^W`j3xMVTU#W+d2YdC;0?Zy;qKFRwPz+$j@V}Cj{$QSJ(MT|Y4*=li zgqgS=x4tho%X0rfG@4hXgbx7Fc}ZqzE#{|k1SS9=nF}80gZXeeURIsz^mCP0`+wi= zd4QT)0Pq0-hJQ@qQLR1B2exPcc!Ppu375~Z!gpzZOaMSXtK%guHz-O369CYD7NkzK zyk^IAyqJ4Om;iu&D2XdDhFaZGF zAKki?<*9oGm;e9(hP{;xCIA2c002M;eT<5BLSu~Cg-VKuNELuBgYSV5@4-tUq{iSS z5K?RKtq@Xk@GTIeV*mgEpx;Q?MK0(f8+K6-)U1dQLe2FH5~I$md^O@700000NkvXX Hu0mjfj9&kwYL!MVq zd9g%B22kj~r;B4qMcmsN)?7@60uGzy9J!_6eld!3w4GbUs=s)ynOIfp)t1aQ)q_)O z+$z@3Y8ByE>+gvDf6!EgqolpPChOPV7&YH>pM_`6Ze(CO$>rtDD#wx&qVV~8Pc3)Q z1}2uA@CmPbJ+2<)68LeRtM2Dt`DRgtgxyV2K&eBjHM-Y7MNWVD_7InVLEOPNbyGb* z$E-=Y)MM)pG9^4fO6!9{!eXYG>`zu5zW+^P4FltC(JKw23Ici$3yUZDpMAGys^{d- zHrfsc%2<~!Wa4Ks)0$A}u+AzezolJNp@D&k14Nu<{n5?F$RgmtfI?*GJh&t6`LA;0 U$CM{Nz@T98boFyt=akR{0K9^S>Hq)$ literal 0 HcmV?d00001 From 109250bb79927098b26335d824f06592c1a7be94 Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Thu, 14 Aug 2014 16:18:41 -0400 Subject: [PATCH 03/13] Added two levels. --- final/data/level2.json | 16 ++++++++++++++++ final/data/levelbonus.json | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 final/data/level2.json create mode 100644 final/data/levelbonus.json diff --git a/final/data/level2.json b/final/data/level2.json new file mode 100644 index 0000000..8d8f0df --- /dev/null +++ b/final/data/level2.json @@ -0,0 +1,16 @@ +[ +[ 1,1,1,1,1,1,1,1,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,1], +[ 1,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1], +[ 1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1], +[ 1,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1], +[ 1,0,0,0,0,0,1,0,0,1,1,0,0,1,0,0,0,0,0,1], +[ 1,0,0,1,0,0,1,0,0,1,1,0,0,1,0,0,1,0,0,1], +[ 1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1], +[ 1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1], +[ 1,0,1,0,1,1,0,1,1,1,1,1,1,0,1,1,0,1,0,1], +[ 1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,1], +[ 1,0,1,0,1,1,0,1,0,1,1,0,1,0,1,1,0,1,0,1], +[ 1,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,1,1,1,1,1,1,1,1] +] \ No newline at end of file diff --git a/final/data/levelbonus.json b/final/data/levelbonus.json new file mode 100644 index 0000000..88345d9 --- /dev/null +++ b/final/data/levelbonus.json @@ -0,0 +1,16 @@ +[ +[ 1,1,1,1,1,1,1,1,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,1], +[ 1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,1], +[ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] +] \ No newline at end of file From 75046120bc1ec0f5616cd1c53ba28f7ffc852e05 Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Thu, 14 Aug 2014 17:13:28 -0400 Subject: [PATCH 04/13] Goes to level 2 after finishing level 1. --- final/data/level2.json | 10 +++++----- final/tower_man.js | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/final/data/level2.json b/final/data/level2.json index 8d8f0df..a7626de 100644 --- a/final/data/level2.json +++ b/final/data/level2.json @@ -1,16 +1,16 @@ [ [ 1,1,1,1,1,1,1,1,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,1], +[ 1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1], [ 1,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1], -[ 1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1], +[ 1,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,1], [ 1,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1], -[ 1,0,0,0,0,0,1,0,0,1,1,0,0,1,0,0,0,0,0,1], +[ 1,0,0,0,0,0,1,0,0,1,1,0,0,1,2,0,0,0,0,1], [ 1,0,0,1,0,0,1,0,0,1,1,0,0,1,0,0,1,0,0,1], [ 1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,1], [ 1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1], [ 1,0,1,0,1,1,0,1,1,1,1,1,1,0,1,1,0,1,0,1], -[ 1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,1], +[ 1,0,0,2,0,0,0,1,0,2,0,0,1,0,0,0,0,0,0,1], [ 1,0,1,0,1,1,0,1,0,1,1,0,1,0,1,1,0,1,0,1], -[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], +[ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1], [ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] ] \ No newline at end of file diff --git a/final/tower_man.js b/final/tower_man.js index dc90842..bede7d7 100644 --- a/final/tower_man.js +++ b/final/tower_man.js @@ -111,7 +111,7 @@ this.stage.dotCount--; // If there are no more dots left, just restart the game if(this.stage.dotCount == 0) { - Q.stageScene("level1"); + Q.stageScene("level2"); } }, @@ -169,7 +169,35 @@ } }); + Q.TileLayer.extend("TowerManMap2",{ + init: function() { + this._super({ + type: SPRITE_TILES, + dataAsset: 'level2.json', + sheet: 'tiles', + }); + + }, + + setup: function() { + // Clone the top level arriw + var tiles = this.p.tiles = this.p.tiles.concat(); + var size = this.p.tileW; + for(var y=0;y Date: Thu, 14 Aug 2014 17:43:30 -0400 Subject: [PATCH 05/13] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0957f2c..f618091 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ Towerman ======== -Pacman + A game like Pac-man, made with the Quintus HTML5 Game Framework + + [Towerman](https://s3.amazonaws.com/uploads.hipchat.com/12722/130235/7iublw3zkzq8zkj/upload.png) From 0624dbe3717b51050154b0e5fe780180bc80e457 Mon Sep 17 00:00:00 2001 From: Josh Gough Date: Thu, 14 Aug 2014 17:43:42 -0400 Subject: [PATCH 06/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f618091..f4394d5 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ Towerman A game like Pac-man, made with the Quintus HTML5 Game Framework - [Towerman](https://s3.amazonaws.com/uploads.hipchat.com/12722/130235/7iublw3zkzq8zkj/upload.png) + ![Towerman](https://s3.amazonaws.com/uploads.hipchat.com/12722/130235/7iublw3zkzq8zkj/upload.png) From 397bde98b7dec542fa355e0dd85ba97514709404 Mon Sep 17 00:00:00 2001 From: Josh Gough Date: Thu, 14 Aug 2014 17:54:32 -0400 Subject: [PATCH 07/13] Serve .json files from Azure in gh-pages too --- Web.config | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Web.config diff --git a/Web.config b/Web.config new file mode 100644 index 0000000..74f799b --- /dev/null +++ b/Web.config @@ -0,0 +1,9 @@ + + + + + + + + + From 4e9456d7067335a53bb8dec29465981fc6794496 Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Thu, 14 Aug 2014 19:51:18 -0400 Subject: [PATCH 08/13] Has scoring capabilities. --- final/tower_man.js | 58 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/final/tower_man.js b/final/tower_man.js index bede7d7..d1ead2e 100644 --- a/final/tower_man.js +++ b/final/tower_man.js @@ -5,7 +5,7 @@ // Set up a basic Quintus object // with the necessary modules and controls var Q = window.Q = Quintus({ development: true }) - .include("Sprites, Scenes, Input, 2D") + .include("Sprites, Scenes, Input, 2D, UI") .setup({ width: 640, height: 480 }) .controls(true) @@ -13,6 +13,8 @@ // along with joypad controls for touch Q.input.keyboardControls(); Q.input.joypadControls(); + Q.state.reset({ score: 0, lives: 2, stage: 1}); + console.log(Q.state.get("score")); Q.gravityX = 0; Q.gravityY = 0; @@ -73,7 +75,19 @@ } }); - + Q.UI.Text.extend("Score", { + init: function(p) { + this._super({ + label: "Score: 0", + x:100, + y:20 + }); + Q.state.on("change.score",this,"scoreChange"); + }, + scoreChange: function(score) { + this.p.label = "Score: " + score; + } + }); Q.Sprite.extend("Player", { init: function(p) { @@ -84,7 +98,7 @@ }); this.add("2d, towerManControls"); - } + } }); @@ -109,6 +123,7 @@ // Destroy it and keep track of how many dots are left this.destroy(); this.stage.dotCount--; + Q.state.inc("score",100); // If there are no more dots left, just restart the game if(this.stage.dotCount == 0) { Q.stageScene("level2"); @@ -263,6 +278,7 @@ hit: function(col) { if(col.obj.isA("Player")) { + Q.state.reset({ score: 0, lives: 2, stage: 1}); Q.stageScene("level1"); } } @@ -271,7 +287,22 @@ Q.scene("level1",function(stage) { var map = stage.collisionLayer(new Q.TowerManMap()); map.setup(); - + /** + var container = stage.insert(new Q.UI.Container({ + + y: 48, + x: Q.width/2 + })); + + stage.insert(new Q.UI.Text({ + label: "Score: " + Q.state.get("score"), + color: "white", + x: -207, + y: -30 + }),container); + container.fit(2,2); + **/ + stage.insert(new Q.Score()); stage.insert(new Q.Player(Q.tilePos(10,7))); stage.insert(new Q.Enemy(Q.tilePos(10,4))); @@ -281,7 +312,23 @@ Q.scene("level2",function(stage) { var map = stage.collisionLayer(new Q.TowerManMap2()); map.setup(); - + /** + var container = stage.insert(new Q.UI.Container({ + + y: 48, + x: Q.width/2 + })); + + Q.state.on("change.score",this,"score"); + stage.insert(new Q.UI.Text({ + + label: "Score: " + Q.state.get("score"), + color: "white", + x: -207, + y: -30 + }),container); + container.fit(2,2);**/ + stage.insert(new Score()); stage.insert(new Q.Player(Q.tilePos(10,7))); stage.insert(new Q.Enemy(Q.tilePos(10,4))); @@ -295,6 +342,7 @@ Q.compileSheets("sprites.png","sprites.json"); Q.stageScene("level1"); + }); }); \ No newline at end of file From 5f663e944fbdb4a4fff7cd4f82d0747fe4367f38 Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Thu, 14 Aug 2014 20:01:58 -0400 Subject: [PATCH 09/13] making sure the file wasn't changed drastically --- final/tower_man.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/final/tower_man.js b/final/tower_man.js index d1ead2e..a0c8f6a 100644 --- a/final/tower_man.js +++ b/final/tower_man.js @@ -1,4 +1,4 @@ - +//Not sure if it worked // 1. Wait for the onload even window.addEventListener("load",function() { From e62c51a194663081a96fc1e13f83f92c188ef48e Mon Sep 17 00:00:00 2001 From: doomsday87 Date: Thu, 14 Aug 2014 20:07:03 -0400 Subject: [PATCH 10/13] Fixed an error the scene setup. --- final/tower_man.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/final/tower_man.js b/final/tower_man.js index a0c8f6a..b141cf3 100644 --- a/final/tower_man.js +++ b/final/tower_man.js @@ -328,7 +328,7 @@ y: -30 }),container); container.fit(2,2);**/ - stage.insert(new Score()); + stage.insert(new Q.Score()); stage.insert(new Q.Player(Q.tilePos(10,7))); stage.insert(new Q.Enemy(Q.tilePos(10,4))); From 59fbd8cc9ceea30a5633857bcc475d5138feb85e Mon Sep 17 00:00:00 2001 From: Josh Gough Date: Fri, 15 Aug 2014 17:43:37 -0400 Subject: [PATCH 11/13] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f4394d5..52a87bd 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ Towerman A game like Pac-man, made with the Quintus HTML5 Game Framework ![Towerman](https://s3.amazonaws.com/uploads.hipchat.com/12722/130235/7iublw3zkzq8zkj/upload.png) + + [Play a live version here](http://towermancoderdojo.azurewebsites.net/final/) From e7451183cb5ac8b896a47f8e6cd00455cc4f6375 Mon Sep 17 00:00:00 2001 From: Josh Gough Date: Sat, 16 Aug 2014 15:07:20 -0400 Subject: [PATCH 12/13] Added two more towers to the top left --- final/data/level.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/final/data/level.json b/final/data/level.json index cfe768a..997ea43 100644 --- a/final/data/level.json +++ b/final/data/level.json @@ -1,6 +1,6 @@ [ [ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], -[ 1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1], +[ 1,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1], [ 1,0,1,1,0,1,1,1,0,1,1,1,0,1,0,1,1,1,0,1], [ 1,0,1,1,0,1,1,1,0,1,1,1,0,1,0,1,1,1,0,1], [ 1,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1], From c61360f21588d1de24c4c4dd8b5bdef9f2fa2b99 Mon Sep 17 00:00:00 2001 From: Josh Gough Date: Sat, 16 Aug 2014 15:28:04 -0400 Subject: [PATCH 13/13] Jogo's code --- final/data/level.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/final/data/level.json b/final/data/level.json index 997ea43..c65ec5a 100644 --- a/final/data/level.json +++ b/final/data/level.json @@ -1,16 +1,16 @@ [ -[ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], -[ 1,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1], -[ 1,0,1,1,0,1,1,1,0,1,1,1,0,1,0,1,1,1,0,1], -[ 1,0,1,1,0,1,1,1,0,1,1,1,0,1,0,1,1,1,0,1], -[ 1,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1], -[ 1,0,1,1,1,1,1,0,1,1,1,1,1,1,0,1,1,1,0,1], -[ 1,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1], -[ 1,0,0,0,1,1,1,0,1,1,0,1,1,0,1,1,1,1,0,1], -[ 1,1,1,0,1,1,1,0,1,1,0,1,1,0,0,0,0,1,0,1], -[ 1,0,0,0,1,1,1,0,1,1,0,1,1,0,1,1,0,1,0,1], -[ 1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,1,0,1,0,1], -[ 1,0,1,0,1,1,1,0,1,1,1,1,1,0,1,1,0,1,0,1], -[ 1,2,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,2,1], -[ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] +[ 1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2], +[ 2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2], +[ 2,1,2,2,1,2,2,2,1,2,2,2,1,2,1,2,2,2,1,2], +[ 2,1,2,2,1,2,2,2,1,2,2,2,1,2,1,2,2,2,1,2], +[ 2,1,2,2,1,1,1,1,1,0,1,1,1,2,1,1,1,1,1,2], +[ 2,1,2,2,2,2,2,1,2,2,2,2,2,2,1,2,2,2,1,2], +[ 2,1,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,2], +[ 2,1,1,1,2,2,2,1,2,2,1,2,2,1,2,2,2,2,1,2], +[ 2,2,2,1,2,2,2,1,2,2,1,2,2,1,1,1,1,2,1,2], +[ 2,1,1,1,2,2,2,1,2,2,1,2,2,1,2,2,1,2,1,2], +[ 2,1,2,1,1,1,1,1,1,1,1,1,1,1,2,2,1,2,1,2], +[ 2,1,2,1,2,2,2,1,2,2,2,2,2,1,2,2,1,2,1,2], +[ 2,1,1,1,1,1,1,1,2,2,2,2,2,1,1,1,1,1,1,2], +[ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2] ]