diff --git a/Assets/FogOfWar/Test/FogOfWarTestScene.unity b/Assets/FogOfWar/Test/FogOfWarTestScene.unity
diff --git a/Assets/FogOfWar/Test/FogOfWarTestSceneClearFog.unity b/Assets/FogOfWar/Test/FogOfWarTestSceneClearFog.unity
diff --git a/Assets/FogOfWar/Test/Highlight.mat b/Assets/FogOfWar/Test/Highlight.mat
@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
   m_LightmapFlags: 5
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 3000
   stringTagMap:
     RenderType: Transparent
   m_SavedProperties:
@@ -135,10 +135,6 @@ Material:
         first:
           name: _Metallic
         second: 0
-      data:
-        first:
-          name: _InvFade
-        second: 1
     m_Colors:
       data:
         first:
@@ -152,7 +148,3 @@ Material:
         first:
           name: _SpecColor
         second: {r: 0.04411763, g: 0.04411763, b: 0.04411763, a: 1}
-      data:
-        first:
-          name: _TintColor
-        second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
diff --git a/Assets/FogOfWar/UserGuide.pdf b/Assets/FogOfWar/UserGuide.pdf
diff --git a/Assets/MinimapRenderTexture.renderTexture b/Assets/MinimapRenderTexture.renderTexture
@@ -9,8 +9,8 @@ RenderTexture:
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
-  m_Width: 250
-  m_Height: 250
+  m_Width: 512
+  m_Height: 512
   m_AntiAliasing: 1
   m_DepthFormat: 2
   m_ColorFormat: 0

diff --git a/Assets/MinimapReveal.renderTexture b/Assets/MinimapReveal.renderTexture
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: MinimapReveal
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_Width: 250
+  m_Height: 250
+  m_AntiAliasing: 1
+  m_DepthFormat: 2
+  m_ColorFormat: 0
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_TextureSettings:
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapMode: 1
diff --git a/Assets/MinimapReveal.renderTexture.meta b/Assets/MinimapReveal.renderTexture.meta
diff --git a/Assets/Nurkka.png.meta b/Assets/Nurkka.png.meta
diff --git a/Assets/Prefabs/MinimapFocusBox.prefab b/Assets/Prefabs/MinimapFocusBox.prefab
@@ -0,0 +1,276 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &120500
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 401914}
+  - 212: {fileID: 21283518}
+  m_Layer: 24
+  m_Name: NWminimapdot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &125106
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 480514}
+  m_Layer: 24
+  m_Name: MinimapFocusBox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &150964
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 478158}
+  - 212: {fileID: 21225240}
+  m_Layer: 24
+  m_Name: 'SEminimapdot '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &158972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 409628}
+  - 212: {fileID: 21289772}
+  m_Layer: 24
+  m_Name: NEminimapdot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &163504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 461800}
+  - 212: {fileID: 21268184}
+  m_Layer: 24
+  m_Name: SWminimapdot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &401914
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120500}
+  m_LocalRotation: {x: 0.49987778, y: 0.5001221, z: -0.5002949, w: 0.49970505}
+  m_LocalPosition: {x: 0, y: 20, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_Children: []
+  m_Father: {fileID: 480514}
+  m_RootOrder: 3
+--- !u!4 &409628
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 158972}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
+  m_LocalPosition: {x: 0, y: 20, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_Children: []
+  m_Father: {fileID: 480514}
+  m_RootOrder: 2
+--- !u!4 &461800
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 163504}
+  m_LocalRotation: {x: -0.00000011518241, y: 0.70722896, z: -0.7069846, w: -0.00000011522223}
+  m_LocalPosition: {x: 0, y: 20, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_Children: []
+  m_Father: {fileID: 480514}
+  m_RootOrder: 1
+--- !u!4 &478158
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 150964}
+  m_LocalRotation: {x: -0.49991375, y: 0.5000863, z: -0.49991348, w: -0.50008655}
+  m_LocalPosition: {x: 0, y: 20, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_Children: []
+  m_Father: {fileID: 480514}
+  m_RootOrder: 0
+--- !u!4 &480514
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 125106}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 478158}
+  - {fileID: 461800}
+  - {fileID: 409628}
+  - {fileID: 401914}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!212 &21225240
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 150964}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_ReflectionProbeUsage: 0
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 3f324fa1411f0794dae177090f661272, type: 3}
+  m_Color: {r: 0.86764705, g: 0.86764705, b: 0.86764705, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!212 &21268184
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 163504}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_ReflectionProbeUsage: 0
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 3f324fa1411f0794dae177090f661272, type: 3}
+  m_Color: {r: 0.86764705, g: 0.86764705, b: 0.86764705, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!212 &21283518
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120500}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_ReflectionProbeUsage: 0
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 3f324fa1411f0794dae177090f661272, type: 3}
+  m_Color: {r: 0.86764705, g: 0.86764705, b: 0.86764705, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!212 &21289772
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 158972}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_ReflectionProbeUsage: 0
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 3f324fa1411f0794dae177090f661272, type: 3}
+  m_Color: {r: 0.86764705, g: 0.86764705, b: 0.86764705, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 125106}
+  m_IsPrefabParent: 1
diff --git a/Assets/Prefabs/MinimapFocusBox.prefab.meta b/Assets/Prefabs/MinimapFocusBox.prefab.meta
diff --git a/Assets/Resources/GUI/GUI Prefabs/Healthbars.prefab b/Assets/Resources/GUI/GUI Prefabs/Healthbars.prefab
@@ -1,38 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &116914
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22499714}
-  - 222: {fileID: 22248696}
-  - 114: {fileID: 11405834}
-  m_Layer: 5
-  m_Name: HPBG
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &120216
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22451734}
-  - 222: {fileID: 22235420}
-  m_Layer: 5
-  m_Name: HPBar
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
 --- !u!1 &139406
 GameObject:
   m_ObjectHideFlags: 0
