Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2026-03-24 04:20:58 +00:00 · 2015-08-16 19:23:54 -04:00 · 2015-08-16 19:23:54 -04:00 · d76ce92a63
commit d76ce92a63
parent fd2aea25c1 1f79a2b15e
22 changed files with 2046 additions and 589 deletions
--- a/Assets/Prefabs/AwarenessBar.prefab
+++ b/Assets/Prefabs/AwarenessBar.prefab
@ -68,8 +68,8 @@ RectTransform:
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
-  m_AnchorMin: {x: .185000002, y: .147}
-  m_AnchorMax: {x: .464206487, y: .5}
+  m_AnchorMin: {x: .150000006, y: .147}
+  m_AnchorMax: {x: .850000024, y: .565513611}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
--- a/Assets/Prefabs/PersonDetailsPanel.prefab
+++ b/Assets/Prefabs/PersonDetailsPanel.prefab
@ -52,24 +52,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &113502
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22474806}
-  - 222: {fileID: 22265720}
-  - 114: {fileID: 11443318}
-  - 114: {fileID: 11400492}
-  m_Layer: 5
-  m_Name: KillButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &119830
 GameObject:
  m_ObjectHideFlags: 1
@ -136,18 +118,18 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &129332
+--- !u!1 &127300
 GameObject:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 4
  m_Component:
-  - 224: {fileID: 22442810}
-  - 222: {fileID: 22228656}
-  - 114: {fileID: 11499626}
+  - 224: {fileID: 22470860}
+  - 222: {fileID: 22232160}
+  - 114: {fileID: 11479644}
  m_Layer: 5
-  m_Name: Text
+  m_Name: FriendsTitle
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -215,41 +197,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &151828
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22448920}
-  - 222: {fileID: 22228460}
-  - 114: {fileID: 11494296}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1 &157272
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22432578}
-  - 222: {fileID: 22252258}
-  - 114: {fileID: 11445202}
-  - 114: {fileID: 11491412}
-  m_Layer: 5
-  m_Name: WatchButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &158220
 GameObject:
  m_ObjectHideFlags: 1
@ -325,7 +272,7 @@ GameObject:
  - 222: {fileID: 22241654}
  - 114: {fileID: 11400246}
  m_Layer: 5
-  m_Name: FriendsTitle
+  m_Name: AwarenessTitle
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -368,67 +315,14 @@ MonoBehaviour:
    m_FontSize: 14
    m_FontStyle: 0
    m_BestFit: 1
-    m_MinSize: 10
+    m_MinSize: 0
    m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
    m_RichText: 1
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: Friends
--- !u!114 &11400492
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
-    m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
-    m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
-    m_ColorMultiplier: 1
-    m_FadeDuration: .100000001
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 11443318}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 11476684}
-        m_MethodName: KillNode
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine, Version=0.0.0.0,
-            Culture=neutral, PublicKeyToken=null
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
+  m_Text: Awareness
 --- !u!114 &11411578
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -467,9 +361,9 @@ MonoBehaviour:
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_NormalColor: {r: .309803933, g: .505882382, b: .741176486, a: 1}
    m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
    m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
    m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
@ -489,7 +383,7 @@ MonoBehaviour:
  m_HandleRect: {fileID: 22417254}
  m_Direction: 2
  m_Value: 0
-  m_Size: 1
+  m_Size: .999999702
  m_NumberOfSteps: 0
  m_OnValueChanged:
    m_PersistentCalls:
@ -508,7 +402,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: .309803933, g: .505882382, b: .741176486, a: 1}
  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
  m_Type: 1
  m_PreserveAspect: 0
@ -538,48 +432,6 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
--- !u!114 &11443318
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
-  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: .309803933, g: .505882382, b: .741176486, a: 1}
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
--- !u!114 &11445202
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
-  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: .309803933, g: .505882382, b: .741176486, a: 1}
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &11452870
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -598,7 +450,7 @@ MonoBehaviour:
  m_Elasticity: .100000001
  m_Inertia: 1
  m_DecelerationRate: .135000005
