Chaos Fixes

Fixes BSData#1287 - Corrected Chosen weapon validation Fixes BSData#1281 - Corrected Fallen power fist cost Fixes BSData#1280 - Fixed Character artefact validation
happykat76 · Aug 18, 2017 · b419c1f · b419c1f
1 parent 1a468c6
commit b419c1f
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 40 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="28" 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="29" 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/>
@@ -8218,7 +8218,7 @@
           </constraints>
           <categoryLinks/>
         </entryLink>
-        <entryLink id="7da4-8292-707f-42db" name="New EntryLink" hidden="false" targetId="45e8-d3d1-105b-90a3" type="selectionEntryGroup">
+        <entryLink id="7da4-8292-707f-42db" name="Mark of Chaos" hidden="false" targetId="45e8-d3d1-105b-90a3" type="selectionEntryGroup">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -8391,7 +8391,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b139-c27b-07d6-b893" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9a64-a86a-7b1a-153a" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="821a-89f2-1d94-50d5" name="New CategoryLink" hidden="false" targetId="012f-abfc-397b-3519" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -8581,7 +8589,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="af17-3ffd-6ae4-39af" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ad34-bf0e-5566-b4f6" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="8e03-e6aa-1fad-5a29" name="New CategoryLink" hidden="false" targetId="dfc5-aa04-9546-1b4c" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -8670,13 +8686,7 @@
           <modifiers/>
         </infoLink>
       </infoLinks>
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <repeats/>
-          <conditions/>
-          <conditionGroups/>
-        </modifier>
-      </modifiers>
+      <modifiers/>
       <constraints/>
       <categoryLinks>
         <categoryLink id="8741-004e-9a3b-3279" name="New CategoryLink" hidden="false" targetId="848a6ff2-0def-4c72-8433-ff7da70e6bc7" primary="true">
@@ -8768,7 +8778,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3616-d332-c1ee-8c14" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eebc-6cac-d1da-3c64" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="a1bb-0bf3-75b6-96e4" name="New CategoryLink" hidden="false" targetId="0fb6-fcaf-b180-5dda" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -8863,20 +8881,7 @@
           <modifiers/>
         </infoLink>
       </infoLinks>
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <repeats/>
-          <conditions/>
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5bd5-2b7c-e518-0514" type="greaterThan"/>
-              </conditions>
-              <conditionGroups/>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
+      <modifiers/>
       <constraints/>
       <categoryLinks>
         <categoryLink id="595f-c5ee-50cd-0a9b" name="New CategoryLink" hidden="false" targetId="848a6ff2-0def-4c72-8433-ff7da70e6bc7" primary="true">
@@ -8968,7 +8973,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a33e-fda6-3ae5-591b" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d724-d375-f983-1490" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="e9a7-02a5-bfef-dc2d" name="New CategoryLink" hidden="false" targetId="1da2-76db-f76f-6b6c" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -9944,7 +9957,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ff4d-de9b-a63e-1aa5" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bbcc-e593-2162-0582" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="1f4e-2d1d-f3cb-7717" name="New CategoryLink" hidden="false" targetId="012f-abfc-397b-3519" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -9955,7 +9976,7 @@
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="d860-913c-1041-e450" name="Force sword options" hidden="false" collective="false">
+        <selectionEntryGroup id="d860-913c-1041-e450" name="Force sword options" hidden="false" collective="false" defaultSelectionEntryId="d8e5-eca2-dd42-c22b">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -10214,7 +10235,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4e6c-bc7b-4d54-3ac8" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8ff5-5706-b6a8-9ca2" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="99ad-1088-c3fd-7a47" name="New CategoryLink" hidden="false" targetId="0fb6-fcaf-b180-5dda" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -10490,7 +10519,15 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e017-a0d3-652b-76ff" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d89a-21d5-fe76-bb79" type="min"/>
           </constraints>
-          <categoryLinks/>
+          <categoryLinks>
+            <categoryLink id="87f1-01bd-7e0d-7db8" name="New CategoryLink" hidden="false" targetId="1da2-76db-f76f-6b6c" primary="false">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints/>
+            </categoryLink>
+          </categoryLinks>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks/>
@@ -12076,12 +12113,18 @@
                       </conditions>
                       <conditionGroups/>
                     </modifier>
-                    <modifier type="set" field="c354-4838-2702-0ae3" value="0.0">
+                    <modifier type="set" field="c354-4838-2702-0ae3" value="0">
                       <repeats/>
