diff --git a/Assets/Scripts/BerryBush.cs b/Assets/Scripts/BerryBush.cs index fab98963e5170604ad5ee99422d55dfc71201525..02598b25a51cf7ad0813c26e2e595e4d09af34bc 100644 --- a/Assets/Scripts/BerryBush.cs +++ b/Assets/Scripts/BerryBush.cs @@ -14,7 +14,26 @@ public class BerryBush : Resource public override void refreshSprite() { - + if (resources < 100) + { + //1 marjan sprite + } + else if (resources < 200) + { + //2 marjan sprite + } + else if (resources < 300) + { + //3 marjan sprite + } + else if (resources < 400) + { + //4 marjan sprite + } + else + { + // 5 marjan sprite + } } // Start is called before the first frame update diff --git a/Assets/Scripts/Forest.cs b/Assets/Scripts/Forest.cs index cc8347eebf1a6f3d92be47f767e51297be5da037..5677484cca9439018d29df7ab54acafc81fc2f8a 100644 --- a/Assets/Scripts/Forest.cs +++ b/Assets/Scripts/Forest.cs @@ -16,7 +16,7 @@ public class Forest : Resource } else { - growthspeed = 1; + growthspeed = 1f; } } diff --git a/Assets/Scripts/Outcrop.cs b/Assets/Scripts/Outcrop.cs index c89d689992d547b8cd1de695f5653952984a80e1..080ceb8c75e31e8a5287adcab5bbe11a3be8d4b8 100644 --- a/Assets/Scripts/Outcrop.cs +++ b/Assets/Scripts/Outcrop.cs @@ -2,20 +2,11 @@ using System.Collections.Generic; using UnityEngine; +// Luokka, joka vaatii collectoreilta 100 puuta ennen kuin Quarry voidaan luoda samaan pisteeseen kartalla public class Outcrop : Resource { - public override void checkExistence() - { - if (resources < 1) - { - Destroy(gameObject); - } - } - - public override void refreshSprite() - { - - } + public override void checkExistence() { } + public override void refreshSprite() { } // Start is called before the first frame update void Start() diff --git a/Assets/Scripts/Resource.cs b/Assets/Scripts/Resource.cs index 12e2222176840903099736ceb30c8c6e9d458faf..651df7fa83a34dcf1f5286a592a384abcbd170e5 100644 --- a/Assets/Scripts/Resource.cs +++ b/Assets/Scripts/Resource.cs @@ -13,9 +13,7 @@ public abstract class Resource : MonoBehaviour public int getAmount() { - //r.setAmount(ref.getAmount() - extraction); return resources; - } public int extractResource(int amount)