powerup refactoring

OneGameAMonth · Feb 17, 2013 · 7cdac4c · 7cdac4c
1 parent 0cc4cc5
commit 7cdac4c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/3d/ship_test.blend b/3d/ship_test.blend
diff --git a/js/effects.js b/js/effects.js
@@ -9,8 +9,7 @@ define(function() {
 			case "shield":
 				e = {"emitterStartLocation":{"x":0,"y":0},"emitterStopLocation":{"x":0,"y":0},"systemLifeSpan":0,"particleSpawnArea":{"x":0,"y":0},"maxParticles":300,"averageLifeSpan":0.3,"lifeSpanVariance":0.1,"startColor":{"red":63,"green":167,"blue":255,"alpha":1},"stopColor":{"red":0,"green":0,"blue":0,"alpha":1},"averageVelocity":{"horizontal":0,"vertical":0},"velocityVariance":{"x":0.3,"y":0.3},"minParticleSize":2,"maxParticleSize":4,"particleFadeTime":0.6,"globalCompositeOperation":"lighter","renderType":"spriteSheet","type":"relative"};
 			break;
-			case "powerup":
-				//return {"emitterStartLocation":{"x":0,"y":0},"emitterStopLocation":{"x":0,"y":0},"systemLifeSpan":5,"particleSpawnArea":{"x":32,"y":32},"maxParticles":100,"averageLifeSpan":1,"lifeSpanVariance":0.5,"startColor":{"red":255,"green":167,"blue":63,"alpha":1},"stopColor":{"red":13,"green":141,"blue":0,"alpha":1},"averageVelocity":{"horizontal":0,"vertical":0},"velocityVariance":{"x":1,"y":1},"minParticleSize":5,"maxParticleSize":10,"particleFadeTime":0.8,"globalCompositeOperation":"lighter","renderType":"image","image":"images/star.png","type":"absolute"};
+			case "powerup":				
 				e = {"emitterStartLocation":{"x":0,"y":0},"emitterStopLocation":{"x":0,"y":0},"systemLifeSpan":1,"particleSpawnArea":{"x":32,"y":32},"maxParticles":100,"averageLifeSpan":0.4,"lifeSpanVariance":0.1,"startColor":{"red":255,"green":167,"blue":63,"alpha":1},"stopColor":{"red":13,"green":141,"blue":0,"alpha":1},"averageVelocity":{"horizontal":0,"vertical":0},"velocityVariance":{"x":2,"y":2},"minParticleSize":5,"maxParticleSize":10,"particleFadeTime":0.5,"globalCompositeOperation":"lighter","renderType":"image","image":image || "images/star.png","type":"absolute"};
 			break;
 			case "explosion":

diff --git a/js/game.js b/js/game.js
@@ -60,6 +60,16 @@ define(["canvas", "resources", "keys", "menu", "stars", "enemy", "effects", "bul
 			}
 		], Resources.images.logo);
 
+	var weapons = {
+		gun: {
+			loadTime: 100,
+			ammo: Bullet
+		},
+		rocket: {
+			loadTime: 1000,
+			ammo: Bullet
+		}
+	}
 
 	var bullets = [];
 	var lastShot = 0;
@@ -70,6 +80,9 @@ define(["canvas", "resources", "keys", "menu", "stars", "enemy", "effects", "bul
 	var ship = {
 		X: 100,
 		Y: 100,
+		hp: 100,
+		shield: 100,
+		currentWeapon: weapons.gun,
 		enableShield: false,
 		loadTime: 100,
 		draw: function() {
@@ -112,7 +125,10 @@ define(["canvas", "resources", "keys", "menu", "stars", "enemy", "effects", "bul
 			}			
 			if(down[play.controls.fire]) {
 				ship.fire();
-			}				
+			}	
+			if(ship.shield <= 0) {
+				ship.enableShield = false;
+			}			
 		},
 		left: function() {
 			ship.X -=10;
@@ -127,9 +143,9 @@ define(["canvas", "resources", "keys", "menu", "stars", "enemy", "effects", "bul
 			ship.Y += 10;
 		},
 		fire: function() {
-			if(Date.now() - lastShot > ship.loadTime) {
+			if(Date.now() - lastShot > ship.currentWeapon.loadTime) {
 				lastShot = Date.now();
-				bullets.push(Bullet({X: ship.X + 11, Y: ship.Y - 25}, enemies));				
+				bullets.push(ship.currentWeapon.ammo({X: ship.X + 11, Y: ship.Y - 25}, enemies));
 			}			
 		}
 	}
@@ -218,6 +234,7 @@ define(["canvas", "resources", "keys", "menu", "stars", "enemy", "effects", "bul
     	image: Resources.images.shield,
     	action: function() {
     		getPowerup();
+    		ship.shield = 100;
     		ship.enableShield = true;
     	}
     }