Ticket #1985: 1985-additional-fixes.diff

binaries/data/mods/public/simulation/components/BuildingAI.js

@@ -15 +15 @@
         "<text/>" +
     "</element>";
 
+BuildingAI.prototype.MAX_PREFERENCE_BONUS = 2;
 
 /**
  * Initialize BuildingAI Component
@@ -288 +289 @@
     var targets = new WeightedList();
     for (var i = 0; i < this.targetUnits.length; i++)
     {
-        var target = this.targetUnits[i],
-            weight = (cmpAttack.GetPreference(target) || 0) + 1
+        var target = this.targetUnits[i];
+        var preference = cmpAttack.GetPreference(target);
+        var weight = 1;
+        if (preference !== null && preference !== undefined)
+        {
+            // Lower preference scores indicate a higher preference so they
+            // should result in a higher weight.
+            weight = 1 + this.MAX_PREFERENCE_BONUS / (1 + preference);
+        }
         targets.push(target, weight);
     }
     for (var i = 0;i < arrowsToFire;i++)
     {
-        var selectedIndex = targets.randomIndex(),
-            selectedTarget = targets.itemAt(selectedIndex);
+        var selectedIndex = targets.randomIndex();
+        var selectedTarget = targets.itemAt(selectedIndex);
         if (selectedTarget && this.CheckTargetVisible(selectedTarget))
         {
             cmpAttack.PerformAttack(attackType, selectedTarget);

binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml

@@ -12 +12 @@
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
-      <PreferredClasses datatype="tokens">organic</PreferredClasses>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>

binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml

@@ -11 +11 @@
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
-      <PreferredClasses datatype="tokens">organic</PreferredClasses>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>

binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml

@@ -11 +11 @@
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
-      <PreferredClasses datatype="tokens">organic</PreferredClasses>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>