Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json	(revision 24636)
@@ -1,26 +1,26 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_advanced.png",
-	"tooltip": "Advanced and Elite units +20% training time, +25% health, +1 resistance, +0.7 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Melee units +20% attack damage; Ranged units −10% spread.",
+	"tooltip": "Advanced and Elite units +20% training time, +25% health, +0.7 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Melee units +1 resistance and +20% attack damage; Ranged units −10% spread.",
 	"modifications": [
 		{ "value": "Attack/Capture/Capture", "add": 0.7 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 1.25 },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/Health", "add": 5, "affects": "Healer" },
 		{ "value": "Loot/food", "multiply": 1.2 },
 		{ "value": "Loot/wood", "multiply": 1.2 },
 		{ "value": "Loot/stone", "multiply": 1.2 },
 		{ "value": "Loot/metal", "multiply": 1.2 },
 		{ "value": "Loot/xp", "multiply": 1.2 },
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 1 },
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 1, "affects": "Melee" },
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1, "affects": "Melee" },
+		{ "value": "Resistance/Entity/Damage/Crush", "add": 1, "affects": "Melee" },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 }
 	],
 	"affects": ["Advanced Unit", "Elite Unit"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json	(revision 24636)
@@ -1,26 +1,26 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_elite.png",
-	"tooltip": "Elite units +20% training time, +25% health, +1 resistance, +0.8 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Melee units +20% attack damage; Ranged units −10% spread.",
+	"tooltip": "Elite units +20% training time, +25% health, +0.8 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Melee units +1 resistance and +20% attack damage; Ranged units −10% spread.",
 	"modifications": [
 		{ "value": "Attack/Capture/Capture", "add": 0.8 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 1.25 },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/Health", "add": 5, "affects": "Healer" },
 		{ "value": "Loot/food", "multiply": 1.2 },
 		{ "value": "Loot/wood", "multiply": 1.2 },
 		{ "value": "Loot/stone", "multiply": 1.2 },
 		{ "value": "Loot/metal", "multiply": 1.2 },
 		{ "value": "Loot/xp", "multiply": 1.2 },
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 1 },
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 1, "affects": "Melee" },
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1, "affects": "Melee" },
+		{ "value": "Resistance/Entity/Damage/Crush", "add": 1, "affects": "Melee" },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 }
 	],
 	"affects": ["Elite Unit"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml	(revision 24636)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>14</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>1.0</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml	(revision 24636)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>36</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70</Speed>
         <Spread>1.0</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Champion Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml	(revision 24636)
@@ -1,45 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>13.5</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>1.0</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml	(revision 24636)
@@ -1,45 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>26</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70</Speed>
         <Spread>1.0</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Champion Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 24636)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>28</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>0.5</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml	(revision 24636)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>60</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70</Speed>
         <Spread>0.5</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 24636)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>27</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>0.5</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml	(revision 24635)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml	(revision 24636)
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>50</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>600</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70</Speed>
         <Spread>0.5</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
 </Entity>