Astartes validation tweaks

BSData · Sep 20, 2019 · 0a2e674 · 0a2e674
1 parent f1e2fe0
commit 0a2e674
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 132 deletions.
diff --git a/Adeptus Astartes.cat b/Adeptus Astartes.cat
@@ -3747,112 +3747,6 @@
         </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
-    <selectionEntryGroup id="2465-57c4-442e-1ddc" name="Chapter" hidden="false" collective="false" import="true">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5906-d1fd-2cf1-78ce" type="max"/>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5a7d-9f89-7773-ef72" type="min"/>
-      </constraints>
-      <selectionEntries>
-        <selectionEntry id="9d78-4169-e46e-93cd" name="*No Chapter*" hidden="false" collective="false" import="true" type="upgrade">
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="7e5d-fc30-8833-3ea3" name="Dark Angels" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="3027-49f8-6334-a1da" name="Dark Angels" hidden="false" targetId="6dc1-298a-5459-4a25" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="b9b1-0690-c201-5b7d" name="White Scars" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="cfa2-cb8e-de20-39fd" name="White Scars" hidden="false" targetId="3b17-281f-ac2d-0410" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="b269-c5ff-1cf2-4716" name="Space Wolves" hidden="false" collective="false" import="true" type="upgrade">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ca38-d54c-3ff9-5c1c" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8adc-9d8c-0bf8-6bc3" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c64-f195-7269-1fff" type="instanceOf"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
-          <categoryLinks>
-            <categoryLink id="0b0c-4837-ba73-9d33" name="Space Wolves" hidden="false" targetId="2ea9-3cbd-e934-0180" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="3a02-6242-e8c1-174c" name="Imperial Fists" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="4840-30d4-43f7-2d4b" name="Imperial Fists" hidden="false" targetId="dd3b-adcc-8bc3-c31d" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="ff4e-479c-9150-a398" name="Blood Angels" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="e0bc-76ba-d21e-7b3d" name="Blood Angels" hidden="false" targetId="f7df-60bf-379d-8847" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="432e-262c-cc01-edcf" name="Iron Hands" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="b26d-fb7c-e924-5d10" name="Iron Hands" hidden="false" targetId="757f-382d-12cf-0f49" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="73da-77ea-32a7-661c" name="Salamanders" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="5894-9e71-ada4-ab9a" name="Salamanders" hidden="false" targetId="def9-9207-76e0-fefd" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="9dad-82f9-6df8-1d8a" name="Ultramarines" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="c065-55a3-b226-40aa" name="Ultramarines" hidden="false" targetId="db00-918b-4bd1-9446" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="d3a1-2022-96d4-36e9" name="Raven Guard" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="f410-f63f-bf8b-8e7c" name="Raven Guard" hidden="false" targetId="dc4e-633e-b7e7-91fc" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="0ccf-e7a1-62bf-69f1" name="Black Templars" hidden="false" collective="false" import="true" type="upgrade">
-          <categoryLinks>
-            <categoryLink id="c650-0eb7-ba70-b17c" name="Black Templars" hidden="false" targetId="76f6-42a4-c0d7-01a1" primary="false"/>
-          </categoryLinks>
-          <costs>
-            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="0.0"/>
-          </costs>
-        </selectionEntry>
-      </selectionEntries>
-    </selectionEntryGroup>
   </sharedSelectionEntryGroups>
   <sharedProfiles>
     <profile id="a8e3-c3ca-54dc-9e66" name="Boltgun" hidden="false" typeId="c067-7929-f4dc-7825" typeName="Weapon">

diff --git a/Space Marines.cat b/Space Marines.cat
@@ -3472,32 +3472,16 @@
     </selectionEntry>
     <selectionEntry id="50e6-375c-f7a3-2a9d" name="Company Veteran" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="f4fc-bb9d-82b4-3b95" value="4">
-          <conditionGroups>
-            <conditionGroup type="and">
-              <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e9e9-67e7-3016-380a" type="equalTo"/>
-              </conditions>
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="beaf-798d-961f-353d" type="equalTo"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="set" field="f4fc-bb9d-82b4-3b95" value="4.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="equalTo"/>
+          </conditions>
         </modifier>
         <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="1">
           <repeats>
             <repeat field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="31f8-563e-ab5d-8e63" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
-        <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="1">
-          <conditions>
-            <condition field="selections" scope="50e6-375c-f7a3-2a9d" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="fa76-651f-322a-dee3" type="equalTo"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="force" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="f4fc-bb9d-82b4-3b95" type="max"/>
@@ -3576,12 +3560,12 @@
               <modifiers>
                 <modifier type="set" field="hidden" value="true">
                   <conditions>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
+                    <condition field="selections" scope="50e6-375c-f7a3-2a9d" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="b46b-d5d5-dbf4-9a5d" value="1">
                   <conditions>
-                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="beaf-798d-961f-353d" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="equalTo"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -3598,7 +3582,7 @@
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
+                <condition field="selections" scope="50e6-375c-f7a3-2a9d" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -3610,7 +3594,7 @@
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e9e9-67e7-3016-380a" type="equalTo"/>
+                <condition field="selections" scope="50e6-375c-f7a3-2a9d" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e9e9-67e7-3016-380a" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -3757,7 +3741,7 @@
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
+                <condition field="selections" scope="e868-203a-914d-e11d" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -3769,7 +3753,7 @@
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e9e9-67e7-3016-380a" type="equalTo"/>
+                <condition field="selections" scope="e868-203a-914d-e11d" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e9e9-67e7-3016-380a" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -3797,6 +3781,18 @@
           </costs>
         </selectionEntry>
         <selectionEntry id="170b-c261-fa08-eb51" name="Dark Angels" hidden="false" collective="false" import="true" type="upgrade">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a3fb-18f1-f728-dc5d" type="instanceOf"/>
+                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c793-9ff1-e5c0-c6d0" type="instanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
           <categoryLinks>
             <categoryLink id="7a16-2c56-dc6d-a207" name="Dark Angels" hidden="false" targetId="6dc1-298a-5459-4a25" primary="false"/>
           </categoryLinks>
@@ -3821,6 +3817,8 @@
                     <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ca38-d54c-3ff9-5c1c" type="instanceOf"/>
                     <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8adc-9d8c-0bf8-6bc3" type="instanceOf"/>
                     <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c64-f195-7269-1fff" type="instanceOf"/>
+                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a3fb-18f1-f728-dc5d" type="instanceOf"/>
+                    <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c793-9ff1-e5c0-c6d0" type="instanceOf"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>