diff --git a/Assets/Prefab/Outcrop.prefab b/Assets/Prefab/Outcrop.prefab index 672f75ba77e0b03185550fe99c339092a869b8d3..4c9cbab81be33b9fc98989e98d22aa7d57e7f1b1 100644 --- a/Assets/Prefab/Outcrop.prefab +++ b/Assets/Prefab/Outcrop.prefab @@ -13,8 +13,8 @@ GameObject: - component: {fileID: 5733991913862907517} - component: {fileID: 7985519473791055737} m_Layer: 0 - m_Name: StoneResource - m_TagString: Resource + m_Name: Outcrop + m_TagString: Buildable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -94,7 +94,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: wood: 0 - quarry: {fileID: 0} --- !u!61 &7985519473791055737 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Resources/Forest.cs b/Assets/Scripts/Resources/Forest.cs index 8d733537cfe36c3b06e9d529f52be0544a5ae510..50385e04ff0afb722cc00e1c1d6f5c0ffd9acac6 100644 --- a/Assets/Scripts/Resources/Forest.cs +++ b/Assets/Scripts/Resources/Forest.cs @@ -74,12 +74,6 @@ public class Forest : Resource StartCoroutine("Grow"); } - // Update is called once per frame - void Update() - { - - } - IEnumerator Grow() { while (getAmount() < 1000) diff --git a/Assets/Scripts/Resources/Outcrop.cs b/Assets/Scripts/Resources/Outcrop.cs index 2b52283acb0ee8c7feca72b1a288b9c6eefb3256..1d7940bf0cdd306d026e6c9a376f3f8020e68cbe 100644 --- a/Assets/Scripts/Resources/Outcrop.cs +++ b/Assets/Scripts/Resources/Outcrop.cs @@ -11,6 +11,7 @@ public class Outcrop : MonoBehaviour private int woodNeeded = 100; private GameObject quarry; + public Resource neededResource; public int getAmount() { @@ -48,6 +49,9 @@ public class Outcrop : MonoBehaviour void Start() { setAmount(0); + GameObject go = new GameObject(); + neededResource = go.AddComponent<Forest>(); + neededResource.enabled = false; } // Update is called once per frame diff --git a/Assets/Scripts/Resources/Quarry.cs b/Assets/Scripts/Resources/Quarry.cs index 2975e62dd47fb7c409ca1768fc3485a3bef16974..cbf90dc7c972d58bf31a206c150c736fe21d75fe 100644 --- a/Assets/Scripts/Resources/Quarry.cs +++ b/Assets/Scripts/Resources/Quarry.cs @@ -44,7 +44,7 @@ public class Quarry : Resource // Start is called before the first frame update void Start() { - + setEventType(EventType.StoneCut); setAmount(Random.Range(2000, 4000)); } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 07d529912098620c87aeb761dfa15f941a273be1..777421a914b132776eb22ce8a45d5075a162e22a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,6 +8,8 @@ TagManager: - Tree - Resource - Home + - Flag + - Buildable layers: - Default - TransparentFX