@@ -50,77 +17,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &153150
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22426584}
-  - 222: {fileID: 22298244}
-  - 114: {fileID: 11422690}
-  m_Layer: 5
-  m_Name: HPGreen
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &11405834
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 116914}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.19852942, b: 0.19852942, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 0
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!114 &11422690
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 153150}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.5440103, g: 0.9852941, b: 0.28979236, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: c054fe36b720acd4ca2fb5cf46d18d4d, type: 3}
-  m_Type: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 0
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &11488174
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -142,24 +38,6 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
---- !u!222 &22235420
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 120216}
---- !u!222 &22248696
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 116914}
---- !u!222 &22298244
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 153150}
 --- !u!223 &22398170
 Canvas:
   m_ObjectHideFlags: 1
@@ -175,44 +53,10 @@ Canvas:
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_TargetDisplay: 0
---- !u!224 &22426584
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 153150}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 22499714}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &22451734
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 120216}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 22499714}
-  m_Father: {fileID: 22496796}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 48.4, y: -22.899994}
-  m_SizeDelta: {x: 102.2, y: 121.9}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &22496796
 RectTransform:
   m_ObjectHideFlags: 1
@@ -222,33 +66,14 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 22451734}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!224 &22499714
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 116914}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
-  m_LocalScale: {x: 0.39074075, y: 0.39074075, z: 0.39074075}
-  m_Children:
-  - {fileID: 22426584}
-  m_Father: {fileID: 22451734}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -5.6, y: 53.800003}
-  m_SizeDelta: {x: 219.6, y: -85}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &100100000
 Prefab:
   m_ObjectHideFlags: 1

diff --git a/Assets/Resources/GUI/GUI Prefabs/UI_Gears.prefab b/Assets/Resources/GUI/GUI Prefabs/UI_Gears.prefab
@@ -320,7 +320,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &121404
 GameObject:
   m_ObjectHideFlags: 1
@@ -4204,7 +4204,7 @@ RectTransform:
   m_RootOrder: 0
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -3.1, y: -0.00001955}
+  m_AnchoredPosition: {x: 0.7, y: -0.00001955}
   m_SizeDelta: {x: 100.3, y: 33.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &22426652
@@ -4798,7 +4798,7 @@ RectTransform:
   m_RootOrder: 2
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1026.7, y: 204.70001}
+  m_AnchoredPosition: {x: 783.7, y: 204.70001}
   m_SizeDelta: {x: 117.599976, y: 40.799988}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &22492578