-                      <conditions>
-                        <condition field="selections" scope="64c8-ad43-da9e-da82" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="83be-1ba9-c326-4760" type="equalTo"/>
-                      </conditions>
-                      <conditionGroups/>
+                      <conditions/>
+                      <conditionGroups>
+                        <conditionGroup type="and">
+                          <conditions>
+                            <condition field="selections" scope="64c8-ad43-da9e-da82" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0dd1-2e2b-7dd1-5495" type="equalTo"/>
+                            <condition field="selections" scope="64c8-ad43-da9e-da82" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="83be-1ba9-c326-4760" type="equalTo"/>
+                          </conditions>
+                          <conditionGroups/>
+                        </conditionGroup>
+                      </conditionGroups>
                     </modifier>
                   </modifiers>
                   <constraints>
@@ -16547,6 +16590,15 @@
             <characteristic name="Abilities" characteristicTypeId="837d-5e63-aeb7-1410" value="This weapon wound on a 2+, unless the target is a VEHICLE, in which case roll to wound as normal."/>
           </characteristics>
         </profile>
+        <profile id="c501-4606-5ffa-c6cf" name="Puscleaver" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" profileTypeName="Abilities">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <characteristics>
+            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="Models with a power sword only. Puscleaver replaces the bearer&apos;s power sword."/>
+          </characteristics>
+        </profile>
       </profiles>
       <rules/>
       <infoLinks/>
@@ -18916,6 +18968,7 @@
           </entryLinks>
           <costs>
             <cost name="pts" costTypeId="points" value="16.0"/>
+            <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="221e-aa23-f632-09a2" name="Chosen" hidden="false" collective="false" type="model">
@@ -18967,6 +19020,7 @@
           </entryLinks>
           <costs>
             <cost name="pts" costTypeId="points" value="16.0"/>
+            <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="0501-2870-cf9f-e27a" name="Chosen" hidden="false" collective="false" type="model">
@@ -19007,6 +19061,7 @@
           </entryLinks>
           <costs>
             <cost name="pts" costTypeId="points" value="16.0"/>
+            <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="00af-706c-b0ef-440d" name="Chosen" hidden="false" collective="false" type="model">
@@ -19075,6 +19130,7 @@
           </entryLinks>
           <costs>
             <cost name="pts" costTypeId="points" value="16.0"/>
+            <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="18e1-6b29-d07f-fd11" name="Chosen" hidden="false" collective="false" type="model">
@@ -19126,13 +19182,15 @@
           </entryLinks>
           <costs>
             <cost name="pts" costTypeId="points" value="16.0"/>
+            <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups/>
       <entryLinks/>
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="8.0"/>
+        <cost name="pts" costTypeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
   </sharedSelectionEntries>
@@ -19241,7 +19299,7 @@
           <constraints/>
           <categoryLinks/>
         </entryLink>
-        <entryLink id="1182-a564-2732-1f71" name="New EntryLink" hidden="false" targetId="0dd1-2e2b-7dd1-5495" type="selectionEntry">
+        <entryLink id="1182-a564-2732-1f71" name="Chainsword" hidden="false" targetId="0dd1-2e2b-7dd1-5495" type="selectionEntry">
           <profiles/>
           <rules/>
           <infoLinks/>

diff --git a/Warhammer 40,000 8th Edition.gst b/Warhammer 40,000 8th Edition.gst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="28ec-711c-d87f-3aeb" name="Warhammer 40,000 8th Edition" revision="22" battleScribeVersion="2.01" authorName="BSData Organisation" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="28ec-711c-d87f-3aeb" name="Warhammer 40,000 8th Edition" revision="23" battleScribeVersion="2.01" authorName="BSData Organisation" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -7156,7 +7156,13 @@
                           <profiles/>
                           <rules/>
                           <infoLinks/>
-                          <modifiers/>
+                          <modifiers>
+                            <modifier type="set" field="points" value="12">
+                              <repeats/>
+                              <conditions/>
+                              <conditionGroups/>
+                            </modifier>
+                          </modifiers>
                           <constraints/>
                           <categoryLinks/>
                         </entryLink>
@@ -8783,7 +8789,13 @@
           <profiles/>
           <rules/>
           <infoLinks/>
-          <modifiers/>
+          <modifiers>
+            <modifier type="set" field="points" value="12">
+              <repeats/>
+              <conditions/>
+              <conditionGroups/>
+            </modifier>
+          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e883-e5b9-8fac-a668" type="max"/>
           </constraints>