From 600e9e43e465407b984ba0da1f23981328ae8b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leevi=20Gr=C3=B6nlund?= <lejugr@utu.fi>
Date: Sun, 3 Mar 2019 17:41:45 +0200
Subject: [PATCH] Outcrop modifications
---
Assets/Prefab/Outcrop.prefab | 5 ++---
Assets/Scripts/Resources/Forest.cs | 6 ------
Assets/Scripts/Resources/Outcrop.cs | 4 ++++
Assets/Scripts/Resources/Quarry.cs | 2 +-
ProjectSettings/TagManager.asset | 2 ++
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Assets/Prefab/Outcrop.prefab b/Assets/Prefab/Outcrop.prefab
index 672f75b..4c9cbab 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 8d73353..50385e0 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 2b52283..1d7940b 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 2975e62..cbf90dc 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 07d5299..777421a 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -8,6 +8,8 @@ TagManager:
- Tree
- Resource
- Home
+ - Flag
+ - Buildable
layers:
- Default
- TransparentFX
--
GitLab