Ticket #1652: skittish.patch

data/mods/public/simulation/components/Attack.js

@@ -276 +276 @@
     const isPreferred = function (value, i, a) { return attack.GetPreferredClasses(value).some(isTargetClass); }
     const byPreference = function (a, b) { return (types.indexOf(a) + (isPreferred(a) ? types.length : 0) ) - (types.indexOf(b) + (isPreferred(b) ? types.length : 0) ); }
 
-    return types.filter(isAllowed).sort(byPreference).pop();
+    const bestAttackAgainst = types.filter(isAllowed).sort(byPreference).pop();
+
+    //Have ranged attacker use a melee attack on nonskittish animals. Otherwise it is too difficult for ranged attackers to kill.
+    const targetNotSkittish = cmpIdentity.HasClass("Animal") && (Engine.QueryInterface(target, IID_UnitAI).template.NaturalBehaviour!="skittish");
+    if (bestAttackAgainst == "Ranged" && targetNotSkittish)
+        return "Melee";
+
+    return bestAttackAgainst;
 };
 
 Attack.prototype.CompareEntitiesByPreference = function(a, b)
@@ -642 +649 @@
                 // Remove the projectile
                 var cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager);
                 cmpProjectileManager.RemoveProjectile(data.projectileId);
+
             }
         }
     }

data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml

@@ -14 +14 @@
       <RestrictedClasses datatype="tokens">StoneWall</RestrictedClasses>
       <Spread>1.6</Spread>
     </Ranged>
+    <Melee>
+      <Hack>5.0</Hack>
+      <Pierce>15.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
   </Attack>
   <Identity>
     <GenericName>Ranged Cavalry</GenericName>