Reworked code, Code cleanup, No new Version

Assets/Scripts/Controls.cs

@@ -59,7 +59,7 @@ public class Controls : MonoBehaviour
                             Destroy(target);
                             break;
                         case "Stone":
-                            GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Stone"));
+                            GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Rock"));
                             Destroy(target);
                             break;
                         case "NPC":

Assets/Scripts/Handler.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 71efee93c90768be4812cb603d42dc98
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Handler/SceneHandler.cs

@@ -29,18 +29,6 @@ namespace Assets.Scripts
             }
         }
 
-        // Start is called before the first frame update
-        void Start()
-        {
-
-        }
-
-        // Update is called once per frame
-        void Update()
-        {
-
-        }
-
         public void openMenuScene()
         {
             SceneManager.LoadSceneAsync("MenuScene", LoadSceneMode.Single);

Assets/Scripts/House.cs

@@ -33,11 +33,17 @@ namespace Assets.Scripts
             }
             else
             {
-                playerPosition = GameObject.Find("Player").transform.position;
-                houseInstance = Instantiate(houseObject);
-                houseInstance.transform.position = new Vector3(playerPosition.x, 50, playerPosition.z);
-                houseInstance.transform.localScale = new Vector3(1, 1, 1);
-                GameObject.Find("Player").transform.position = new Vector3(playerPosition.x, 51, playerPosition.z);
+                int openChance = new System.Random().Next(4);
+                if(openChance == 0){
+                    playerPosition = GameObject.Find("Player").transform.position;
+                    houseInstance = Instantiate(houseObject);
+                    houseInstance.transform.position = new Vector3(playerPosition.x, 50, playerPosition.z);
+                    houseInstance.transform.localScale = new Vector3(1, 1, 1);
+                    GameObject.Find("Player").transform.position = new Vector3(playerPosition.x, 51, playerPosition.z);
+                }
+                else{
+                    GameObject.Find("UIHandler").GetComponent<UIHandler>().showMessage("ERROR;This house is locked.");
+                }
             }
             hasInteracted = true;
         }
@@ -56,6 +62,7 @@ namespace Assets.Scripts
                 switch (type)
                 {
                     case 0:
+                        // Maybe add luck to increase chance for equipment
                         item = new Equipment(luck);
                         break;
                     case 1:

Assets/Scripts/Inventory.cs

@@ -187,7 +187,7 @@ namespace Assets.Scripts
             return startDrag;
         }
 
-        public Item getEquip(ItemPlace place)
+        /*public Item getEquip(ItemPlace place)
         {
             switch (place)
             {
@@ -210,7 +210,7 @@ namespace Assets.Scripts
                 default:
                     return null;
             }
-        }
+        }*/
 
         public void calculateStatBoost(Dictionary<string, int> attributes, bool isAddition)
         {

Assets/Scripts/Items/Item.cs

@@ -89,7 +89,7 @@ namespace Assets.Scripts
                 case "Wood":
                     image = Resources.Load<Texture>("Items/Inv_Wood");
                     break;
-                case "Stone":
+                case "Rock":
                     image = Resources.Load<Texture>("Items/Inv_Stone");
                     break;
             }
@@ -129,8 +129,8 @@ namespace Assets.Scripts
                 case "Wood":
                     result = "Quite a nice piece of wood";
                     break;
-                case "Stone":
-                    result = "A small stone to craft with";
+                case "Rock":
+                    result = "Is it... Dwayne?";
                     break;
             }
             return result;
@@ -156,7 +156,7 @@ namespace Assets.Scripts
 
             endDrag.setItem(this, startDrag.getCurrentBag());
         }
-        
+
         private void chooseItem()
         {
             /* Common:      Slimeball

Assets/Scripts/Menu/UIHandlerMenu.cs

@@ -23,11 +23,6 @@ namespace Assets.Scripts.Menu
             SteamWorksHandler.getStandardAchievement("StartAchievement");
         }
 
-        void Update()
-        {
-
-        }
-
         public void startGame(SceneHandler sceneHandler)
         {
             int cityAmount = 0;

Assets/Scripts/NewTileScript.cs

@@ -1,203 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class NewTileScript : MonoBehaviour
-{
-    Vector3 position;
-    float borderNorth;
-    float borderEast;
-    float borderSouth;
-    float borderWest;
-    System.Random rand = new System.Random();
-    string tilename;
-    GameObject contentGenerator;
-
-    List<GameObject> aliveEnemies = new List<GameObject>();
-    List<GameObject> deadEnemies = new List<GameObject>();
-
-    public void generateTile(Vector3 pos, string name)
-    {
-        tilename = name;
-        //contentGenerator = GameObject.Find("ContentGenerator");
-        setPosition(pos);
-        setBorders();
-        //generateContent();
-    }
-
-    public void setBorders()
-    {
-        borderNorth = position.z * 100 + 50;
-        borderEast = position.x * 100 + 50;
-        borderSouth = position.z * 100 - 50;
-        borderWest = position.x * 100 - 50;
-    }
-
-    public void generateContent()
-    {
-        if (!tilename.ToLower().Equals("City"))
-        {
-            foreach (Vector3 position in getSpawnLocations())
-            {
-                spawnObject(position);
-            }
-        }
-    }
-
-    public List<Vector3> getSpawnLocations()
-    {
-        List<Vector3> list = new List<Vector3>();
-        int xChange = 0;
-        int zChange = 0;
-        for (float i = borderNorth - 10; i >= borderSouth + 10; i = i - 10)
-        {
-            for (float j = borderWest + 10; j <= borderEast - 10; j = j + 10)
-            {
-                xChange = rand.Next(-4, +4);
-                zChange = rand.Next(-4, +4);
-                list.Add(new Vector3(j + xChange, 5, i + zChange));
-            }
-        }
-        return list;
-    }
-
-    public void spawnObject(Vector3 position)
-    {
-        int chance = rand.Next(1, 101);
-        if (chance >= 50)
-        {
-            GameObject content = contentGenerator.GetComponent<ContentGenerator>().generateContent(tilename);
-            if (content != null)
-            {
-                GameObject obj = Instantiate(content, position, Quaternion.identity);
-                obj.transform.parent = gameObject.transform;
-                if (obj.tag.Contains("Enemy"))
-                {
-                    aliveEnemies.Add(obj);
-                }
-            }
-        }
-    }
-
-    public void setPosition(Vector3 position)
-    {
-        this.position = position;
-    }
-
-    public Vector3 getPosition()
-    {
-        return position;
-    }
-
-    public bool leftTile(float playerX, float playerZ)
-    {
-        bool result = false;
-        if (playerX >= borderEast + 10 || playerX <= borderWest - 10 || playerZ >= borderNorth + 10 || playerZ <= borderSouth - 10)
-        {
-            changeRenderer();
-            result = true;
-        }
-        return result;
-    }
-
-    public void changeRenderer()
-    {
-        foreach (Rigidbody rigid in gameObject.GetComponentsInChildren<Rigidbody>())
-        {
-            if (!deadEnemies.Contains(rigid.gameObject))
-            {
-                rigid.useGravity = !rigid.useGravity;
-            }
-        }
-
-        foreach (Renderer rend in gameObject.GetComponentsInChildren<Renderer>())
-        {
-            if (!deadEnemies.Contains(rend.gameObject))
-            {
-                rend.enabled = !rend.enabled;
-            }
-        }
-
-        foreach (Collider col in gameObject.GetComponentsInChildren<Collider>())
-        {
-            if (!deadEnemies.Contains(col.gameObject))
-            {
-                col.enabled = !col.enabled;
-            }
-        }
-    }
-
-    public void resetSpawn()
-    {
-        foreach (Rigidbody rigid in gameObject.GetComponentsInChildren<Rigidbody>())
-        {
-            rigid.useGravity = true;
-        }
-
-        foreach (Renderer rend in gameObject.GetComponentsInChildren<Renderer>())
-        {
-            rend.enabled = true;
-        }
-
-        foreach (Collider col in gameObject.GetComponentsInChildren<Collider>())
-        {
-            col.enabled = true;
-        }
-    }
-
-    public bool enteredTile(float playerX, float playerZ)
-    {
-        bool result = false;
-        if (playerX <= borderEast && playerX >= borderWest && playerZ <= borderNorth && playerZ >= borderSouth)
-        {
-            result = true;
-        }
-        return result;
-    }
-
-    public Vector3 needConnectedTile(float playerX, float playerZ)
-    {
-        Vector3 result = new Vector3(position.x, 1, position.z);
-        if (playerX >= borderEast - 10)
-        {
-            result.x = result.x + 1;
-            result.y = 0;
-        }
-        else if (playerX <= borderWest + 10)
-        {
-            result.x = result.x - 1;
-            result.y = 0;
-        }
-
-        if (playerZ >= borderNorth - 10)
-        {
-            result.z = result.z + 1;
-            result.y = 0;
-        }
-        else if (playerZ <= borderSouth + 10)
-        {
-            result.z = result.z - 1;
-            result.y = 0;
-        }
-        return result;
-    }
-
-    public bool removeConnectedTiles(float playerX, float playerZ)
-    {
-        bool result = false;
-        if (playerX <= borderEast - 10 && playerX >= borderWest + 10 && playerZ <= borderNorth - 10 && playerZ >= borderSouth + 10)
-        {
-            result = true;
-        }
-        return result;
-    }
-
-    public void enemyKilled(GameObject enemy)
-    {
-        deadEnemies.Add(enemy);
-        enemy.GetComponent<Rigidbody>().useGravity = false;
-        enemy.GetComponent<Renderer>().enabled = false;
-        enemy.GetComponent<Collider>().enabled = false;
-        aliveEnemies.Remove(enemy);
-    }
-}

Assets/Scripts/NewTileScript.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4d53b2b3bfaa3874885a1bc9b08093dc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/PlayerCamera.cs

@@ -53,7 +53,7 @@ namespace Assets.Scripts
                             displayInformation("Tree");
                             break;
                         case "stone":
-                            displayInformation("Stone");
+                            displayInformation("Rock");
                             break;
                         case "npc":
                             displayInformation("NPC");

Assets/Scripts/Quests/CollectQuest.cs

@@ -20,8 +20,8 @@ namespace Assets.Scripts
                     keyword = "Slimeball";
                     break;
                 case 1:
-                    questname = questname + "stones";
-                    keyword = "Stone";
+                    questname = questname + "rocks";
+                    keyword = "Rock";
                     break;
                 case 2:
                     questname = questname + "wood";
@@ -102,7 +102,7 @@ namespace Assets.Scripts
             {
                 return true;
             }
-            if (keyword == "Stone" && item.getName().ToLower().Contains("stone"))
+            if (keyword == "Rock" && item.getName().ToLower().Contains("rock"))
             {
                 return true;
             }