Index: binaries/data/mods/public/maps/scenarios/combat_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/combat_demo.xml
+++ binaries/data/mods/public/maps/scenarios/combat_demo.xml
@@ -3,462 +3,68 @@
 <Scenario version="7">
 	<Environment>
 		<SkySet>cirrus</SkySet>
-		<SunColor r="1.69922" g="1.69922" b="1.69922"/>
+		<SunColor r="1.24609" g="1.24609" b="1.24609"/>
 		<SunElevation angle="0.676026"/>
 		<SunRotation angle="0.592187"/>
 		<AmbientColor r="0.392157" g="0.392157" b="0.392157"/>
+		<Fog>
+			<FogFactor>0</FogFactor>
+			<FogThickness>0.5</FogThickness>
+			<FogColor r="0.8" g="0.8" b="0.894118"/>
+		</Fog>
 		<Water>
 			<WaterBody>
 				<Type>lake</Type>
 				<Color r="0.294118" g="0.34902" b="0.694118"/>
+				<Tint r="0.27451" g="0.294118" b="0.584314"/>
 				<Height>34.623</Height>
-				<Waviness>3.0</Waviness>
+				<Waviness>3</Waviness>
 				<Murkiness>0.898438</Murkiness>
-				<Tint r="0.27451" g="0.294118" b="0.584314"/>
+				<WindAngle>0</WindAngle>
 			</WaterBody>
 		</Water>
+		<Postproc>
+			<Brightness>0</Brightness>
+			<Contrast>1</Contrast>
+			<Saturation>0.99</Saturation>
+			<Bloom>0.1999</Bloom>
+			<PostEffect>default</PostEffect>
+		</Postproc>
 	</Environment>
 	<Camera>
-		<Position x="122.057" y="111.803" z="7.81555"/>
-		<Rotation angle="0.0231291"/>
-		<Declination angle="0.538964"/>
+		<Position x="175.305" y="107.003" z="9.95145"/>
+		<Rotation angle="0"/>
+		<Declination angle="0.610865"/>
 	</Camera>
 	<ScriptSettings><![CDATA[
 {
-  "Name": "Combat Demo",
+  "AISeed": 0,
+  "DefaultStance": "defensive",
   "Description": "A combat demonstration between a small number of ranged and melee infantry units.",
-  "Keywords": ["demo"],
+  "Keywords": [
+    "demo"
+  ],
+  "LockTeams": false,
+  "Name": "Combat Demo",
   "PlayerData": [
+    "",
     {
       "Civ": "athen"
     },
     {
-      "Civ": "athen",
-      "AI": ""
+      "AI": "",
+      "Civ": "athen"
     }
   ],
-  "RevealMap": true,
-  "DefaultStance": "defensive",
+  "Preview": "",
+  "ExploreMap": false,
+  "RevealMap": false,
   "VictoryConditions": [
     "conquest"
   ]
 }
 ]]></ScriptSettings>
 	<Entities>
