Added rocks and removed thick snow behaviour

snowpool · Feb 18, 2013 · 9a88faf · 9a88faf
1 parent 7c6283b
commit 9a88faf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/js/main.js b/js/main.js
@@ -192,10 +192,11 @@ function startGame (images) {
 			snowboarder.draw(dContext);
 		});
 
-		randomlyGenerateObject(sprites.smallTree, 3);
-		randomlyGenerateObject(sprites.tallTree, 1);
+		randomlyGenerateObject(sprites.smallTree, 4);
+		randomlyGenerateObject(sprites.tallTree, 2);
 		randomlyGenerateObject(sprites.jump, 1);
 		randomlyGenerateObject(sprites.thickSnow, 1);
+		randomlyGenerateObject(sprites.rock, 1);
 
 		distanceTravelledInMetres = parseFloat(skier.getPixelsTravelledDownMountain() / pixelsPerMetre).toFixed(1);
 

diff --git a/js/spriteInfo.js b/js/spriteInfo.js
@@ -46,6 +46,13 @@
 			},
 			hitBehaviour: {}
 		},
+		'rock' : {
+			$imageFile : 'skifree-objects.png',
+			parts : {
+				main : [ 30, 52, 23, 11 ]
+			},
+			hitBehaviour: {}
+		},
 		'monster' : {
 			$imageFile : 'sprite-characters.png',
 			parts : {
@@ -109,6 +116,12 @@
 	sprites.smallTree.hitBehaviour.skier = treeHitsSkierBehaviour;
 	sprites.tallTree.hitBehaviour.skier = treeHitsSkierBehaviour;
 
+	function rockHitsSkierBehaviour(rock, skier) {
+		skier.hasHitObstacle(rock);
+	}
+
+	sprites.rock.hitBehaviour.skier = rockHitsSkierBehaviour;
+
 	function skierHitsJumpBehaviour(skier, jump) {
 		skier.hasHitJump(jump);
 	}
@@ -119,7 +132,8 @@
 
 	sprites.jump.hitBehaviour.skier = jumpHitsSkierBehaviour;
 
-	function skierHitsThickSnowBehaviour(skier, thickSnow) {
+// Really not a fan of this behaviour.
+/*	function skierHitsThickSnowBehaviour(skier, thickSnow) {
 		// Need to implement this properly
 		skier.setSpeed(2);
 		setTimeout(function() {
@@ -133,9 +147,9 @@
 		setTimeout(function() {
 			skier.resetSpeed();
 		}, 300);
-	}
+	}*/
 
-	sprites.thickSnow.hitBehaviour.skier = thickSnowHitsSkierBehaviour;
+	// sprites.thickSnow.hitBehaviour.skier = thickSnowHitsSkierBehaviour;
 
 	function snowboarderHitsSkierBehaviour(snowboarder, skier) {
 		skier.hasHitObstacle(snowboarder);