Fixed support logic

fixed support squad logic on Tact, breach, despoilers and vets
BSData · Sep 29, 2024 · 5f12065 · 5f12065
1 parent 5854d79
commit 5f12065
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
@@ -16326,10 +16326,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                   <modifiers>
                     <modifier type="set" field="hidden" value="false">
                       <conditionGroups>
-                        <conditionGroup type="and">
-                          <conditions>
-                            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="90ee-77dd-1b7f-ddfe" type="equalTo"/>
-                          </conditions>
+                        <conditionGroup type="or">
                           <conditionGroups>
                             <conditionGroup type="and">
                               <conditions>
@@ -16340,6 +16337,19 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                                 <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                                 <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="4e1a-275e-e691-5b92" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                                 <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="6acd-d4ab-ee9b-0a07" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                              </conditions>
+                            </conditionGroup>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="d71e-10a6-216f-d796" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="4e1a-275e-e691-5b92" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                                <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                               </conditions>
                             </conditionGroup>
                           </conditionGroups>
@@ -47250,9 +47260,14 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
     <selectionEntry id="f670-7544-e4f3-f5fa" name="Argyrum-pattern Boarding Shield" hidden="true" collective="false" import="true" type="upgrade">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
-          <conditions>
-            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e0f-3552-8842-f281" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="8e0f-3552-8842-f281" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="3cd1-f7ee-0b1e-bd47" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <profiles>

diff --git a/Shattered Legions.cat b/Shattered Legions.cat
@@ -108,7 +108,7 @@
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="50b4-b5ef-c95f-ab51" shared="true" includeChildSelections="true"/>
+                <condition type="equalTo" value="0" field="selections" scope="parent" childId="50b4-b5ef-c95f-ab51" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -305,7 +305,7 @@
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="ef54-aab4-53ae-d96c" shared="true" includeChildSelections="true"/>
+                <condition type="equalTo" value="0" field="selections" scope="parent" childId="ef54-aab4-53ae-d96c" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -1274,7 +1274,7 @@
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="0531-85dd-feb0-116d" shared="true" includeChildSelections="true"/>
+                <condition type="equalTo" value="0" field="selections" scope="parent" childId="0531-85dd-feb0-116d" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -1576,7 +1576,7 @@
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="8fbf-dba5-5b44-1875" shared="true" includeChildSelections="true"/>
+                <condition type="equalTo" value="0" field="selections" scope="parent" childId="8fbf-dba5-5b44-1875" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>