-		<Entity uid="11">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="85.15519" z="140.54519"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="12">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="85.08178" z="136.46955"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="13">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="84.68078" z="132.29049"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="14">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="84.58814" z="128.5625"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="15">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="84.54111" z="119.59098"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="16">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="84.61438" z="123.77323"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="26">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="87.67463" z="142.93183"/>
-			<Orientation y="1.547"/>
-		</Entity>
-		<Entity uid="27">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="87.72016" z="137.77866"/>
-			<Orientation y="1.57961"/>
-		</Entity>
-		<Entity uid="28">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="88.15882" z="146.16172"/>
-			<Orientation y="1.63631"/>
-		</Entity>
-		<Entity uid="29">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="87.92872" z="154.50611"/>
-			<Orientation y="1.6508"/>
-		</Entity>
-		<Entity uid="30">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="88.56109" z="133.22132"/>
-			<Orientation y="1.56295"/>
-		</Entity>
-		<Entity uid="31">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="87.7494" z="121.28443"/>
-			<Orientation y="1.38645"/>
-		</Entity>
-		<Entity uid="32">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="88.09148" z="129.64138"/>
-			<Orientation y="1.46003"/>
-		</Entity>
-		<Entity uid="33">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="87.97072" z="125.21911"/>
-			<Orientation y="1.67937"/>
-		</Entity>
-		<Entity uid="34">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="88.36658" z="150.86048"/>
-			<Orientation y="1.60602"/>
-		</Entity>
-		<Entity uid="35">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>1</Player>
-			<Position x="88.1539" z="117.16916"/>
-			<Orientation y="1.74827"/>
-		</Entity>
-		<Entity uid="49">
-			<Template>units/athen/infantry_marine_archer_b</Template>
-			<Player>2</Player>
-			<Position x="163.9004" z="125.90111"/>
-			<Orientation y="-1.4233"/>
-		</Entity>
-		<Entity uid="50">
-			<Template>units/athen/infantry_marine_archer_b</Template>
-			<Player>2</Player>
-			<Position x="164.3852" z="123.3568"/>
-			<Orientation y="-0.9854"/>
-		</Entity>
-		<Entity uid="51">
-			<Template>units/athen/infantry_marine_archer_b</Template>
-			<Player>2</Player>
-			<Position x="163.96814" z="119.58962"/>
-			<Orientation y="-1.14623"/>
-		</Entity>
-		<Entity uid="52">
-			<Template>units/athen/infantry_marine_archer_b</Template>
-			<Player>2</Player>
-			<Position x="163.79677" z="115.81934"/>
-			<Orientation y="-1.68952"/>
-		</Entity>
-		<Entity uid="53">
-			<Template>units/athen/infantry_marine_archer_b</Template>
-			<Player>2</Player>
-			<Position x="164.07688" z="111.72794"/>
-			<Orientation y="-1.62508"/>
-		</Entity>
-		<Entity uid="54">
-			<Template>units/athen/infantry_javelineer_a</Template>
-			<Player>2</Player>
-			<Position x="159.92733" z="127.59427"/>
-			<Orientation y="-1.76246"/>
-		</Entity>
-		<Entity uid="55">
-			<Template>units/athen/infantry_javelineer_a</Template>
-			<Player>2</Player>
-			<Position x="160.04854" z="123.91709"/>
-			<Orientation y="-1.67342"/>
-		</Entity>
-		<Entity uid="56">
-			<Template>units/athen/infantry_javelineer_a</Template>
-			<Player>2</Player>
-			<Position x="159.83585" z="120.3453"/>
-			<Orientation y="-1.49901"/>
-		</Entity>
-		<Entity uid="57">
-			<Template>units/athen/infantry_javelineer_a</Template>
-			<Player>2</Player>
-			<Position x="160.17838" z="115.80375"/>
-			<Orientation y="-1.43216"/>
-		</Entity>
-		<Entity uid="58">
-			<Template>units/athen/infantry_javelineer_a</Template>
-			<Player>2</Player>
-			<Position x="160.20728" z="111.99112"/>
-			<Orientation y="-1.9506"/>
-		</Entity>
-		<Entity uid="59">
-			<Template>units/athen/infantry_javelineer_e</Template>
-			<Player>2</Player>
-			<Position x="157.74924" z="125.35561"/>
-			<Orientation y="-1.54555"/>
-		</Entity>
-		<Entity uid="60">
-			<Template>units/athen/infantry_javelineer_e</Template>
-			<Player>2</Player>
-			<Position x="157.21273" z="120.67916"/>
-			<Orientation y="-1.55486"/>
-		</Entity>
-		<Entity uid="61">
-			<Template>units/athen/infantry_javelineer_e</Template>
-			<Player>2</Player>
-			<Position x="157.98159" z="117.02564"/>
-			<Orientation y="-1.35657"/>
-		</Entity>
-		<Entity uid="62">
-			<Template>units/athen/infantry_javelineer_e</Template>
-			<Player>2</Player>
-			<Position x="157.73165" z="112.43825"/>
-			<Orientation y="-1.33074"/>
-		</Entity>
-		<Entity uid="63">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="175.43361" z="127.81891"/>
-			<Orientation y="-1.53321"/>
-		</Entity>
-		<Entity uid="64">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="176.15781" z="123.52012"/>
-			<Orientation y="-1.49622"/>
-		</Entity>
-		<Entity uid="65">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="176.0735" z="119.49639"/>
-			<Orientation y="-1.38704"/>
-		</Entity>
-		<Entity uid="66">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="175.8148" z="115.91982"/>
-			<Orientation y="-1.35958"/>
-		</Entity>
-		<Entity uid="67">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="175.55961" z="111.81333"/>
-			<Orientation y="-1.4916"/>
-		</Entity>
-		<Entity uid="73">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="171.84617" z="127.92798"/>
-			<Orientation y="-1.3056"/>
-		</Entity>
-		<Entity uid="74">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="171.98732" z="123.73227"/>
-			<Orientation y="-1.49645"/>
-		</Entity>
-		<Entity uid="75">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="171.78121" z="119.4952"/>
-			<Orientation y="-1.3431"/>
-		</Entity>
-		<Entity uid="76">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="171.91086" z="116.1196"/>
-			<Orientation y="-1.37102"/>
-		</Entity>
-		<Entity uid="77">
-			<Template>units/athen/infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="172.01429" z="111.56289"/>
-			<Orientation y="-1.36196"/>
-		</Entity>
-		<Entity uid="87">
-			<Template>units/athen/champion_ranged</Template>
-			<Player>1</Player>
-			<Position x="85.35996" z="115.0928"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="88">
-			<Template>units/athen/champion_ranged</Template>
-			<Player>1</Player>
-			<Position x="85.40084" z="109.64284"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="89">
-			<Template>units/athen/champion_ranged</Template>
-			<Player>1</Player>
-			<Position x="85.4768" z="104.69619"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="90">
-			<Template>units/athen/champion_ranged</Template>
-			<Player>1</Player>
-			<Position x="85.74891" z="100.50165"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="91">
-			<Template>units/athen/champion_infantry</Template>
-			<Player>1</Player>
-			<Position x="85.69983" z="158.74531"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="92">
-			<Template>units/athen/champion_infantry</Template>
-			<Player>1</Player>
-			<Position x="85.65835" z="162.1988"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="93">
-			<Template>units/athen/champion_infantry</Template>
-			<Player>1</Player>
-			<Position x="86.43186" z="166.41028"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="94">
-			<Template>units/athen/champion_infantry</Template>
-			<Player>1</Player>
-			<Position x="86.41076" z="169.14298"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="100">
-			<Template>units/mace/champion_infantry_spearman_02</Template>
-			<Player>2</Player>
-			<Position x="168.93398" z="103.77627"/>
-			<Orientation y="-2.2371"/>
-		</Entity>
-		<Entity uid="101">
-			<Template>units/mace/champion_infantry_spearman_02</Template>
-			<Player>2</Player>
-			<Position x="165.84691" z="98.34908"/>
-			<Orientation y="-2.04358"/>
-		</Entity>
-		<Entity uid="102">
-			<Template>units/mace/champion_infantry_spearman_02</Template>
-			<Player>2</Player>
-			<Position x="168.86768" z="98.66317"/>
-			<Orientation y="-2.3224"/>
-		</Entity>
-		<Entity uid="103">
-			<Template>units/mace/champion_infantry_spearman_02</Template>
-			<Player>2</Player>
-			<Position x="163.70981" z="101.77434"/>
-			<Orientation y="-2.35347"/>
-		</Entity>
-		<Entity uid="104">
-			<Template>units/mace/champion_infantry_spearman_02</Template>
-			<Player>2</Player>
-			<Position x="166.12447" z="103.64206"/>
-			<Orientation y="-2.23449"/>
-		</Entity>
-		<Entity uid="114">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>2</Player>
-			<Position x="168.18609" z="127.05552"/>
-			<Orientation y="-1.26153"/>
-		</Entity>
-		<Entity uid="115">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>2</Player>
-			<Position x="167.85106" z="122.80275"/>
-			<Orientation y="-1.3042"/>
-		</Entity>
-		<Entity uid="116">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>2</Player>
-			<Position x="167.55842" z="119.18093"/>
-			<Orientation y="-1.52973"/>
-		</Entity>
-		<Entity uid="117">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>2</Player>
-			<Position x="167.74762" z="115.1375"/>
-			<Orientation y="-1.61007"/>
-		</Entity>
-		<Entity uid="118">
-			<Template>units/athen/infantry_spearman_e</Template>
-			<Player>2</Player>
-			<Position x="168.84044" z="111.44822"/>
-			<Orientation y="-1.36821"/>
-		</Entity>
-		<Entity uid="133">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="82.00031" z="119.69343"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="134">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="81.79651" z="123.9323"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="135">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="81.89438" z="129.08104"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="136">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="82.47654" z="132.5271"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="137">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="82.42194" z="137.56394"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="138">
-			<Template>units/athen/infantry_marine_archer_e</Template>
-			<Player>1</Player>
-			<Position x="82.26951" z="141.66085"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="148">
-			<Template>units/thebes_sacred_band_hoplitai</Template>
-			<Player>2</Player>
-			<Position x="164.92902" z="136.10615"/>
-			<Orientation y="-2.00321"/>
-		</Entity>
-		<Entity uid="149">
-			<Template>units/thebes_sacred_band_hoplitai</Template>
-			<Player>2</Player>
-			<Position x="165.04322" z="139.71152"/>
-			<Orientation y="-1.77216"/>
-		</Entity>
-		<Entity uid="150">
-			<Template>units/thebes_sacred_band_hoplitai</Template>
-			<Player>2</Player>
-			<Position x="165.55748" z="145.05408"/>
-			<Orientation y="-2.13974"/>
-		</Entity>
-		<Entity uid="151">
-			<Template>units/thebes_sacred_band_hoplitai</Template>
-			<Player>2</Player>
-			<Position x="165.77775" z="148.99723"/>
-			<Orientation y="-1.97867"/>
-		</Entity>
-		<Entity uid="152">
-			<Template>units/thebes_sacred_band_hoplitai</Template>
-			<Player>2</Player>
-			<Position x="165.6308" z="154.0413"/>
-			<Orientation y="-1.7224"/>
-		</Entity>
 		<Entity uid="153">
 			<Template>actor|props/special/common/waypoint_flag_factions.xml</Template>
 			<Position x="93.55131" z="196.04044"/>