-  m_ScrollSensitivity: 10
+  m_ScrollSensitivity: 15
  m_HorizontalScrollbar: {fileID: 0}
  m_VerticalScrollbar: {fileID: 11414010}
  m_OnValueChanged:
@ -671,10 +523,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  ProfilePicture: {fileID: 11440110}
  Name: {fileID: 11472562}
-  FriendsTitle: {fileID: 11400246}
+  FriendsTitle: {fileID: 11479644}
  FriendsPanel: {fileID: 159508}
-  KillButton: {fileID: 11400492}
-  WatchButton: {fileID: 11491412}
  XButton: {fileID: 11494666}
  Container: {fileID: 147852}
  AwarenessBar: {fileID: 11476856}
@ -733,6 +583,32 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
+--- !u!114 &11479644
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 127300}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Friends
 --- !u!114 &11479696
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -766,73 +642,6 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
--- !u!114 &11491412
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
-    m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
-    m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
-    m_ColorMultiplier: 1
-    m_FadeDuration: .100000001
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 11445202}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
--- !u!114 &11494296
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 151828}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Watch
 --- !u!114 &11494666
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -886,32 +695,6 @@ MonoBehaviour:
        m_CallState: 2
    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
      Culture=neutral, PublicKeyToken=null
--- !u!114 &11499626
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 129332}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Kill
 --- !u!222 &22204826
 CanvasRenderer:
  m_ObjectHideFlags: 1
@ -936,18 +719,12 @@ CanvasRenderer:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 119830}
--- !u!222 &22228460
+--- !u!222 &22232160
 CanvasRenderer:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 151828}
--- !u!222 &22228656
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 129332}
+  m_GameObject: {fileID: 127300}
 --- !u!222 &22234000
 CanvasRenderer:
  m_ObjectHideFlags: 1
@ -978,18 +755,6 @@ CanvasRenderer:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 107780}
--- !u!222 &22252258
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
--- !u!222 &22265720
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
 --- !u!222 &22286240
 CanvasRenderer:
  m_ObjectHideFlags: 1
@ -1050,24 +815,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: -20, y: -20}
  m_Pivot: {x: .5, y: .5}
--- !u!224 &22432578
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
-  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: 22448920}
-  m_Father: {fileID: 22492032}
-  m_RootOrder: 0
-  m_AnchorMin: {x: .0700000003, y: .600000024}
-  m_AnchorMax: {x: .930000007, y: .920000017}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22436630
 RectTransform:
  m_ObjectHideFlags: 1
@ -1096,7 +843,7 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 22484756}
+  - {fileID: 22470860}
  - {fileID: 22464522}
  - {fileID: 22462244}
  m_Father: {fileID: 22475688}
@ -1106,40 +853,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: .100000381, y: 0}
  m_Pivot: {x: .5, y: .5}
--- !u!224 &22442810
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 129332}
-  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: 22474806}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: .25}
-  m_AnchorMax: {x: 1, y: .75}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
--- !u!224 &22448920
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 151828}
-  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: 22432578}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: .25}
-  m_AnchorMax: {x: 1, y: .75}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22454288
 RectTransform:
  m_ObjectHideFlags: 1
@ -1150,10 +863,10 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 22471300}
+  m_Father: {fileID: 22492032}
  m_RootOrder: 1
-  m_AnchorMin: {x: .465619415, y: 0}
-  m_AnchorMax: {x: .857309759, y: 1}
+  m_AnchorMin: {x: 0, y: .432000011}
+  m_AnchorMax: {x: 1, y: .705498219}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
@ -1227,6 +940,23 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
+--- !u!224 &22470860
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 127300}
+  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: 22440948}
+  m_RootOrder: 0
+  m_AnchorMin: {x: 0, y: .800000012}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -7.62939453e-06, y: 0}
+  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22471300
 RectTransform:
  m_ObjectHideFlags: 1
