diff --git a/Assets/Scripts/City.cs b/Assets/Scripts/City.cs index acc19191885dafe56f0eb7c3cb3226fef7aefba4..4886609f5fc63f9995dc146d10566b4958420929 100644 --- a/Assets/Scripts/City.cs +++ b/Assets/Scripts/City.cs @@ -75,20 +75,22 @@ public class City : MonoBehaviour * Kayttaa resurssia r, maaran 'amount' verran (amount >= 0). * Voidaan kayttaa maximissaan sen verran resursseja mita niita on kaytossa. */ - public void UseResource(Resource r, int amount) + public int UseResource(Resource r, int amount) { if (amount<0) { - return; + return 0; } + int otettuMaara = 0; ResourcePool[] lista = gameObject.GetComponents<ResourcePool>(); for (int i = 0; i < lista.Length; i++) { if (lista[i].GetResource().GetType().Equals(r.GetType())) { - lista[i].UseResource(amount); + otettuMaara = lista[i].UseResource(amount); } } + return otettuMaara; } public void AddPopulation(int v) @@ -145,4 +147,12 @@ public class City : MonoBehaviour UseResource(lista[i].GetResource(), a[0]); } } + public List<GameObject> GetWorkerList() + { + return workerlista; + } + public void OnMouseDown() + { + AddCollector(); + } } diff --git a/Assets/Scripts/ResourcePool.cs b/Assets/Scripts/ResourcePool.cs index d09e1d331c3347873579f40640e86d0fba171f94..ce51047eb39df40df55b8882cc5c703731eb0c74 100644 --- a/Assets/Scripts/ResourcePool.cs +++ b/Assets/Scripts/ResourcePool.cs @@ -30,15 +30,19 @@ public class ResourcePool : MonoBehaviour /** * Kayttaa resurssia maaran X verran */ - public void UseResource(int x) + public int UseResource(int x) { + int otettuMaara = 0; if (this.amount - x <= 0) { + otettuMaara = this.amount; this.amount = 0; + return otettuMaara; } else { this.amount -= x; + return x; } } /**