Fixing fatal merge - see BSData#5204 (BSData#5214)

fixing BSData#5204
happykat76 · Jun 16, 2019 · 2c816d5 · 2c816d5
1 parent f12c0a3
commit 2c816d5
Show file tree

Hide file tree

Showing 13 changed files with 813 additions and 541 deletions.
diff --git a/Aeldari - Craftworlds.cat b/Aeldari - Craftworlds.cat
diff --git a/Aeldari - Drukhari.cat b/Aeldari - Drukhari.cat
@@ -6887,7 +6887,7 @@
       <profiles>
         <profile id="95b0-5e74-c409-5995" name="Spirit Vortex" hidden="false" typeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" typeName="Weapon">
           <characteristics>
-            <characteristic name="Range" typeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464">8&quot;</characteristic>
+            <characteristic name="Range" typeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464">18&quot;</characteristic>
             <characteristic name="Type" typeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2">Asssault D6</characteristic>
             <characteristic name="S" typeId="59b1-319e-ec13-d466">3</characteristic>
             <characteristic name="AP" typeId="75aa-a838-b675-6484">-2</characteristic>

diff --git a/Chaos - Chaos Space Marines.cat b/Chaos - Chaos Space Marines.cat
@@ -14577,9 +14577,18 @@ If your summoning roll included any doubles, your character then suffers a morta
         <selectionEntryGroup id="b658-0a23-a691-e256" name="Codex" hidden="false" collective="false">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ae09-117e-a6fa-316b" 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="a675-3934-815b-7d5e" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="99d7-f254-4967-afe4" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c623-e693-f04a-841a" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d252-6d80-3f9a-1352" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b63b-82db-05ab-5b24" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f1dd-d8b2-1fd2-7fd6" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
           </modifiers>
           <constraints>
@@ -14834,22 +14843,15 @@ If your summoning roll included any doubles, your character then suffers a morta
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditionGroups>
-                <conditionGroup type="or">
+                <conditionGroup type="and">
                   <conditions>
-                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ae09-117e-a6fa-316b" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a675-3934-815b-7d5e" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="99d7-f254-4967-afe4" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c623-e693-f04a-841a" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d252-6d80-3f9a-1352" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b63b-82db-05ab-5b24" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f1dd-d8b2-1fd2-7fd6" type="equalTo"/>
                   </conditions>
-                  <conditionGroups>
-                    <conditionGroup type="and">
-                      <conditions>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a675-3934-815b-7d5e" type="equalTo"/>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="99d7-f254-4967-afe4" type="equalTo"/>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c623-e693-f04a-841a" type="equalTo"/>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d252-6d80-3f9a-1352" type="equalTo"/>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b63b-82db-05ab-5b24" type="equalTo"/>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f1dd-d8b2-1fd2-7fd6" type="equalTo"/>
-                      </conditions>
-                    </conditionGroup>
-                  </conditionGroups>
                 </conditionGroup>
               </conditionGroups>
             </modifier>
@@ -14935,14 +14937,9 @@ If your summoning roll included any doubles, your character then suffers a morta
         <selectionEntryGroup id="34a3-f92e-e4e1-5c56" name="Black Legion (Vigilus)" hidden="false" collective="false">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="37cd-2830-725b-a321" type="equalTo"/>
-                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ae09-117e-a6fa-316b" type="equalTo"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
+              <conditions>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="37cd-2830-725b-a321" type="equalTo"/>
+              </conditions>
             </modifier>
           </modifiers>
           <constraints>

diff --git a/Chaos - FW Heretic Astartes.cat b/Chaos - FW Heretic Astartes.cat
@@ -1185,6 +1185,11 @@
                 <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3905-13bd-8d33-8ac7" type="max"/>
               </constraints>
             </entryLink>
+            <entryLink id="8023-7ca1-3e74-9112" name="Multi-melta" hidden="false" collective="false" targetId="2b37-65ee-9443-b4ef" type="selectionEntry">
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cd1a-50d4-6965-1838" type="max"/>
+              </constraints>
+            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
         <selectionEntryGroup id="cacb-0958-50be-ae0f" name="Combi-bolter option" hidden="false" collective="false" defaultSelectionEntryId="d5eb-8728-4916-a32a">

diff --git a/Chaos - FW Renegade and Heretics.cat b/Chaos - FW Renegade and Heretics.cat
@@ -3394,7 +3394,7 @@
         <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="517d-ad0d-cf72-801f" name="Renegade Militia Squad" hidden="false" collective="false" type="unit">
+    <selectionEntry id="517d-ad0d-cf72-801f" name="Renegade Militia Squad" publicationId="2ebb-7865-pubN65537" page="85" hidden="false" collective="false" type="unit">
       <modifiers>
         <modifier type="increment" field="e356-c769-5920-6e14" value="3">
           <conditions>

diff --git a/Chaos - Servants of the Abyss.cat b/Chaos - Servants of the Abyss.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="9837-3435-7452-d14b" name="Chaos - Servants of the Abyss" revision="3" battleScribeVersion="2.02" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="58" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="9837-3435-7452-d14b" name="Chaos - Servants of the Abyss" revision="4" battleScribeVersion="2.02" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="58" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="9837-3435-pubN65537" name="Blackstone Fortress"/>
   </publications>
@@ -385,6 +385,19 @@
                 <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">If your army is Battle-forged, you can only include this unit in a Detachment which also includes OBSIDIUS MALLEX. Furthermore, this unit does not take up slots in a Detachment that includes OBSIDIUS MALLEX.</characteristic>
               </characteristics>
             </profile>
+            <profile id="c364-99e6-3f8d-b9ed" name="Black Legionnaire" hidden="false" typeId="800f-21d0-4387-c943" typeName="Unit">
+              <characteristics>
+                <characteristic name="M" typeId="0bdf-a96e-9e38-7779">6&quot;</characteristic>
+                <characteristic name="WS" typeId="e7f0-1278-0250-df0c">3+</characteristic>
+                <characteristic name="BS" typeId="381b-eb28-74c3-df5f">3+</characteristic>
+                <characteristic name="S" typeId="2218-aa3c-265f-2939">4</characteristic>
+                <characteristic name="T" typeId="9c9f-9774-a358-3a39">4</characteristic>
+                <characteristic name="W" typeId="f330-5e6e-4110-0978">1</characteristic>
+                <characteristic name="A" typeId="13fc-b29b-31f2-ab9f">1</characteristic>
+                <characteristic name="Ld" typeId="00ca-f8b8-876d-b705">7</characteristic>
+                <characteristic name="Save" typeId="c0df-df94-abd7-e8d3">3+</characteristic>
+              </characteristics>
+            </profile>
           </profiles>
           <infoLinks>
             <infoLink id="e8d3-6804-9e91-537c" name="Servants of the Abyss" hidden="false" targetId="50ce-cc4f-7ac1-6a22" type="rule"/>

diff --git a/Imperium - Adeptus Custodes.cat b/Imperium - Adeptus Custodes.cat
@@ -2611,7 +2611,7 @@
               <modifiers>
                 <modifier type="set" field="points" value="20">
                   <conditions>
-                    <condition field="selections" scope="61ec-5001-5fc8-999d" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="33ce-f632-7d21-e85c" type="equalTo"/>
+                    <condition field="selections" scope="61ec-5001-5fc8-999d" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="33ce-f632-7d21-e85c" type="equalTo"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -2630,7 +2630,7 @@
               <modifiers>
                 <modifier type="set" field="points" value="20">
                   <conditions>
-                    <condition field="selections" scope="61ec-5001-5fc8-999d" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="85cb-2db7-4303-607b" type="equalTo"/>
+                    <condition field="selections" scope="61ec-5001-5fc8-999d" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="85cb-2db7-4303-607b" type="equalTo"/>
                   </conditions>
                 </modifier>
               </modifiers>