From 670f260a4c52dc122227c54ace2cf5f0e97babe7 Mon Sep 17 00:00:00 2001
From: Tiberiu Chibici <chibicitiberiu@gmail.com>
Date: Wed, 17 Jun 2015 12:07:02 +0300
Subject: [PATCH] Renamed Map to CityMap

---
 .../Business/Generator/BuildingGenerator.cs   |   4 ++--
 .../Business/Generator/CityGenerator.cs       |   4 ++--
 .../Generator/PopulationCentersGenerator.cs   |   2 +-
 .../Business/Generator/RoadGenerator.cs       |   6 +++---
 .../Business/Generator/TerrainGenerator.cs    |   6 +++---
 .../Scripts/Model/{Map.cs => CityMap.cs}      |   6 +++---
 .../Model/{Map.cs.meta => CityMap.cs.meta}    |   0
 .../Scripts/Unity/BuildingMeshGenerator.cs    |   4 ++--
 .../Assets/Scripts/Unity/RoadMeshGenerator.cs |   4 ++--
 .../Scripts/Unity/TerrainGeneratorScript.cs   |   2 +-
 Game/Assets/Scripts/Utils/Logger.cs           |   2 +-
 Game/Game-csharp.sln                          |   2 +-
 Game/Game.sln                                 |   2 +-
 .../Managed/Assembly-CSharp-firstpass.dll     | Bin 5120 -> 5120 bytes
 .../Managed/Assembly-CSharp-firstpass.dll.mdb | Bin 896 -> 896 bytes
 .../Managed/Assembly-CSharp.dll               | Bin 95232 -> 95232 bytes
 .../Managed/Assembly-CSharp.dll.mdb           | Bin 47291 -> 47291 bytes
 .../Assembly-UnityScript-firstpass.dll        | Bin 14336 -> 14336 bytes
 .../Assembly-UnityScript-firstpass.dll.mdb    | Bin 3134 -> 3134 bytes
 .../PlayerConnectionConfigFile                |   2 +-
 Game/TransportGame_Data/output_log.txt        |  13 +------------
 Game/TransportGame_Data/sharedassets0.assets  | Bin 11109820 -> 11116332 bytes
 Game/UnityVS.Game.CSharp.csproj               |  10 ++++++----
 23 files changed, 30 insertions(+), 39 deletions(-)
 rename Game/Assets/Scripts/Model/{Map.cs => CityMap.cs} (98%)
 rename Game/Assets/Scripts/Model/{Map.cs.meta => CityMap.cs.meta} (100%)

diff --git a/Game/Assets/Scripts/Business/Generator/BuildingGenerator.cs b/Game/Assets/Scripts/Business/Generator/BuildingGenerator.cs
index ac058bb..967b41d 100644
--- a/Game/Assets/Scripts/Business/Generator/BuildingGenerator.cs
+++ b/Game/Assets/Scripts/Business/Generator/BuildingGenerator.cs
@@ -17,7 +17,7 @@ namespace TransportGame.Generator
         private float LotSquareMaxSize { get { return ConfigManager.Buildgen.LotSquareMaxSize; } }
         private float LotSpacing { get { return ConfigManager.Buildgen.LotSpacing; } }
 
-        private Map map;
+        private CityMap map;
         QuadTree<RoadNode> nodeTree;
         QuadTree<BuildingLot> lotTree;
 
@@ -214,7 +214,7 @@ namespace TransportGame.Generator
             return b;
         }
 