@ -1238,7 +968,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 22456054}
-  - {fileID: 22454288}
  - {fileID: 22483690}
  - {fileID: 22486224}
  m_Father: {fileID: 22404366}
@ -1248,24 +977,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: -2.68453979}
  m_SizeDelta: {x: -13.571991, y: -2.64448547}
  m_Pivot: {x: .5, y: .5}
--- !u!224 &22474806
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
-  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: 22442810}
-  m_Father: {fileID: 22492032}
-  m_RootOrder: 1
-  m_AnchorMin: {x: .0700000003, y: .0799999982}
-  m_AnchorMax: {x: .930000007, y: .400000006}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22475688
 RectTransform:
  m_ObjectHideFlags: 1
@ -1296,9 +1007,9 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 22471300}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_AnchorMin: {x: .185000002, y: 0}
-  m_AnchorMax: {x: .450309694, y: .877516687}
+  m_AnchorMax: {x: .520412922, y: .877516687}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
@ -1312,7 +1023,7 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 22440948}
+  m_Father: {fileID: 22492032}
  m_RootOrder: 0
  m_AnchorMin: {x: 0, y: .800000012}
  m_AnchorMax: {x: 1, y: 1}
@ -1331,7 +1042,7 @@ RectTransform:
  m_Children:
  - {fileID: 22489830}
  m_Father: {fileID: 22471300}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_AnchorMin: {x: .901000023, y: .546483397}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
@ -1364,11 +1075,11 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 22432578}
-  - {fileID: 22474806}
+  - {fileID: 22484756}
+  - {fileID: 22454288}
  m_Father: {fileID: 22475688}
  m_RootOrder: 1
-  m_AnchorMin: {x: .660000026, y: 0}
+  m_AnchorMin: {x: .600000024, y: 0}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
--- a/Assets/Resources/TextFiles.meta
+++ b/Assets/Resources/TextFiles.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: c91f8e405df42f74e880b3973908352f
+folderAsset: yes
+timeCreated: 1439749971
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/TextFiles/MenNames.txt
+++ b/Assets/Resources/TextFiles/MenNames.txt
--- a/Assets/Resources/TextFiles/MenNames.txt.meta
+++ b/Assets/Resources/TextFiles/MenNames.txt.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f1f6e2863779cb1479023150ff18fd79
+timeCreated: 1439750276
+licenseType: Free
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/TextFiles/WomenNames.txt
+++ b/Assets/Resources/TextFiles/WomenNames.txt
--- a/Assets/Resources/TextFiles/WomenNames.txt.meta
+++ b/Assets/Resources/TextFiles/WomenNames.txt.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee73b21cee1c9d040888f275acce66fd
+timeCreated: 1439750222
+licenseType: Free
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/slaughterLogo.png.meta
+++ b/Assets/Resources/slaughterLogo.png.meta
@ -26,26 +26,26 @@ TextureImporter:
  cubemapConvolutionSteps: 8
  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
-  textureFormat: -1
+  textureFormat: -3
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
  lightmap: 0
  rGBM: 0
  compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: .5, y: .5}
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
  buildTargetSettings: []
  spriteSheet:
    sprites: []
--- a/Assets/Scenes/Gameplay.unity
+++ b/Assets/Scenes/Gameplay.unity
@ -209,38 +209,241 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
--- !u!1 &142867287
+--- !u!1001 &255508666
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 906703074}
+    m_Modifications:
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: .0299999993
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.y
+      value: .0299999993
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: .970000029
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.y
+      value: .970000029
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_Pivot.x
+      value: .5
+      objectReference: {fileID: 0}
+    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_Pivot.y
+      value: .5
+      objectReference: {fileID: 0}
+    - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_Size
+      value: .999999881
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: .400000006
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: -7.62939453e-06
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: .462000012
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: .831619442
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.y
+      value: .30400002
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.y
+      value: .720465124
+      objectReference: {fileID: 0}
+    - target: {fileID: 11472562, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_FontData.m_Alignment
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 11479644, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_FontData.m_Alignment
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_Value
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1 &256633603
 GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  serializedVersion: 4
  m_Component:
-  - 224: {fileID: 142867288}
+  - 224: {fileID: 256633604}
+  - 222: {fileID: 256633606}
+  - 114: {fileID: 256633605}
  m_Layer: 5
-  m_Name: Content
+  m_Name: Logo
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &142867288
+--- !u!224 &256633604
 RectTransform:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 142867287}
