buildings

GGJ17/Assets/LairCannon.cs

@@ -6,10 +6,8 @@ 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;

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

@@ -8,7 +8,7 @@ public class Building_Barracks : AbstractBaseBuilding {
     public float sonarPulseIntervall = 2f;
     public int ticksToLeaveAlert = 10;
     public float alertResourceDrain = -0.1f;
-    public float atackIntervall = 0.5f;
+    public float attackAimDuration = 1f, attackFlareDuration = 0.1f;
 
     private LineRenderer ousiaRay;
     private Collider[] enemiesSpotted = new Collider[0];
@@ -19,13 +19,14 @@ public bool IsAlerted
         set
         {
             isAlerted = value;
+            ResourceManager m = FindObjectOfType<ResourceManager>();
             if (value)
             {
-                FindObjectOfType<ResourceManager>().RegisterResources(alertResourceDrain);
+                if(m)m.RegisterResources(alertResourceDrain);
             }
             else
             {
-                FindObjectOfType<ResourceManager>().DeregisterResources(alertResourceDrain);
+                if(m)m.DeregisterResources(alertResourceDrain);
             }
         }
     }
@@ -58,32 +59,36 @@ public Collider AquireTarget()
     {
         foreach(Collider enemy in enemiesSpotted)
         {
-            Vector3 dir = enemy.transform.position - transform.position;
-            float distance = dir.magnitude;
-            dir.Normalize();
-            if (Physics.Raycast(transform.position, dir, distance))
-            { continue; }
-            else
+            if (EvaluateTarget(enemy))
             {
-                ousiaRay.SetPosition(1, enemy.transform.position);
                 return enemy;
             }
-
         }
         return null;
     }
 
+    public bool EvaluateTarget(Collider enemy)
+    {
+        Vector3 dir = enemy.transform.position - transform.position;
+        float distance = dir.magnitude;
+        dir.Normalize();
+        return !Physics.Raycast(transform.position, dir, distance, LayerMask.NameToLayer("Building"));
+    }
+
+    public int clearTicks = 0;
     public IEnumerator Sonar()
     {
-        int clearTicks = 0;
         while(true)
         {
             Collider[] cc;
             if(AlertCheck(out cc))
             {
-                if(!isAlerted) StartCoroutine(Engaging());
+                if (!isAlerted)
+                {
+                    StartCoroutine(Engaging());
+                    IsAlerted = true;
+                }
                 clearTicks = 0;
-                IsAlerted = true;
             }
             else if(++clearTicks == ticksToLeaveAlert)
             {
@@ -95,10 +100,21 @@ public IEnumerator Sonar()
 
     public IEnumerator Engaging()
     {
+        Debug.Log("Engaged!");
         for(Collider target = AquireTarget(); target; target = AquireTarget())
         {
-
-            yield return null;
+            Debug.Log("Aiming!");
+            Debug.DrawLine(transform.position, target.transform.position, Color.cyan);
+            yield return new WaitForSeconds(attackAimDuration);
+            if (EvaluateTarget(target))
+            {
+                ousiaRay.SetPosition(1, target.transform.position);
+                ousiaRay.enabled = true;
+                Destroy(target.gameObject);
+                yield return new WaitForSeconds(attackFlareDuration);
+                ousiaRay.enabled = false;
+            }
         }
+        Debug.Log("No Targets!");
     }
 }