Merged branch master into master

GGJ17/Assets/LairCannon.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LairCannon : MonoBehaviour {
+
+    void OnParticleCollision(GameObject go)
+    {
+        Debug.Log("Blubl");
+        if (go.tag.Equals("Ground"))
+        {
+            Debug.Log("Blubl" + go.transform.position);
+            Building_EnemyLair lair = GetComponentInParent<Building_EnemyLair>();
+            GameObject obj = Instantiate(lair.spawnPrefab);
+            obj.transform.position = go.transform.position + Vector3.up * 1.2f;
+        }
+    }
+
+    public IEnumerator SpawnDrops(Building_EnemyLair lair, float startdelay)
+    {
+        yield return new WaitForSeconds(startdelay);
+        //rotate cannon to target
+        Vector3 firedirection = FindObjectOfType<Building_Flag>().transform.position - lair.transform.position;
+        transform.parent.rotation = Quaternion.LookRotation(firedirection, Vector3.up);
+
+        ParticleSystem spwner = GetComponent<ParticleSystem>();
+        while (true)
+        {
+            yield return new WaitForSeconds(lair.spawnFrequence);
+            if (spwner) spwner.Emit(1);
+        }
+    }
+}

GGJ17/Assets/Script/Blocks/Building/Building_Barracks.cs

@@ -4,11 +4,36 @@
 
 public class Building_Barracks : AbstractBaseBuilding {
 
+    public float EffectiveRange = 5;
+    public float AlertCheckIntervall = 1f;
+    public float AtackIntervall = 0.5f;
+    public bool isAlerted;
+
 	// Use this for initialization
 	void Awake () {
         BuildingBlockInit bbi = new BuildingBlockInit();
         bbi.up = bbi.down = true;
         bbi.sides = false;
         Init(bbi);
     }
+
+    void Update()
+    {
+        if (!isAlerted)
+        {
+            Collider[] cc = Physics.OverlapBox(transform.position, new Vector3(EffectiveRange, 20, EffectiveRange));
+            foreach(Collider c in cc)
+            {
+                if(c.tag == "Enemy")
+                {
+
+                }
+            }
+        }
+    }
+
+    public IEnumerator OnAlert()
+    {
+        yield return null;
+    }
 }

GGJ17/Assets/Script/Blocks/Building/Building_EnemyLair.cs

@@ -7,7 +7,7 @@ public class Building_EnemyLair : AbstractBuildingBlock {
     #region Instantiate
     public GameObject spawnPrefab;
     #endregion
-    public float spawnFrequence = 20;
+    public float spawnFrequence = 20, startDelay = 1;
 
     // Use this for initialization
     void Awake () {
@@ -20,27 +20,10 @@ void Awake () {
 
     void Start()
     {
-        StartCoroutine(SpawnDrops());
+        StartCoroutine(GetComponentInChildren<LairCannon>().SpawnDrops(this, startDelay));
     }
 
-    IEnumerator SpawnDrops()
-    {
-        ParticleSystem spwner = GetComponent<ParticleSystem>();
-        while (true)
-        {
-            yield return new WaitForSeconds(spawnFrequence);
-            if(spwner)spwner.Emit(1);
-        }
-    }
 
-    void OnParticleCollision(GameObject go)
-    {
-        Debug.Log("Blubl");
-        if (go.tag.Equals("Ground"))
-        {
-            Debug.Log("Blubl" + go.transform.position);
-            GameObject obj = Instantiate(spawnPrefab);
-            obj.transform.position = go.transform.position + Vector3.up * 1.2f;
-        }
-    }
+
+
 }