diff --git a/Assets/Resources/GUI/GUI Prefabs/UI_Scales.prefab b/Assets/Resources/GUI/GUI Prefabs/UI_Scales.prefab
@@ -3937,7 +3937,7 @@ RectTransform:
   m_RootOrder: 0
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -3.1, y: -0.00001955}
+  m_AnchoredPosition: {x: 0.7, y: -0.00001955}
   m_SizeDelta: {x: 100.3, y: 33.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &22406578
@@ -4841,7 +4841,7 @@ RectTransform:
   m_RootOrder: 2
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1026.7, y: 204.70001}
+  m_AnchoredPosition: {x: 783.7, y: 204.70001}
   m_SizeDelta: {x: 117.599976, y: 40.799988}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &22487772

diff --git a/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Player1.prefab b/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Player1.prefab
@@ -101,8 +101,8 @@ GameObject:
   - 114: {fileID: 11420048}
   - 114: {fileID: 11422152}
   - 114: {fileID: 11473950}
-  - 114: {fileID: 11481384}
   - 95: {fileID: 9571284}
+  - 114: {fileID: 11408474}
   m_Layer: 12
   m_Name: Player1
   m_TagString: Player1
@@ -1402,6 +1402,36 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!114 &11408474
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120848}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 4
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 0}
+          m_MethodName: ToggleCanvasConst
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+      m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
+        Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  delegates: []
 --- !u!114 &11420048
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1614,36 +1644,6 @@ MonoBehaviour:
   stickyness: 14.9
   unit: 2
   dragCoefficient: 0.3
---- !u!114 &11481384
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 120848}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Delegates:
-  - eventID: 4
-    callback:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 0}
-          m_MethodName: ToggleCanvasConst
-          m_Mode: 1
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 0
-          m_CallState: 2
-      m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
-        Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  delegates: []
 --- !u!114 &11492632
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/...ngs/gearsHouse/FloatingFortress/Textures/FloatingFortress_With_Transparency.png b/...ngs/gearsHouse/FloatingFortress/Textures/FloatingFortress_With_Transparency.png
diff --git a/...uildings/gearsHouse/FloatingFortress/Textures/FloatingFortress_With_Transparency.png.meta b/...uildings/gearsHouse/FloatingFortress/Textures/FloatingFortress_With_Transparency.png.meta
diff --git a/...ls/Buildings/gearsHouse/FloatingFortress/Textures/Floating_Fortress_Diffuse.png b/...ls/Buildings/gearsHouse/FloatingFortress/Textures/Floating_Fortress_Diffuse.png
diff --git a/.../Models/Buildings/gearsHouse/FloatingFortress/Textures/Floating_Fortress_Diffuse.png.meta b/.../Models/Buildings/gearsHouse/FloatingFortress/Textures/Floating_Fortress_Diffuse.png.meta
diff --git a/...sHouse/FloatingFortress/Textures/Gears_FloatingFortress_Tekstuurit_27022016.png b/...sHouse/FloatingFortress/Textures/Gears_FloatingFortress_Tekstuurit_27022016.png
diff --git a/...sHouse/FloatingFortress/Textures/Gears_FloatingFortress_Tekstuurit_27022017.png b/...sHouse/FloatingFortress/Textures/Gears_FloatingFortress_Tekstuurit_27022017.png
diff --git a/...tingFortress_Tekstuurit_27022016.png.meta → ...tingFortress_Tekstuurit_27022017.png.meta b/...tingFortress_Tekstuurit_27022016.png.meta → ...tingFortress_Tekstuurit_27022017.png.meta
diff --git a/...s/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Keltainen.png b/...s/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Keltainen.png
diff --git a/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Keltainen.png.meta b/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Keltainen.png.meta
diff --git a/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Vihrea.png b/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Vihrea.png
diff --git a/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Vihrea.png.meta b/Assets/Resources/Models/Buildings/gearsHouse/FloatingFortress/Textures/Vihrea.png.meta
diff --git a/.../gearsHouse/FloatingFortress_OLD/Materials/Gears_FloatingFortress_Tekstuurit_27022016.mat b/.../gearsHouse/FloatingFortress_OLD/Materials/Gears_FloatingFortress_Tekstuurit_27022016.mat
@@ -20,7 +20,7 @@ Material:
         first:
           name: _MainTex
         second:
