From 5fdb1fd6875d233e65bd0130981a8321859ea27d Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Tue, 11 Aug 2015 15:37:58 +0200 Subject: [PATCH] * Max stack Size * Transfer One (shift) * Moovinf Files (scripts folder) --- Assets/CodeMap1.dgml | 716 +++++++++--------- Assets/GUI/Inventory/Inventory.cs | 65 -- Assets/GameController.cs | 2 +- Assets/{GUI => }/Inventory.meta | 0 Assets/{GUI => }/Inventory/Dual.meta | 0 .../Inventory/Dual/DualInventoryDesplay.cs | 8 +- .../Dual/DualInventoryDesplay.cs.meta | 0 .../Inventory/Dual/DualInventoryElement.cs | 9 +- .../Dual/DualInventoryElement.cs.meta | 0 Assets/Inventory/Inventory.cs | 149 ++++ Assets/{GUI => }/Inventory/Inventory.cs.meta | 0 .../{GUI => }/Inventory/InventoryDesplay.cs | 0 .../Inventory/InventoryDesplay.cs.meta | 0 .../Inventory/InventoryDrawedElement.cs | 0 .../Inventory/InventoryDrawedElement.cs.meta | 0 Assets/MapLoad.cs | 2 +- Assets/Scenes/Start.unity | Bin 44490 -> 44522 bytes Assets/UnityVS.meta | 2 +- Assets/UnityVS/Editor.meta | 2 +- .../SyntaxTree.VisualStudio.Unity.Bridge.dll | Bin 490776 -> 490776 bytes ...yntaxTree.VisualStudio.Unity.Messaging.dll | Bin 50976 -> 50976 bytes .../Editor/UnityVS.VersionSpecific.dll | Bin 3072 -> 3072 bytes .../Editor/UnityVS.VersionSpecific.dll.meta | 2 +- Assets/scripts/IInventory.cs | 5 - Assets/scripts/IInventory.cs.meta | 12 - Assets/scripts/{ => Items}/IronIngot.cs | 0 Assets/scripts/{ => Items}/IronIngot.cs.meta | 4 +- Assets/scripts/Items/Item.cs | 17 + Assets/scripts/{ => Items}/Item.cs.meta | 0 .../Items/Ore/{OreIron.cs => IronOre.cs} | 2 +- .../Ore/{OreIron.cs.meta => IronOre.cs.meta} | 0 Assets/scripts/{Item.cs => Items/Ore/Ore.cs} | 11 +- Assets/scripts/{ => Items/Ore}/Ore.cs.meta | 4 +- Assets/scripts/{ => Items/Ore}/OreType.cs | 0 .../scripts/{ => Items/Ore}/OreType.cs.meta | 4 +- .../{Stone.cs => Items/Ore/StoneOre.cs} | 0 .../Ore/StoneOre.cs.meta} | 4 +- .../{Uranium.cs => Items/Ore/UraniumOre.cs} | 0 .../Ore/UraniumOre.cs.meta} | 4 +- Assets/scripts/{ => Items}/RefrinedUranium.cs | 0 .../{ => Items}/RefrinedUranium.cs.meta | 4 +- .../Items/Resources.meta} | 5 +- .../{ => Items/Resources}/GlassPLane.cs | 0 .../{ => Items/Resources}/GlassPLane.cs.meta | 4 +- .../{ => Items/Resources}/InteriorPlate.cs | 0 .../Resources}/InteriorPlate.cs.meta | 4 +- .../scripts/{ => Items/Resources}/IronPipe.cs | 0 .../{ => Items/Resources}/IronPipe.cs.meta | 4 +- .../{ => Items/Resources}/IronPlate.cs | 0 .../{ => Items/Resources}/IronPlate.cs.meta | 4 +- Assets/scripts/{ => Items/Resources}/Roof.cs | 0 .../{ => Items/Resources}/Roof.cs.meta | 4 +- .../{ => Items/Resources}/StoneBrick.cs | 0 .../{ => Items/Resources}/StoneBrick.cs.meta | 4 +- Assets/scripts/{ => Items/Resources}/Wood.cs | 0 .../{ => Items/Resources}/Wood.cs.meta | 4 +- Assets/scripts/Ore.cs | 11 - Assets/test.sequencediagram | 100 --- ProjectSettings/InputManager.asset | Bin 5492 -> 5568 bytes 59 files changed, 577 insertions(+), 595 deletions(-) delete mode 100644 Assets/GUI/Inventory/Inventory.cs rename Assets/{GUI => }/Inventory.meta (100%) rename Assets/{GUI => }/Inventory/Dual.meta (100%) rename Assets/{GUI => }/Inventory/Dual/DualInventoryDesplay.cs (94%) rename Assets/{GUI => }/Inventory/Dual/DualInventoryDesplay.cs.meta (100%) rename Assets/{GUI => }/Inventory/Dual/DualInventoryElement.cs (85%) rename Assets/{GUI => }/Inventory/Dual/DualInventoryElement.cs.meta (100%) create mode 100644 Assets/Inventory/Inventory.cs rename Assets/{GUI => }/Inventory/Inventory.cs.meta (100%) rename Assets/{GUI => }/Inventory/InventoryDesplay.cs (100%) rename Assets/{GUI => }/Inventory/InventoryDesplay.cs.meta (100%) rename Assets/{GUI => }/Inventory/InventoryDrawedElement.cs (100%) rename Assets/{GUI => }/Inventory/InventoryDrawedElement.cs.meta (100%) delete mode 100644 Assets/scripts/IInventory.cs delete mode 100644 Assets/scripts/IInventory.cs.meta rename Assets/scripts/{ => Items}/IronIngot.cs (100%) rename Assets/scripts/{ => Items}/IronIngot.cs.meta (76%) create mode 100644 Assets/scripts/Items/Item.cs rename Assets/scripts/{ => Items}/Item.cs.meta (100%) rename Assets/scripts/Items/Ore/{OreIron.cs => IronOre.cs} (70%) rename Assets/scripts/Items/Ore/{OreIron.cs.meta => IronOre.cs.meta} (100%) rename Assets/scripts/{Item.cs => Items/Ore/Ore.cs} (53%) rename Assets/scripts/{ => Items/Ore}/Ore.cs.meta (76%) rename Assets/scripts/{ => Items/Ore}/OreType.cs (100%) rename Assets/scripts/{ => Items/Ore}/OreType.cs.meta (76%) rename Assets/scripts/{Stone.cs => Items/Ore/StoneOre.cs} (100%) rename Assets/scripts/{Stone.cs.meta => Items/Ore/StoneOre.cs.meta} (76%) rename Assets/scripts/{Uranium.cs => Items/Ore/UraniumOre.cs} (100%) rename Assets/scripts/{Uranium.cs.meta => Items/Ore/UraniumOre.cs.meta} (76%) rename Assets/scripts/{ => Items}/RefrinedUranium.cs (100%) rename Assets/scripts/{ => Items}/RefrinedUranium.cs.meta (76%) rename Assets/{test.sequencediagram.meta => scripts/Items/Resources.meta} (58%) rename Assets/scripts/{ => Items/Resources}/GlassPLane.cs (100%) rename Assets/scripts/{ => Items/Resources}/GlassPLane.cs.meta (76%) rename Assets/scripts/{ => Items/Resources}/InteriorPlate.cs (100%) rename Assets/scripts/{ => Items/Resources}/InteriorPlate.cs.meta (76%) rename Assets/scripts/{ => Items/Resources}/IronPipe.cs (100%) rename Assets/scripts/{ => Items/Resources}/IronPipe.cs.meta (76%) rename Assets/scripts/{ => Items/Resources}/IronPlate.cs (100%) rename Assets/scripts/{ => Items/Resources}/IronPlate.cs.meta (76%) rename Assets/scripts/{ => Items/Resources}/Roof.cs (100%) rename Assets/scripts/{ => Items/Resources}/Roof.cs.meta (76%) rename Assets/scripts/{ => Items/Resources}/StoneBrick.cs (100%) rename Assets/scripts/{ => Items/Resources}/StoneBrick.cs.meta (76%) rename Assets/scripts/{ => Items/Resources}/Wood.cs (100%) rename Assets/scripts/{ => Items/Resources}/Wood.cs.meta (76%) delete mode 100644 Assets/scripts/Ore.cs delete mode 100644 Assets/test.sequencediagram 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 9f1b0d6fdc9e520c2905a926608ab66a4132394b..049393f9bb6b750c91bb29e0d8db1398431babf0 100644 GIT binary patch delta 528 zcmX?go9WeUCIJS9(#s4CYhN)iFz^G}A2ten))Z9^6#5=7*m7aN*VD#7wOl(*fU>VP zf6#Ylnmm#g7wE>?xTG|Y&&UD9KMUt zeH~O>87$7=1a=(ApmwN)3Pb`fJ_#zWiX=W4$X*Y`AP=j7J);ixum+Hi?BQKdHJV^G zT3|KWXlnLD)#!lL=z`UN0u*M>5g_{lRE<7ZjR8oFp&^nQko&Iy`JjL>0%BOeEdU1G zLm-zCh>a)T(bH#5Ps~jX-pr-1WwY5RyNro(!{(K_@?w)0l(9^j#xnU#bH(HhEgYKz HTB_67R?cAtJFeeTX8W1#Gl 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 QJsvSi;Y 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 diff --git a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll b/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll index b48f81e9933814139bb899de8dedf6474b8f0b45..c7cd0a9c7d34976f39679ec8756e22a5c9325f7d 100644 GIT binary patch delta 2843 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 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 25e314c88e57d874507831851d5d6929326b675d..6ffc145725ab1ff328ff9027c1feba0a6bdcb024 100644 GIT binary patch delta 56 zcmeyObwHbgfq|8YfkE`ZMvfmWj0ZL|vNCfs3QwLXB)wTdAcS>tf&dFga6xKvW?E+Q MWEVk&$sxiD0H~u6D*ylh delta 35 rcmX@0{Y8s|fq|8YfkCunBgYRG#*)p9tjyeuLX&3-NpDsV2w?>Pn;8f@