Enemy weapons list. Bosses use random weapons from defined list.

Refactoring shotgun entity.

Author: FranciscoKnebel

index.html

@@ -66,10 +66,14 @@
     <script type="text/javascript" src="src/entities/enemy/styles.js"></script>
     <script type="text/javascript" src="src/entities/enemy/boss.js"></script>
     <script type="text/javascript" src="src/entities/player/entity.js"></script>
+
     <script type="text/javascript" src="src/entities/laser/entity.js"></script>
     <script type="text/javascript" src="src/entities/weapons/bomb.js"></script>
     <script type="text/javascript" src="src/entities/weapons/trident.js"></script>
     <script type="text/javascript" src="src/entities/weapons/shotgun.js"></script>
+    <script type="text/javascript" src="src/entities/weapons/enemy/single.js"></script>
+    <script type="text/javascript" src="src/entities/weapons/enemy/dual.js"></script>
+
 
     <!-- Screens -->
     <script type="text/javascript" src="src/screens/play/screen.js"></script>

src/config/weapons.js

@@ -26,3 +26,11 @@ game.data.weapons = [{
 	reloadAmount: 5,
 	reloadCost: 15
 }];
+
+game.data.enemyWeapons = [{
+	name: 'single',
+	damage: 50
+}, {
+	name: 'dual',
+	damage: 50
+}];

src/entities/enemy/boss.js

@@ -38,10 +38,15 @@ game.Entities.Boss = me.Entity.extend({
 			points: this.type.points
 		};
 
+		this.weapons = this.type.fire.weapons.map(i => game.data.enemyWeapons[i]);
 		this.fireInterval = setInterval(() => {
-			me.audio.play('fire');
-			me.game.world.addChild(me.pool.pull('laser', this._absPos.x + this.width / 3, this._absPos.y + this.height, 's', this.type.fire.damage, true));
-			me.game.world.addChild(me.pool.pull('laser', this._absPos.x + this.width / 1.5, this._absPos.y + this.height, 's', this.type.fire.damage, true));
+			const { name } = this.weapons[Math.floor(Math.random() * this.weapons.length)];
+
+			me.game.world.addChild(me.pool.pull(
+				name,
+				this._absPos.x + this.width / 2,
+				this._absPos.y + this.height
+			));
 		}, this.type.fire.rate);
 	},
 

src/entities/enemy/manager.js

@@ -109,7 +109,6 @@ game.Entities.EnemyManager = me.Container.extend({
 			x: Math.round(this.COLS / 2) - 1
 		};
 
-		boss = [0];
 		let bossCreated = !boss;
 		for (y = 0; y < this.ROWS; y += 1) {
 			for (x = 0; x < this.COLS; x += 1) {

src/entities/enemy/styles.js

@@ -11,7 +11,7 @@ game.Entities.EnemyList = [
 			points: 450,
 			fire: {
 				rate: 1000,
-				damage: 50
+				weapons: [0, 1]
 			}
 		}
 	},

src/entities/weapons/bomb.js

@@ -1,6 +1,3 @@
-// TODO: bomb should explode after __ seconds.
-// TODO: Time should be customizable (defined on init)
-
 game.Entities = game.Entities || {};
 game.Entities.Weapons = game.Entities.Weapons || {};
 

src/entities/weapons/enemy/dual.js

@@ -0,0 +1,18 @@
+game.Entities = game.Entities || {};
+game.Entities.Weapons = game.Entities.Weapons || {};
+game.Entities.Weapons.Enemy = game.Entities.Weapons.Enemy || {};
+
+game.Entities.Weapons.Enemy.Dual = me.Entity.extend({
+	init(x, y) {
+		this._super(me.Entity, 'init', [x, y, { width: 0, height: 0 }]);
+
+		const { damage } = game.data.enemyWeapons[1];
+
+		me.game.world.addChild(me.pool.pull('laser', x - 15, y, 's', damage, true));
+		me.game.world.addChild(me.pool.pull('laser', x + 15, y, 's', damage, true));
+		me.audio.play('fire');
+	},
+	update() {
+		me.game.world.removeChild(this);
+	}
+});

src/entities/weapons/enemy/single.js

@@ -0,0 +1,17 @@
+game.Entities = game.Entities || {};
+game.Entities.Weapons = game.Entities.Weapons || {};
+game.Entities.Weapons.Enemy = game.Entities.Weapons.Enemy || {};
+
+game.Entities.Weapons.Enemy.Single = me.Entity.extend({
+	init(x, y) {
+		this._super(me.Entity, 'init', [x, y, { width: 0, height: 0 }]);
+
+		const { damage } = game.data.enemyWeapons[0];
+
+		me.game.world.addChild(me.pool.pull('laser', x, y, 's', damage, true));
+		me.audio.play('fire');
+	},
+	update() {
+		me.game.world.removeChild(this);
+	}
+});

src/entities/weapons/shotgun.js

@@ -3,31 +3,22 @@ game.Entities.Weapons = game.Entities.Weapons || {};
 
 game.Entities.Weapons.Shotgun = me.Entity.extend({
 	init(x, y, amount = 3) {
-		this._super(me.Entity, 'init', [x, y, { width: game.Entities.Weapons.Shotgun.width, height: game.Entities.Weapons.Shotgun.height }]);
-		this.body.setVelocity(0, 35);
-		this.body.collisionType = me.collision.types.PROJECTILE_OBJECT;
+		this._super(me.Entity, 'init', [x, y, { width: 0, height: 0 }]);
 
-		this.amount = amount;
-		this.renderable = new (me.Renderable.extend({
-			init() {
-				this._super(me.Renderable, 'init', [0, 0, game.Entities.Weapons.Shotgun.width, game.Entities.Weapons.Shotgun.height]);
-			},
-			destroy() {}
-		}))();
+		this.split(this.pos.x, this.pos.y, amount);
 		me.audio.play('fire');
 	},
 	update() {
 		me.game.world.removeChild(this);
-		this.split(this.pos.x, this.pos.y);
 		return true;
 	},
-	split(x, y) {
-		const { damage } = game.Entities.Weapons.Shotgun;
+	split(x, y, amount) {
+		const { damage } = game.data.weapons[0];
 
 		me.game.world.addChild(me.pool.pull('laser', x, y - 5, 'n', damage));
 
 		let addToRight = true;
-		for (let i = 1, amountFired = 1; amountFired < this.amount; amountFired += 1) {
+		for (let i = 1, amountFired = 1; amountFired < amount; amountFired += 1) {
 			if (addToRight) {
 				me.game.world.addChild(me.pool.pull('laser', x + i * 5, y - 5 - i * 3, 'n', damage));
 			} else {
@@ -39,7 +30,3 @@ game.Entities.Weapons.Shotgun = me.Entity.extend({
 		}
 	}
 });
-
-game.Entities.Weapons.Shotgun.damage = game.data.weapons[0].damage;
-game.Entities.Weapons.Shotgun.width = 3;
-game.Entities.Weapons.Shotgun.height = 20;

src/game.js

@@ -77,6 +77,9 @@ const game = {
 		me.pool.register('trident-bomb', game.Entities.Weapons.Trident, true);
 		me.pool.register('shotgun', game.Entities.Weapons.Shotgun, true);
 
+		me.pool.register('single', game.Entities.Weapons.Enemy.Single, true);
+		me.pool.register('dual', game.Entities.Weapons.Enemy.Dual, true);
+
 		this.playing = new game.Screens.Play();
 		me.state.set(me.state.PLAY, this.playing);
 		me.state.set(me.state.GAMEOVER, new game.Screens.Lost());