Merge branch 'main' of https://github.com/BSData/wh40k-10e

BSData · Oct 17, 2023 · 55392de · 55392de
2 parents b41d4ba + 16b1d99
commit 55392de
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 27 deletions.
diff --git a/Chaos - Chaos Space Marines.cat b/Chaos - Chaos Space Marines.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="c8da-e875-58f7-f6d6" name="Chaos - Chaos Space Marines" revision="28" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="c8da-e875-58f7-f6d6" name="Chaos - Chaos Space Marines" revision="29" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
   <profileTypes>
     <profileType id="3084-68b8-1d20-2f26" name="Marks of Chaos">
       <characteristicTypes>
@@ -1389,7 +1389,7 @@
         <cost name="pts" typeId="51b2-306e-1021-d207" value="195"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="cd9c-96e7-6dcb-bedf" name="Fabius Bile" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="cd9c-96e7-6dcb-bedf" name="Fabius Bile" hidden="false" collective="false" import="true" type="unit">
       <constraints>
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="d542-4b6-6728-981e" type="max"/>
       </constraints>
@@ -1424,7 +1424,7 @@
         <categoryLink id="4537-768d-e071-ecbb" name="Epic Hero" hidden="false" targetId="4f3a-f0f7-6647-348d" primary="true"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="9ddb-d7c2-e120-9b1d" name="Fabius Bile" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="9ddb-d7c2-e120-9b1d" name="Fabius Bile" hidden="false" collective="false" import="true" type="model">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="af01-5c56-c92-c801" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4ef2-ef5c-fca3-9388" type="max"/>
@@ -1531,7 +1531,7 @@
             <cost name="pts" typeId="51b2-306e-1021-d207" value="0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="d523-2913-1201-3284" name="Surgeon Acolyte" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="d523-2913-1201-3284" name="Surgeon Acolyte" hidden="false" collective="false" import="true" type="model">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8d0b-b6eb-f874-df25" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="838d-f91-4eeb-9529" type="max"/>
@@ -1606,6 +1606,16 @@
             <characteristic name="Description" typeId="9b8f-694b-e5e-b573">Each time an enemy unit is selected to shoot, if one or more of those attacks target a friendly HERETIC ASTARTES unit within 3&quot; of this model, after that enemy unit has finished making its attacks, this model can shoot as if it were your Shooting phase, but when doing so it must target only that enemy unit (and only if it is an eligible target).</characteristic>
           </characteristics>
         </profile>
+        <profile name="Cypher" typeId="c547-1836-d8a-ff4f" typeName="Unit" hidden="false" id="62b5-7c85-3be5-28bc">
+          <characteristics>
+            <characteristic name="M" typeId="e703-ecb6-5ce7-aec1">6&quot;</characteristic>
+            <characteristic name="T" typeId="d29d-cf75-fc2d-34a4">4</characteristic>
+            <characteristic name="SV" typeId="450-a17e-9d5e-29da">3+</characteristic>
+            <characteristic name="W" typeId="750a-a2ec-90d3-21fe">5</characteristic>
+            <characteristic name="LD" typeId="58d2-b879-49c7-43bc">6+</characteristic>
+            <characteristic name="OC" typeId="bef7-942a-1a23-59f8">1</characteristic>
+          </characteristics>
+        </profile>
       </profiles>
       <infoLinks>
         <infoLink id="702c-9673-253e-2100" name="Dark Pacts" hidden="false" targetId="fd69-68cc-5d63-c84d" type="rule"/>
@@ -3869,7 +3879,11 @@ You can attach this model to one of the above units even if one other CHARACTER
               </selectionEntries>
               <entryLinks>
                 <entryLink id="b32-e48-57b8-ad3b" name="Bolt pistol" hidden="false" collective="false" import="true" targetId="ce4a-6df3-3c24-621b" type="selectionEntry"/>
-                <entryLink id="5385-7f51-1d3-a579" name="Plasma pistol" hidden="false" collective="false" import="true" targetId="14a5-4b2-415a-c1d" type="selectionEntry"/>
+                <entryLink id="5385-7f51-1d3-a579" name="Plasma pistol" hidden="false" collective="false" import="true" targetId="14a5-4b2-415a-c1d" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="fecc-eb85-46b6-8f31" shared="true" id="b97d-b35a-b61f-daac" includeChildSelections="true"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
@@ -4232,14 +4246,15 @@ You can attach this model to one of the above units even if one other CHARACTER
                         <cost name="pts" typeId="51b2-306e-1021-d207" value="0"/>
                       </costs>
                     </selectionEntry>
-                  </selectionEntries>
-                  <entryLinks>
-                    <entryLink id="8d41-3ff2-ffbf-1fde" name="Plasma pistol" hidden="false" collective="false" import="true" targetId="14a5-4b2-415a-c1d" type="selectionEntry">
+                    <selectionEntry type="upgrade" import="true" name="Plasma pistol" hidden="false" id="b63d-1885-e026-9de6">
+                      <infoLinks>
+                        <infoLink name="Plasma pistol" hidden="false" type="infoGroup" id="1e83-c864-87d6-7add" targetId="f6bd-a5e5-dfcd-a086"/>
+                      </infoLinks>
                       <constraints>
-                        <constraint field="selections" scope="615-e6bf-cfd2-9384" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a5d8-984e-af7e-b5e6" type="max"/>
+                        <constraint type="max" value="1" field="selections" scope="615-e6bf-cfd2-9384" shared="true" id="92c5-7840-2706-b9fe" includeChildSelections="true"/>
                       </constraints>
-                    </entryLink>
-                  </entryLinks>
+                    </selectionEntry>
+                  </selectionEntries>
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <entryLinks>

diff --git a/Imperium - Deathwatch.cat b/Imperium - Deathwatch.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="f89b-84e0-6e3b-f1e2" name="Imperium - Adeptus Astartes - Deathwatch" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="11" battleScribeVersion="2.03" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="f89b-84e0-6e3b-f1e2" name="Imperium - Adeptus Astartes - Deathwatch" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="12" battleScribeVersion="2.03" type="catalogue">
   <catalogueLinks>
     <catalogueLink type="catalogue" name="Imperium - Space Marines" id="87c0-221-ecf8-5190" targetId="e0af-67df-9d63-8fb7" importRootEntries="true"/>
     <catalogueLink type="catalogue" name="Imperium - Imperial Agents" id="7f14-274f-6355-56bb" targetId="b00-cd86-4b4c-97ba" importRootEntries="true"/>
@@ -1314,7 +1314,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
         <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="349b-ce38-c1e9-d222"/>
       </constraints>
       <selectionEntries>
-        <selectionEntry type="upgrade" import="true" name="Chaplain Cassius" hidden="false" id="92eb-83bc-dcff-9386">
+        <selectionEntry type="model" import="true" name="Chaplain Cassius" hidden="false" id="92eb-83bc-dcff-9386">
           <categoryLinks>
             <categoryLink targetId="4f3a-f0f7-6647-348d" id="e353-d81a-188-8b86" primary="false" name="Epic Hero"/>
             <categoryLink targetId="9cfd-1c32-585f-7d5c" id="ce01-a32c-1053-c4f6" primary="false" name="Character"/>
@@ -1371,7 +1371,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </selectionEntry>
           </selectionEntries>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Vael Donatus" hidden="false" id="fe0a-b5eb-1e1a-21bc">
+        <selectionEntry type="model" import="true" name="Vael Donatus" hidden="false" id="fe0a-b5eb-1e1a-21bc">
           <constraints>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="e6e-3cee-b48f-b72b"/>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="d3b3-6143-21d5-424a"/>
@@ -1424,7 +1424,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </entryLink>
           </entryLinks>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Zameon Gydrael" hidden="false" id="743c-f14-a2c2-a12c">
+        <selectionEntry type="model" import="true" name="Zameon Gydrael" hidden="false" id="743c-f14-a2c2-a12c">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="d4a5-e2d0-e3-9e31"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="5777-4ba6-4d5a-1841"/>
@@ -1456,7 +1456,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </entryLink>
           </entryLinks>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Rodricus Grytt" hidden="false" id="572c-d3a3-e597-94a3">
+        <selectionEntry type="model" import="true" name="Rodricus Grytt" hidden="false" id="572c-d3a3-e597-94a3">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="9294-b7d5-ba47-4624"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3124-ea7d-9e24-6365"/>
@@ -1527,7 +1527,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </entryLink>
           </entryLinks>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Antor Delassio" hidden="false" id="16d6-b842-a1d1-2d77">
+        <selectionEntry type="model" import="true" name="Antor Delassio" hidden="false" id="16d6-b842-a1d1-2d77">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="90c4-63a1-d491-c487"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3155-9560-67f5-efde"/>
@@ -1564,7 +1564,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </entryLink>
           </entryLinks>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Edryc Setorax" hidden="false" id="9636-f9b-1bbf-14b9">
+        <selectionEntry type="model" import="true" name="Edryc Setorax" hidden="false" id="9636-f9b-1bbf-14b9">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="1b32-c01d-4c23-7c10"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a143-4711-ee-3eb9"/>
@@ -1611,7 +1611,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </selectionEntry>
           </selectionEntries>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Jensus Natorian" hidden="false" id="16b6-4055-1e55-27d5">
+        <selectionEntry type="model" import="true" name="Jensus Natorian" hidden="false" id="16b6-4055-1e55-27d5">
           <constraints>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="782-2435-ce77-4d58"/>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="d3a5-e9d1-fcba-9c5a"/>
@@ -1688,7 +1688,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </entryLink>
           </entryLinks>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Drenn Redblade" hidden="false" id="b42a-2552-4350-e1d1">
+        <selectionEntry type="model" import="true" name="Drenn Redblade" hidden="false" id="b42a-2552-4350-e1d1">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="1a58-5fc1-eb81-93be"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="65fa-66af-377c-113d"/>
@@ -1720,7 +1720,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </entryLink>
           </entryLinks>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Garran Branatar" hidden="false" id="7e27-9914-e88-5858">
+        <selectionEntry type="model" import="true" name="Garran Branatar" hidden="false" id="7e27-9914-e88-5858">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="2f08-c19d-c797-50f"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8054-8547-6f51-9092"/>
@@ -1795,7 +1795,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </profile>
           </profiles>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Ennox Sorrlock" hidden="false" id="3722-72d6-5151-5003">
+        <selectionEntry type="model" import="true" name="Ennox Sorrlock" hidden="false" id="3722-72d6-5151-5003">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="61d0-fe42-c171-cec6"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="e121-1d56-33d3-6492"/>
@@ -1842,7 +1842,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
             </selectionEntry>
           </selectionEntries>
         </selectionEntry>
-        <selectionEntry type="upgrade" import="true" name="Jetek Suberei" hidden="false" id="cd4a-d623-f7b6-b8e6">
+        <selectionEntry type="model" import="true" name="Jetek Suberei" hidden="false" id="cd4a-d623-f7b6-b8e6">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="b3b3-1414-7cae-ec8b"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="9517-9c85-56f6-f33e"/>
@@ -4259,7 +4259,7 @@ In addition, that unit can be targeted with a Stratagem even while it is Battle-
                 </entryLink>
               </entryLinks>
             </selectionEntry>
-            <selectionEntry type="upgrade" import="true" name="Kill Team Infiltrator w/ Combat knife" hidden="false" id="ef1-426f-69f6-a9b5">
+            <selectionEntry type="model" import="true" name="Kill Team Infiltrator w/ Combat knife" hidden="false" id="ef1-426f-69f6-a9b5">
               <constraints>
                 <constraint type="max" value="4" field="selections" scope="parent" shared="true" id="cbe4-a6a3-1d10-b9b6"/>
               </constraints>

diff --git a/Necrons.cat b/Necrons.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="b654-a18a-ea1-3bf2" name="Xenos - Necrons" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="20" battleScribeVersion="2.03" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="b654-a18a-ea1-3bf2" name="Xenos - Necrons" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="21" battleScribeVersion="2.03" type="catalogue">
   <sharedSelectionEntryGroups>
     <selectionEntryGroup name="Enhancements" hidden="false" id="9574-b5d1-8b0a-d95d">
       <constraints>
@@ -2229,8 +2229,8 @@ You can attach this model to one of the above units even if one ROYAL WARDEN or
       <selectionEntries>
         <selectionEntry type="upgrade" import="true" name="Atomiser beam" hidden="false" id="3dcb-6d4a-632b-b2c5">
           <constraints>
-            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="a208-4435-4415-bc0d"/>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="cfc-323a-1983-27ea"/>
+            <constraint type="min" value="2" field="selections" scope="parent" shared="true" id="a208-4435-4415-bc0d"/>
+            <constraint type="max" value="2" field="selections" scope="parent" shared="true" id="cfc-323a-1983-27ea"/>
           </constraints>
           <profiles>
             <profile name="Atomiser beam" typeId="f77d-b953-8fa4-b762" typeName="Ranged Weapons" hidden="false" id="600b-6620-1a45-3eb">