From 9901ea4924abf624ad3c3855d5d3053744930c9f Mon Sep 17 00:00:00 2001
From: Kimi Heinonen <kimiheinonen@hotmail.com>
Date: Sat, 2 Mar 2019 18:28:37 +0200
Subject: [PATCH] metodit isolla ja debugattu T erno
---
Assets/Scripts/City.cs | 24 ++++++++++++++---
Assets/Scripts/CollectorUpgrade.cs | 2 +-
Assets/Scripts/PopulationUpgrade.cs | 4 +--
Assets/Scripts/ResourceCapacityUpgrade.cs | 2 +-
Assets/Scripts/ResourceEfficiencyUpgrade.cs | 2 +-
Assets/Scripts/ResourcePool.cs | 4 +++
Assets/Scripts/Road.cs | 29 +++++++++++++++++++++
Assets/Scripts/Road.cs.meta | 11 ++++++++
Assets/Scripts/RoadUpgrade.cs | 4 +--
Assets/Scripts/Upgrade.cs | 2 +-
10 files changed, 72 insertions(+), 12 deletions(-)
create mode 100644 Assets/Scripts/Road.cs
create mode 100644 Assets/Scripts/Road.cs.meta
diff --git a/Assets/Scripts/City.cs b/Assets/Scripts/City.cs
index 0b9c7ff..8c7f8c2 100644
--- a/Assets/Scripts/City.cs
+++ b/Assets/Scripts/City.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -11,8 +12,18 @@ public class City : MonoBehaviour
{
}
-
-
+
+ public int GetLevel(UpgradeTargets target)
+ {
+ return 1;
+ }
+
+ public void AddCollector()
+ {
+
+ }
+
+
/**
* Kayttaa resurssia r, maaran 'amount' verran (amount >= 0).
* Voidaan kayttaa maximissaan sen verran resursseja mita niita on kaytossa.
@@ -32,7 +43,12 @@ public class City : MonoBehaviour
}
}
}
-
+
+ public void AddPopulation(int v)
+ {
+
+ }
+
/**
* Lisaa resurssia r, maaran 'amount' verran (amount >= 0).
diff --git a/Assets/Scripts/CollectorUpgrade.cs b/Assets/Scripts/CollectorUpgrade.cs
index 0cb03a6..3e4be0d 100644
--- a/Assets/Scripts/CollectorUpgrade.cs
+++ b/Assets/Scripts/CollectorUpgrade.cs
@@ -12,7 +12,7 @@ public class CollectorUpgrade : Upgrade
UpgradeTargets target = UpgradeTargets.collector;
City city = gameObject.GetComponent<City>();
float currentLevel = city.GetLevel(target);
- city.UseResources(getPrices(currentLevel));
+ city.UseResources(GetPrices(currentLevel));
city.AddCollector();
}
diff --git a/Assets/Scripts/PopulationUpgrade.cs b/Assets/Scripts/PopulationUpgrade.cs
index 57d6c3b..f2de952 100644
--- a/Assets/Scripts/PopulationUpgrade.cs
+++ b/Assets/Scripts/PopulationUpgrade.cs
@@ -20,8 +20,8 @@ public class PopulationUpgrade : Upgrade
{
UpgradeTargets target = UpgradeTargets.population;
City city = gameObject.GetComponent<City>();
- float currentLevel = city.GetLevel(target);
- city.UseResources(getPrices(currentLevel));
+ int 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 008b638..eda19d9 100644
--- a/Assets/Scripts/ResourceCapacityUpgrade.cs
+++ b/Assets/Scripts/ResourceCapacityUpgrade.cs
@@ -20,7 +20,7 @@ public class ResourceCapacityUpgrade : Upgrade
{
UpgradeTargets target = UpgradeTargets.capacity;
City city = gameObject.GetComponent<City>();
- float currentLevel = city.GetLevel(target);
+ int 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 6db0798..86514c5 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/ResourcePool.cs b/Assets/Scripts/ResourcePool.cs
index c4d6843..c4cbf61 100644
--- a/Assets/Scripts/ResourcePool.cs
+++ b/Assets/Scripts/ResourcePool.cs
@@ -59,4 +59,8 @@ public class ResourcePool : MonoBehaviour
{
this.maxCapacity += x;
}
+ public void AddCollector()
+ {
+ Collector c = gameObject.AddComponent<Collector>();
+ }
}
diff --git a/Assets/Scripts/Road.cs b/Assets/Scripts/Road.cs
new file mode 100644
index 0000000..7576280
--- /dev/null
+++ b/Assets/Scripts/Road.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Road : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+
+ internal float GetLevel(UpgradeTargets target)
+ {
+ throw new NotImplementedException();
+ }
+
+ internal void IncreaseSpeed(float v)
+ {
+ throw new NotImplementedException();
+ }
+}
diff --git a/Assets/Scripts/Road.cs.meta b/Assets/Scripts/Road.cs.meta
new file mode 100644
index 0000000..f596568
--- /dev/null
+++ b/Assets/Scripts/Road.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a13d323f8e41b544c95f8ef1a2b4baba
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/RoadUpgrade.cs b/Assets/Scripts/RoadUpgrade.cs
index ed98d5f..dbb667b 100644
--- a/Assets/Scripts/RoadUpgrade.cs
+++ b/Assets/Scripts/RoadUpgrade.cs
@@ -21,8 +21,8 @@ public class RoadUpgrade : Upgrade
UpgradeTargets target = UpgradeTargets.speed;
Road road = gameObject.GetComponent<Road>();
City city = gameObject.GetComponent<City>();
- float currentLevel = road.getLevel(target);
- city.UseResources(getPrices(currentLevel));
+ float currentLevel = road.GetLevel(target);
+ city.UseResources(GetPrices(currentLevel));
road.IncreaseSpeed(1 / currentLevel);
Debug.Log("Road upgraded");
}
diff --git a/Assets/Scripts/Upgrade.cs b/Assets/Scripts/Upgrade.cs
index d521f6e..b201b43 100644
--- a/Assets/Scripts/Upgrade.cs
+++ b/Assets/Scripts/Upgrade.cs
@@ -58,7 +58,7 @@ public abstract class Upgrade : MonoBehaviour
}
- public List<float> getPrices(float modifier)
+ public List<float> GetPrices(float modifier)
{
List<float> prices = new List<float>();
foreach(KeyValuePair<Resources, int> key in resources)
--
GitLab