diff --git a/Assets/Scripts/CollectorUpgrade.cs b/Assets/Scripts/CollectorUpgrade.cs index 3e4be0d1e48530275fcfd0c9f6144d67dd464192..ab1c34d767aed16bf66ab706a5824176a0ddf3d0 100644 --- a/Assets/Scripts/CollectorUpgrade.cs +++ b/Assets/Scripts/CollectorUpgrade.cs @@ -11,7 +11,7 @@ public class CollectorUpgrade : Upgrade UpgradeTargets target = UpgradeTargets.collector; City city = gameObject.GetComponent<City>(); - float currentLevel = city.GetLevel(target); + int currentLevel = city.GetLevel(target); city.UseResources(GetPrices(currentLevel)); city.AddCollector(); } diff --git a/Assets/Scripts/PopulationUpgrade.cs b/Assets/Scripts/PopulationUpgrade.cs index f2de952c2b92ac0244099399ac4425ed94c84af9..04377c22e30f7c2ab3c8ded9ff765617130e67b9 100644 --- a/Assets/Scripts/PopulationUpgrade.cs +++ b/Assets/Scripts/PopulationUpgrade.cs @@ -16,7 +16,7 @@ public class PopulationUpgrade : Upgrade } - public void upgrade() + public void UpgradePopulation() { UpgradeTargets target = UpgradeTargets.population; City city = gameObject.GetComponent<City>(); diff --git a/Assets/Scripts/ResourceCapacityUpgrade.cs b/Assets/Scripts/ResourceCapacityUpgrade.cs index eda19d90a6da184ac8d599a3c6daec3982dcdc20..803ec748918623948857740fb7e0d60e7c66ad07 100644 --- a/Assets/Scripts/ResourceCapacityUpgrade.cs +++ b/Assets/Scripts/ResourceCapacityUpgrade.cs @@ -16,7 +16,7 @@ public class ResourceCapacityUpgrade : Upgrade } - public void upgrade() + public void UpgradeCapacity() { UpgradeTargets target = UpgradeTargets.capacity; City city = gameObject.GetComponent<City>(); diff --git a/Assets/Scripts/ResourceEfficiencyUpgrade.cs b/Assets/Scripts/ResourceEfficiencyUpgrade.cs index 86514c535793536e06f27d179844359bac7777ee..94cb070ee00f1601542f1e71b113f0a87d970a9a 100644 --- a/Assets/Scripts/ResourceEfficiencyUpgrade.cs +++ b/Assets/Scripts/ResourceEfficiencyUpgrade.cs @@ -16,11 +16,11 @@ public class ResourceEfficiencyUpgrade : Upgrade } - public void upgrade() + public void UpgradeEfficiency() { City city = gameObject.GetComponent<City>(); - increaseEfficiencyLevel(); - city.UseResources(GetPrices(getEfficiencyLevel() * getEfficiencyLevel())); - Debug.Log("Efficienfy upgraded to: " + getEfficiencyLevel()); + IncreaseEfficiencyLevel(); + city.UseResources(GetPrices(GetEfficiencyLevel() * GetEfficiencyLevel())); + Debug.Log("Efficienfy upgraded to: " + GetEfficiencyLevel()); } } diff --git a/Assets/Scripts/RoadUpgrade.cs b/Assets/Scripts/RoadUpgrade.cs index dbb667be82ececd37c920697ead1a7d35c3e489e..52676a0fd29f8148bfedffab67789e09a572ed9a 100644 --- a/Assets/Scripts/RoadUpgrade.cs +++ b/Assets/Scripts/RoadUpgrade.cs @@ -16,7 +16,7 @@ public class RoadUpgrade : Upgrade } - public void upgrade() + public void UpgradeRoad() { UpgradeTargets target = UpgradeTargets.speed; Road road = gameObject.GetComponent<Road>(); diff --git a/Assets/Scripts/Upgrade.cs b/Assets/Scripts/Upgrade.cs index b201b431ab0b7bbb5d02ab4c4fed21670f04c50d..36839b8d40d15a48d5b5cdae9cf0f244ff23801d 100644 --- a/Assets/Scripts/Upgrade.cs +++ b/Assets/Scripts/Upgrade.cs @@ -25,17 +25,17 @@ public abstract class Upgrade : MonoBehaviour } - public float getEfficiencyLevel() + public float GetEfficiencyLevel() { return efficiencyLevel; } - public void increaseEfficiencyLevel() + public void IncreaseEfficiencyLevel() { efficiencyLevel++; } - public float getEfficiency() + public float GetEfficiency() { switch (efficiencyLevel) { @@ -63,7 +63,7 @@ public abstract class Upgrade : MonoBehaviour List<float> prices = new List<float>(); foreach(KeyValuePair<Resources, int> key in resources) { - prices.Add(key.Value * modifier * 50 * getEfficiency()); + prices.Add(key.Value * modifier * 50 * GetEfficiency()); } return prices;