-          m_Texture: {fileID: 2800000, guid: 9def4638f0eb09c40beaf843fd052cc6, type: 3}
+          m_Texture: {fileID: 2800000, guid: a9619b7eda77a924b85657c6fa203104, type: 3}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:

diff --git a/Assets/Resources/Models/Buildings/gearsHouse/NavalYard/Model/G_NavalYard.fbx.meta b/Assets/Resources/Models/Buildings/gearsHouse/NavalYard/Model/G_NavalYard.fbx.meta
diff --git a/...ts/Resources/Models/Buildings/gearsHouse/NavalYard/NavalYardAnimatorController.controller b/...ts/Resources/Models/Buildings/gearsHouse/NavalYard/NavalYardAnimatorController.controller
@@ -21,34 +21,34 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1101 &110163492
+--- !u!1101 &110194804
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: 
   m_Conditions: []
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 110219806}
+  m_DstState: {fileID: 110278434}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.9
+  m_ExitTime: 0.99996823
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1102 &110219806
+--- !u!1102 &110278434
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: Scene
+  m_Name: GearsRotate
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -60,7 +60,7 @@ AnimatorState:
   m_SpeedParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
-  m_Motion: {fileID: 7400004, guid: 49928683134b681418841bd23cb800c6, type: 3}
+  m_Motion: {fileID: 7400002, guid: 49928683134b681418841bd23cb800c6, type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -74,16 +74,16 @@ AnimatorStateMachine:
   m_Name: Base Layer
   m_ChildStates:
   - serializedVersion: 1
-    m_State: {fileID: 110219806}
-    m_Position: {x: 396, y: 144, z: 0}
+    m_State: {fileID: 110278434}
+    m_Position: {x: 504, y: 156, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
-  - {fileID: 110163492}
+  - {fileID: 110194804}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: 348, y: 48, z: 0}
   m_EntryPosition: {x: 408, y: -60, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 110219806}
+  m_DefaultState: {fileID: 110278434}
diff --git a/...ts/Resources/Models/Units/gearsHouse/FishingBoat/FishingBoatAnimatorController.controller b/...ts/Resources/Models/Units/gearsHouse/FishingBoat/FishingBoatAnimatorController.controller
@@ -60,7 +60,7 @@ AnimatorState:
   m_SpeedParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 7197afdbb17f43c4188f971613d8d872, type: 3}
+  m_Motion: {fileID: 7400002, guid: 7fb9ca66fdfa2314e98946662ea7a781, type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -82,7 +82,7 @@ AnimatorStateMachine:
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 348, y: 48, z: 0}
+  m_AnyStatePosition: {x: 264, y: 48, z: 0}
   m_EntryPosition: {x: 408, y: -60, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}

diff --git a/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat.blend1 b/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat.blend1
diff --git a/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx.fbx b/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx.fbx
diff --git a/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx.fbx.meta b/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx.fbx.meta
diff --git a/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx1.fbx b/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx1.fbx
diff --git a/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx1.fbx.meta b/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Fishing_boat_fbx1.fbx.meta
diff --git a/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Model/G_FishingBoat.fbx.meta b/Assets/Resources/Models/Units/gearsHouse/FishingBoat/Model/G_FishingBoat.fbx.meta
diff --git a/Assets/Scenes/Scene_test_Karl/TestLevel_3.unity b/Assets/Scenes/Scene_test_Karl/TestLevel_3.unity
@@ -227,7 +227,7 @@ Transform:
   m_LocalScale: {x: 100, y: 1, z: 100}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
 --- !u!4 &69900794 stripped
 Transform:
   m_PrefabParentObject: {fileID: 409740, guid: c9ee777b962fa6f49b66f3048f7b4b28, type: 2}
@@ -833,6 +833,39 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: c2cc95431b5472f4d806a9406bcfc564, type: 2}
   m_IsPrefabParent: 0
