Ticket #2136: patch_collecttreasure.diff

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

@@ -1577 +1577 @@
                         var nearby = this.FindNearbyResource(function (ent, type, template) {
                             return (
                                 ent != oldTarget
-                                 && ((type.generic == "treasure" && oldType.generic == "treasure")
-                                 || (type.specific == oldType.specific
-                                 && (type.specific != "meat" || oldTemplate == template)))
+                                 && (type.specific == oldType.specific
+                                 && (type.specific != "meat" || oldTemplate == template))
                             );
                         });
                         if (nearby)
@@ -1637 +1636 @@
                         var nearby = this.FindNearbyResource(function (ent, type, template) {
                             return (
                                 ent != oldTarget
-                                && ((type.generic == "treasure" && oldType.generic == "treasure")
-                                || (type.specific == oldType.specific
-                                && (type.specific != "meat" || oldTemplate == template)))
+                                && (type.specific == oldType.specific
+                                && (type.specific != "meat" || oldTemplate == template))
                             );
                         });
                         if (nearby)
@@ -1680 +1678 @@
                     // Also don't switch to a different type of huntable animal
                     var nearby = this.FindNearbyResource(function (ent, type, template) {
                         return (
-                            (type.generic == "treasure" && resourceType.generic == "treasure")
-                            || (type.specific == resourceType.specific
-                            && (type.specific != "meat" || resourceTemplate == template))
+                            type.specific == resourceType.specific
+                            && (type.specific != "meat" || resourceTemplate == template)
                         );
                     });
 
@@ -1872 +1869 @@
                     // Also don't switch to a different type of huntable animal
                     var nearby = this.FindNearbyResource(function (ent, type, template) {
                         return (
-                            (type.generic == "treasure" && resourceType.generic == "treasure")
-                            || (type.specific == resourceType.specific
-                            && (type.specific != "meat" || resourceTemplate == template))
+                            type.specific == resourceType.specific
+                            && (type.specific != "meat" || resourceTemplate == template)
                         );
                     });
                     if (nearby)