From 0436d884baaeab75c501f41516ce9049c2e2071c Mon Sep 17 00:00:00 2001
From: Matti Loimaranta <makalo@utu.fi>
Date: Sat, 2 Mar 2019 18:51:10 +0200
Subject: [PATCH] changed unnecessary floats to ints
---
Assets/Scripts/City.cs | 2 +-
Assets/Scripts/ResourceCapacityUpgrade.cs | 2 +-
Assets/Scripts/Upgrade.cs | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/City.cs b/Assets/Scripts/City.cs
index 8c7f8c2..5c15fd4 100644
--- a/Assets/Scripts/City.cs
+++ b/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)
{
}
diff --git a/Assets/Scripts/ResourceCapacityUpgrade.cs b/Assets/Scripts/ResourceCapacityUpgrade.cs
index 803ec74..6158772 100644
--- a/Assets/Scripts/ResourceCapacityUpgrade.cs
+++ b/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");
}
diff --git a/Assets/Scripts/Upgrade.cs b/Assets/Scripts/Upgrade.cs
index 36839b8..085a6a5 100644
--- a/Assets/Scripts/Upgrade.cs
+++ b/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;
}
--
GitLab