From 521069d55055b8a23cc511784cf5bdba53e6019d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leevi=20Gr=C3=B6nlund?= <lejugr@utu.fi>
Date: Sat, 2 Mar 2019 16:22:53 +0200
Subject: [PATCH] Resources
---
Assets/Scenes/MainScene.meta | 8 --
.../{NewBehaviourScript.cs => BerryBush.cs} | 8 +-
...aviourScript.cs.meta => BerryBush.cs.meta} | 2 +-
Assets/Scripts/Forest.cs | 91 +++++++++++++++++++
Assets/Scripts/Forest.cs.meta | 11 +++
Assets/Scripts/Outcrop.cs | 29 ++++++
Assets/Scripts/Outcrop.cs.meta | 11 +++
Assets/Scripts/Quarry.cs | 26 ++++++
Assets/Scripts/Quarry.cs.meta | 11 +++
Assets/Scripts/Resource.cs | 40 ++++++++
Assets/Scripts/Resource.cs.meta | 11 +++
11 files changed, 238 insertions(+), 10 deletions(-)
delete mode 100644 Assets/Scenes/MainScene.meta
rename Assets/Scripts/{NewBehaviourScript.cs => BerryBush.cs} (72%)
rename Assets/Scripts/{NewBehaviourScript.cs.meta => BerryBush.cs.meta} (83%)
create mode 100644 Assets/Scripts/Forest.cs
create mode 100644 Assets/Scripts/Forest.cs.meta
create mode 100644 Assets/Scripts/Outcrop.cs
create mode 100644 Assets/Scripts/Outcrop.cs.meta
create mode 100644 Assets/Scripts/Quarry.cs
create mode 100644 Assets/Scripts/Quarry.cs.meta
create mode 100644 Assets/Scripts/Resource.cs
create mode 100644 Assets/Scripts/Resource.cs.meta
diff --git a/Assets/Scenes/MainScene.meta b/Assets/Scenes/MainScene.meta
deleted file mode 100644
index fad139c..0000000
--- a/Assets/Scenes/MainScene.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 829c46be4b50d504a8fd053e72cf24e3
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/NewBehaviourScript.cs b/Assets/Scripts/BerryBush.cs
similarity index 72%
rename from Assets/Scripts/NewBehaviourScript.cs
rename to Assets/Scripts/BerryBush.cs
index 0549f64..41be492 100644
--- a/Assets/Scripts/NewBehaviourScript.cs
+++ b/Assets/Scripts/BerryBush.cs
@@ -2,8 +2,14 @@
using System.Collections.Generic;
using UnityEngine;
-public class NewBehaviourScript : MonoBehaviour
+public class BerryBush : Resource
{
+
+ public override void checkExistence()
+ {
+
+ }
+
// Start is called before the first frame update
void Start()
{
diff --git a/Assets/Scripts/NewBehaviourScript.cs.meta b/Assets/Scripts/BerryBush.cs.meta
similarity index 83%
rename from Assets/Scripts/NewBehaviourScript.cs.meta
rename to Assets/Scripts/BerryBush.cs.meta
index a6fa2a8..282ca4e 100644
--- a/Assets/Scripts/NewBehaviourScript.cs.meta
+++ b/Assets/Scripts/BerryBush.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: d3674a5cdecf6e14abe5d88e6f0f7618
+guid: fa5bb155b8732f34994d234d1a214353
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/Forest.cs b/Assets/Scripts/Forest.cs
new file mode 100644
index 0000000..2900ac7
--- /dev/null
+++ b/Assets/Scripts/Forest.cs
@@ -0,0 +1,91 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Forest : Resource
+{
+ private bool isForester;
+ private float growthspeed;
+
+ public void setForester(bool i)
+ {
+ isForester = i;
+ if (isForester == true)
+ {
+ growthspeed = 0.5f;
+ }
+ else
+ {
+ growthspeed = 1;
+ }
+ }
+
+ public void refreshSprite()
+ {
+ if (resources < 125)
+ {
+ //yhden puun sprite
+ }
+ else if (resources < 250)
+ {
+ //2 sprite
+ }
+ else if (resources < 375)
+ {
+
+ }
+ else if (resources < 500)
+ {
+
+ }
+ else if (resources < 625)
+ {
+
+ }
+ else if (resources < 750)
+ {
+
+ }
+ else if (resources < 875)
+ {
+
+ }
+ else
+ {
+
+ }
+ }
+
+ public override void checkExistence()
+ {
+ if (resources < 1)
+ {
+ Destroy(gameObject);
+ }
+ }
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ resources = Random.Range(50, 300);
+ isForester = false;
+ growthspeed = 1;
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ checkExistence();
+ StartCoroutine("Grow");
+ refreshSprite();
+ }
+
+ IEnumerator Grow()
+ {
+ yield return new WaitForSeconds(growthspeed);
+ while (resources < 1000)
+ {
+ resources++;
+ }
+ }
+}
diff --git a/Assets/Scripts/Forest.cs.meta b/Assets/Scripts/Forest.cs.meta
new file mode 100644
index 0000000..3c4d35b
--- /dev/null
+++ b/Assets/Scripts/Forest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cb94cfa918a502245a4097b1749281ad
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Outcrop.cs b/Assets/Scripts/Outcrop.cs
new file mode 100644
index 0000000..1495d06
--- /dev/null
+++ b/Assets/Scripts/Outcrop.cs
@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Outcrop : Resource
+{
+ public override void checkExistence()
+ {
+ if (resources < 1)
+ {
+ Destroy(gameObject);
+ }
+ }
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ resources = 0;
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ if (resources == 100)
+ {
+ // luo Quarry -olio samaan pisteeseen kartalla ja tuhoa Outcrop -olio
+ }
+ }
+}
diff --git a/Assets/Scripts/Outcrop.cs.meta b/Assets/Scripts/Outcrop.cs.meta
new file mode 100644
index 0000000..a22b51e
--- /dev/null
+++ b/Assets/Scripts/Outcrop.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 35ded1978221bf847a4ec774ba1dc91c
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Quarry.cs b/Assets/Scripts/Quarry.cs
new file mode 100644
index 0000000..d15039e
--- /dev/null
+++ b/Assets/Scripts/Quarry.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Quarry : Resource
+{
+
+ public override void checkExistence()
+ {
+ if (resources < 1)
+ {
+ Destroy(gameObject);
+ }
+ }
+ // Start is called before the first frame update
+ void Start()
+ {
+ resources = Random.Range(2000, 4000);
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Quarry.cs.meta b/Assets/Scripts/Quarry.cs.meta
new file mode 100644
index 0000000..bfb8d56
--- /dev/null
+++ b/Assets/Scripts/Quarry.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 23de19c4f52dce74cb534c58eddea6df
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Resource.cs b/Assets/Scripts/Resource.cs
new file mode 100644
index 0000000..0d34126
--- /dev/null
+++ b/Assets/Scripts/Resource.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class Resource : MonoBehaviour
+{
+ protected int resources;
+
+ public void setAmount(int i)
+ {
+ resources = i;
+ }
+
+ public int getAmount()
+ {
+ //r.setAmount(ref.getAmount() - extraction);
+ return resources;
+
+ }
+
+ public int extractResource(int amount)
+ {
+ if (resources-amount < 0)
+ {
+ int r = resources;
+ resources = 0;
+ return r;
+ }
+ else
+ {
+ resources = resources - amount;
+ return amount;
+ }
+
+ }
+
+
+
+ public abstract void checkExistence();
+}
diff --git a/Assets/Scripts/Resource.cs.meta b/Assets/Scripts/Resource.cs.meta
new file mode 100644
index 0000000..c16ced8
--- /dev/null
+++ b/Assets/Scripts/Resource.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cd35c40904ffd144cb72afc7c3b5edc1
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab