Namespacing

- Added - CivMars - CivMarsEngine - Sorting Folders
GDSourceMakers · Dec 22, 2015 · 045a083 · 045a083
1 parent d479b3f
commit 045a083
Show file tree

Hide file tree

Showing 293 changed files with 6,755 additions and 5,074 deletions.
diff --git a/Assets/AssetsLoading/GameRegystry.cs b/Assets/AssetsLoading/GameRegystry.cs
@@ -4,77 +4,78 @@
 using System.Text;
 using UnityEngine;
 
-
-static class GameRegystry
+namespace CivMarsEngine
 {
-	public static Dictionary<string, IRegystratabe> all = new Dictionary<string, IRegystratabe>();
+	static class GameRegystry
+	{
+		public static Dictionary<string, IRegystratabe> all = new Dictionary<string, IRegystratabe>();
 
-	public static Dictionary<String,Building> buildings = new Dictionary<String, Building>();
+		public static Dictionary<String, Building> buildings = new Dictionary<String, Building>();
 
-	public static void RegisterBuildableBuilding(string ID, Building b)
-	{
-		if (b is Building)
+		public static void RegisterBuildableBuilding(string ID, Building b)
 		{
-			buildings.Add(ID, b);
-			Debug.Log(ID);
+			if (b is Building)
+			{
+				buildings.Add(ID, b);
+				Debug.Log(ID);
+			}
 		}
-	}
-
-	public static Dictionary<string, IWorldGen> ores = new Dictionary<string, IWorldGen>();
-	//public static List<IWorldGen> ores = new List<IWorldGen>();
-
-	public static void RegisterWorldGen(string ID,IWorldGen b)
-	{
-		ores.Add(ID,b);
-		Debug.Log(b.ToString());
-	}
 
-	public static Dictionary<String, List<Recipe>> recepies = new Dictionary<String, List<Recipe>>();
+		public static Dictionary<string, IWorldGen> ores = new Dictionary<string, IWorldGen>();
+		//public static List<IWorldGen> ores = new List<IWorldGen>();
 
-	public static void RegisterRecepie(string ID, Recipe b)
-	{
-		if (recepies.ContainsKey(ID))
-		{
-			recepies[ID].Add(b);
-		}
-		else
+		public static void RegisterWorldGen(string ID, IWorldGen b)
 		{
-			recepies.Add(ID, new List<Recipe>());
-			recepies[ID].Add(b);
+			ores.Add(ID, b);
+			Debug.Log(b.ToString());
 		}
-		Debug.Log(ID);
-	}
 
-	public static Dictionary<String, Item> items = new Dictionary<String, Item>();
+		public static Dictionary<String, List<Recipe>> recepies = new Dictionary<String, List<Recipe>>();
 
-	public static void RegisterItem(string ID, Item b)
-	{
-		if (recepies.ContainsKey(ID))
-		{
-			throw new System.NotImplementedException();
-		}
-		else
+		public static void RegisterRecepie(string ID, Recipe b)
 		{
-			if (b is IRegystratabe)
-				((IRegystratabe)b).Regystrate();
-			items.Add(ID, b);
+			if (recepies.ContainsKey(ID))
+			{
+				recepies[ID].Add(b);
+			}
+			else
+			{
+				recepies.Add(ID, new List<Recipe>());
+				recepies[ID].Add(b);
+			}
 			Debug.Log(ID);
 		}
-	}
 
-	public static Sprite GetSprite(string path,string name)
-	{
-		UnityEngine.Object[] a = Resources.LoadAll(path);
-		foreach (UnityEngine.Object item in a)
-		{
+		public static Dictionary<String, Item> items = new Dictionary<String, Item>();
 
-			if (item is Sprite && item.name == name)
+		public static void RegisterItem(string ID, Item b)
+		{
+			if (recepies.ContainsKey(ID))
 			{
-				return item as Sprite;
+				throw new System.NotImplementedException();
+			}
+			else
+			{
+				if (b is IRegystratabe)
+					((IRegystratabe)b).Regystrate();
+				items.Add(ID, b);
+				Debug.Log(ID);
 			}
 		}
 
-		return null;
-	}
-}
+		public static Sprite GetSprite(string path, string name)
+		{
+			UnityEngine.Object[] a = Resources.LoadAll(path);
+			foreach (UnityEngine.Object item in a)
+			{
 
+				if (item is Sprite && item.name == name)
+				{
+					return item as Sprite;
+				}
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs
@@ -1,17 +1,21 @@
 using UnityEngine;
 using System.Collections;
 
-public class Surface : Tiled {
+namespace CivMarsEngine
+{
+	public class Surface : Tiled
+	{
 
-	/*
-	// Use this for initialization
-	void Start () {
-	
-	}
-	
-	// Update is called once per frame
-	void Update () {
-	
+		/*
+		// Use this for initialization
+		void Start () {
+
+		}
+
+		// Update is called once per frame
+		void Update () {
+
+		}
+		*/
 	}
-	*/
 }
diff --git a/Assets/BasicUtility/TileMap/Tile/Tile.cs b/Assets/BasicUtility/TileMap/Tile/Tile.cs
@@ -12,4 +12,4 @@ public Tile(int xpos, int ypos)
     }
 
 
-}
+}
diff --git a/Assets/BasicUtility/TileMap/TileTransform.cs b/Assets/BasicUtility/TileMap/TileTransform.cs
@@ -31,4 +31,4 @@ public void SetTileMap(TileMap t)
 	}
 
 
-}
+}
diff --git a/Assets/CivMars/Buildings/Building.cs b/Assets/CivMars/Buildings/Building.cs
diff --git a/Assets/CivMars/Buildings/Chest.cs b/Assets/CivMars/Buildings/Chest.cs
@@ -3,11 +3,12 @@
 using UnityEngine.UI;
 using System;
 using System.Collections.Generic;
+using CivMarsEngine;
 
 namespace CivMars
 {
 	[AddComponentMenu("Buildings/Chest")]
-	public class Chest : Building, IInventory, IBuildable, IRegystratabe, IHasGui, ISaveble
+	public class Chest : BuildingWGUI, IInventory, IBuildable, IRegystratabe, IHasGui, ISaveble
 	{
 		new public static string ID = CivMarsInit.BlockSpace + ".Chest";
 
@@ -18,7 +19,7 @@ public class Chest : Building, IInventory, IBuildable, IRegystratabe, IHasGui, I
 
 		public Sprite Icon;
 
-		static Item[] buildingMaterials = { new SandOre(2) };
+		static new Item[] buildingMaterials = { new SandOre(2) };
 
 		bool invOn;
 
@@ -57,7 +58,7 @@ public Sprite GetImage()
 			return Icon;
 		}
 
-		public GameObject GetPrefab()
+		public override GameObject GetPrefab()
 		{
 			return gameObject;
 		}

diff --git a/Assets/CivMars/Buildings/Furnace.cs b/Assets/CivMars/Buildings/Furnace.cs
@@ -3,10 +3,11 @@
 using System.Collections.Generic;
 using System;
 using UnityEngine.UI;
+using CivMarsEngine;
 
 namespace CivMars
 {
-	public class Furnace : Building, IRegystratabe, IBuildable, IInventory, IHasGui, ICrafter
+	public class Furnace : BuildingWGUI, IRegystratabe, IBuildable, IInventory, IHasGui, ICrafter
 	{
 
 		enum States
@@ -18,7 +19,7 @@ enum States
 
 		public List<CraftingProcess> craftingQueue = new List<CraftingProcess>();
 
-		public string ID = "CivMars.Furnace";
+		public new string ID = "CivMars.Furnace";
 		static Item[] neededMaterials = { new SandOre(1) };
 		public Sprite icon;
 
@@ -168,7 +169,7 @@ public Sprite GetImage()
 			return icon;
 		}
 
-		public GameObject GetPrefab()
+		public override GameObject GetPrefab()
 		{
 			return gameObject;
 		}

diff --git a/Assets/CivMars/Buildings/GreenHouse.cs b/Assets/CivMars/Buildings/GreenHouse.cs
@@ -2,15 +2,16 @@
 using System.Collections;
 using System;
 using UnityEngine.UI;
+using CivMarsEngine;
 
 namespace CivMars
 {
-	public class GreenHouse : Building, IInventory, IHasGui, IBuildable, IRegystratabe
+	public class GreenHouse : BuildingWGUI, IInventory, IHasGui, IBuildable, IRegystratabe
 	{
 		Inventory storage = new Inventory(5);
 		public Sprite icon;
 		Item[] x = { new IronPlate(1), new GlassPlane(1), new Sapling(1) };
-		string ID = "CivMars.GreenHouse";
+		new string ID = "CivMars.GreenHouse";
 		float timeleft = 6000;
 		bool onoff = false;
 
@@ -119,7 +120,7 @@ public Sprite GetImage()
 			return icon;
 		}
 
-		public GameObject GetPrefab()
+		public override GameObject GetPrefab()
 		{
 			return this.gameObject;
 		}

diff --git a/Assets/CivMars/Buildings/MainBuilding.cs b/Assets/CivMars/Buildings/MainBuilding.cs
@@ -1,13 +1,13 @@
 using System;
 using UnityEngine.UI;
 using UnityEngine;
-
+using CivMarsEngine;
 
 namespace CivMars
 {
 	[AddComponentMenu("Buildings/Main Building")]
 	[System.Serializable]
-	public class MainBuilding : Building, IInventory, IGasTank, IRegystratabe, ISaveble
+	public class MainBuilding : BuildingWGUI, IInventory, IGasTank, IRegystratabe, ISaveble
 	{
 		enum States
 		{
@@ -16,7 +16,7 @@ enum States
 			Gas
 		}
 
-		public static string ID = "CivMars.MainBuilding";
+		new public static string ID = "CivMars.MainBuilding";
 
 		public Text Name;
 		public Text InventoryButtonText;
@@ -166,7 +166,7 @@ public void Regystrate()
 		}
 		#endregion
 
-		public GameObject GetPrefab()
+		public override GameObject GetPrefab()
 		{
 			return gameObject;
 		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ public Tile(int xpos, int ypos)
		}


		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,4 @@ public void SetTileMap(TileMap t)
		}


		}
		}