From 3b97d0cfa56129dff2cf14a5699e2fb5c90dda50 Mon Sep 17 00:00:00 2001
From: Matti Loimaranta <makalo@utu.fi>
Date: Sat, 2 Mar 2019 18:13:24 +0200
Subject: [PATCH] fixed method names
---
Assets/Scripts/CollectorUpgrade.cs | 6 +++---
Assets/Scripts/PopulationUpgrade.cs | 6 +++---
Assets/Scripts/ResourceCapacityUpgrade.cs | 6 +++---
Assets/Scripts/ResourceEfficiencyUpgrade.cs | 2 +-
Assets/Scripts/RoadUpgrade.cs | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Assets/Scripts/CollectorUpgrade.cs b/Assets/Scripts/CollectorUpgrade.cs
index cb793b2..0cb03a6 100644
--- a/Assets/Scripts/CollectorUpgrade.cs
+++ b/Assets/Scripts/CollectorUpgrade.cs
@@ -11,9 +11,9 @@ public class CollectorUpgrade : Upgrade
UpgradeTargets target = UpgradeTargets.collector;
City city = gameObject.GetComponent<City>();
- float currentLevel = city.getLevel(target);
- city.useResources(getPrices(currentLevel));
- city.addCollector();
+ float currentLevel = city.GetLevel(target);
+ city.UseResources(getPrices(currentLevel));
+ city.AddCollector();
}
// Update is called once per frame
diff --git a/Assets/Scripts/PopulationUpgrade.cs b/Assets/Scripts/PopulationUpgrade.cs
index c2338c2..57d6c3b 100644
--- a/Assets/Scripts/PopulationUpgrade.cs
+++ b/Assets/Scripts/PopulationUpgrade.cs
@@ -20,9 +20,9 @@ public class PopulationUpgrade : Upgrade
{
UpgradeTargets target = UpgradeTargets.population;
City city = gameObject.GetComponent<City>();
- float currentLevel = city.getLevel(target);
- city.useResources(getPrices(currentLevel));
- city.addPopulation(currentLevel * 10);
+ float currentLevel = city.GetLevel(target);
+ city.UseResources(getPrices(currentLevel));
+ city.AddPopulation(currentLevel * 10);
Debug.Log("population upgraded");
}
}
diff --git a/Assets/Scripts/ResourceCapacityUpgrade.cs b/Assets/Scripts/ResourceCapacityUpgrade.cs
index 88ba170..008b638 100644
--- a/Assets/Scripts/ResourceCapacityUpgrade.cs
+++ b/Assets/Scripts/ResourceCapacityUpgrade.cs
@@ -20,9 +20,9 @@ public class ResourceCapacityUpgrade : Upgrade
{
UpgradeTargets target = UpgradeTargets.capacity;
City city = gameObject.GetComponent<City>();
- float currentLevel = city.getLevel(target);
- city.useResources(getPrices(currentLevel));
- city.increaseCapacity(currentLevel * 100);
+ float currentLevel = city.GetLevel(target);
+ city.UseResources(GetPrices(currentLevel));
+ city.IncreaseCapacity(currentLevel * 100);
Debug.Log("Capacity upgraded");
}
diff --git a/Assets/Scripts/ResourceEfficiencyUpgrade.cs b/Assets/Scripts/ResourceEfficiencyUpgrade.cs
index adb2040..6db0798 100644
--- a/Assets/Scripts/ResourceEfficiencyUpgrade.cs
+++ b/Assets/Scripts/ResourceEfficiencyUpgrade.cs
@@ -20,7 +20,7 @@ public class ResourceEfficiencyUpgrade : Upgrade
{
City city = gameObject.GetComponent<City>();
increaseEfficiencyLevel();
- city.useResources(getPrices(getEfficiencyLevel() * getEfficiencyLevel()));
+ city.UseResources(getPrices(getEfficiencyLevel() * getEfficiencyLevel()));
Debug.Log("Efficienfy upgraded to: " + getEfficiencyLevel());
}
}
diff --git a/Assets/Scripts/RoadUpgrade.cs b/Assets/Scripts/RoadUpgrade.cs
index 7ec0bef..ed98d5f 100644
--- a/Assets/Scripts/RoadUpgrade.cs
+++ b/Assets/Scripts/RoadUpgrade.cs
@@ -22,8 +22,8 @@ public class RoadUpgrade : Upgrade
Road road = gameObject.GetComponent<Road>();
City city = gameObject.GetComponent<City>();
float currentLevel = road.getLevel(target);
- city.useResources(getPrices(currentLevel));
- road.increaseSpeed(1 / currentLevel);
+ city.UseResources(getPrices(currentLevel));
+ road.IncreaseSpeed(1 / currentLevel);
Debug.Log("Road upgraded");
}
--
GitLab