diff --git a/Assets/CodeMap1.dgml b/Assets/CodeMap1.dgml
index 78afaa6..3f515ad 100644
--- a/Assets/CodeMap1.dgml
+++ b/Assets/CodeMap1.dgml
@@ -1,274 +1,274 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -280,10 +280,10 @@
-
+
-
-
+
+
@@ -319,92 +319,92 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -415,49 +415,49 @@
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
@@ -507,7 +507,7 @@
-
+
@@ -527,9 +527,9 @@
-
+
-
+
@@ -540,7 +540,7 @@
-
+
@@ -563,7 +563,7 @@
-
+
@@ -582,91 +582,91 @@
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -682,26 +682,26 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
@@ -1177,7 +1177,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/Assets/GUI/Inventory/Inventory.cs b/Assets/GUI/Inventory/Inventory.cs
deleted file mode 100644
index d0126ff..0000000
--- a/Assets/GUI/Inventory/Inventory.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-[System.Serializable]
-public class Inventory
-{
-
- public Item[] inventory;
-
- public int size;
-
-
- public void Add(Item added)
- {
- foreach (Item item in inventory)
- {
-
- if (item != null)
- {
-
- if (item.GetType() == added.GetType())
- {
- Debug.Log(added.GetType());
- item.amount += added.amount;
- Debug.Log("Inventory added: " + item.GetType() + " Amount: " + item.amount);
-
- return;
- }
- }
- }
-
- for (int i = 0; i < 10; i++)
- {
- if (inventory[i] == null)
- {
- inventory[i] = added;
- return;
- }
- }
-
-
- }
-
- public Inventory (int InventorySize)
- {
- inventory = new Item[InventorySize];
- this.size = InventorySize;
- }
-
- public void Remove(int i)
- {
- inventory[i] = null;
- }
-
- public Item Get(int i)
- {
- return inventory[i];
- }
-
- public void TransferItem(Inventory inv, int index)
- {
- this.Add(inv.Get(index));
- inv.Remove(index);
- }
-}
diff --git a/Assets/GameController.cs b/Assets/GameController.cs
index 70c3b58..e83fc44 100644
--- a/Assets/GameController.cs
+++ b/Assets/GameController.cs
@@ -159,7 +159,7 @@ public void TogleDualInventory(Inventory other)
}
else if (!(guiHandler.dualinventoryOn))
{
- Debug.Log("Opening");
+ //Debug.Log("Opening");
guiHandler.actionGroup.SetActive(false);
guiHandler.DualInventory.SetOtherInv(other);
guiHandler.DualInventory.gameObject.SetActive(true);
diff --git a/Assets/GUI/Inventory.meta b/Assets/Inventory.meta
similarity index 100%
rename from Assets/GUI/Inventory.meta
rename to Assets/Inventory.meta
diff --git a/Assets/GUI/Inventory/Dual.meta b/Assets/Inventory/Dual.meta
similarity index 100%
rename from Assets/GUI/Inventory/Dual.meta
rename to Assets/Inventory/Dual.meta
diff --git a/Assets/GUI/Inventory/Dual/DualInventoryDesplay.cs b/Assets/Inventory/Dual/DualInventoryDesplay.cs
similarity index 94%
rename from Assets/GUI/Inventory/Dual/DualInventoryDesplay.cs
rename to Assets/Inventory/Dual/DualInventoryDesplay.cs
index fa3a493..ceeff86 100644
--- a/Assets/GUI/Inventory/Dual/DualInventoryDesplay.cs
+++ b/Assets/Inventory/Dual/DualInventoryDesplay.cs
@@ -61,8 +61,8 @@ public void UpdateInventory()
drawedInv[i].GetComponent().thisinv = player;
drawedInv[i].GetComponent().index = i;
- Debug.Log(inv.inventory[i].GetType());
- Debug.Log("Drawed " + i);
+ //Debug.Log(inv.inventory[i].GetType());
+ //Debug.Log("Drawed " + i);
#endregion
}
else
@@ -111,8 +111,8 @@ public void UpdateInventory()
drawedInv[i].GetComponent().thisinv = other;
drawedInv[i].GetComponent().index = i;
- Debug.Log(inv.inventory[i].GetType());
- Debug.Log("Drawed " + i);
+ //Debug.Log(inv.inventory[i].GetType());
+ //Debug.Log("Drawed " + i);
#endregion
}
else
diff --git a/Assets/GUI/Inventory/Dual/DualInventoryDesplay.cs.meta b/Assets/Inventory/Dual/DualInventoryDesplay.cs.meta
similarity index 100%
rename from Assets/GUI/Inventory/Dual/DualInventoryDesplay.cs.meta
rename to Assets/Inventory/Dual/DualInventoryDesplay.cs.meta
diff --git a/Assets/GUI/Inventory/Dual/DualInventoryElement.cs b/Assets/Inventory/Dual/DualInventoryElement.cs
similarity index 85%
rename from Assets/GUI/Inventory/Dual/DualInventoryElement.cs
rename to Assets/Inventory/Dual/DualInventoryElement.cs
index f21df35..e45e991 100644
--- a/Assets/GUI/Inventory/Dual/DualInventoryElement.cs
+++ b/Assets/Inventory/Dual/DualInventoryElement.cs
@@ -48,7 +48,7 @@ public void Set(int setAmount)
public void Set(string setName)
{
this.name = setName;
- Debug.Log(setName);
+ //Debug.Log(setName);
nameDisplay.GetComponent().text = setName.ToString();
}
@@ -63,7 +63,7 @@ public void Set(Item item)
{
Set(item.amount);
- Debug.Log(GameCon.language);
+ //Debug.Log(GameCon.language);
Set(Language.Get(item, GameCon.language));
}
#endregion
@@ -72,6 +72,11 @@ public void Set(Item item)
public void Transfer()
{
Debug.Log("Transfer");
+ if (Input.GetButton("Specific"))
+ {
+ thisinv.TransferItemAmount(other, index, 1);
+ return;
+ }
other.TransferItem(thisinv, index);
diff --git a/Assets/GUI/Inventory/Dual/DualInventoryElement.cs.meta b/Assets/Inventory/Dual/DualInventoryElement.cs.meta
similarity index 100%
rename from Assets/GUI/Inventory/Dual/DualInventoryElement.cs.meta
rename to Assets/Inventory/Dual/DualInventoryElement.cs.meta
diff --git a/Assets/Inventory/Inventory.cs b/Assets/Inventory/Inventory.cs
new file mode 100644
index 0000000..2866ff8
--- /dev/null
+++ b/Assets/Inventory/Inventory.cs
@@ -0,0 +1,149 @@
+using UnityEngine;
+using System.Collections;
+using System;
+
+[System.Serializable]
+public class Inventory
+{
+
+ public Item[] inventory;
+
+ public int size;
+
+
+ public Inventory(int InventorySize)
+ {
+ inventory = new Item[InventorySize];
+ this.size = InventorySize;
+ }
+
+
+ public Item Add(Item added)
+ {
+ int size = added.amount;
+
+ foreach (Item item in inventory)
+ {
+
+ if (item != null)
+ {
+
+ if (item.GetType() == added.GetType())
+ {
+ Debug.Log(added.GetType());
+
+ size = AddAmount(added.amount, item);
+
+ Debug.Log("Inventory added: " + item.GetType() + " Amount: " + item.amount);
+ if (size == 0)
+ {
+ return item;
+ }
+ added.amount = size;
+ }
+ }
+ }
+
+ for (int i = 0; i < 10; i++)
+ {
+ if (inventory[i] == null)
+ {
+ inventory[i] = added;
+ return inventory[i];
+ }
+ }
+
+ return null;
+
+ }
+
+ public void Remove(int i)
+ {
+ inventory[i] = null;
+ }
+
+
+
+ public Item Get(int i)
+ {
+ return inventory[i];
+ }
+
+ public void TransferItem(Inventory inv, int index)
+ {
+ this.Add(inv.Get(index));
+ inv.Remove(index);
+ }
+
+ public void TransferItemAmount(Inventory Toinv, int Fromindex, int addingAmount)
+ {
+
+
+
+ // Toinv.Add(inventory[Fromindex]);
+
+ //if (inventory[Fromindex].amount == 0)
+ //{
+ // Remove(Fromindex);
+ //}
+
+
+ Debug.Log(inventory[Fromindex]);
+
+ if (inventory[Fromindex].amount - addingAmount < 0)
+ {
+ Item addable = (((Item)Activator.CreateInstance(null, inventory[Fromindex].GetType().ToString()).Unwrap()));
+
+ addable.amount = (addingAmount - inventory[Fromindex].amount);
+
+ Toinv.Add(addable);
+
+ Remove(Fromindex);
+
+ }
+ else if (inventory[Fromindex].amount - addingAmount == 0)
+ {
+ Item addable = (((Item)Activator.CreateInstance(null, inventory[Fromindex].GetType().ToString()).Unwrap()));
+
+ addable.amount = addingAmount;
+
+ Toinv.Add(addable);
+
+ Remove(Fromindex);
+ }
+ else if (inventory[Fromindex].amount - addingAmount > 0)
+ {
+ Item addable = (((Item)Activator.CreateInstance(null, inventory[Fromindex].GetType().ToString()).Unwrap()));
+
+ addable.amount = addingAmount;
+
+ Toinv.Add(addable);
+
+ inventory[Fromindex].amount -= addingAmount;
+
+ //Remove(Fromindex);
+ }
+
+
+ ;
+
+
+}
+
+ public int AddAmount(int rAmount, Item i)
+ {
+ if ((i.amount + rAmount) > (i.maxStackSize))
+ {
+ i.amount = i.maxStackSize;
+ Debug.Log(i.amount);
+ return (i.amount + rAmount) - i.maxStackSize;
+ }
+ else
+ {
+ i.amount = i.amount + rAmount;
+ Debug.Log(i.amount);
+ return 0;
+ }
+
+ }
+}
diff --git a/Assets/GUI/Inventory/Inventory.cs.meta b/Assets/Inventory/Inventory.cs.meta
similarity index 100%
rename from Assets/GUI/Inventory/Inventory.cs.meta
rename to Assets/Inventory/Inventory.cs.meta
diff --git a/Assets/GUI/Inventory/InventoryDesplay.cs b/Assets/Inventory/InventoryDesplay.cs
similarity index 100%
rename from Assets/GUI/Inventory/InventoryDesplay.cs
rename to Assets/Inventory/InventoryDesplay.cs
diff --git a/Assets/GUI/Inventory/InventoryDesplay.cs.meta b/Assets/Inventory/InventoryDesplay.cs.meta
similarity index 100%
rename from Assets/GUI/Inventory/InventoryDesplay.cs.meta
rename to Assets/Inventory/InventoryDesplay.cs.meta
diff --git a/Assets/GUI/Inventory/InventoryDrawedElement.cs b/Assets/Inventory/InventoryDrawedElement.cs
similarity index 100%
rename from Assets/GUI/Inventory/InventoryDrawedElement.cs
rename to Assets/Inventory/InventoryDrawedElement.cs
diff --git a/Assets/GUI/Inventory/InventoryDrawedElement.cs.meta b/Assets/Inventory/InventoryDrawedElement.cs.meta
similarity index 100%
rename from Assets/GUI/Inventory/InventoryDrawedElement.cs.meta
rename to Assets/Inventory/InventoryDrawedElement.cs.meta
diff --git a/Assets/MapLoad.cs b/Assets/MapLoad.cs
index 84483db..4ca2f6b 100644
--- a/Assets/MapLoad.cs
+++ b/Assets/MapLoad.cs
@@ -45,7 +45,7 @@ public static void MapDraw(Map map, GameObject mapPiece, Sprite[] GeneratedSprit
go.name = "Tile_" + xPos + "_" + yPos;
SpriteRenderer curr = go.GetComponent();
- Debug.Log(xPos + "," + yPos);
+ //Debug.Log(xPos + "," + yPos);
curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)];
curr.transform.parent = showLay.transform;
diff --git a/Assets/Scenes/Start.unity b/Assets/Scenes/Start.unity
index 9f1b0d6..049393f 100644
Binary files a/Assets/Scenes/Start.unity and b/Assets/Scenes/Start.unity differ
diff --git a/Assets/UnityVS.meta b/Assets/UnityVS.meta
index 4ed67cd..b63b1f6 100644
--- a/Assets/UnityVS.meta
+++ b/Assets/UnityVS.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 02fe78e962405814a83b8ba6c9471d32
folderAsset: yes
-timeCreated: 1438615220
+timeCreated: 1439133520
licenseType: Free
DefaultImporter:
userData:
diff --git a/Assets/UnityVS/Editor.meta b/Assets/UnityVS/Editor.meta
index 615808d..2e0b1a6 100644
--- a/Assets/UnityVS/Editor.meta
+++ b/Assets/UnityVS/Editor.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 6e71a3e2fb5854e43823a9da25b68e21
folderAsset: yes
-timeCreated: 1438615220
+timeCreated: 1439133520
licenseType: Free
DefaultImporter:
userData:
diff --git a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll b/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll
index c8e6011..e2f5f17 100644
Binary files a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll and b/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll differ
diff --git a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll b/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll
index b48f81e..c7cd0a9 100644
Binary files a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll and b/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll differ
diff --git a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
index 53a1841..893e05c 100644
Binary files a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll and b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll differ
diff --git a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
index 3e3a39d..c87bbb0 100644
--- a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
+++ b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 8a6acd3e3a6b57d40838ad9cc3fe480e
-timeCreated: 1438615234
+timeCreated: 1439133526
licenseType: Free
PluginImporter:
serializedVersion: 1
diff --git a/Assets/scripts/IInventory.cs b/Assets/scripts/IInventory.cs
deleted file mode 100644
index 03e62e6..0000000
--- a/Assets/scripts/IInventory.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
diff --git a/Assets/scripts/IInventory.cs.meta b/Assets/scripts/IInventory.cs.meta
deleted file mode 100644
index f64587e..0000000
--- a/Assets/scripts/IInventory.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 0488147415c7f824bbc10f0e5408698c
-timeCreated: 1437723298
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/scripts/IronIngot.cs b/Assets/scripts/Items/IronIngot.cs
similarity index 100%
rename from Assets/scripts/IronIngot.cs
rename to Assets/scripts/Items/IronIngot.cs
diff --git a/Assets/scripts/IronIngot.cs.meta b/Assets/scripts/Items/IronIngot.cs.meta
similarity index 76%
rename from Assets/scripts/IronIngot.cs.meta
rename to Assets/scripts/Items/IronIngot.cs.meta
index c1bc9ad..1e76cc4 100644
--- a/Assets/scripts/IronIngot.cs.meta
+++ b/Assets/scripts/Items/IronIngot.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 9a6534d38fc495045a4f3a7feb6511f5
-timeCreated: 1437723306
+guid: a9402b2dc904a6d4fba6ecdbf3765d0d
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/Items/Item.cs b/Assets/scripts/Items/Item.cs
new file mode 100644
index 0000000..266ffa1
--- /dev/null
+++ b/Assets/scripts/Items/Item.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+
+
+public class Item
+{
+ public int amount;
+ public int maxStackSize;
+
+
+
+
+}
+
diff --git a/Assets/scripts/Item.cs.meta b/Assets/scripts/Items/Item.cs.meta
similarity index 100%
rename from Assets/scripts/Item.cs.meta
rename to Assets/scripts/Items/Item.cs.meta
diff --git a/Assets/scripts/Items/Ore/OreIron.cs b/Assets/scripts/Items/Ore/IronOre.cs
similarity index 70%
rename from Assets/scripts/Items/Ore/OreIron.cs
rename to Assets/scripts/Items/Ore/IronOre.cs
index f08062c..0753d14 100644
--- a/Assets/scripts/Items/Ore/OreIron.cs
+++ b/Assets/scripts/Items/Ore/IronOre.cs
@@ -6,7 +6,7 @@
public class IronOre:Ore
{
- public string name = "Iron" + "Ore";
+
}
diff --git a/Assets/scripts/Items/Ore/OreIron.cs.meta b/Assets/scripts/Items/Ore/IronOre.cs.meta
similarity index 100%
rename from Assets/scripts/Items/Ore/OreIron.cs.meta
rename to Assets/scripts/Items/Ore/IronOre.cs.meta
diff --git a/Assets/scripts/Item.cs b/Assets/scripts/Items/Ore/Ore.cs
similarity index 53%
rename from Assets/scripts/Item.cs
rename to Assets/scripts/Items/Ore/Ore.cs
index 989b8d0..c27ac66 100644
--- a/Assets/scripts/Item.cs
+++ b/Assets/scripts/Items/Ore/Ore.cs
@@ -3,11 +3,14 @@
using System.Linq;
using System.Text;
-
- public class Item
- {
- public int amount;
+public class Ore : Item
+{
+ public Ore()
+ {
+ base.maxStackSize = 4;
}
+}
+
diff --git a/Assets/scripts/Ore.cs.meta b/Assets/scripts/Items/Ore/Ore.cs.meta
similarity index 76%
rename from Assets/scripts/Ore.cs.meta
rename to Assets/scripts/Items/Ore/Ore.cs.meta
index 540aabf..e603e95 100644
--- a/Assets/scripts/Ore.cs.meta
+++ b/Assets/scripts/Items/Ore/Ore.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 9f05dbac7afe3134bbc34765c6baf8df
-timeCreated: 1437723307
+guid: de72c418ca92d0244967900be7476732
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/OreType.cs b/Assets/scripts/Items/Ore/OreType.cs
similarity index 100%
rename from Assets/scripts/OreType.cs
rename to Assets/scripts/Items/Ore/OreType.cs
diff --git a/Assets/scripts/OreType.cs.meta b/Assets/scripts/Items/Ore/OreType.cs.meta
similarity index 76%
rename from Assets/scripts/OreType.cs.meta
rename to Assets/scripts/Items/Ore/OreType.cs.meta
index 99c729a..b60b153 100644
--- a/Assets/scripts/OreType.cs.meta
+++ b/Assets/scripts/Items/Ore/OreType.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 16328ae1dae0d6848ba82f4e380dd44e
-timeCreated: 1437723300
+guid: e287299b3ad8849499110fc55823db1a
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/Stone.cs b/Assets/scripts/Items/Ore/StoneOre.cs
similarity index 100%
rename from Assets/scripts/Stone.cs
rename to Assets/scripts/Items/Ore/StoneOre.cs
diff --git a/Assets/scripts/Stone.cs.meta b/Assets/scripts/Items/Ore/StoneOre.cs.meta
similarity index 76%
rename from Assets/scripts/Stone.cs.meta
rename to Assets/scripts/Items/Ore/StoneOre.cs.meta
index e4fee2d..88616db 100644
--- a/Assets/scripts/Stone.cs.meta
+++ b/Assets/scripts/Items/Ore/StoneOre.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 0c4dec67dff30c74d84f6ae97840a6eb
-timeCreated: 1437723299
+guid: cf74da3f9da6955439407ecb3e716faa
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/Uranium.cs b/Assets/scripts/Items/Ore/UraniumOre.cs
similarity index 100%
rename from Assets/scripts/Uranium.cs
rename to Assets/scripts/Items/Ore/UraniumOre.cs
diff --git a/Assets/scripts/Uranium.cs.meta b/Assets/scripts/Items/Ore/UraniumOre.cs.meta
similarity index 76%
rename from Assets/scripts/Uranium.cs.meta
rename to Assets/scripts/Items/Ore/UraniumOre.cs.meta
index f076e15..d869bc8 100644
--- a/Assets/scripts/Uranium.cs.meta
+++ b/Assets/scripts/Items/Ore/UraniumOre.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 18c1c78909fe6464599fce2184a87db8
-timeCreated: 1437723300
+guid: 90c006c7ce5f1a44796f6e501673f3a4
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/RefrinedUranium.cs b/Assets/scripts/Items/RefrinedUranium.cs
similarity index 100%
rename from Assets/scripts/RefrinedUranium.cs
rename to Assets/scripts/Items/RefrinedUranium.cs
diff --git a/Assets/scripts/RefrinedUranium.cs.meta b/Assets/scripts/Items/RefrinedUranium.cs.meta
similarity index 76%
rename from Assets/scripts/RefrinedUranium.cs.meta
rename to Assets/scripts/Items/RefrinedUranium.cs.meta
index e7313ba..cea0d33 100644
--- a/Assets/scripts/RefrinedUranium.cs.meta
+++ b/Assets/scripts/Items/RefrinedUranium.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 2f5ee5df6d2f3af4285ddb4d3967f45b
-timeCreated: 1437723302
+guid: c24cc1d24b72ead4b8b5a318edb86ca9
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/test.sequencediagram.meta b/Assets/scripts/Items/Resources.meta
similarity index 58%
rename from Assets/test.sequencediagram.meta
rename to Assets/scripts/Items/Resources.meta
index 8098614..51f77a2 100644
--- a/Assets/test.sequencediagram.meta
+++ b/Assets/scripts/Items/Resources.meta
@@ -1,6 +1,7 @@
fileFormatVersion: 2
-guid: ab8a6c46b60de834497822245209a9ad
-timeCreated: 1438937752
+guid: 9b7487aa1c512d543a2d3dfe7d454cdc
+folderAsset: yes
+timeCreated: 1439211145
licenseType: Free
DefaultImporter:
userData:
diff --git a/Assets/scripts/GlassPLane.cs b/Assets/scripts/Items/Resources/GlassPLane.cs
similarity index 100%
rename from Assets/scripts/GlassPLane.cs
rename to Assets/scripts/Items/Resources/GlassPLane.cs
diff --git a/Assets/scripts/GlassPLane.cs.meta b/Assets/scripts/Items/Resources/GlassPLane.cs.meta
similarity index 76%
rename from Assets/scripts/GlassPLane.cs.meta
rename to Assets/scripts/Items/Resources/GlassPLane.cs.meta
index 33fc354..ff31a45 100644
--- a/Assets/scripts/GlassPLane.cs.meta
+++ b/Assets/scripts/Items/Resources/GlassPLane.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 530d2fb630705084bab0f45b70871197
-timeCreated: 1437723303
+guid: db1056777bbcbd843b9cfe2cee3da4c5
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/InteriorPlate.cs b/Assets/scripts/Items/Resources/InteriorPlate.cs
similarity index 100%
rename from Assets/scripts/InteriorPlate.cs
rename to Assets/scripts/Items/Resources/InteriorPlate.cs
diff --git a/Assets/scripts/InteriorPlate.cs.meta b/Assets/scripts/Items/Resources/InteriorPlate.cs.meta
similarity index 76%
rename from Assets/scripts/InteriorPlate.cs.meta
rename to Assets/scripts/Items/Resources/InteriorPlate.cs.meta
index 9f92d6b..c08f420 100644
--- a/Assets/scripts/InteriorPlate.cs.meta
+++ b/Assets/scripts/Items/Resources/InteriorPlate.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 0bf6444166a4397429c712a52bb1e237
-timeCreated: 1437723299
+guid: 6318708eb81c8924cbc2b72576f9b783
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/IronPipe.cs b/Assets/scripts/Items/Resources/IronPipe.cs
similarity index 100%
rename from Assets/scripts/IronPipe.cs
rename to Assets/scripts/Items/Resources/IronPipe.cs
diff --git a/Assets/scripts/IronPipe.cs.meta b/Assets/scripts/Items/Resources/IronPipe.cs.meta
similarity index 76%
rename from Assets/scripts/IronPipe.cs.meta
rename to Assets/scripts/Items/Resources/IronPipe.cs.meta
index ce23546..2ad8044 100644
--- a/Assets/scripts/IronPipe.cs.meta
+++ b/Assets/scripts/Items/Resources/IronPipe.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 0a776bc8459d78041a9c9d0d1765e262
-timeCreated: 1437723299
+guid: b686dd051c1dead4586ac154ccab25e1
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/IronPlate.cs b/Assets/scripts/Items/Resources/IronPlate.cs
similarity index 100%
rename from Assets/scripts/IronPlate.cs
rename to Assets/scripts/Items/Resources/IronPlate.cs
diff --git a/Assets/scripts/IronPlate.cs.meta b/Assets/scripts/Items/Resources/IronPlate.cs.meta
similarity index 76%
rename from Assets/scripts/IronPlate.cs.meta
rename to Assets/scripts/Items/Resources/IronPlate.cs.meta
index d52c525..effcc75 100644
--- a/Assets/scripts/IronPlate.cs.meta
+++ b/Assets/scripts/Items/Resources/IronPlate.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: c70ec76085d705b4b8c83d1bfe957aa7
-timeCreated: 1437723309
+guid: 1c9340d8d8e082240bbdfb3498be9f2c
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/Roof.cs b/Assets/scripts/Items/Resources/Roof.cs
similarity index 100%
rename from Assets/scripts/Roof.cs
rename to Assets/scripts/Items/Resources/Roof.cs
diff --git a/Assets/scripts/Roof.cs.meta b/Assets/scripts/Items/Resources/Roof.cs.meta
similarity index 76%
rename from Assets/scripts/Roof.cs.meta
rename to Assets/scripts/Items/Resources/Roof.cs.meta
index ff1ac29..cfd1cb6 100644
--- a/Assets/scripts/Roof.cs.meta
+++ b/Assets/scripts/Items/Resources/Roof.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 9cc483f1d2e33c24abe73e1a40fcac6f
-timeCreated: 1437723306
+guid: 9f71c6f2d5a82524986bd70c455a6e7b
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/StoneBrick.cs b/Assets/scripts/Items/Resources/StoneBrick.cs
similarity index 100%
rename from Assets/scripts/StoneBrick.cs
rename to Assets/scripts/Items/Resources/StoneBrick.cs
diff --git a/Assets/scripts/StoneBrick.cs.meta b/Assets/scripts/Items/Resources/StoneBrick.cs.meta
similarity index 76%
rename from Assets/scripts/StoneBrick.cs.meta
rename to Assets/scripts/Items/Resources/StoneBrick.cs.meta
index b200c32..a2ad51c 100644
--- a/Assets/scripts/StoneBrick.cs.meta
+++ b/Assets/scripts/Items/Resources/StoneBrick.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 277f528732f98ac4f9b3454b94bc0067
-timeCreated: 1437723301
+guid: d91fdc62d91616149843edce8345261f
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/Wood.cs b/Assets/scripts/Items/Resources/Wood.cs
similarity index 100%
rename from Assets/scripts/Wood.cs
rename to Assets/scripts/Items/Resources/Wood.cs
diff --git a/Assets/scripts/Wood.cs.meta b/Assets/scripts/Items/Resources/Wood.cs.meta
similarity index 76%
rename from Assets/scripts/Wood.cs.meta
rename to Assets/scripts/Items/Resources/Wood.cs.meta
index 867fb2b..bd81b46 100644
--- a/Assets/scripts/Wood.cs.meta
+++ b/Assets/scripts/Items/Resources/Wood.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 8ebfab4430d93ae4890b1f85ecab0255
-timeCreated: 1437723305
+guid: d218629760842cb40acd74b8c2d7fd18
+timeCreated: 1439211145
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/Assets/scripts/Ore.cs b/Assets/scripts/Ore.cs
deleted file mode 100644
index e743087..0000000
--- a/Assets/scripts/Ore.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-
-
- public class Ore:Item
- {
- }
-
diff --git a/Assets/test.sequencediagram b/Assets/test.sequencediagram
deleted file mode 100644
index 071349b..0000000
--- a/Assets/test.sequencediagram
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
index 25e314c..6ffc145 100644
Binary files a/ProjectSettings/InputManager.asset and b/ProjectSettings/InputManager.asset differ