diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs index 56a9c0c..55f57c7 100644 --- a/Assets/Scripts/Resource/ResourceMaker.cs +++ b/Assets/Scripts/Resource/ResourceMaker.cs @@ -8,10 +8,17 @@ public class ResourceMaker : MonoBehaviour [SerializeField] private int _resourceMakingAmount; [SerializeField] - private ResourceManager.ResourceChoice _resourceChoice; + private ResourceChoice _resourceChoice; private ResourceManager _resourceManagerInstance; - private void Awake() + public enum ResourceChoice + { + Rock, + Wood, + Food + }; + + private void Start() { _resourceManagerInstance = ResourceManager.Instance; } @@ -23,13 +30,13 @@ public class ResourceMaker : MonoBehaviour { switch (_resourceChoice) { - case ResourceManager.ResourceChoice.Rock: + case ResourceChoice.Rock: _resourceManagerInstance.RockAmount = _resourceMakingAmount; break; - case ResourceManager.ResourceChoice.Wood: + case ResourceChoice.Wood: _resourceManagerInstance.WoodAmount = _resourceMakingAmount; break; - case ResourceManager.ResourceChoice.Food: + case ResourceChoice.Food: _resourceManagerInstance.FoodAmount = _resourceMakingAmount; break; } diff --git a/Assets/Scripts/Resource/ResourceManager.cs b/Assets/Scripts/Resource/ResourceManager.cs index 70bc44e..d7748b1 100644 --- a/Assets/Scripts/Resource/ResourceManager.cs +++ b/Assets/Scripts/Resource/ResourceManager.cs @@ -10,19 +10,6 @@ public class ResourceManager : MonoBehaviour private int _woodAmount = 20; private int _foodAmount = 20; - public enum ResourceChoice - { - Rock, - Wood, - Food - }; - - public enum AddOrRemove - { - Add, - Remove - }; - private const int MAX = 100; private const int MIN = 0; diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index 0f1e7f1..7a7ab28 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -21,9 +21,6 @@ public class ResourceTile : LevelTile public override void LevelUpdate() { - //if (!Occupied) return; Uncomment once tile occupation exists - - _yieldCounter += Time.deltaTime * _yieldSpeed; if (_yieldCounter < 1) return;