Last Sweep at Support Squad rule

This should fix it. It didn't seem to like being higher up or lower down, so reworked.
BSData · Sep 29, 2024 · bcffe27 · bcffe27
1 parent dcb3a24
commit bcffe27
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 89 deletions.
diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
@@ -3954,11 +3954,6 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="remove" field="category" value="8f42-a824-fb5f-8fea">
-          <conditions>
-            <condition field="selections" scope="aa72-63e4-bc60-4611" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e05-7d1e-16e4-1669" type="equalTo"/>
-          </conditions>
-        </modifier>
         <modifier type="append" field="name" value="(Inductii)">
           <conditions>
             <condition field="selections" scope="aa72-63e4-bc60-4611" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e05-7d1e-16e4-1669" type="equalTo"/>
@@ -3987,6 +3982,23 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="8f42-a824-fb5f-8fea" field="category">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="aa72-63e4-bc60-4611" childId="8e05-7d1e-16e4-1669" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="equalTo" value="1" field="selections" scope="force" childId="9950-2cd2-fd88-9bb1" shared="true" includeChildSelections="true"/>
+                    <condition type="atLeast" value="1" field="selections" scope="aa72-63e4-bc60-4611" childId="0531-85dd-feb0-116d" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <modifierGroups>
         <modifierGroup>
@@ -4105,9 +4117,9 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
         </infoLink>
         <infoLink id="ee05-b9e9-df3b-871d" name="Support Squad" hidden="true" targetId="768e-56d6-ca52-24ae" type="rule">
           <modifiers>
-            <modifier type="set" field="hidden" value="false">
+            <modifier type="set" field="hidden" value="true">
               <conditions>
-                <condition field="selections" scope="aa72-63e4-bc60-4611" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e05-7d1e-16e4-1669" type="equalTo"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -18764,9 +18776,21 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
           </conditions>
         </modifier>
         <modifier type="remove" field="category" value="8f42-a824-fb5f-8fea">
-          <conditions>
-            <condition field="selections" scope="4357-930e-165a-a6e3" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e05-7d1e-16e4-1669" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="4357-930e-165a-a6e3" childId="8e05-7d1e-16e4-1669" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="equalTo" value="1" field="selections" scope="force" childId="9950-2cd2-fd88-9bb1" shared="true" includeChildSelections="true"/>
+                    <condition type="atLeast" value="1" field="selections" scope="4357-930e-165a-a6e3" childId="ef54-aab4-53ae-d96c" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="remove" value="11f2-472f-c1d1-9ae9" field="category">
           <conditionGroups>
@@ -18893,7 +18917,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditions>
-                <condition field="selections" scope="4357-930e-165a-a6e3" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e05-7d1e-16e4-1669" type="equalTo"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -21361,6 +21385,16 @@ If one or more Wounds is discounted due to this special rule, and the unit that
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="8f42-a824-fb5f-8fea" field="category">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="9950-2cd2-fd88-9bb1" shared="true" includeChildSelections="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="ad97-c090-fa67-696f" childId="50b4-b5ef-c95f-ab51" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <modifierGroups>
         <modifierGroup>
@@ -21404,6 +21438,15 @@ If one or more Wounds is discounted due to this special rule, and the unit that
           </modifiers>
         </infoLink>
         <infoLink id="2c31-c5fa-cf8b-dee2" name="Legiones Hereticus (Emperor’s Children)" hidden="false" targetId="b9e-b2ef-86e-e52d" type="rule"/>
+        <infoLink name="Support Squad" id="64ad-20cd-8803-cfc1" hidden="false" targetId="768e-56d6-ca52-24ae" type="rule">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ebd3-8853-ca06-24e5" name="Infantry Unit Type" hidden="false" targetId="8b4f-bfe2-ce7b-f1b1" primary="false"/>
@@ -27801,9 +27844,18 @@ If one or more Wounds is discounted due to this special rule, and the unit that
         <modifier type="add" field="category" value="8f42-a824-fb5f-8fea">
           <conditionGroups>
             <conditionGroup type="or">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="equalTo" value="1" field="selections" scope="force" childId="9950-2cd2-fd88-9bb1" shared="true" includeChildSelections="true"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="9b5d-fac7-799b-d7e7" shared="true"/>
+                    <condition type="equalTo" value="0" field="selections" scope="a423-7dd8-3f1b-3e28" childId="8fbf-dba5-5b44-1875" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
               <conditions>
-                <condition field="selections" scope="a423-7dd8-3f1b-3e28" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8c3a-f99e-4226-e519" type="equalTo"/>
-                <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="06cc-c559-d71e-b75e" type="equalTo"/>
+                <condition type="equalTo" value="1" field="selections" scope="a423-7dd8-3f1b-3e28" childId="8c3a-f99e-4226-e519" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="06cc-c559-d71e-b75e" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -27923,6 +27975,27 @@ If one or more Wounds is discounted due to this special rule, and the unit that
             </modifier>
           </modifiers>
         </infoLink>