-        public void Generate(Map map)
+        public void Generate(CityMap map)
         {
             this.map = map;
             map.Buildings = new List<Building>();
diff --git a/Game/Assets/Scripts/Business/Generator/CityGenerator.cs b/Game/Assets/Scripts/Business/Generator/CityGenerator.cs
index a4a4952..a871d21 100644
--- a/Game/Assets/Scripts/Business/Generator/CityGenerator.cs
+++ b/Game/Assets/Scripts/Business/Generator/CityGenerator.cs
@@ -19,9 +19,9 @@ namespace TransportGame.Generator
         /// <param name="width">Width</param>
         /// <param name="height">Height</param>
         /// <returns>City</returns>
-        public Map Generate(int width, int height)
+        public CityMap Generate(int width, int height)
         {
-            Map map;
+            CityMap map;
 
             // Generate terrain
             TerrainGenerator terrainGen = new TerrainGenerator();
diff --git a/Game/Assets/Scripts/Business/Generator/PopulationCentersGenerator.cs b/Game/Assets/Scripts/Business/Generator/PopulationCentersGenerator.cs
index 5e709f9..13edfd5 100644
--- a/Game/Assets/Scripts/Business/Generator/PopulationCentersGenerator.cs
+++ b/Game/Assets/Scripts/Business/Generator/PopulationCentersGenerator.cs
@@ -11,7 +11,7 @@ namespace TransportGame.Generator
     {
         System.Random random = new System.Random();
 
-        public void Generate(Map map)
+        public void Generate(CityMap map)
         {
             // Generate range
             float mp = (float)(map.Width * map.Height) / (1024 * 1024); // For 4k x 4k range should be around 900
diff --git a/Game/Assets/Scripts/Business/Generator/RoadGenerator.cs b/Game/Assets/Scripts/Business/Generator/RoadGenerator.cs
index bef9e76..ca86a1c 100644
--- a/Game/Assets/Scripts/Business/Generator/RoadGenerator.cs
+++ b/Game/Assets/Scripts/Business/Generator/RoadGenerator.cs
@@ -49,7 +49,7 @@ namespace TransportGame.Generator
         List<RoadGeneratorSegment> queue;
 
         System.Random random = new System.Random();
-        Map map;
+        CityMap map;
 
         private float HighwaySegmentLength { get { return ConfigManager.Roadgen.HighwaySegmentLength; } }
         private float DefaultBranchPopulationTreshold { get { return ConfigManager.Roadgen.DefaultBranchPopulationTreshold; } }
@@ -71,7 +71,7 @@ namespace TransportGame.Generator
         {
         }
 
-        public void Initialize(Map map)
+        public void Initialize(CityMap map)
         {
             this.map = map;
             map.RoadNetwork = new RoadNetwork();
@@ -142,7 +142,7 @@ namespace TransportGame.Generator
             return !map.IsInside(p.X, p.Y) || map.IsWater(p.X, p.Y) || map.GetSteepness(p.X, p.Y) > SteepnessLimit;
         }
 
-        public void Generate(Map map)
+        public void Generate(CityMap map)
         {
             Initialize(map);
 
diff --git a/Game/Assets/Scripts/Business/Generator/TerrainGenerator.cs b/Game/Assets/Scripts/Business/Generator/TerrainGenerator.cs
index f3fac12..7fd3fe5 100644
--- a/Game/Assets/Scripts/Business/Generator/TerrainGenerator.cs
+++ b/Game/Assets/Scripts/Business/Generator/TerrainGenerator.cs
@@ -34,10 +34,10 @@ namespace TransportGame.Generator
             Noise.Scale = ConfigManager.Tergen.ElevationScale;
         }
 
-        public Map Generate(int width, int height)
+        public CityMap Generate(int width, int height)
         {
             // Create map
-            Map map = new Map(width, height);
+            CityMap map = new CityMap(width, height);
 
             // Pick a random biome
             map.Biome = PickBiome();
@@ -61,7 +61,7 @@ namespace TransportGame.Generator
             return BiomeManager.Biomes.ElementAt(biome);
         }
 
-        private void GenerateElevation(Map map)
+        private void GenerateElevation(CityMap map)
         {
             for (int x = 0; x < map.Width; ++x)
                 for (int y = 0; y < map.Height; ++y)
diff --git a/Game/Assets/Scripts/Model/Map.cs b/Game/Assets/Scripts/Model/CityMap.cs
similarity index 98%
rename from Game/Assets/Scripts/Model/Map.cs
rename to Game/Assets/Scripts/Model/CityMap.cs
index 513f682..f78e16b 100644
--- a/Game/Assets/Scripts/Model/Map.cs
+++ b/Game/Assets/Scripts/Model/CityMap.cs
@@ -10,7 +10,7 @@ using UnityEngine;
 namespace TransportGame.Model
 {
     [XmlRoot("map")]
-    public class Map
+    public class CityMap
     {
         private float[,] heightmap;
 
@@ -108,7 +108,7 @@ namespace TransportGame.Model
         /// <remarks>
         /// Warning: heights array will be null.
         /// </remarks>
-        public Map()
+        public CityMap()
         {
             PopulationCenters = new List<Vector2>();
         }
@@ -118,7 +118,7 @@ namespace TransportGame.Model
         /// </summary>
         /// <param name="width">Width</param>
         /// <param name="height">Height</param>
-        public Map(int width, int height)
+        public CityMap(int width, int height)
         {
             heightmap = new float[width, height];
             PopulationCenters = new List<Vector2>();
diff --git a/Game/Assets/Scripts/Model/Map.cs.meta b/Game/Assets/Scripts/Model/CityMap.cs.meta
similarity index 100%
rename from Game/Assets/Scripts/Model/Map.cs.meta
rename to Game/Assets/Scripts/Model/CityMap.cs.meta
diff --git a/Game/Assets/Scripts/Unity/BuildingMeshGenerator.cs b/Game/Assets/Scripts/Unity/BuildingMeshGenerator.cs
index ad1fbed..294637f 100644
--- a/Game/Assets/Scripts/Unity/BuildingMeshGenerator.cs
+++ b/Game/Assets/Scripts/Unity/BuildingMeshGenerator.cs
@@ -14,10 +14,10 @@ namespace TransportGame.Unity
         public Texture2D[] Textures { get; set; }
 
         private GameObject parent = new GameObject("buildings");
-        private Map map;
+        private CityMap map;
         private System.Random random = new System.Random();
 
-        public IEnumerable Generate(Map map)
+        public IEnumerable Generate(CityMap map)
         {
             this.map = map;
             int i = 0;
diff --git a/Game/Assets/Scripts/Unity/RoadMeshGenerator.cs b/Game/Assets/Scripts/Unity/RoadMeshGenerator.cs
index 8e3b58a..75468b2 100644
--- a/Game/Assets/Scripts/Unity/RoadMeshGenerator.cs
+++ b/Game/Assets/Scripts/Unity/RoadMeshGenerator.cs
@@ -35,7 +35,7 @@ namespace TransportGame.Unity
 
         #region Private fields
 
-        private Map map;
+        private CityMap map;
 
         private Dictionary<int, Vector2[]> segmentTerminal1Limit = new Dictionary<int, Vector2[]>();
         private Dictionary<int, Vector2[]> segmentTerminal2Limit = new Dictionary<int, Vector2[]>();
@@ -47,7 +47,7 @@ namespace TransportGame.Unity
         public Material RoadMaterial { get; set; }
         public Material SidewalkMaterial { get; set; }
 
-        public IEnumerable Generate(Map map)
+        public IEnumerable Generate(CityMap map)
         {
             this.map = map;
 
diff --git a/Game/Assets/Scripts/Unity/TerrainGeneratorScript.cs b/Game/Assets/Scripts/Unity/TerrainGeneratorScript.cs
index c1c7cca..33c838c 100644
--- a/Game/Assets/Scripts/Unity/TerrainGeneratorScript.cs
+++ b/Game/Assets/Scripts/Unity/TerrainGeneratorScript.cs
@@ -9,7 +9,7 @@ using UnityEngine;
 
 public class TerrainGeneratorScript : MonoBehaviour
 {
-	private Map map = null;
+	private CityMap map = null;
 
 	public int TerrainWidth = 1024;
 	public int TerrainHeight = 1024;
diff --git a/Game/Assets/Scripts/Utils/Logger.cs b/Game/Assets/Scripts/Utils/Logger.cs
index becc142..12bd456 100644
--- a/Game/Assets/Scripts/Utils/Logger.cs
+++ b/Game/Assets/Scripts/Utils/Logger.cs
@@ -91,7 +91,7 @@ namespace TransportGame.Utils
             Log(Level.Critical, "{0}: {1}\nStack trace:{2}", ex.GetType().ToString(), ex.Message, ex.StackTrace);
         }
 
-        public static void DumpMap(Map map, string filename)
+        public static void DumpMap(CityMap map, string filename)
         {
             map.SerializeXml(Path.Combine(LogsDirectory, filename));
         }
diff --git a/Game/Game-csharp.sln b/Game/Game-csharp.sln
index 5b0c91f..2d38414 100644
--- a/Game/Game-csharp.sln
+++ b/Game/Game-csharp.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																																									GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																												GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/Game/Game.sln b/Game/Game.sln
index 7f5cc16..5c83234 100644
--- a/Game/Game.sln
+++ b/Game/Game.sln
@@ -29,7 +29,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																																								GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																											GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/Game/TransportGame_Data/Managed/Assembly-CSharp-firstpass.dll b/Game/TransportGame_Data/Managed/Assembly-CSharp-firstpass.dll
index 7f01c590f5a0f9264282cbbe49c0e535ae2bd568..2f71ce9cad149024b9af63f34568201a851e1b66 100644
GIT binary patch
delta 41
zcmV+^0M`G2D1a!Chy#wxf3b`43lP3Z%T(*M6HK57r$36|kjAqS5`qD<4i54KiZl`&

delta 41
xcmZqBXwaC@!8~<+&BpGJ+yWIZik;4|>HAJuth&+bONG{EL7^tb&3t^HSOIj%5aR#<

diff --git a/Game/TransportGame_Data/Managed/Assembly-CSharp-firstpass.dll.mdb b/Game/TransportGame_Data/Managed/Assembly-CSharp-firstpass.dll.mdb
index fa50cf152d9967a282514232349fb1b77e9e22ab..000cf1fe5653d5a5b6f6512a0eaef6982027dcaf 100644
GIT binary patch
delta 82
zcmZo*Z(vstSyum7S?z_Z5d#G5^E@5$dW*2n0`}$hT@NN4o2YO>pm3Vh>Gs)g-Ii*X
k30cVN%S~eJ6Nvrm_&izusM}tr$dU~~QOuj?F+O4h0O}hb>;M1&

delta 82
zcmZo*Z(vstSyum7S?z_Z5d#ENyeM`$!=~>$WwGi;uP+r^6BRB9#EVq1)#>l>p22oT
kdeih5Vv`vA1Y%yV_%i*Bg3rwLIT86$+m>yf$M}d50J(J_rT_o{

diff --git a/Game/TransportGame_Data/Managed/Assembly-CSharp.dll b/Game/TransportGame_Data/Managed/Assembly-CSharp.dll
index 0a15aadb13d3f72945ca116ccd8cce28b4442dcd..6e7ecb0aaad0efb4afe2bb9e61f68e54a14d91eb 100644
GIT binary patch
delta 48
zcmV-00MGw`=mmi21(1jXkIR37i?xdZ;cF0)zpwRN=}bnXS>0@nDUP(a5pn^N0k;lr
G0rCY%To!r&

delta 48
zcmV-00MGw`=mmi21(1jXmalw)i?xdZ;cF0Jr~~@IPFYEsHXr?vEO|<|5pn^N0k;lr
G0rCYKn-qBf

diff --git a/Game/TransportGame_Data/Managed/Assembly-CSharp.dll.mdb b/Game/TransportGame_Data/Managed/Assembly-CSharp.dll.mdb
index dc8c760cc400e2faea58f0593693a8b568dc6247..a336f26a7a35b34913bc308f9b2bb1200c96dd53 100644
GIT binary patch
delta 882
zcmV-&1C9K<@dCT?0w5HofBhpS=tVLB00000005D{uk~E%Oh%+x-E561j<k^=t`L$Y
zu&}g|xkQ_ifD*G5K!lOra1iwy<LI2JS4y?<12x$WQs$Fh0e%qlbn3QgB`-yUs+JUj
zph=mN>;ZZZi(0jhKfsnmxZP{+nQ^U=lXe1!5JKEjsLA0@Lzmwm)}(@wo|6p&dJqcg
zdi?RTr%tD=a_p+^*}9XL1AP#!_U2g-O}$K)&}a95kh*k}Bm{R5`rgoa9MPdbiBCK!
z(wjl3ldA-M5S!jKF*GQNL!KLG&((@VGLtw3We_j~f#A>8A5Dx*mTC-^KjV|F1!xco
z$T*4Kjpav;eRl0sgZjdgB?fB{3KR{@3q-&|zLxULg~&zNlb{BE5H4>r8<NneN|A#6
zQXWCB9Fr~wdJwNZ5AhVMt4)+_L;bT50}Ye72YnEZbZsVDxZzK(eP3!7{epm#MF?#W
zJen`Yvz#SMvEg6&4TTH(lfnpV5D;H)%m(uJN2r`u54ydF9Fsi>V-VC!70e3=bw;Vc
zS1Q$UJ8P4$31<+*dyA+!o*+fOOeI}4I~}2uCkkZ{b|&DA*sfDWoXhc)y*L_Tlbi}^
z5P@$Xx8_XpOoB)SLFX=AN0Su`a1hK`C<sXD3`4%8ed>}fX%&-|3vCdT&y77}__RX3
z(^TK~agsZe5)5z<nGBYgfIUn}q*J*5HOYC}ladT)5Gm5RBi2d?OQ((TD}7*rXp;#I
zXAoJqtUTu~b49<4<&cgXuNaen4RsJXCvt(Vc+E(KtQ>VpHp*0!1rBf!WL#!JpTQSI
zp}hO$e$aX~lZ6g(5awsR1}rmrNv>rPF&j?nJd*|wb`bnssUG4>U`mw?KIwz9+b5HZ
z4{8uwwue|-O!h{-w<7i?%QrNW1`vP{vl;4&Z+pl=u?jpQr7}!gla>%`5VYPS7*~04
zNS~BVQ|T2iRg)1BY7nJlOt{z-AVZI$_oj<O+4hr*5oQn<_e|xFl^ss4b>Cv^)hCpb
z0TO5sTs3RcRH0Bpn(Gk-RmC3NlX((w5GC~$tEk<NN51$$MjC2WWs~_5a}bm#wK5D_
z#7n%`cC~^V4<(a)6J!u`R6i+6p#nsc!Qc9kiRY%1@Dp<orof54Nc9Rwy>AjG^@s=d
IvvU+kq!GJ`E&u=k

delta 882
zcmV-&1C9K<@dCT?0w5HofBhpS=tVLB00000003a91Ny*DSxK5UAN`Olc}kHWt`OAh
zZL-J}qE3c`COFmxvzL+Ha1h41PeAMTtU!Ugij-@6$kCHt0e%op#%vQWD2z_ITg0H&
z8-!bv>;ZZZ;W`rn&HM#HrxB4voyl@@lXe1!5U>)mC|T=6M}nXxTq?A5ev=IYdJrST
zss9*gb4$E%7C789r{I&91AP!k(aAH;DJVy)HXb5Q7%{DrBm{R5f(E}rgszWEl%6|E
z7?55yldA-M5CzEya~^t%MxIJdmTJjSpp!TSWe~+$^FoK)5kj}@aKZGI_+XQ*1!xeu
zNSg+vVMk56Vz_qD>q8BbB?fB{*MGog2(^$&xh<TDsSep&lb{BE5cr7olBZ{tPP>a|
zb9+WPvy(0ddJr`*u67FdkxZm5ZeIQ_Ua^z72YnDw;G>Q-!^2Fxu8ccA{a9X;MF?#W
z<*T+ge0f<)f*6Zjn2jP7lfnpV5Uxt@@m|ETO_O{{5hKyDu9H0pV-T)W>pnzp3`4Zz
z`z@jeK;)CK31<)+BJZyXXnsbSh?|bx5tlrZCkkZ{CA5dxND0+JlXG$iTY>i2lbi}^
z5CvreWQHk>PL!&c+3p;COp_H0a1hz-Y<PuDG*6}!b3A#jX)=?Q3vCb<_=8Oboe)8o
zTYJ9iL8v5?5)5z<%#6>A{$TG<u)u0so<b3$ladT)5G1qEBnbDAO`^PIKuD#(kdp}w
zXAu3jcX;>kUqruf#|IL+nY5FD4RsLE_qaR<*w;ay{)KC)Gs4@G1rBf!TzR!KBw0X0
zmAWdYvb$S5lZ6g(5TnD`W0K+FN27}W&hkpp=#vHyb`VRGvipjLzd)G7Kl>A9`1F&E
z4{8t$3!kX%UsXuB_!AaH)jE-r1`vP{(LG4sIr8#GoJM|MQNh=xla>%`5Ucn>S)gm5
zM7)PnU-@-C8<P<cY7nw<d<_vJE>5?6QcnC1AZC+`5oQpCC54Kp2m()wg#X>r){i`s
z0TO5sn`g5Gw+~7}vrqM4fcS+ZlX((w5Xx36eE$5KMU&*3CCua&rIYy*a}Z~#Hf4)D
z=17vAAi2oTeczLO6J!wCxe1e|9PLf5$HuS`Vxmfu@Dp<ofI`$Mpa5J#fQ|C0JLFo$
IvvU+kq&Cir<p2Nx

diff --git a/Game/TransportGame_Data/Managed/Assembly-UnityScript-firstpass.dll b/Game/TransportGame_Data/Managed/Assembly-UnityScript-firstpass.dll
index a4bbd58471dee334c94c20abc3cf4d459749464b..4397e12db570d92b112ee8d40106d0e88fbbfc3c 100644
GIT binary patch
delta 41
xcmZoDXegM_!Q6Mceq(o_iGa(M&U3cr4$i$1!s2SrJ{{UDXeP?InbGV&BLH|!5Yzww

delta 41
xcmZoDXegM_!8~<+&BpFP6M=c{!e1l%{hW7RT9xro>QwP&K{HXt&5UOM83B#~5&{4K

diff --git a/Game/TransportGame_Data/Managed/Assembly-UnityScript-firstpass.dll.mdb b/Game/TransportGame_Data/Managed/Assembly-UnityScript-firstpass.dll.mdb
index 6da2f60733c5f1e9708323c69c3cab49ff905618..87a9523f7bc24a413fac9736c2a17186cb9ece3a 100644
GIT binary patch
delta 125
zcmdldu}?xlWLf=RWwjTsMhp<(a;5W}t+|79Z-lV8+OtoGCMsML*pTDio8SN5ZG)!f
zTff-F(v#U3XAAT@njMc`Q|jIE=GER0{_o2sZ)EHfxUtxP)rD8zv)ezZ^PPLi^vV8A
d3j|8Pz7Vrsdd+29{fDj2LNC{C{?BC32>?!1HKPCk

delta 125
zcmV-@0D}L%7`_-F6sCXuBPQrYG5`Po00000o`)0lS&vRbxzeg=;Tp<wks#I(5)dYG
zCa(TUo&Wif+9gWRlLi5s5cSRKz951_LABZ|m}Qw_)043Qju1k2i>7Y&1Vn*c8RrR|
fQM!{)0-z8rdl;4ct?Ejb#>?8Gkytdd{{lY={W&+a

diff --git a/Game/TransportGame_Data/PlayerConnectionConfigFile b/Game/TransportGame_Data/PlayerConnectionConfigFile
index ca7f7d2..a68b89a 100644
--- a/Game/TransportGame_Data/PlayerConnectionConfigFile
+++ b/Game/TransportGame_Data/PlayerConnectionConfigFile
@@ -1 +1 @@
-listen 2605474146 1 1
\ No newline at end of file
+listen 3964677318 1 1
\ No newline at end of file
diff --git a/Game/TransportGame_Data/output_log.txt b/Game/TransportGame_Data/output_log.txt
index 8368fcf..f3a55a7 100644
--- a/Game/TransportGame_Data/output_log.txt
+++ b/Game/TransportGame_Data/output_log.txt
@@ -16,7 +16,7 @@ Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Transpo
 Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-UnityScript-firstpass.dll into Unity Child Domain
 Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll (this message is harmless)
 Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
-- Completed reload, in  0.081 seconds
+- Completed reload, in  0.045 seconds
 desktop: 1920x1080 60Hz; virtual: 1920x1080 at 0,0
 <RI> Initializing input.

 <RI> Input initialized.

@@ -84,14 +84,3 @@ TransportGame.Utils.Logger:Info(String, Object[]) (at C:\Users\Tibi\Google Drive
  
 (Filename: C:/Users/Tibi/Google Drive/FacultateCY/$ Licenta/Game/Assets/Scripts/Utils/Logger.cs Line: 66)
 
-Finished generating road mesh.
-UnityEngine.Debug:Internal_Log(Int32, String, Object)
-UnityEngine.Debug:Log(Object)
-TransportGame.Utils.Logger:Log(Level, String, Object[]) (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Logger.cs:66)
-TransportGame.Utils.Logger:Info(String, Object[]) (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Logger.cs:74)
-TransportGame.Unity.<Generate>c__Iterator2:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Unity\RoadMeshGenerator.cs:95)
-TransportGame.Utils.<InParallel>c__Iterator8:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Task.cs:82)
-<GenerateMap>c__Iterator3:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Unity\TerrainGeneratorScript.cs:146)
- 
-(Filename: C:/Users/Tibi/Google Drive/FacultateCY/$ Licenta/Game/Assets/Scripts/Utils/Logger.cs Line: 66)
-
diff --git a/Game/TransportGame_Data/sharedassets0.assets b/Game/TransportGame_Data/sharedassets0.assets
index f2df28118aa6ceaea9226f8e588f25088d96ff0c..039f06786c4ce48235ef22f58efcce933b94e776 100644
GIT binary patch
delta 1971
zcmZwHdu&rx90%~Vd-TD8y9cZwtSt^1523sSk;%qD0eO@+12)#KUAJ!I7DPe84WV1<
z#s*`h-?p$m7_KfNY$%pLh>k2i$wK`@F-F7q!zhX1L^Nt*@Ov5lq46Z2d+t5I({q34
zcW!#6sWbW9`<=<kgoM<Rgs#xE9;H(*&na$ek&o8?9*!mq?2;uI5)$aa19l0S(uM7-
z^sd8wa#x>RMpB<hNt8?}q#z}!NKL~im4?#@8c71BQ95N%CXJ%eltmgELu2VN8b{+P
zo3x}OJx!p;DTgM~6Eul(X);ZrsWgqAr0Fz+3^bEw(QKMSbLlCXNAu}vT0qaxLdv6O
zX%Xd90WGFNT0%?dIeMO!(Q;ZrFVIR_MXPBI8EGx8qxH0bHqs{AOk1dkw$e7*PQ_G0
zJE)XQWTrB*kd?~GMio>^cB-Oks-c}El7n{9ZhDdS&`b0(?WKM63cX7E=>WY(wNyt3
z>2*3phhu$mXWCkMVsY%t_0EDNFs6rcApCM<Iqn>E?tpQ7{W;{X^XA6tZoB5lAbt|e
zm{wU`QEsoYT12zMVzbv+>}57{mEB@<SjuhIN{eVRn;tf^)l>~x{;5%URaTQl8mcmx
z>{4G=Bi))zR<q4v6D@XI%~1TGUYg<%9S*gl##DyA3;l;>b`;!;X5j8sq$Y9=eDG;-
zlx!zvZuI7)SUKNOg|thqF$l*`sA6?_{#7!$Nkq?U!7Qv^6Hy>~F_4Y(<H94+v_3E%
z$A4^B;G=6ntzMK8F^SenrX%%L=12LLnQRPHh-h7bY;RpKS!Tx7K3{gC+FS<N7OxiH
z$Rh#_TfAwEjOY()vEW`L6Nb}ghH;JsYx;xvj2xFDR~|(a-U5G$%!1GRgDVlPKoT6k
zMpJOJJCKIZoPYpvhfjg}0{>KeH#aa6y896|sy~KOB^A}oB+D^S<jtBQJ(ls2IWlM7
z5A8ucRA81<njmee0=GW&Wx;r(BMC-*I7wECTOu^LQyWZ0{17iE??*Ec--#p^*?y@b
z7Z3E|VN#hmTHK+Q)u3mvJqtITQ3V_m!Wvxs$v1N=PnV5v9y;wZ^}{1{@bv!^kjiSR
z{Gajie~+sjY|@$-XmZX+vCgYP?Vzs+x=qcxSl;|VvJ4kCMpV$%9$}qyCnurg&*oHb
zx@$ztP~zR2h~HK;<)b#(slW`AONIUSU0Uc)I8_kdb{&G_TelkaLZ21}d%XtnXrmGp
zg+4uW?|QVb75Wxn!0OQ>em=yXm3t<jbazmP(n6mS_Hxe{#M_*cARO+>K=@2xG;|)P
z2Gf`N#y(natV;od$Eh3|EB&H@FM9Mi3xjRWT$H}&$wjxtt492tdL;xQ!u6c)boAai
zs(?|5<RVnX^|}+=H4u7S8g%!aQXmv)OY>H@>XH9_s}gcOQweL_8W<F<BT?#gt8mcj
zO2f@wzXHc?+<5QeKo-A1GiKi4wC=_RCU#lcV^d=~;(xFz2QPaB%&I+^j=@Xy+^x~C
zf^llI0=gS5D%9mP@f8yp5PoP%LU&6f8$zF7i({+1RB(TGM2AHRKR^A%pc3)bU1^L4
zxU*E3Ql>^hUtm5Q*BX?#u;(cE=5}U5XF8?9K6g|Pp^+65|8m!GiZdC84b1{{*Uyea
zct$80MQ<I|p?98J!1dXui!rdRWg`EQ+EX#L6eD2lZ^**n9hU&(W|tDfAGjwYblZOb
z+qXKG#ll}VoE`2GJDpTd4dkLD<fcYyqNCJIEp&{IQ!AaIHuBI(@)F2LehSbjI!)~q
eq!5KELT9Lh&e9t(v9nY5vr9xYCgROicmD>jdp$Y;

delta 781
zcmWl~SyK%F0EXdn4iROEWS4zkvSnXV2w9Rf$xe3J_pMVWB2i@DRfdbqm^n9%F8TwE
z8JErZ1!i2haFwTT=K0>w-|FI;D(d3m1A)ZCz{k?2FY)0}=xb(mWhf=JJW?Ns6$b-p
zfdFl75=d@8EBe<^(h`cago3oU109K@6P<~t3tdSdk#2OS2R%um7rjZQ4=MDeAN?7?
zKn5|GA*3>tVGL&kBN@eL#xRy~jAsH9nZ#tKkj7M|F`XIAB%N8zW)5?i$9xvBkVPye
zgC%5=#Zs2BoNQLGl2zoenl-Ft9l5M0j}2^O6Pww>R`S_K0oy5L2RqrtZuYR3eeCA|
zMI7W1hdIJgj&Yn56mybOoaPK?ImdY}aFI(~<_cH2#&vFRlagplD4diVs>zK0$_r;?
z)mD9~ORsHQSe{;6kRQ&D#=e*S2u5Rn%YG(ATARa^QbvSwZgHCm?r@h%?oq{k9#BmU
r4|zl_k9opVp7ER)yyO+HdBa=Y@tzOS*5<n4pGd5+J{oIm$oc&r8Ms=g

diff --git a/Game/UnityVS.Game.CSharp.csproj b/Game/UnityVS.Game.CSharp.csproj
index 9b31a49..d11fc8f 100644
--- a/Game/UnityVS.Game.CSharp.csproj
+++ b/Game/UnityVS.Game.CSharp.csproj
@@ -7,14 +7,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{02576F1D-BE9C-CFA7-763D-1EBF63B36977}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.0.1f1</UnityVersion>
@@ -85,7 +87,7 @@
     <Compile Include="Assets\Scripts\Model\Config\TerrainGeneratorConfig.cs" />
     <Compile Include="Assets\Scripts\Model\IPositionable.cs" />
     <Compile Include="Assets\Scripts\Model\LineSegment.cs" />
-    <Compile Include="Assets\Scripts\Model\Map.cs" />
+    <Compile Include="Assets\Scripts\Model\CityMap.cs" />
     <Compile Include="Assets\Scripts\Model\Polygon.cs" />
     <Compile Include="Assets\Scripts\Model\Range.cs" />
     <Compile Include="Assets\Scripts\Model\Rectangle.cs" />
@@ -117,4 +119,4 @@
     <None Include="Assets\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2013\UnityVS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file