+  m_GameObject: {fileID: 256633603}
  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: 1411243506}
-  m_RootOrder: 1
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: .850000024}
+  m_Father: {fileID: 1858163985}
+  m_RootOrder: 0
+  m_AnchorMin: {x: 0, y: .0500000007}
+  m_AnchorMax: {x: .182673752, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
+--- !u!114 &256633605
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 256633603}
+  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: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 21300000, guid: eaaa90877e079004eb38be08a3e86db7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &256633606
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 256633603}
 --- !u!1 &268520029
 GameObject:
  m_ObjectHideFlags: 0
@ -270,10 +473,10 @@ RectTransform:
  m_Children: []
  m_Father: {fileID: 1411243506}
  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: .699999988}
-  m_AnchorMax: {x: 1, y: .925000012}
+  m_AnchorMin: {x: .0500000007, y: .696616352}
+  m_AnchorMax: {x: .949999988, y: .925000012}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -3.05175781e-05, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: .5, y: .5}
 --- !u!114 &268520031
 MonoBehaviour:
@ -300,7 +503,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: Watchs
+  m_Text: Global Awareness
 --- !u!222 &268520032
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -680,7 +883,7 @@ RectTransform:
  m_Children: []
  m_Father: {fileID: 122634401}
  m_RootOrder: 1
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: .566316545, y: 0}
  m_AnchorMax: {x: 1, y: .224000007}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
@ -772,138 +975,16 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 1
--- !u!1001 &1197925313
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 906703074}
-    m_Modifications:
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchorMin.x
-      value: .0299999993
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchorMin.y
-      value: .0299999993
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchorMax.x
-      value: .970000029
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchorMax.y
-      value: .970000029
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Pivot.x
-      value: .5
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Pivot.y
-      value: .5
-      objectReference: {fileID: 0}
-    - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11452870, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_ScrollSensitivity
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Colors.m_NormalColor.r
-      value: .309803933
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Colors.m_NormalColor.g
-      value: .505882382
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Colors.m_NormalColor.b
-      value: .741176486
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Transition
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 11431992, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Color.r
-      value: .309803933
-      objectReference: {fileID: 0}
-    - target: {fileID: 11431992, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Color.g
-      value: .505882382
-      objectReference: {fileID: 0}
-    - target: {fileID: 11431992, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Color.b
-      value: .741176486
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
-  m_IsPrefabParent: 0
 --- !u!224 &1197925314 stripped
 RectTransform:
  m_PrefabParentObject: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832,
    type: 2}
-  m_PrefabInternal: {fileID: 1197925313}
+  m_PrefabInternal: {fileID: 255508666}
 --- !u!114 &1197925315 stripped
 MonoBehaviour:
  m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832,
    type: 2}
-  m_PrefabInternal: {fileID: 1197925313}
+  m_PrefabInternal: {fileID: 255508666}
  m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3}
 --- !u!1 &1366676552
 GameObject:
@ -981,6 +1062,7 @@ GameObject:
  - 224: {fileID: 1411243506}
  - 222: {fileID: 1411243508}
  - 114: {fileID: 1411243507}
+  - 114: {fileID: 1411243509}
  m_Layer: 5
  m_Name: WatchArea
  m_TagString: Untagged
@ -999,7 +1081,8 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 268520030}
-  - {fileID: 142867288}
+  - {fileID: 1772384304}
+  - {fileID: 2112992426}
  m_Father: {fileID: 122634401}
  m_RootOrder: 5
  m_AnchorMin: {x: 0, y: 0}