@@ -1284,6 +890,139 @@
 			<Position x="202.73786" z="55.09504"/>
 			<Orientation y="2.35621"/>
 		</Entity>
+		<Entity uid="320">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="81.10514" z="176.29258"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="2308"/>
+		</Entity>
+		<Entity uid="321">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="79.5316" z="156.27503"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="60616"/>
+		</Entity>
+		<Entity uid="322">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="81.55491" z="143.60224"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="18037"/>
+		</Entity>
+		<Entity uid="323">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="83.10233" z="121.2915"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="44349"/>
+		</Entity>
+		<Entity uid="324">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="85.37626" z="105.72284"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="40958"/>
+		</Entity>
+		<Entity uid="325">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="87.79722" z="91.2821"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="14720"/>
+		</Entity>
+		<Entity uid="326">
+			<Template>units/athen/support_female_citizen</Template>
+			<Player>1</Player>
+			<Position x="88.36165" z="86.14928"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="19072"/>
+		</Entity>
+		<Entity uid="327">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.55414" z="163.93146"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="33927"/>
+		</Entity>
+		<Entity uid="328">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.25641" z="137.16813"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="15882"/>
+		</Entity>
+		<Entity uid="329">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.11362" z="124.33094"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="53380"/>
+		</Entity>
+		<Entity uid="330">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="176.77247" z="93.6666"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="8135"/>
+		</Entity>
+		<Entity uid="331">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="176.69941" z="87.09942"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="14010"/>
+		</Entity>
+		<Entity uid="332">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="176.81467" z="97.45856"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="40921"/>
+		</Entity>
+		<Entity uid="333">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="176.85361" z="100.95997"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="8023"/>
+		</Entity>
+		<Entity uid="334">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.03183" z="116.98049"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="52547"/>
+		</Entity>
+		<Entity uid="335">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.10972" z="123.98177"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="54165"/>
+		</Entity>
+		<Entity uid="336">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.55777" z="130.50574"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="18003"/>
+		</Entity>
+		<Entity uid="337">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.7548" z="145.2656"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="55136"/>
+		</Entity>
+		<Entity uid="338">
+			<Template>units/maur/infantry_archer_a</Template>
+			<Player>2</Player>
+			<Position x="177.84107" z="151.72736"/>
+			<Orientation y="2.35621"/>
+			<Actor seed="26466"/>
+		</Entity>
 	</Entities>
 	<Paths/>
 </Scenario>
