Ticket #3611: mauryanHouse-v2.patch

binaries/data/mods/public/globalscripts/Templates.js

@@ -33 +33 @@
  * @param match Either a string in the form 
  *     "Class1 Class2+Class3"
  * where spaces are handled as OR and '+'-signs as AND,
+ * and ! is handled as NOT, thus Class1+!Class2 = Class1 AND NOT Class2
  * Or a list in the form
  *     [["Class1"], ["Class2", "Class3"]]
  * where the outer list is combined as OR, and the inner lists are AND-ed
@@ -56 +57 @@
         // if the elements are still strings, split them by space or by '+'
         if (typeof sublist == "string")
             sublist = sublist.split(/[+\s]+/);
-        if (sublist.every(function(c) { return classes.indexOf(c) != -1; }))
+        if (sublist.every(function(c) {
+            if (c.charAt(0) == "!")
+                return classes.indexOf(c.substr(1)) == -1;
+            return classes.indexOf(c) != -1;
+        }))
             return true;
     }
 

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

@@ -22 +22 @@
     <BuffHeal>0</BuffHeal>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support</List>
+    <List datatype="tokens">Support+!Elephant</List>
     <LoadingRange>1</LoadingRange>
   </GarrisonHolder>
   <Health>