fix bullets

Author: balajmarius

src/actors/bullets/column.js

@@ -2,7 +2,7 @@ import { GAME, BULLETS, BUGS } from '../../shared/config'
 import Bullet from './bullet'
 
 class Column extends Phaser.Group {
-  constructor(game, name, frame, index, remove, score) {
+  constructor(game, name, frame, index, remove, score, bugs) {
     super(game, null, name)    
 
     this.x = frame.x
@@ -12,6 +12,7 @@ class Column extends Phaser.Group {
     this.index = index
     this.currentPosition = 3
 
+    this.bugs = bugs
     this.score = score
     this.remove = remove
 
@@ -29,7 +30,7 @@ class Column extends Phaser.Group {
     this.hit = false
     this.currentPosition = 3    
     this.children.forEach(bullet => bullet.disable())
-    this.remove()
+    this.remove(this.index)
   }
 
   render() {
@@ -41,7 +42,7 @@ class Column extends Phaser.Group {
     const previousBullet = this.children[this.currentPosition+1]
     const nextBullet = this.children[this.currentPosition-1]
 
-    const bugsColumn = this.parent.bugs.children[this.index]
+    const bugsColumn = this.bugs.children[this.index]
     const currentBug = bugsColumn.children[this.currentPosition]
     const nextBug = bugsColumn.children[this.currentPosition+1]
 

src/actors/bullets/index.js

@@ -11,15 +11,14 @@ class Bullets extends Phaser.Group {
     this.y = BULLETS.y
 
     this.stack = []
-    this.bugs = bugs
     this.updateTime = 0
 
     this.fire = this.fire.bind(this)
     this.render = this.render.bind(this)
     this.remove = this.remove.bind(this)
 
     BULLETS.frames.forEach((frame, index) => {
-      this.addChild(new Column(this.game, name, frame, index, this.remove, score))
+      this.addChild(new Column(this.game, name, frame, index, this.remove, score, bugs))
     })
 
     this.game.world.addChild(this)
@@ -33,8 +32,9 @@ class Bullets extends Phaser.Group {
     this.stack.push(column)
   }
 
-  remove() {
-    this.stack.shift()
+  remove(column) {
+    const index = this.stack.indexOf(column)
+    this.stack.splice(index, 1)
   }
 
   render() {

src/helpers/controls.js

@@ -12,6 +12,7 @@ class Controls {
     this.left = this.game.input.keyboard.addKey(Phaser.Keyboard.LEFT)
     this.right = this.game.input.keyboard.addKey(Phaser.Keyboard.RIGHT)
     this.spacebar = this.game.input.keyboard.addKey(Phaser.Keyboard.SPACEBAR)
+    this.enter = this.game.input.keyboard.addKey(Phaser.Keyboard.ENTER)
 
     this.left.onDown.add(this.goLeft)
     this.right.onDown.add(this.goRight)

src/states/play.js

@@ -2,7 +2,7 @@ import * as Actors from '../actors'
 import * as Helpers from '../helpers'
 
 class Play extends Phaser.State {
-  create() {
+  create() {           
     this.game.add.sprite(0, 0, 'background')
 
     this.score = new Helpers.Score(this.game)