+--- !u!1 &353928411 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 156072, guid: 602cbbc66ab2b1b4785ca5c4574635b3, type: 2}
+  m_PrefabInternal: {fileID: 1001920449}
+--- !u!114 &353928412
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 353928411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 213ef47ac45624aa68d2087e0785386c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cameraObj: {fileID: 1783412201}
+  minimapCamera: {fileID: 1888068640}
+  minimapBoxCamera: {fileID: 0}
+  Minimap: {fileID: 2091294265}
+  MapWidth: 0
+  MapHeight: 0
+  fowMinimap: {fileID: 0}
+  canvas: {fileID: 1271119690}
+  cameraRotation: {x: 0, y: 0, z: 0}
+  cameraDistance: 0
+  minmapcampos: {x: 0, y: 0, z: 0}
+  NWcornerDot: {fileID: 719209057}
+  NEcornerDot: {fileID: 719209056}
+  SWcornerDot: {fileID: 719209055}
+  SEcornerDot: {fileID: 719209054}
+  corners: []
+  minimapRevealTexture: {fileID: 0}
+  minimapMask: {fileID: 0}
 --- !u!1001 &488970260
 Prefab:
   m_ObjectHideFlags: 0
@@ -1023,7 +1056,7 @@ Transform:
   - {fileID: 1033094327}
   - {fileID: 1742805550}
   m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 31
 --- !u!1 &604122802
 GameObject:
   m_ObjectHideFlags: 0
@@ -1270,12 +1303,90 @@ RectTransform:
   m_Children:
   - {fileID: 333945692}
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1001 &719209053
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 480514, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 163504, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_Layer
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 158972, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_Layer
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 150964, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_Layer
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 125106, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_Layer
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 120500, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+      propertyPath: m_Layer
+      value: 24
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1 &719209054 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 150964, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+  m_PrefabInternal: {fileID: 719209053}
+--- !u!1 &719209055 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 163504, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+  m_PrefabInternal: {fileID: 719209053}
+--- !u!1 &719209056 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 158972, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+  m_PrefabInternal: {fileID: 719209053}
+--- !u!1 &719209057 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 120500, guid: bb7b7440eda80c9448000dab2d803eea, type: 2}
+  m_PrefabInternal: {fileID: 719209053}
 --- !u!1001 &737144205
 Prefab:
   m_ObjectHideFlags: 0
@@ -1552,7 +1663,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 21
 --- !u!4 &936689683 stripped
 Transform:
   m_PrefabParentObject: {fileID: 407796, guid: c13ec7bbf8457204586a53fb14f130ed, type: 2}
@@ -1616,6 +1727,10 @@ Prefab:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2026752, guid: 602cbbc66ab2b1b4785ca5c4574635b3, type: 2}
+      propertyPath: m_CullingMask.m_Bits
+      value: 4277862143
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 602cbbc66ab2b1b4785ca5c4574635b3, type: 2}
   m_IsPrefabParent: 0
@@ -2102,14 +2217,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 11481384, guid: f17b78858b43aaf4b833ca638278b444, type: 2}
+    - target: {fileID: 11408474, guid: f17b78858b43aaf4b833ca638278b444, type: 2}
       propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
       objectReference: {fileID: 1857952853}
-    - target: {fileID: 11481384, guid: f17b78858b43aaf4b833ca638278b444, type: 2}
-      propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: ToggleCanvasConst
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: f17b78858b43aaf4b833ca638278b444, type: 2}
   m_IsPrefabParent: 0
@@ -2162,7 +2273,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 39
 --- !u!1001 &1181480359
 Prefab:
   m_ObjectHideFlags: 0
@@ -2429,6 +2540,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 0bd708bb5d324324b8104d367c79e7ce, type: 2}
   m_IsPrefabParent: 0
+--- !u!223 &1271119690 stripped
+Canvas:
+  m_PrefabParentObject: {fileID: 22333998, guid: 5535322ac0913b14992afc5f1fc2a375,
+    type: 2}
+  m_PrefabInternal: {fileID: 1680272494}
 --- !u!1001 &1275438654
 Prefab:
   m_ObjectHideFlags: 0
@@ -2760,7 +2876,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 26
 --- !u!1001 &1361615743
 Prefab:
   m_ObjectHideFlags: 0
@@ -3180,7 +3296,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 117468, guid: 5b4b9c2bbba32f24e819c7b18edeaf40, type: 2}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 5b4b9c2bbba32f24e819c7b18edeaf40, type: 2}
@@ -3598,7 +3714,41 @@ Prefab:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 121396, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_Name
+      value: UI
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492328, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 22462950, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22460060, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22459000, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492328, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492328, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492328, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: -117.29999
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 11452548, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+    - {fileID: 11421672, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
   m_ParentPrefab: {fileID: 100100000, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
   m_IsPrefabParent: 0
 --- !u!1001 &1697711551
@@ -4053,7 +4203,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
 --- !u!114 &1857952853 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11408210, guid: 5535322ac0913b14992afc5f1fc2a375,
@@ -4234,6 +4384,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: c9ee777b962fa6f49b66f3048f7b4b28, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &1888068640 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 2075110, guid: 5d9fde79cc099194ab7c22c774471fcd,
+    type: 2}
+  m_PrefabInternal: {fileID: 53566567}
 --- !u!1001 &1895456326
 Prefab:
   m_ObjectHideFlags: 0
@@ -4626,7 +4781,41 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 5
+--- !u!1 &2091294265 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 105848, guid: 5535322ac0913b14992afc5f1fc2a375, type: 2}
+  m_PrefabInternal: {fileID: 1680272494}
+--- !u!114 &2091294266
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2091294265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 4
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 353928412}
+          m_MethodName: MinimapClick
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+      m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
+        Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  delegates: []
 --- !u!4 &2103582386 stripped
 Transform:
   m_PrefabParentObject: {fileID: 407796, guid: c13ec7bbf8457204586a53fb14f130ed, type: 2}

diff --git a/Assets/Scenes/Scene_test_Karl/TestLevel_4.unity b/Assets/Scenes/Scene_test_Karl/TestLevel_4.unity
diff --git a/...ouse/FishingBoat/Fishing_boat.blend1.meta → ...es/Scene_test_Karl/TestLevel_4.unity.meta b/...ouse/FishingBoat/Fishing_boat.blend1.meta → ...es/Scene_test_Karl/TestLevel_4.unity.meta
diff --git a/Assets/Scripts/Buildings/SteamHouse/FloatingFortress/FloatingFortress.cs b/Assets/Scripts/Buildings/SteamHouse/FloatingFortress/FloatingFortress.cs
@@ -1,8 +1,11 @@
 using UnityEngine;
 using System.Collections;
