Merge branch 'master' of https://github.com/BlueIceshard/neonmania

Neonmania/Assets/Scripts/Interfaces/IKillable.cs → Neonmania/Assets/Scripts/ColorChanger.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public interface IKillable {
+public class ColorChanger : MonoBehaviour {
 
-    void Kill();
+	
 }

Neonmania/Assets/Scripts/EnemyColorChanger.cs

@@ -28,9 +28,6 @@ private void Start () {
         int level = GetComponent<EnemyPropertyController>().properties.level;
 
         currentColor = GetLevelColor(level);
-
-        Debug.Log(level + ": " + currentColor);
-
         ApplyColor(currentColor);
 	}
 

Neonmania/Assets/Scripts/EnemyProperties.cs

@@ -23,9 +23,6 @@ public class EnemyProperties : ScriptableObject
 	// higher is stronger 
 	public float strengthIndicator = 0.1f;
 
-    [Header("Handlers")]
-    public KillHandler deathHandler;
-
 	[Header("Boss Properties")]
 	// if true, players
 	public bool isBoss = false;

Neonmania/Assets/Scripts/PlayerColorChanger.cs

@@ -5,18 +5,14 @@
 
 public class PlayerColorChanger : MonoBehaviour {
 
-
     private Rigidbody rb;
     private int color = 0;
 
     private void Start () {
         rb = GetComponent<Rigidbody>();
+        color = UnityEngine.Random.Range(0, 3);
         ApplyColor(GetColor());
 	}
-
-	private void Update () {
-
-	}
 
     private void SwitchColor() {
         color = (color + 1) % 3;