+        <infoLink name="Support Squad" id="472b-61ba-d4e7-8411" hidden="false" type="rule" targetId="768e-56d6-ca52-24ae">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="equalTo" value="1" field="selections" scope="force" childId="9950-2cd2-fd88-9bb1" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="7aee-565f-b0ae-294e" shared="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="028b-dfb1-e521-2745" name="Legiones Astartes" hidden="false" targetId="11f2-472f-c1d1-9ae9" primary="false"/>

diff --git a/Shattered Legions.cat b/Shattered Legions.cat
@@ -103,24 +103,6 @@
           <comment>template_id_c624-3ae0-46c0-9b06</comment>
         </categoryLink>
       </categoryLinks>
-      <infoLinks>
-        <infoLink name="Support Squad" id="383a-2869-106c-dd66" hidden="false" type="rule" targetId="768e-56d6-ca52-24ae">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-        </infoLink>
-      </infoLinks>
-      <modifiers>
-        <modifier type="remove" value="8f42-a824-fb5f-8fea" field="category">
-          <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="parent" childId="50b4-b5ef-c95f-ab51" shared="true" includeChildSelections="true"/>
-          </conditions>
-        </modifier>
-      </modifiers>
     </entryLink>
     <entryLink import="false" name="Caestus Assault Ram" hidden="true" id="a877-bfc2-979e-1ccc" collective="false" targetId="67b6-3d17-3b16-a94d" type="selectionEntry">
       <modifiers>
@@ -300,24 +282,6 @@
           <comment>template_id_febb-f536-4d25-a8ab</comment>
         </categoryLink>
       </categoryLinks>
-      <infoLinks>
-        <infoLink name="Support Squad" id="3748-b3c2-a1ff-864a" hidden="false" type="rule" targetId="768e-56d6-ca52-24ae">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-        </infoLink>
-      </infoLinks>
-      <modifiers>
-        <modifier type="remove" value="8f42-a824-fb5f-8fea" field="category">
-          <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="parent" childId="ef54-aab4-53ae-d96c" shared="true" includeChildSelections="true"/>
-          </conditions>
-        </modifier>
-      </modifiers>
     </entryLink>
     <entryLink import="false" name="Destroyer Assault Squad" hidden="false" id="2808-1833-e5bf-fc4d" collective="false" targetId="d30b-59bb-8ae0-36d1" type="selectionEntry">
       <categoryLinks>
@@ -1264,28 +1228,8 @@
         <categoryLink name="Troops:" hidden="false" id="9935-f795-480d-349d" targetId="9b5d-fac7-799b-d7e7" primary="true">
           <comment>template_id_e1fa-b7d8-47b0-a88a</comment>
         </categoryLink>
-        <categoryLink name="Compulsory Troops:" hidden="false" id="402d-ea4a-427a-7345" targetId="8f42-a824-fb5f-8fea" primary="false">
-          <comment>template_id_a137-e3c0-4d63-a48c</comment>
-        </categoryLink>
+        <categoryLink targetId="8f42-a824-fb5f-8fea" id="525e-2b03-f514-b61c" primary="false" name="Compulsory Troops:"/>
       </categoryLinks>
-      <infoLinks>
-        <infoLink name="Support Squad" id="a67c-b146-d805-747c" hidden="false" type="rule" targetId="768e-56d6-ca52-24ae">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-        </infoLink>
-      </infoLinks>
-      <modifiers>
-        <modifier type="remove" value="8f42-a824-fb5f-8fea" field="category">
-          <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="parent" childId="0531-85dd-feb0-116d" shared="true" includeChildSelections="true"/>
-          </conditions>
-        </modifier>
-      </modifiers>
     </entryLink>
     <entryLink import="false" name="Tactical Support Squad" hidden="false" id="0c7e-04c9-830e-2166" collective="false" targetId="50ed-5869-643d-1ac5" type="selectionEntry">
       <categoryLinks>
@@ -1568,26 +1512,7 @@
         </categoryLink>
         <categoryLink name="Line Sub-type" hidden="false" id="ce4a-686d-cbce-b606" targetId="6399-5c65-7833-1025" primary="false"/>
         <categoryLink targetId="9b5d-fac7-799b-d7e7" id="a311-12be-1d45-2c83" primary="true" name="Troops:"/>
-        <categoryLink targetId="8f42-a824-fb5f-8fea" id="3ffb-d7eb-cb84-1532" primary="false" name="Compulsory Troops:"/>
       </categoryLinks>
-      <infoLinks>
-        <infoLink name="Support Squad" id="472b-61ba-d4e7-8411" hidden="false" type="rule" targetId="768e-56d6-ca52-24ae">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8f42-a824-fb5f-8fea" shared="true"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-        </infoLink>
-      </infoLinks>
-      <modifiers>
-        <modifier type="remove" value="8f42-a824-fb5f-8fea" field="category">
-          <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="parent" childId="8fbf-dba5-5b44-1875" shared="true" includeChildSelections="true"/>
-          </conditions>
-        </modifier>
-      </modifiers>
     </entryLink>
   </entryLinks>
 </catalogue>