Index: binaries/data/mods/public/simulation/components/Visibility.js
===================================================================
--- binaries/data/mods/public/simulation/components/Visibility.js
+++ binaries/data/mods/public/simulation/components/Visibility.js
@@ -27,6 +27,8 @@
 
 	this.activated = false;
 
+	this.temporaryReveal = {};
+
 	if (this.preview || this.corpse)
 		this.SetActivated(true);
 };
@@ -60,6 +62,9 @@
  */
 Visibility.prototype.GetVisibility = function(player, isVisible, isExplored)
 {
+	if (player in this.temporaryReveal)
+		return VIS_VISIBLE;
+
 	if (this.preview)
 	{
 		// For the owner only, mock the "RetainInFog" behavior
@@ -81,7 +86,25 @@
 		return isVisible ? VIS_VISIBLE : VIS_HIDDEN;
 	}
 
-	return VIS_VISIBLE;
+	return isVisible ? VIS_VISIBLE : (isExplored ? VIS_FOGGED : VIS_HIDDEN);
+};
+
+Visibility.prototype.RevealForPlayer = function(player, time)
+{
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	if (player in this.temporaryReveal)
+		cmpTimer.CancelTimer(this.temporaryReveal[player]);
+
+	cmpTimer.SetTimeout(this.entity, IID_Visibility, "StopTemporaryReveal", time, { "player": player });
+	this.SetActivated(true);
+};
+
+Visibility.prototype.StopTemporaryReveal = function(data)
+{
+	if (!(data.player in this.temporaryReveal))
+		return;
+	delete this.temporaryReveal[data.player];
+	this.SetActivated(false);
 };
 
 Visibility.prototype.GetRetainInFog = function()
@@ -94,4 +117,24 @@
 	return this.alwaysVisible;
 };
 
+Visibility.prototype.OnAttacked = function(msg)
+{
+	if (!msg.attacker)
+		return;
+
+	let cmpAttackerVisibility = Engine.QueryInterface(msg.attacker, IID_Visibility);
+	if (!cmpAttackerVisibility)
+		return;
+
+	let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
+	if (!cmpOwnership)
+		return;
+
+	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+	if (cmpRangeManager.GetLosVisibility(msg.attacker, cmpOwnership.GetOwner()) === "visible")
+		return;
+
+	cmpAttackerVisibility.RevealForPlayer(cmpOwnership.GetOwner(), 3000);
+};
+
 Engine.RegisterComponentType(IID_Visibility, "Visibility", Visibility);