diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index b6b11be..3ba305f 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scripts/Inventory.cs b/MoCha/Assets/Scripts/Inventory.cs index 3b52d2d..15a3126 100644 --- a/MoCha/Assets/Scripts/Inventory.cs +++ b/MoCha/Assets/Scripts/Inventory.cs @@ -7,7 +7,7 @@ public class Inventory : MonoBehaviour { public Image[] itemImages = new Image[numItemSlots]; public Item[] items = new Item[numItemSlots]; - public const int numItemSlots = 6; + public const int numItemSlots = 25; public void AddItem(Item itemToAdd) { for (int i = 0; i < items.Length; i++) diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index 5225457..bc5d34f 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -5,12 +5,31 @@ using System.Text; using UnityEngine.SceneManagement; public class MonsterManager : MonoBehaviour { + + public GameObject inventory; + public Item item; - void Start() { - + private Inventory inv; + + void Start() + { + inv = FindObjectOfType (); + giveItem (item); } - public void saveMonster () + public void giveItem(Item itm) + { + inv.AddItem (itm); + } + + public void showItems() + { + if (inventory.activeSelf == false) + inventory.SetActive (true); + else inventory.SetActive (false); + } + + public void saveMonster() { StringBuilder eyePos = new StringBuilder();