Merge branch 'master' of http://git.thirdlevel.gmbh/GameDevOS/LD39

game/Assets/Prefabs/Enemy.prefab

@@ -487,7 +487,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1196849215294664}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -14.08, y: 1, z: -27.1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4517153640541662}

game/Assets/Scripts/Enemy/WeaponEnemy.cs

@@ -9,11 +9,11 @@ public class WeaponEnemy : MonoBehaviour
 
     void OnCollisionEnter(Collision collision)
     {
-            if (collision.collider.tag == "Player")
-            {
-                drainCoroutine = DrainPower(collision.collider.GetComponent<Player>());
-                StartCoroutine(drainCoroutine);
-            }
+        if (collision.collider.tag == "Player")
+        {
+            drainCoroutine = DrainPower(collision.collider.GetComponent<Player>());
+            StartCoroutine(drainCoroutine);
+        }
     }
 
     void OnCollisionExit(Collision collision)