@ -1034,6 +1117,19 @@ CanvasRenderer:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1411243505}
+--- !u!114 &1411243509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1411243505}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 292d41d787a32ef42aa6bc4f48643f9c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AwarenessBar: {fileID: 1772384305}
+  Percentage: {fileID: 2112992427}
 --- !u!1 &1728657168
 GameObject:
  m_ObjectHideFlags: 0
@ -1064,7 +1160,7 @@ RectTransform:
  m_Father: {fileID: 122634401}
  m_RootOrder: 0
  m_AnchorMin: {x: 0, y: .367000014}
-  m_AnchorMax: {x: .455000013, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: -1.90734863e-06}
  m_SizeDelta: {x: 0, y: -3.81469727e-06}
  m_Pivot: {x: .5, y: .5}
@ -1095,6 +1191,83 @@ CanvasRenderer:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1728657168}
+--- !u!1 &1772384303
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 163070, guid: c993e87661906234fba410e55ed66832, type: 2}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 1772384304}
+  - 222: {fileID: 1772384307}
+  - 114: {fileID: 1772384306}
+  - 114: {fileID: 1772384305}
+  m_Layer: 5
+  m_Name: AwarenessBar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1772384304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1772384303}
+  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: 1411243506}
+  m_RootOrder: 1
+  m_AnchorMin: {x: .0531043299, y: .215897292}
+  m_AnchorMax: {x: .566316485, y: .618000031}
+  m_AnchoredPosition: {x: 0, y: -.5}
+  m_SizeDelta: {x: 0, y: 1}
+  m_Pivot: {x: .5, y: .5}
+--- !u!114 &1772384305
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 11476856, guid: c993e87661906234fba410e55ed66832,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1772384303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1772384306
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 11478634, guid: c993e87661906234fba410e55ed66832,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1772384303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 085386af6af570a47b29380efacfa18d, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 21300000, guid: a023c2b27dbaaec45ae34c278711bc24, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1772384307
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 22205402, guid: c993e87661906234fba410e55ed66832,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1772384303}
 --- !u!1 &1858163984
 GameObject:
  m_ObjectHideFlags: 0
@ -1121,7 +1294,8 @@ RectTransform:
  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_Children:
+  - {fileID: 256633604}
  m_Father: {fileID: 750965895}
  m_RootOrder: 0
  m_AnchorMin: {x: 0, y: .899999976}
@ -1469,3 +1643,69 @@ Prefab:
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
  m_IsPrefabParent: 0
+--- !u!1 &2112992425
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 2112992426}
+  - 222: {fileID: 2112992428}
+  - 114: {fileID: 2112992427}
+  m_Layer: 5
+  m_Name: Percentage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2112992426
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2112992425}
+  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: 1411243506}
+  m_RootOrder: 2
+  m_AnchorMin: {x: .676841795, y: .150383666}
+  m_AnchorMax: {x: .911104441, y: .670410872}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: .5, y: .5}
+--- !u!114 &2112992427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2112992425}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 100%
+--- !u!222 &2112992428
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2112992425}
--- a/Assets/Scripts/Models/LevelGenerator.cs
+++ b/Assets/Scripts/Models/LevelGenerator.cs
@ -141,12 +141,13 @@ namespace DeathBook.Model

 			bool isFemale = Random.value <= 0.5;
 			
+            /*
 			string fName = "Fifi"; //isFemale ? NameGenerator.GetFemaleName() : NameGenerator.GetMaleName();
-			string lName = "Brindacier"; //NameGenerator.GetLastName();
+			string lName = "Brindacier"; //NameGenerator.GetLastName();*/

-			Sprite pic = isFemale ? PictureGenerator.GetFemalePicture() : PictureGenerator.GetMalePicture();
+            var generatedPerson = isFemale ? PersonGenerator.GetGeneratedFemale() : PersonGenerator.GetGeneratedMale();

-			Person p = new Person(id, fName, lName, pos, connectionTime, disconnectionTime, freq, pic);
+            Person p = new Person(id, generatedPerson.FirstName, generatedPerson.LastName, pos, connectionTime, disconnectionTime, freq, generatedPerson.Picture);

 			return p;
 		}
