Merge remote-tracking branch 'refs/remotes/origin/master' into FarseerV

ytrewq1994 · Oct 9, 2017 · 299b3aa · 299b3aa
2 parents 19dcb87 + 9949de6
commit 299b3aa
Show file tree

Hide file tree

Showing 23 changed files with 30,059 additions and 18,801 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 id="cb54-c035-5759-7697" name="Chaos - Chaos Space Marines" book="" revision="32" battleScribeVersion="2.01" authorName="BSData team" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="cb54-c035-5759-7697" name="Chaos - Chaos Space Marines" book="" revision="33" battleScribeVersion="2.01" authorName="BSData team" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -7381,7 +7381,33 @@
               <modifiers/>
               <constraints/>
               <categoryLinks/>
-              <selectionEntries/>
+              <selectionEntries>
+                <selectionEntry id="b840-c598-b0ce-1423" name="Plague knife" hidden="false" collective="false" type="upgrade">
+                  <profiles/>
+                  <rules/>
+                  <infoLinks>
+                    <infoLink id="4156-3413-b7b3-3113" name="Plague knife" hidden="false" targetId="b62d-7cc2-1b2a-ca61" type="profile">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers/>
+                    </infoLink>
+                  </infoLinks>
+                  <modifiers/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f745-5c71-dfb8-52b3" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="c25d-c64b-063c-5840" type="min"/>
+                  </constraints>
+                  <categoryLinks/>
+                  <selectionEntries/>
+                  <selectionEntryGroups/>
+                  <entryLinks/>
+                  <costs>
+                    <cost name="pts" costTypeId="points" value="0.0"/>
+                    <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
               <selectionEntryGroups>
                 <selectionEntryGroup id="2df9-534f-512f-fa1f" name="Weapon Options" hidden="false" collective="false">
                   <profiles/>
@@ -7412,14 +7438,7 @@
                         </profile>
                       </profiles>
                       <rules/>
-                      <infoLinks>
-                        <infoLink id="0359-81d7-d78c-2602" name="Plague knife" hidden="false" targetId="b62d-7cc2-1b2a-ca61" type="profile">
-                          <profiles/>
-                          <rules/>
-                          <infoLinks/>
-                          <modifiers/>
-                        </infoLink>
-                      </infoLinks>
+                      <infoLinks/>
                       <modifiers/>
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b7b9-1c32-9fc6-245b" type="max"/>
@@ -7433,17 +7452,10 @@
                         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
                       </costs>
                     </selectionEntry>
-                    <selectionEntry id="c1de-5504-30a7-093b" name="2x Plague knife" hidden="false" collective="false" type="upgrade">
+                    <selectionEntry id="c1de-5504-30a7-093b" name="2nd Plague knife" hidden="false" collective="false" type="upgrade">
                       <profiles/>
                       <rules/>
-                      <infoLinks>
-                        <infoLink id="365d-0099-2958-9f00" name="Plague knife" hidden="false" targetId="b62d-7cc2-1b2a-ca61" type="profile">
-                          <profiles/>
-                          <rules/>
-                          <infoLinks/>
-                          <modifiers/>
-                        </infoLink>
-                      </infoLinks>
+                      <infoLinks/>
                       <modifiers/>
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="92ec-68d2-7e30-73d0" type="max"/>

diff --git a/Chaos - Daemons.cat b/Chaos - Daemons.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="422a-a40e-3f7c-e8b3" name="Chaos - Daemons" book="Index: Chaos" revision="18" battleScribeVersion="2.01" authorName="BSData team" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="422a-a40e-3f7c-e8b3" name="Chaos - Daemons" book="Index: Chaos" revision="19" battleScribeVersion="2.01" authorName="BSData team" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -6630,9 +6630,9 @@
             <cost name="pts" costTypeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="fa5e-8d7f-da9d-0173" name="Blue Horrors" hidden="false" collective="false" type="upgrade">
+        <selectionEntry id="f6a9-2145-250d-0ec0" name="Blue Horrors" hidden="false" collective="false" type="upgrade">
           <profiles>
-            <profile id="59d7-be86-3cff-1d8c" name="Irritating Chant" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" profileTypeName="Abilities">
+            <profile id="d78b-770b-5947-4ca5" name="Irritating Chant" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" profileTypeName="Abilities">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -6646,24 +6646,12 @@
           <infoLinks/>
           <modifiers/>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2f29-a90d-087d-97db" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="545b-2bc0-454a-fdee" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="64a8-bc3e-2201-025a" name="Blue Horror" hidden="false" targetId="e629-dd59-ff66-f368" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints>
-                <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="82fd-cabc-065d-a6b3" type="max"/>
-                <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e1e9-4946-96dc-908f" type="min"/>
-              </constraints>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
+          <entryLinks/>
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="0.0"/>