stuff

Author: tsarchghs

js/meteors/asteroid.js

@@ -1,9 +1,10 @@
 class Asteroid{
-	constructor(ctx,health,x,y,w,h,speed,dt){
+	constructor(ctx,health,x,y,w,h,asteroid_image_url){
 		this.health = health;
 		this.destroyed = false;
 		this.ctx = ctx;
-		this.image = document.getElementById("asteroid");
+		this.image = new Image();
+		this.image.src = asteroid_image_url;
 		this.explosion_images = []
 		for (var x=1;x<=27;x++){
 			var explosion_img = new Image();
@@ -14,8 +15,7 @@ class Asteroid{
 		this.y = y;
 		this.w = w;
 		this.h = h;
-		this.speed = speed;
-		this.dt = dt;
+		this.dt;
 	}
 	get draw(){
 		this.reDraw();
@@ -39,20 +39,27 @@ class Asteroid{
 
 var asteroids_at_once = 2
 var asteroids_thrown = 0
-
+//meteorBrown_big1
 function createAsteroid(dt,score){
 	if (dt){
 		if (asteroids_thrown < 0){
 			asteroids_thrown = 2;
 		}
 		if (asteroids_at_once > asteroids_thrown){
+			random = Math.floor((Math.random() * 15));
 			x = Math.floor((Math.random() * canvas.width) + 1);
 			y = Math.floor((Math.random() * 60) * -1);
-			asteroid = new Asteroid(ctx,100,undefined,undefined,50,50,undefined);
+			if (random > 3){
+				size = "small";
+				asteroid = new Asteroid(ctx,100,undefined,undefined,50,50,"img/meteors/meteorBrown_small1.png");
+			} else {
+				size = "big";
+				asteroid = new Asteroid(ctx,200,undefined,undefined,100,100,"img/meteors/meteorBrown_big1.png");
+			}
 			asteroid.x  = x;
 			asteroid.y = y;
 			asteroid.speed = 150 + (score * 0.01);
-			asteroids.push(asteroid);
+			asteroids.push({"size":size,"object":asteroid,"x_speed":0,"y_speed":asteroid.speed});
 			asteroids_thrown++;
 		}
 		asteroids_thrown -= asteroids_at_once * dt;

js/pickups/powerUp_pickup.js

@@ -20,7 +20,7 @@ class PowerUp_pickup{
 		this.y += this.dt * this.drop_speed;
 	}
 }
-var powerUp_pickups_at_once = 0.5;
+var powerUp_pickups_at_once = 2;
 var powerUp_pickups_thrown = 10;
 var powerUp_pickups_thrown_reset = 10;
 

js/scenes/game.js

@@ -10,6 +10,7 @@ class Game{
 		this.homeButton = homeButton;
 		this.dt = 0;
 		this.show = false;
+		this.ctx = document.getElementById("canvas").getContext("2d");
 	}
 	get draw(){
 		this.reDraw();
@@ -76,31 +77,55 @@ class Game{
 			this.replayButton.draw;
 		}
 		if (this.asteroids){
-			for (var asteroid in this.asteroids){
-				if (!this.asteroids[asteroid].destroyed){
-					CollisionDetector.rect1 = this.asteroids[asteroid];
+			for (var i in this.asteroids){
+				var create_asteroids_in_end = []
+		    	asteroid.draw;
+		    	asteroid.x += this.asteroids[i].x_speed * this.dt;
+		    	asteroid.y += this.asteroids[i].y_speed * this.dt;
+		    	if (asteroid.y > canvas.height){
+		    		if (this.health.health && !asteroid.destroyed) {
+		    			this.health.health -= 1;
+		    		}
+		    		this.asteroids.splice(asteroid,1);
+		    	}
+		    	if (this.asteroids[i]){
+					asteroid = this.asteroids[i].object;
+		    	} else {
+		    		asteroid = {"destroyed":true};	
+		    	}
+				if (!asteroid.destroyed){
+					CollisionDetector.rect1 = asteroid;
 					for (var i in this.player.lasers){
 						var laser = this.player.lasers[i];
 						CollisionDetector.rect2 = laser;
 						if (CollisionDetector.get_rect_rect_collision){
-							this.asteroids[asteroid].health -= this.player.shoot_damage;
-							if (this.asteroids[asteroid].health <= 0  && this.health.health){
+							asteroid.health -= this.player.shoot_damage;
+							if (asteroid.health <= 0  && this.health.health){
 								this.score.score += 100;
-								this.asteroids[asteroid].destroyed = true;
+								asteroid.destroyed = true;
+							} else {
+								var small_asteroid = JSON.parse(JSON.stringify(asteroid));
+								small_asteroid.w /= 2;
+								small_asteroid.h /= 2;
+								small_asteroid.health /= 2;
+								small_asteroid.x = asteroid.x + (asteroid.w / 2);
+								small_asteroid.y = asteroid.y
+								var asteroid_1 = new Asteroid(this.ctx,100,30,30,50,50,"img/meteors/meteorBrown_small1.png")
+								this.asteroids[i].object = asteroid_1;
+								this.asteroids[i].object.y_speed = -300;
+								//create_asteroids_in_end.push({"size":size,"object":asteroid_1,"x_speed":300,"y_speed":300})
 							}
 							this.player.lasers.splice(i,1);
 						}
 					}
 				}
-				asteroid = this.asteroids[asteroid];
-		    	asteroid.draw;
-		    	asteroid.y += asteroid.speed * this.dt;
-		    	if (asteroid.y > canvas.height){
-		    		if (this.health.health && !asteroid.destroyed) {
-		    			this.health.health -= 1;
-		    		}
-		    		this.asteroids.splice(asteroid,1);
-		    	}
+				for (var i in create_asteroids_in_end){
+					if (create_asteroids_in_end[i]){
+						this.asteroids.push(create_asteroids_in_end[i]);
+						console.log(this.asteroids);
+					}
+					create_asteroids_in_end = [];
+				}
 			}
 		}
 		createAsteroid(this.dt,score.score);