From daa73c600e092aa145a8d6c301097bf59150f593 Mon Sep 17 00:00:00 2001
From: Matti Loimaranta <makalo@utu.fi>
Date: Sat, 2 Mar 2019 18:42:18 +0200
Subject: [PATCH] Fixed method names
---
Assets/Scripts/CollectorUpgrade.cs | 2 +-
Assets/Scripts/PopulationUpgrade.cs | 2 +-
Assets/Scripts/ResourceCapacityUpgrade.cs | 2 +-
Assets/Scripts/ResourceEfficiencyUpgrade.cs | 8 ++++----
Assets/Scripts/RoadUpgrade.cs | 2 +-
Assets/Scripts/Upgrade.cs | 8 ++++----
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Assets/Scripts/CollectorUpgrade.cs b/Assets/Scripts/CollectorUpgrade.cs
index 3e4be0d..ab1c34d 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 f2de952..04377c2 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 eda19d9..803ec74 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 86514c5..94cb070 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 dbb667b..52676a0 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 b201b43..36839b8 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;
--
GitLab