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

Assets/Scripts/City.cs

@@ -88,7 +88,7 @@ public class City : MonoBehaviour
             lista[i].SetCapacity(x);
         }
     }
-    public void UseResources(List<float> a)
+    public void UseResources(List<int> a)
     {
         
     }

Assets/Scripts/ResourceCapacityUpgrade.cs

@@ -21,7 +21,7 @@ public class ResourceCapacityUpgrade : Upgrade
         UpgradeTargets target = UpgradeTargets.capacity;
         City city = gameObject.GetComponent<City>();
         int currentLevel = city.GetLevel(target);
-        city.UseResources(GetPrices(currentLevel));
+        city.UseResources((GetPrices(currentLevel)));
         city.IncreaseCapacity(currentLevel * 100);
         Debug.Log("Capacity upgraded");
     }

Assets/Scripts/Upgrade.cs

@@ -58,14 +58,13 @@ public abstract class Upgrade : MonoBehaviour
 
     }
 
-    public List<float> GetPrices(float modifier)
+    public List<int> GetPrices(float modifier)
     {
-        List<float> prices = new List<float>();
+        List<int> prices = new List<int>();
         foreach(KeyValuePair<Resources, int> key in resources)
         {
-            prices.Add(key.Value * modifier * 50 * GetEfficiency());
+            prices.Add((int) (key.Value * modifier * 50 * GetEfficiency()));
         }
-
         return prices;
     }