--- a/Assets/Scripts/Models/NameParser.cs
+++ b/Assets/Scripts/Models/NameParser.cs
@ -0,0 +1,58 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using SimpleJSON;
+
+// Names generated from http://www.uinames.com
+public class NameParser
+{
+    private string[] maleFirstNames;
+    private string[] femaleFirstNames;
+
+    private string[] maleLastNames;
+    private string[] femaleLastNames;
+
+    public NameParser(int count)
+    {
+        maleFirstNames = new string[count];
+        femaleFirstNames = new string[count];
+
+        maleLastNames = new string[count];
+        femaleLastNames = new string[count];
+
+        TextAsset femaleJson = Resources.Load("TextFiles/WomenNames") as TextAsset;
+        TextAsset maleJson = Resources.Load("TextFiles/MenNames") as TextAsset;
+
+        var parsedFemales = JSON.Parse(femaleJson.text);
+        var parsedMales = JSON.Parse(maleJson.text);
+
+        for (int i = 0; i < count; i++)
+        {
+            femaleFirstNames[i] = parsedFemales[i]["name"];
+            femaleLastNames[i] = parsedFemales[i]["surname"];
+
+            maleFirstNames[i] = parsedMales[i]["name"];
+            maleLastNames[i] = parsedMales[i]["surname"];
+        }
+    }
+
+    public string GetFemaleFirstName(int index)
+    {
+        return femaleFirstNames[index];
+    }
+
+    public string GetMaleFirstName(int index)
+    {
+        return maleFirstNames[index];
+    }
+
+    public string GetFemaleLastName(int index)
+    {
+        return femaleLastNames[index];
+    }
+
+    public string GetMaleLastName(int index)
+    {
+        return maleLastNames[index];
+    }
+}
--- a/Assets/Scripts/Models/NameParser.cs.meta
+++ b/Assets/Scripts/Models/NameParser.cs.meta
@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: cb64766bc3173cc479631225a688a263
+timeCreated: 1439750059
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Models/PersonGenerator.cs
+++ b/Assets/Scripts/Models/PersonGenerator.cs
@ -0,0 +1,77 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using System;
+
+// Pictures generated from http://uifaces.com
+public class PersonGenerator
+{
+    private const int PICTURES_COUNT = 185;
+
+    private static List<int> pictureIndexesMale;
+    private static List<int> pictureIndexesFemale;
+
+    private static NameParser nameParser;
+
+    public struct GeneratedPerson
+    {
+        public Sprite Picture;
+        public string FirstName;
+        public string LastName;
+    }
+
+    static PersonGenerator()
+    {
+        nameParser = new NameParser(PICTURES_COUNT);
+
+        // Might be a little heavy, but since it's only done once, it's not that bad
+        pictureIndexesMale = new List<int>(PICTURES_COUNT);
+        pictureIndexesFemale = new List<int>(PICTURES_COUNT);
+
+        for (int i = 1; i <= PICTURES_COUNT; i++)
+        {
+            pictureIndexesFemale.Add(i);
+            pictureIndexesMale.Add(i);
+        }
+    }
+
+    public static GeneratedPerson GetGeneratedFemale()
+    {
+        // Might be a little heavy, but since it's only done once, it's not that bad
+
+        int index = UnityEngine.Random.Range(0, pictureIndexesFemale.Count);
+
+        int picID = pictureIndexesFemale[index];
+
+        pictureIndexesFemale.RemoveAt(index);
+
+        GeneratedPerson person = new GeneratedPerson()
+        {
+            Picture = Resources.Load<Sprite>(String.Format("ProfilePictures/F_{0}", picID)),
+            FirstName = nameParser.GetFemaleFirstName(index),
+            LastName = nameParser.GetFemaleLastName(index)
+        };
+
+        return person;
+    }
+
+    public static GeneratedPerson GetGeneratedMale()
+    {
+        // Might be a little heavy, but since it's only done once, it's not that bad
+
+        int index = UnityEngine.Random.Range(0, pictureIndexesMale.Count);
+
+        int picID = pictureIndexesMale[index];
+
+        pictureIndexesMale.RemoveAt(index);
+
+        GeneratedPerson person = new GeneratedPerson()
+        {
+            Picture = Resources.Load<Sprite>(String.Format("ProfilePictures/M_{0}", picID)),
+            FirstName = nameParser.GetMaleFirstName(index),
+            LastName = nameParser.GetMaleLastName(index)
+        };
+
+        return person;
+    }
+}
--- a/Assets/Scripts/Models/PictureGenerator.cs.meta
+++ b/Assets/Scripts/Models/PictureGenerator.cs.meta
--- a/Assets/Scripts/Models/PictureGenerator.cs
+++ b/Assets/Scripts/Models/PictureGenerator.cs
@ -1,52 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using System.Collections.Generic;
-using System;
-
-//www.uifaces.com
-public class PictureGenerator
-{
-    private const int PICTURES_COUNT = 185;
-
-    private static List<int> pictureIndexesMale;
-    private static List<int> pictureIndexesFemale;
-
-    static PictureGenerator()
-    {
-        // Might be a little heavy, but since it's only done once, it's not that bad
-        pictureIndexesMale = new List<int>(PICTURES_COUNT);
-        pictureIndexesFemale = new List<int>(PICTURES_COUNT);
-
-        for (int i = 0; i < PICTURES_COUNT; i++)
-        {
-            pictureIndexesFemale.Add(i);
-            pictureIndexesMale.Add(i);
-        }
-    }
-
-    public static Sprite GetFemalePicture()
-    {
-        // Might be a little heavy, but since it's only done once, it's not that bad
-
-        int index = UnityEngine.Random.Range(1, pictureIndexesFemale.Count);
-
-        int picID = pictureIndexesFemale[index];
-
-        pictureIndexesFemale.RemoveAt(index);
-
-        return Resources.Load<Sprite>(String.Format("ProfilePictures/F_{0}", picID));
-    }
-
-    public static Sprite GetMalePicture()
-    {
-        // Might be a little heavy, but since it's only done once, it's not that bad
-
-        int index = UnityEngine.Random.Range(1, pictureIndexesMale.Count);
-
-        int picID = pictureIndexesMale[index];
-
-        pictureIndexesMale.RemoveAt(index);
-
-        return Resources.Load<Sprite>(String.Format("ProfilePictures/M_{0}", picID));
-    }
-}
--- a/Assets/Scripts/PersonDetailsPanel.cs
+++ b/Assets/Scripts/PersonDetailsPanel.cs
@ -11,8 +11,6 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
    public Text Name;
    public Text FriendsTitle;
    public GameObject FriendsPanel;
