From: MegaBrutal <code+git@megabrutal.com>
Date: Thu, 28 Dec 2017 01:00:00 +0000 (+0100)
Subject: Merge branches 'cleaning' and 'balancing'
X-Git-Url: http://git.megabrutal.com/?p=ld40.git;a=commitdiff_plain;h=196048400fbe50d1f238f4385a0b3a85f45863a5;ds=sidebyside

Merge branches 'cleaning' and 'balancing'

	modified:   ld40.js
---

196048400fbe50d1f238f4385a0b3a85f45863a5
diff --cc ld40.js
index 7b14c05,892e1b1..f7954c2
--- a/ld40.js
+++ b/ld40.js
@@@ -44,10 -43,9 +44,10 @@@
                  this.lasttime_shoot = 0;
                  this.lasttime_mode = 0;
                  this.lasttime_damage = 0;
-                 this.speed = 150;
+                 this.speed = SPEED_PLAYER;
                  this.switchmode(MODE_DETERMINATION);
 -                this.projectiles = game.add.group();
 +                this.weapon = new JusticeBlaster(game, this);
 +                this.weapon.bulletSpeed = SPEED_PPROJECTILE;
                  this.healthBar = new HealthBar(60, game.world.height - (WALL_BORDERBOTTOM / 2));
              }