Merged branch master into master

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

@@ -4,15 +4,43 @@
 
 public class Building_EnemyLair : AbstractBuildingBlock {
 
-	// Use this for initialization
-	void Awake () {
+    #region Instantiate
+    public GameObject spawnPrefab;
+    #endregion
+    public float spawnFrequence = 20;
+
+    // Use this for initialization
+    void Awake () {
         BuildingBlockInit bbi = new BuildingBlockInit();
-        bbi.up = true;
+        bbi.up = false;
         bbi.down = true;
-        bbi.sides = true;
+        bbi.sides = false;
         Init(bbi);
     }
+
+    void Start()
+    {
+        StartCoroutine(SpawnDrops());
+    }
 
-    public new void ShowNodes(bool topN, bool botN) { }
-    public new void HideNodes() { }
+    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;
+        }
+    }
 }

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

@@ -12,4 +12,11 @@ void Awake () {
         bbi.sides = false;
         Init(bbi);
     }
+
+
+    public new void DestroyBuilding()
+    {
+        // Todo GameOver
+        Destroy(gameObject);
+    }
 }

GGJ17/Assets/Script/IsoCamera.cs

@@ -2,24 +2,28 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class IsoCamera : MonoBehaviour {
-
+public class IsoCamera : MonoBehaviour
+{
+
     public float panSpeed = 10, rotateSpeed = 100, zoomSpeed = 5;
     private const float camFocusHeight = 0;
     private Vector3 focusPoint, mousePosition;
     private new Camera camera;
+    public float zoomMin, zoomMax;
 
-	// Use this for initialization
-	void Awake () {
+    // Use this for initialization
+    void Awake()
+    {
         camera = GetComponent<Camera>();
         Vector3 globalCamForwardDir = transform.forward;
         Vector3 downProjectedCamForward = Vector3.Project(transform.TransformVector(Vector3.forward), Vector3.down);
         float m = (transform.position.y - camFocusHeight) / downProjectedCamForward.magnitude;
         focusPoint = transform.position + globalCamForwardDir * m;
     }
-
-	// Update is called once per frame
-	void Update () {
+
+    // Update is called once per frame
+    void Update()
+    {
         #region pan
         Vector3 localMove = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0);
         Vector3 groundMove = Vector3.ProjectOnPlane(transform.TransformVector(localMove), Vector3.up);
@@ -29,8 +33,8 @@ void Update () {
         focusPoint += translation;
         #endregion
         // poll the mouse
-        if (Input.GetMouseButton(1))
         #region rotate
+        if (Input.GetMouseButton(1))
         {
             Vector2 rotation = new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y"));
             rotation *= rotateSpeed * Time.deltaTime;
@@ -42,7 +46,22 @@ void Update () {
         }
         #endregion
         #region zoom
-        camera.orthographicSize += Input.mouseScrollDelta.y * zoomSpeed * Time.deltaTime;
+        // reset if out of bounds
+        if (camera.orthographicSize < zoomMin)
+        {
+            camera.orthographicSize = zoomMin;
+        }
+        else if (camera.orthographicSize > zoomMax)
+        {
+            camera.orthographicSize = zoomMax;
+        }
+        // only move if target position is within bounds
+        float targetZoom = camera.orthographicSize + Input.mouseScrollDelta.y * zoomSpeed * Time.deltaTime;
+        if ((targetZoom >= zoomMin) &&
+            (targetZoom <= zoomMax))
+        {
+            camera.orthographicSize = targetZoom;
+        }
         #endregion
     }