Merge branch 'master' of https://gitlab.utu.fi/eolokk/game_jam19

Assets/Prefab/City.prefab

@@ -119,7 +119,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dfe928a858872424991e927606dd4bc3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  worker: {fileID: 0}
+  workerlista: []
+  worker: {fileID: 548039319383633024, guid: 7dc194a2047a39340a91ca7636a56290, type: 3}
   population: 0
   populationLevel: 0
   resourcePoolLevel: 0

Assets/Scripts/City.cs

@@ -5,6 +5,9 @@ using UnityEngine;
 
 public class City : MonoBehaviour
 {
+    [SerializeField]
+    List<GameObject> workerlista;
+
     [SerializeField]
     GameObject worker;
 
@@ -20,16 +23,18 @@ public class City : MonoBehaviour
     [SerializeField]
     public int roadLevel = 0;
 
-    [SerializeField]
-    public int collectorLevel = 0;
 
     
     // Start is called before the first frame update
     void Start()
     {
         
+        
     }
 
+    /**
+     * Palauttaa kysytyn targetin levelin
+     */
     public int GetLevel(UpgradeTargets target)
     {
         switch (target)
@@ -41,7 +46,7 @@ public class City : MonoBehaviour
             case UpgradeTargets.speed:
                 return this.roadLevel;
             case UpgradeTargets.collector:
-                return this.collectorLevel;
+                return this.workerlista.Count;
             default:
                 Debug.Log("Default");
                 return -1;
@@ -50,12 +55,19 @@ public class City : MonoBehaviour
         return 1;
     }
 
+    /**
+     * Lisaa uuden collecotrin
+     */
     public void AddCollector()
     {
 
         GameObject go = Instantiate<GameObject>(worker);
+        this.workerlista.Add(go);
 
         go.transform.position = new Vector3();
+
+        
+        this.population++;
     }
 
 

Assets/Scripts/Collector.cs

@@ -53,7 +53,7 @@ public class Collector : MonoBehaviour
                 MoveTo(hit.collider.gameObject);
             }
         }
-        if (target != null)
+        if (move_to != null)
             transform.position = Vector3.MoveTowards(new Vector3(transform.position.x, transform.position.y, -1f), move_to.transform.position, speed * Time.deltaTime);
     }
     private void OnTriggerEnter2D(Collider2D collision)
@@ -67,7 +67,7 @@ public class Collector : MonoBehaviour
             this.resource = this.target.GetComponent<Resource>();
             StartCoroutine("goHome");
         }
-        else if (collision.gameObject.name == "City" && this.resource != null)
+        else if (collision.gameObject.tag == "Home" && this.resource != null)
         {
             //resets amount and resource variables
             collision.gameObject.GetComponent<City>().AddResource(this.resource, this.amount);

Assets/Scripts/EventSystem/EventSystem.cs

@@ -15,9 +15,12 @@ public static class EventSystem
 
     public static void EventHappened(EventType name)
     {
+        Debug.Log("happened");
         if (events.ContainsKey(name))
         {
-            foreach (IAction e in events.Values){
+
+            Debug.Log("contains: "+events.Values.ToString());
+            foreach (IAction e in events[name]){
                 e.React(name);
             }
         }

Assets/Scripts/ResourcePool.cs

@@ -59,5 +59,9 @@ public class ResourcePool : MonoBehaviour
     {
         this.maxCapacity += x;
     }
+    public int GetMaxCapacity()
+    {
+        return this.maxCapacity;
+    }
     
 }