+using UnityEngine.EventSystems;
 
 public class FloatingFortress : Building {
 
+    ShowCanvas showCanvasScript = GameObject.Find("UI").GetComponentInChildren<ShowCanvas>();
+
 	// Use this for initialization
 	new void Start () 
 	{
@@ -18,4 +21,10 @@ public class FloatingFortress : Building {
         base.Update();
         AstarPath.active.UpdateGraphs(GetComponent<BoxCollider>().bounds);
     }
+
+    public void OnPointerDown(PointerEventData eventData)
+    {
+        showCanvasScript.ToggleCanvasConst();
+        //doesn't work, need to get this work to get the thing optimized
+    }
 }
diff --git a/Assets/EmptyClass.cs → Assets/Scripts/EmptyClass.cs b/Assets/EmptyClass.cs → Assets/Scripts/EmptyClass.cs
diff --git a/Assets/EmptyClass.cs.meta → Assets/Scripts/EmptyClass.cs.meta b/Assets/EmptyClass.cs.meta → Assets/Scripts/EmptyClass.cs.meta
diff --git a/Assets/FaceCamera.cs → Assets/Scripts/FaceCamera.cs b/Assets/FaceCamera.cs → Assets/Scripts/FaceCamera.cs
diff --git a/Assets/FaceCamera.cs.meta → Assets/Scripts/FaceCamera.cs.meta b/Assets/FaceCamera.cs.meta → Assets/Scripts/FaceCamera.cs.meta
diff --git a/Assets/HPBarScaling.cs → Assets/Scripts/HPBarScaling.cs b/Assets/HPBarScaling.cs → Assets/Scripts/HPBarScaling.cs
diff --git a/Assets/HPBarScaling.cs.meta → Assets/Scripts/HPBarScaling.cs.meta b/Assets/HPBarScaling.cs.meta → Assets/Scripts/HPBarScaling.cs.meta
diff --git a/Assets/Scripts/MinimapArmi.cs b/Assets/Scripts/MinimapArmi.cs
diff --git a/Assets/Scripts/NewMinimapScript.cs b/Assets/Scripts/NewMinimapScript.cs
@@ -0,0 +1,122 @@
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+
+public class NewMinimapScript : MonoBehaviour
+{
+
+    private Vector3 NW;
+    private Vector3 NE;
+    private Vector3 SW;
+    private Vector3 SE;
+
+    public GameObject cameraObj;
+    public Camera minimapCamera;
+    public Camera minimapBoxCamera;
+    public GameObject Minimap;
+    public float MapWidth;
+    public float MapHeight;
+    public GameObject fowMinimap;
+
+    public Canvas canvas;
+
+    public Vector3 cameraRotation;
+    public float cameraDistance;
+    public Vector3 minmapcampos;
+
+    public GameObject NWcornerDot;
+    public GameObject NEcornerDot;
+    public GameObject SWcornerDot;
+    public GameObject SEcornerDot;
+
+    public Vector3[] corners;
+
+    public Texture2D minimapRevealTexture;
+
+    public GameObject minimapMask;
+
+
+    FogOfWar _fog;
+    Texture2D _texture;
+    GUIStyle _panelStyle;
+
+
+    Camera _camera;
+    Transform _cameraTransform;
+
+
+    void Start()
+    { 
+        _fog = GetComponent<FogOfWar>();
+        _camera = GetComponent<Camera>();
+        _cameraTransform = transform;
+
+        if (_texture == null)
+        {
+            _texture = new Texture2D(_fog.texture.width, _fog.texture.height);
+            _texture.wrapMode = TextureWrapMode.Clamp;
+        }
+    }
+
+    void FixedUpdate()
+    {
+        cameraDistance = Vector3.Distance(cameraObj.transform.position, cameraObj.GetComponent<MyCamera>().focusPoint.transform.position);
+
+        NE = Camera.main.ViewportToWorldPoint(new Vector3(0, 1, cameraDistance));
+        NEcornerDot.transform.position = new Vector3(NE.x, 20, NE.z);
+        NW = Camera.main.ViewportToWorldPoint(new Vector3(1, 1, cameraDistance));
+        NWcornerDot.transform.position = new Vector3(NW.x, 20, NW.z);
+        SW = Camera.main.ViewportToWorldPoint(new Vector3(1, 0, cameraDistance));
+        SWcornerDot.transform.position = new Vector3(SW.x, 20, SW.z);
+        SE = Camera.main.ViewportToWorldPoint(new Vector3(0, 0, cameraDistance));
+        SEcornerDot.transform.position = new Vector3(SE.x, 20, SE.z);
+
+        cameraRotation = cameraObj.transform.rotation.eulerAngles;
+        minimapCamera.transform.eulerAngles = new Vector3(90, cameraRotation.y, 0);
+        minimapBoxCamera.transform.eulerAngles = new Vector3(90, cameraRotation.y, 0);
+        fowMinimap.transform.eulerAngles = new Vector3(0, 0, cameraRotation.y);
+        GameObject.Find("MinimapFocusBox").transform.eulerAngles = cameraRotation;
+
+
+    }
+
+    public void MinimapClick()
+    {
+
+        Vector3 mousePos = (Input.mousePosition);
+        Vector2 minimapPos = Minimap.transform.position;
+
+        //Get the 4 corners (in world space) of the raw image gameobject's rect transform on the GUI
+        corners = new Vector3[4];
+        Minimap.GetComponent<RectTransform>().GetWorldCorners(corners);
+        Rect newRect = new Rect(corners[0], corners[2] - corners[0]);
+
+
+        //Get the pixel offset amount from the current mouse position to the left edge of the minimap
+        //rect transform.  And likewise for the y offset position.
+        float xPositionDeltaPoint = Input.mousePosition.x - newRect.x;
+        float yPositionDeltaPoint = Input.mousePosition.y - newRect.y;
+
+        minmapcampos = minimapCamera.ViewportToWorldPoint(new Vector3(xPositionDeltaPoint / newRect.width, yPositionDeltaPoint / newRect.height, 0f));
+        cameraObj.GetComponent<MyCamera>().status = MyCameraStatusEnum.MANUAL;
+        cameraObj.transform.position = new Vector3(minmapcampos.x + 20f, cameraObj.transform.position.y, minmapcampos.z - 40f);
+
+    }
+
+    void OnGUI()
+    {
+
+        byte[] original = _fog.texture.GetRawTextureData();
+        Color32[] pixels = new Color32[original.Length];
+        for (int i = 0; i < pixels.Length; ++i)
+            pixels[i] = original[i] < 255 ? new Color32(20, 20, 20, 0) : new Color32(0, 0, 0, 255);
+        minimapRevealTexture.SetPixels32(pixels);
+        minimapRevealTexture.Apply();
+
+
+
+    }
+
+
+}
+
diff --git a/Assets/Scripts/MinimapArmi.cs.meta → Assets/Scripts/NewMinimapScript.cs.meta b/Assets/Scripts/MinimapArmi.cs.meta → Assets/Scripts/NewMinimapScript.cs.meta
diff --git a/Assets/PulsatingCircle.cs → Assets/Scripts/PulsatingCircle.cs b/Assets/PulsatingCircle.cs → Assets/Scripts/PulsatingCircle.cs
diff --git a/Assets/PulsatingCircle.cs.meta → Assets/Scripts/PulsatingCircle.cs.meta b/Assets/PulsatingCircle.cs.meta → Assets/Scripts/PulsatingCircle.cs.meta
diff --git a/Assets/ScreenEdgeScript.cs → Assets/Scripts/ScreenEdgeScript.cs b/Assets/ScreenEdgeScript.cs → Assets/Scripts/ScreenEdgeScript.cs
diff --git a/Assets/ScreenEdgeScript.cs.meta → Assets/Scripts/ScreenEdgeScript.cs.meta b/Assets/ScreenEdgeScript.cs.meta → Assets/Scripts/ScreenEdgeScript.cs.meta
diff --git a/Assets/cooldownfill.cs → Assets/Scripts/cooldownfill.cs b/Assets/cooldownfill.cs → Assets/Scripts/cooldownfill.cs
diff --git a/Assets/cooldownfill.cs.meta → Assets/Scripts/cooldownfill.cs.meta b/Assets/cooldownfill.cs.meta → Assets/Scripts/cooldownfill.cs.meta
diff --git a/Assets/minimapRevealTex2d.png.meta b/Assets/minimapRevealTex2d.png.meta
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
@@ -38,7 +38,7 @@ TagManager:
   - TempBuilding
   - ResourceMine
   - DangerZone
-  - 
+  - MinimapFocusBox
   - 
   - 
   - 

diff --git a/fmod.log b/fmod.log
diff --git a/fmod_editor.log b/fmod_editor.log
@@ -7,7 +7,7 @@
 
 [LOG] OutputWASAPI::init                       : Mix Format (WAVEFORMATEX): wFormatTag=0xFFFE, nChannels=2, nSamplesPerSec=48000, nAvgBytesPerSec=384000, nBlockAlign=8, wBitsPerSample=32, cbSize=22.
 [LOG] OutputWASAPI::init                       : Mix Format (WAVEFORMATEXTENSIBLE): wValidBitsPerSample=32, dwChannelMask=0x00000003, SubFormat=00000003-0000-0010-8000-00AA00389B71.
-[LOG] OutputWASAPI::init                       : Output buffer size: 4096 samples, latency: 10.67ms, period: 10.00ms, DSP buffer: 1024 * 4
+[LOG] OutputWASAPI::init                       : Output buffer size: 4096 samples, latency: 0.00ms, period: 10.00ms, DSP buffer: 1024 * 4
 [LOG] Thread::initThread                       : Initializing FMOD mixer thread.  priority 3
 [LOG] Thread::initThread                       : - Stacksize 49152.  Stack pointer 0000000000000000 : usesemaphore = 0 : sleeptime = 0
 [LOG] Thread::callback                         : * FMOD mixer thread started