-    public Button KillButton;
-    public Button WatchButton;
    public Button XButton;
    public GameObject Container;
    public RatioProgression AwarenessBar;
@ -54,9 +52,6 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
    {
        Name.text = _model.Name;

-        KillButton.gameObject.SetActive(_model.Alive);
-        WatchButton.gameObject.SetActive(_model.Alive);
-
        AwarenessBar.SetCompletedRatio(_model.AwarenessLevel);

        foreach (Transform picture in FriendsPanel.transform)
@ -65,28 +60,37 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
        }

        ProfilePicture.sprite = _model.Picture;
-        
-        RectTransform panelTrans = FriendsPanel.GetComponent<RectTransform>();
-
-        panelTrans.anchorMin = new Vector2(0f, -0.3125f * _model.FriendList.Count);
-        panelTrans.anchorMax = new Vector2(1f, 1f);
-        panelTrans.offsetMin = Vector2.zero;
-        panelTrans.offsetMax = Vector2.zero;
-
-        float height = 1f / _model.FriendList.Count;

        // We copy the list so we can sort it without affecting the model data
        List<Friendship> list = new List<Friendship>(_model.FriendList);
        list.Sort();

-        FriendsTitle.text = string.Concat("Friends (", list.Count, ")");
+        int aliveCount = list.Count - _model.DeadFriendList.Count;
+
+        RectTransform panelTrans = FriendsPanel.GetComponent<RectTransform>();
+
+        panelTrans.anchorMin = new Vector2(0f, 1f - 0.4f * aliveCount);
+        panelTrans.anchorMax = new Vector2(1f, 1f);
+        panelTrans.offsetMin = Vector2.zero;
+        panelTrans.offsetMax = Vector2.zero;
+
+        float height = 1f / aliveCount;
+
+        FriendsTitle.text = string.Concat("Friends (", aliveCount, ")");
+
+        int index = 0;

        for (int i = 0; i < list.Count; i++)
        {
            Person friend = list[i].Friend;
+            
+            if (!friend.Alive)
+            {
+                continue;
+            }

-            float minY = 1f - (height - 0.01f) * (i + 1) - i * 0.01f;
-            float maxY = 1f - height * i;
+            float minY = 1f - (height - 0.01f) * (index + 1) - index * 0.01f;
+            float maxY = 1f - height * index;

            // Friend picture
            UIFriendPicture friendPicture = Instantiate(FriendPicture) as UIFriendPicture;
@ -111,6 +115,8 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
            barRectTrans.anchorMax = new Vector2(1f, maxY);
            barRectTrans.offsetMin = Vector2.zero;
            barRectTrans.offsetMax = Vector2.zero;
+
+            ++index;
        }
    }

