Ticket #4092: 4092_ai_compatibility_v1.1.patch

binaries/data/mods/public/simulation/ai/common-api/entity.js

@@ -324 +324 @@
             return false;
 
         for (let type in this.get("Attack"))
         {
             let restrictedClasses = this.get("Attack/" + type + "/RestrictedClasses/_string");
-            if (!restrictedClasses)
-                continue;
-            if (restrictedClasses.split(" ").indexOf(saidClass) !== -1)
+            if (restrictedClasses && !MatchesClassList([saidClass], restrictedClasses)))
                 return false;
         }
+
         return true;
     },
 
     "buildableEntities": function() {
         let templates = this.get("Builder/Entities/_string");

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

@@ -240 +240 @@
 
         let restrictedClasses = this.GetRestrictedClasses(type);
         if (!restrictedClasses.length)
             return true;
 
-        if (targetClasses.every(c => restrictedClasses.indexOf(c) == -1))
+        if (!MatchesClassList(targetClasses, restrictedClasses))
             return true;
     }
 
     return false;
 };

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

@@ -10 +10 @@
       <Hack>10.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Ship Structure Human Elephant Domestic</RestrictedClasses>
+      <RestrictedClasses datatype="tokens">!SeaCreature </RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="10.0"/>
     <Height>6.0</Height>