Allied units and redoing detachments again

hgrimsel · Jun 25, 2023 · a5db35c · a5db35c
1 parent 7ffe3c3
commit a5db35c
Show file tree

Hide file tree

Showing 13 changed files with 282 additions and 162 deletions.
diff --git a/Aeldari - Aeldari Library.cat b/Aeldari - Aeldari Library.cat
@@ -15090,31 +15090,17 @@ makes an attack, subtract 1 from the Hit roll</characteristic>
         </selectionEntry>
       </selectionEntries>
     </selectionEntry>
-    <selectionEntry type="upgrade" import="true" name="Battle Host" hidden="false" id="4228-6f84-4eae-d1c4">
-      <rules>
-        <rule name="Unparalleled Foresight" hidden="false" id="3c51-8bff-46d2-2da9">
-          <description>Each time an Aeldari unit from your army is selected to shoot or fight, you can re-roll one Hit roll and you can re-roll one Wound roll when resolving those attacks.</description>
-        </rule>
-      </rules>
+    <selectionEntry type="upgrade" import="false" name="Detachment" hidden="false" id="6711-4e83-ec8d-c7f0">
       <constraints>
-        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="6646-58a-efd4-f8a"/>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="224c-1a91-1484-d83"/>
-      </constraints>
-    </selectionEntry>
-    <selectionEntry type="upgrade" import="true" name="Realspace Raiders" hidden="false" id="46e2-e9d9-716a-746f">
-      <rules>
-        <rule name="Realspace Raiders" hidden="false" id="2bff-9f74-9eff-9852">
-          <description>At the start of the battle, you gain an additional 1 Pain token for each of the following your army contains:
-■ One or more Archon models
-■ One or more Succubus models
-■ One or more Haemonculus models
-Designer’s Note: These are all cumulative, so if your army contains at least one Archon, at least one Succubus and at least one Haemonculus, you would start the battle with an additional 3 Pain tokens</description>
-        </rule>
-      </rules>
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3a84-7bea-7655-a8e6"/>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="1997-9538-803c-f7dc"/>
+        <constraint type="min" value="1" field="selections" scope="roster" shared="true" id="537b-7036-a6cf-54a5" includeChildSelections="true" includeChildForces="true"/>
+        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="6f8d-7ce6-5f74-bd13" includeChildSelections="true" includeChildForces="true"/>
       </constraints>
+      <categoryLinks>
+        <categoryLink targetId="4ac9-fd30-1e3d-b249" id="e366-d876-bf5-1dc8" primary="true" name="Configuration"/>
+      </categoryLinks>
+      <entryLinks>
+        <entryLink import="true" name="Detachment Selection" hidden="false" type="selectionEntryGroup" id="5b19-f5a7-c819-e37c" targetId="d812-1e0c-f979-cab2"/>
+      </entryLinks>
     </selectionEntry>
   </sharedSelectionEntries>
   <sharedSelectionEntryGroups>
@@ -15266,6 +15252,54 @@ Designer’s Note: These are all cumulative, so if your army contains at least o
         <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="2f7a-ac04-3b21-e150"/>
       </constraints>
     </selectionEntryGroup>
+    <selectionEntryGroup name="Detachment Selection" hidden="false" id="d812-1e0c-f979-cab2">
+      <selectionEntries>
+        <selectionEntry type="upgrade" import="true" name="Battle Host" hidden="false" id="b14f-b3cb-e54e-8c30">
+          <rules>
+            <rule name="Unparalleled Foresight" hidden="false" id="ba0f-f0bd-c1a3-a489">
+              <description>Each time an Aeldari unit from your army is selected to shoot or fight, you can re-roll one Hit roll and you can re-roll one Wound roll when resolving those attacks.</description>
+            </rule>
+          </rules>
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="6646-58a-efd4-f8a"/>
+            <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="224c-1a91-1484-d83"/>
+          </constraints>
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="primary-catalogue" childId="38de-521f-1ce0-44a0" shared="true" includeChildSelections="true" includeChildForces="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </selectionEntry>
+        <selectionEntry type="upgrade" import="true" name="Realspace Raiders" hidden="false" id="d13b-5a1b-25-184">
+          <rules>
+            <rule name="Realspace Raiders" hidden="false" id="8b24-af68-9404-eb83">
+              <description>At the start of the battle, you gain an additional 1 Pain token for each of the following your army contains:
+■ One or more Archon models
+■ One or more Succubus models
+■ One or more Haemonculus models
+Designer’s Note: These are all cumulative, so if your army contains at least one Archon, at least one Succubus and at least one Haemonculus, you would start the battle with an additional 3 Pain tokens</description>
+            </rule>
+          </rules>
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3a84-7bea-7655-a8e6"/>
+            <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="1997-9538-803c-f7dc"/>
+          </constraints>
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="38de-521f-1ce0-44a0" shared="true" includeChildSelections="true" includeChildForces="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </selectionEntry>
+      </selectionEntries>
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="c57f-460d-37e-29a6" includeChildSelections="true"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="78d0-9e4-566c-c03f" includeChildSelections="true"/>
+      </constraints>
+    </selectionEntryGroup>
   </sharedSelectionEntryGroups>
   <sharedRules>
     <rule id="c324-e193-e23c-7d2e" name="Strands of Fate" hidden="false"/>

diff --git a/Aeldari - Craftworlds.cat b/Aeldari - Craftworlds.cat
@@ -73,11 +73,7 @@
     <entryLink import="true" name="Revenant Titan" hidden="false" type="selectionEntry" id="ed6a-ff9f-28a3-1716" targetId="ca40-4a0d-567-852"/>
     <entryLink import="true" name="Warp Hunter" hidden="false" type="selectionEntry" id="3549-ed9e-6768-b32b" targetId="ef18-ff32-2be6-7372"/>
     <entryLink import="true" name="Wraithseer" hidden="false" type="selectionEntry" id="42ef-1197-f9dd-799c" targetId="b369-a813-75ac-2dc6"/>
-    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="c7ec-c926-40a5-c990" targetId="8609-685f-f598-44d5">
-      <entryLinks>
-        <entryLink import="true" name="Battle Host" hidden="false" type="selectionEntry" id="9ac7-4d29-4dd6-f89f" targetId="4228-6f84-4eae-d1c4"/>
-      </entryLinks>
-    </entryLink>
+    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="c7ec-c926-40a5-c990" targetId="6711-4e83-ec8d-c7f0"/>
   </entryLinks>
   <catalogueLinks>
     <catalogueLink id="184b-23d5-1ac8-cf3c" name="Aeldari - Aeldari Library" targetId="dfcf-1214-b57-2205" type="catalogue" importRootEntries="true"/>

diff --git a/Aeldari - Drukhari.cat b/Aeldari - Drukhari.cat
@@ -39,11 +39,7 @@
     <entryLink import="true" name="Voidweaver" hidden="false" type="selectionEntry" id="fd0b-aee0-3632-f3c6" targetId="e011-d99d-f0de-5289"/>
     <entryLink import="true" name="Troupe" hidden="false" type="selectionEntry" id="f21a-cd8a-ab17-5ecd" targetId="dac1-6a7f-a06a-82cf"/>
     <entryLink import="true" name="Troupe Master" hidden="false" type="selectionEntry" id="97e5-742b-fa8f-ae08" targetId="dada-b81b-37bd-1f3b"/>
-    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="7f91-2ea-672e-bcdc" targetId="8609-685f-f598-44d5">
-      <entryLinks>
-        <entryLink import="true" name="Realspace Raiders" hidden="false" type="selectionEntry" id="56f7-844f-f7e0-74a" targetId="46e2-e9d9-716a-746f"/>
-      </entryLinks>
-    </entryLink>
+    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="7f91-2ea-672e-bcdc" targetId="6711-4e83-ec8d-c7f0"/>
   </entryLinks>
   <xmlns>http://www.battlescribe.net/schema/catalogueSchema</xmlns>
 </catalogue>
diff --git a/Aeldari - Ynnari.cat b/Aeldari - Ynnari.cat
@@ -247,11 +247,7 @@
     <entryLink import="true" name="Revenant Titan" hidden="false" type="selectionEntry" id="fc22-aebf-1e69-d3d0" targetId="ca40-4a0d-567-852"/>
     <entryLink import="true" name="Warp Hunter" hidden="false" type="selectionEntry" id="8799-8be5-ee5f-a61" targetId="ef18-ff32-2be6-7372"/>
     <entryLink import="true" name="Wraithseer" hidden="false" type="selectionEntry" id="25c2-2d02-7949-a275" targetId="b369-a813-75ac-2dc6"/>
-    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="64db-449d-f4f8-1889" targetId="8609-685f-f598-44d5">
-      <entryLinks>
-        <entryLink import="true" name="Battle Host" hidden="false" type="selectionEntry" id="803f-f0e7-ebcb-9555" targetId="4228-6f84-4eae-d1c4"/>
-      </entryLinks>
-    </entryLink>
+    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="64db-449d-f4f8-1889" targetId="6711-4e83-ec8d-c7f0"/>
   </entryLinks>
   <sharedSelectionEntries>
     <selectionEntry id="7b97-53a1-685-12b2" name="Devotees from the Dark City" hidden="false" collective="false" import="true" type="upgrade">

diff --git a/Genestealer Cults.cat b/Genestealer Cults.cat
@@ -19,14 +19,17 @@ No ASTRA MILITARUM models in your army can be your Warlord, and they cannot be g
     </rule>
   </rules>
   <sharedSelectionEntries>
-    <selectionEntry type="upgrade" import="true" name="Detachment" hidden="false" id="b96c-3fb6-1ee9-15ae">
+    <selectionEntry type="upgrade" import="false" name="Detachment" hidden="false" id="b96c-3fb6-1ee9-15ae">
       <constraints>
         <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="39b8-22db-7b6a-81d1" includeChildForces="true" includeChildSelections="true"/>
         <constraint type="min" value="1" field="selections" scope="roster" shared="true" id="77dc-6218-6b74-a245" includeChildSelections="true" includeChildForces="true"/>
       </constraints>
       <categoryLinks>
         <categoryLink targetId="4ac9-fd30-1e3d-b249" id="7685-6aec-9739-88c7" primary="true" name="Configuration"/>
       </categoryLinks>
+      <entryLinks>
+        <entryLink import="true" name="Detachment" hidden="false" type="selectionEntryGroup" id="6c8a-a2ef-13ea-516b" targetId="7170-c243-d89f-6644"/>
+      </entryLinks>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Aberrants" hidden="false" id="f51d-bc51-f301-9dee">
       <categoryLinks>
@@ -3378,11 +3381,7 @@ You can attach this model to a GENESTEALER CULTS BATTLELINE unit, even if a PRIM
     <entryLink import="true" name="Ursula Creed" hidden="false" type="selectionEntry" id="b455-c6f1-b37e-c3b7" targetId="b6b2-9971-ec0c-349e"/>
     <entryLink import="true" name="Valkyrie" hidden="false" type="selectionEntry" id="792-4a0b-303c-bf6c" targetId="9665-3160-8a04-d2bc"/>
     <entryLink import="true" name="Wyvern" hidden="false" type="selectionEntry" id="f9a6-cebc-48db-8236" targetId="d11b-c49d-41bf-1f36"/>
-    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="ff89-975d-9ba-8c1a" targetId="8609-685f-f598-44d5">
-      <entryLinks>
-        <entryLink import="true" name="Detachment" hidden="false" type="selectionEntryGroup" id="9ca9-3187-91e1-698" targetId="7170-c243-d89f-6644"/>
-      </entryLinks>
-    </entryLink>
+    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="ff89-975d-9ba-8c1a" targetId="b96c-3fb6-1ee9-15ae"/>
   </entryLinks>
   <catalogueLinks>
     <catalogueLink type="catalogue" name="Imperium - Astra Militarum - Library" id="1931-3c9a-ba46-7c7b" targetId="5a44-f048-114b-e3ff"/>

diff --git a/Imperium - Astra Militarum - Library.cat b/Imperium - Astra Militarum - Library.cat
@@ -1556,6 +1556,23 @@
         </profile>
       </profiles>
     </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="Detachment" hidden="false" id="406d-8707-c597-abd6">
+      <entryLinks>
+        <entryLink import="true" name="Detachment" hidden="false" type="selectionEntryGroup" id="6e25-4306-4115-8676" targetId="bfc1-eb63-c641-3ac4">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="4dc2-8250-9575-7e49"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="9b1e-c831-981-9b28"/>
+          </constraints>
+        </entryLink>
+      </entryLinks>
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="roster" shared="true" id="cfd1-1eb1-d0dd-4a4d"/>
+        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="f493-adf0-4a7e-b875"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink targetId="4ac9-fd30-1e3d-b249" id="9de6-1f3a-96f-e3a1" primary="true" name="Configuration"/>
+      </categoryLinks>
+    </selectionEntry>
   </sharedSelectionEntries>
   <categoryEntries>
     <categoryEntry name="Aegis Defence Line" hidden="false" id="a56a-23f-9ea1-d8ee"/>
@@ -1675,5 +1692,30 @@ Improve the Leadership and Objective Control characteristics of models in this u
       </characteristicTypes>
     </profileType>
   </profileTypes>
+  <sharedSelectionEntryGroups>
+    <selectionEntryGroup name="Detachment" hidden="false" id="bfc1-eb63-c641-3ac4">
+      <modifiers>
+        <modifier type="set" value="true" field="hidden">
+          <conditions>
+            <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="b0ae-12a5-c84-ea45" shared="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <selectionEntries>
+        <selectionEntry type="upgrade" import="true" name="Combined Regiment" hidden="false" id="67ce-ebd5-b428-e4f7">
+          <profiles>
+            <profile name="Born Soldiers" typeId="9cc3-6d83-4dd3-9b64" typeName="Abilities" hidden="false" id="dca5-9eb0-b65f-d1c1">
+              <characteristics>
+                <characteristic name="Description" typeId="9b8f-694b-e5e-b573">Each time an Astra Militarum unit from your army Remains Stationary, until the end of the turn, ranged weapons equipped by models in that unit have the [LETHAL HITS] ability.</characteristic>
+              </characteristics>
+            </profile>
+          </profiles>
+          <infoLinks>
+            <infoLink name="Lethal Hits" hidden="false" type="rule" id="dac0-f686-9164-51ca" targetId="d1d1-611e-5191-1095"/>
+          </infoLinks>
+        </selectionEntry>
+      </selectionEntries>
+    </selectionEntryGroup>
+  </sharedSelectionEntryGroups>
   <xmlns>http://www.battlescribe.net/schema/catalogueSchema</xmlns>
 </catalogue>
diff --git a/Imperium - Astra Militarum.cat b/Imperium - Astra Militarum.cat
@@ -57,36 +57,9 @@
     <entryLink import="true" name="Ursula Creed" hidden="false" type="selectionEntry" id="b455-c6f1-b37e-c3b7" targetId="b6b2-9971-ec0c-349e"/>
     <entryLink import="true" name="Valkyrie" hidden="false" type="selectionEntry" id="792-4a0b-303c-bf6c" targetId="9665-3160-8a04-d2bc"/>
     <entryLink import="true" name="Wyvern" hidden="false" type="selectionEntry" id="f9a6-cebc-48db-8236" targetId="d11b-c49d-41bf-1f36"/>
-    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="cd5f-2fc8-7d6f-9dee" targetId="8609-685f-f598-44d5">
-      <entryLinks>
-        <entryLink import="true" name="Detachment" hidden="false" type="selectionEntryGroup" id="6cf7-a7dd-e0ec-a6bd" targetId="debe-a7a6-c6-e3a6"/>
-      </entryLinks>
-    </entryLink>
+    <entryLink import="true" name="Detachment" hidden="false" type="selectionEntry" id="cd5f-2fc8-7d6f-9dee" targetId="5a84-ea91-b707-1656"/>
   </entryLinks>
   <sharedSelectionEntryGroups>
-    <selectionEntryGroup name="Detachment" hidden="false" id="debe-a7a6-c6-e3a6">
-      <modifiers>
-        <modifier type="set" value="true" field="hidden">
-          <conditions>
-            <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="b0ae-12a5-c84-ea45" shared="true"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <selectionEntries>
-        <selectionEntry type="upgrade" import="true" name="Combined Regiment" hidden="false" id="227f-61c6-910a-894e">
-          <profiles>
-            <profile name="Born Soldiers" typeId="9cc3-6d83-4dd3-9b64" typeName="Abilities" hidden="false" id="b7d1-1fcf-689-b03f">
-              <characteristics>
-                <characteristic name="Description" typeId="9b8f-694b-e5e-b573">Each time an Astra Militarum unit from your army Remains Stationary, until the end of the turn, ranged weapons equipped by models in that unit have the [LETHAL HITS] ability.</characteristic>
-              </characteristics>
-            </profile>
-          </profiles>
-          <infoLinks>
-            <infoLink name="Lethal Hits" hidden="false" type="rule" id="2a0d-4e55-601-f81c" targetId="d1d1-611e-5191-1095"/>
-          </infoLinks>
-        </selectionEntry>
-      </selectionEntries>
-    </selectionEntryGroup>
     <selectionEntryGroup name="Enhancements" hidden="false" id="d645-658a-5bc2-7abe">
       <selectionEntryGroups>
         <selectionEntryGroup name="Combined Regiment" hidden="false" id="5996-ed15-ca97-9e5e">