@ -119,9 +125,4 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
        Container.SetActive(false);
        _node.Select(false);
    }
-
-    public void KillNode()
-    {
-        _node.Kill();
-    }
 }
--- a/Assets/Scripts/PersonNode.cs
+++ b/Assets/Scripts/PersonNode.cs
@ -223,8 +223,6 @@ public class PersonNode : MonoBehaviour, IObserver
    {
        if (!_model.Alive) return;

-        Debug.Log(_model.Alive);
-
        _holdDuration += Time.deltaTime;
        
        xMarkLeft.SetCompletedRatio(Mathf.Clamp(_holdDuration - 0.025f, 0f, 1f));
--- a/Assets/Scripts/SimpleJSON.meta
+++ b/Assets/Scripts/SimpleJSON.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 14ea719f8026fd044b3afebc5e05ca57
+folderAsset: yes
+timeCreated: 1439750110
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/SimpleJSON/SimpleJSON.cs
+++ b/Assets/Scripts/SimpleJSON/SimpleJSON.cs
--- a/Assets/Scripts/SimpleJSON/SimpleJSON.cs.meta
+++ b/Assets/Scripts/SimpleJSON/SimpleJSON.cs.meta
@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c3f618bcc002ff146a4341b7d7c40a4e
+timeCreated: 1439750123
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/WatchArea.cs
+++ b/Assets/Scripts/WatchArea.cs
@ -0,0 +1,31 @@
+using UnityEngine;
+using System.Collections;
+using DeathBook.Util;
+using DeathBook.Model;
+using UnityEngine.UI;
+
+public class WatchArea : MonoBehaviour, IObserver
+{
+    public RatioProgression AwarenessBar;
+    public Text Percentage;
+
+	// Use this for initialization
+	void Start ()
+    {
+        LevelManager.Instance.GameLevel.Subscribe(this);
+        UpdateBar();
+	}
+
+    public void Notify()
+    {
+        UpdateBar();
+    }
+
+    private void UpdateBar()
+    {
+        float adjustedRatio = Mathf.Clamp((LevelManager.Instance.GameLevel.Awareness / 0.6f), 0f, 1f);
+
+        AwarenessBar.SetCompletedRatio(adjustedRatio);
+        Percentage.text = (int)(adjustedRatio * 100f) + "%";
+    }
+}
--- a/Assets/Scripts/WatchArea.cs.meta
+++ b/Assets/Scripts/WatchArea.cs.meta
@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 292d41d787a32ef42aa6bc4f48643f9c
+timeCreated: 1439755513
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: