Bugfixes

- new ore mechanicks
- gui fixes

Assets/BasicUtility/TileMap/TileMap.cs

@@ -392,14 +392,22 @@ public bool HasTileOn(TileVector cor)
 	/// <returns></returns>
 	public TileTransform GetTileOn(int x, int y)
 	{
-		return tiles[x, y];
+		if (Inside(x, y))
+		{
+			return tiles[x, y];
+		}
+		else
+		{
+			Debug.LogError("x:" + x + ", y:" + y + "Is not inside the map");
+			return null;
+		}
 	}
 
 
 	/// <summary>
 	/// Returns the TileTransform of the tile on coordinates
 	/// </summary>
-	/// <param name="cor">Coordinates in TileVector</param>
+	/// <param name="v">Coordinates in TileVector</param>
 	/// <returns></returns>
 	public TileTransform GetTileOn(TileVector v)
 	{

Assets/CivMars/Items/IronPipe.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using CivMarsEngine;
-using UnityEngine;
+using CivMarsEngine;
 
 namespace CivMars
 {

Assets/CivMars/Items/Ore/CoalOre.cs

@@ -1,4 +1,6 @@
-namespace CivMars
+using CivMarsEngine;
+
+namespace CivMars
 {
 	public class CoalOre : Item
 	{

Assets/CivMars/Items/Ore/IronOre.cs

@@ -1,4 +1,6 @@
-namespace CivMars
+using CivMarsEngine;
+
+namespace CivMars
 {
 	public class IronOre : Item
 	{

Assets/CivMars/Items/Ore/SandOre.cs

@@ -1,4 +1,6 @@
-namespace CivMars
+using CivMarsEngine;
+
+namespace CivMars
 {
 	public class SandOre : Item
 	{

Assets/CivMars/Items/Ore/StoneOre.cs

@@ -1,4 +1,6 @@
-namespace CivMars
+using CivMarsEngine;
+
+namespace CivMars
 {
 	public class StoneOre : Item
 	{

Assets/CivMars/Items/Ore/UraniumOre.cs

@@ -1,4 +1,6 @@
-namespace CivMars
+using CivMarsEngine;
+
+namespace CivMars
 {
 	public class UraniumOre : Item
 	{

Assets/CivMars/NeedToBeImplemented/Food.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using CivMarsEngine;
 
-
-    public class Food:Item
-    {
-    }
+namespace CivMars
+{
 
+	public class Food : Item
+	{
+	}
+}

Assets/CivMars/NeedToBeImplemented/RefrinedUranium.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-
-
-    public class RefrinedUranium:Item
+using CivMarsEngine;
+public class RefrinedUranium:Item
     {
         public string name = "RefrinedUranium";
 

Assets/CivMars/NeedToBeImplemented/Resource.cs

@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using CivMarsEngine;
 
- 
-
-    public class Resource:Item
-    {
-    }
+namespace CivMars
+{
+	public class Resource : Item
+	{
+	}
 
+}

Assets/CivMars/NeedToBeImplemented/Tool.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using CivMarsEngine;
 
-
-
-    public class Tool:Item
+public class Tool:Item
     {
     }
 

Assets/CivMars/Ores/CoalOreTile.cs

@@ -18,12 +18,11 @@ public override void Generate(System.Random r, TileMap map)
 			base.Generate(r, map);
 		}
 
-
 		override public void Regystrate()
 		{
 			base.ID = this.ID;
 
-			chanche = 0;
+			chanche = 100;
 			chanche2 = 250;
 			chancheReduce = 5;
 			distance = -1;

Assets/CivMars/Ores/OreTile.cs

@@ -31,7 +31,7 @@ public virtual void Generate(System.Random r, TileMap map)
 
 				bool k = map.HasTileOn(pos);
 
-				if (r.Next(0,1000) <= chanche && first && k)
+				if (r.Next(0, 1000) <= chanche && first && k)
 				{
 					first = true;
 					GameObject a = Instantiate(this.gameObject);
@@ -41,7 +41,7 @@ public virtual void Generate(System.Random r, TileMap map)
 
 					a.GetComponent<OreTile>().Spread(r, map, chanche2);
 				}
-
+				
 
 			}
 		}
@@ -57,17 +57,27 @@ public void Spread(System.Random r, TileMap map, float chancheCurrent)
 			for (int j = -1; j < 2; j++)
 			{
 				TileVector pos = transform.position + new TileVector(i, j);
-				if ((i != 0 || j != 0) && map.Inside(pos) && map.HasTileOn(pos))
+
+				bool k = !map.HasTileOn(pos);
+
+				if ((i != 0 || j != 0) && map.Inside(pos) && !k)
 				{
-					if (r.Next(1000) <= chancheCurrent)
+					if (r.Next(0, 1000) <= chancheCurrent)
 					{
-						GameObject a = Instantiate(this.gameObject);
+						if (!k)
+						{
+							GameObject a = Instantiate(this.gameObject);
 
-						a.name = (int.Parse(this.name[0].ToString()) + 1).ToString() + "a";
+							a.name = (int.Parse(this.name[0].ToString()) + 1).ToString() + "a";
 
-						map.SetTile(pos.x, pos.y, a.GetComponent<TileTransform>());
+							map.SetTile(pos.x, pos.y, a.GetComponent<TileTransform>());
 
-						a.GetComponent<OreTile>().Spread(r, map, chancheCurrent - chancheReduce);
+							a.GetComponent<OreTile>().Spread(r, map, chancheCurrent - chancheReduce);
+						}
+						else if(map.GetTileOn(pos.x, pos.y).GetComponent<OreTile>().ID == this.ID)
+						{
+							map.GetTileOn(pos.x, pos.y).GetComponent<OreTile>().Spread(r, map, chancheCurrent - chancheReduce);
+						}
 					}
 				}
 			}

Assets/CivMarsEngine/BuildingWGUI.cs

@@ -8,7 +8,7 @@
 
 namespace CivMarsEngine
 {
-	public class BuildingWGUI : Building, IHasGui
+	public class BuildingWGUI : Building, IHasGui, IPointerClickHandler
 	{
 
 		public GameObject SideMenu;
@@ -53,12 +53,11 @@ public int ClosingLevel()
 			return 1;
 		}
 
-		/*
 		public void OnPointerClick(PointerEventData eventData)
 		{
-			TogelGui();
+			if (!eventData.rawPointerPress.transform.IsChildOf(graphics.transform))
+				TogelGui();
 		}
-		*/
 		#endregion
 
 	}