DW Points fix

BSData · Mar 5, 2021 · 86c94f5 · 86c94f5
1 parent 641e469
commit 86c94f5
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 28 deletions.
diff --git a/Deathwatch.cat b/Deathwatch.cat
@@ -10,12 +10,6 @@
       </characteristicTypes>
     </profileType>
   </profileTypes>
-  <categoryEntries>
-    <categoryEntry id="4fba-7c76-7dc8-8a49" name="Deathwatch Veteran" hidden="false"/>
-    <categoryEntry id="31e1-8ec4-0707-f4e2" name="Primaris" hidden="false"/>
-    <categoryEntry id="f9cc-54d5-6a6b-55d7" name="Intercessor" hidden="false"/>
-    <categoryEntry id="faaf-ba3e-797f-0c06" name="Reiver" hidden="false"/>
-  </categoryEntries>
   <selectionEntries>
     <selectionEntry id="d0f4-7192-a424-abc8" name="Gaius Acastian" hidden="false" collective="false" import="true" type="model">
       <modifiers>
@@ -1810,8 +1804,8 @@
         <categoryLink id="1319-8fed-08c8-947a" name="Imperium" hidden="false" targetId="8d6d-8c4b-f475-e74a" primary="false"/>
         <categoryLink id="d3af-d7ae-e35d-93c4" name="Adeptus Astartes" hidden="false" targetId="76f9-f77f-8300-3b37" primary="false"/>
         <categoryLink id="efdb-94a6-1744-f1e0" name="Infantry" hidden="false" targetId="96c1-32dc-d9dc-4678" primary="false"/>
-        <categoryLink id="4e06-3e9c-6698-d290" name="Deathwatch Veteran" hidden="false" targetId="4fba-7c76-7dc8-8a49" primary="false"/>
         <categoryLink id="0763-251b-54db-b75e" name="Model" hidden="false" targetId="50dd-a755-e02d-1c30" primary="false"/>
+        <categoryLink id="cb2f-c185-db1b-8ac4" name="Deathwatch Veteran" hidden="false" targetId="80dc-277c-5df2-1e92" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="e34b-075a-ec94-abf5" name="Frag and krak grenades" hidden="false" collective="false" import="true" targetId="cc75-b2ca-11ae-5e7f" type="selectionEntry"/>
@@ -1821,7 +1815,7 @@
         <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="14.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="fe35-3207-26cd-c3ce" name="Death Watch Veteran Gunner" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="fe35-3207-26cd-c3ce" name="Deathwatch Veteran Gunner" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="822d-22dc-828a-e4ae" value="4">
           <conditions>
@@ -1838,7 +1832,7 @@
         <constraint field="selections" scope="force" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="822d-22dc-828a-e4ae" type="max"/>
       </constraints>
       <profiles>
-        <profile id="2e6c-37a4-5868-725f" name="Veteran Gunner" hidden="false" typeId="bb0a-aba1-abd0-beb3" typeName="Model">
+        <profile id="2e6c-37a4-5868-725f" name="Deathwatch Veteran Gunner" hidden="false" typeId="bb0a-aba1-abd0-beb3" typeName="Model">
           <characteristics>
             <characteristic name="M" typeId="0a65-6cb0-f00d-e414">6&quot;</characteristic>
             <characteristic name="WS" typeId="99d4-2590-8bac-3ad3">3+</characteristic>
@@ -1862,8 +1856,8 @@
         <categoryLink id="418f-005f-26b4-802e" name="Imperium" hidden="false" targetId="8d6d-8c4b-f475-e74a" primary="false"/>
         <categoryLink id="76de-dcda-e34b-5915" name="Adeptus Astartes" hidden="false" targetId="76f9-f77f-8300-3b37" primary="false"/>
         <categoryLink id="f399-9992-a6e3-9724" name="Infantry" hidden="false" targetId="96c1-32dc-d9dc-4678" primary="false"/>
-        <categoryLink id="07ed-f68f-1580-05a8" name="Deathwatch Veteran" hidden="false" targetId="4fba-7c76-7dc8-8a49" primary="false"/>
         <categoryLink id="7c1f-b869-01f1-0c42" name="Model" hidden="false" targetId="50dd-a755-e02d-1c30" primary="false"/>
+        <categoryLink id="5276-e2aa-55ad-b753" name="Deathwatch Veteran" hidden="false" targetId="80dc-277c-5df2-1e92" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="8a9a-4425-27ba-52db" name="Frag and krak grenades" hidden="false" collective="false" import="true" targetId="cc75-b2ca-11ae-5e7f" type="selectionEntry"/>
@@ -1919,8 +1913,8 @@
         <categoryLink id="b88d-1087-0494-b183" name="Imperium" hidden="false" targetId="8d6d-8c4b-f475-e74a" primary="false"/>
         <categoryLink id="a2ef-c3ed-50c8-588a" name="Adeptus Astartes" hidden="false" targetId="76f9-f77f-8300-3b37" primary="false"/>
         <categoryLink id="065a-74cc-0c7b-a414" name="Infantry" hidden="false" targetId="96c1-32dc-d9dc-4678" primary="false"/>
-        <categoryLink id="460f-a805-7f90-d7f6" name="Deathwatch Veteran" hidden="false" targetId="4fba-7c76-7dc8-8a49" primary="false"/>
         <categoryLink id="d607-afbd-7888-5d25" name="Model" hidden="false" targetId="50dd-a755-e02d-1c30" primary="false"/>
+        <categoryLink id="4e51-9255-1a97-f0a2" name="Deathwatch Veteran" hidden="false" targetId="80dc-277c-5df2-1e92" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="e4a7-e3cf-107c-a759" name="Frag and krak grenades" hidden="false" collective="false" import="true" targetId="cc75-b2ca-11ae-5e7f" type="selectionEntry"/>
@@ -1971,8 +1965,8 @@
         <categoryLink id="da0c-8903-a279-a983" name="Imperium" hidden="false" targetId="8d6d-8c4b-f475-e74a" primary="false"/>
         <categoryLink id="8cc8-eb38-ba11-f3bd" name="Adeptus Astartes" hidden="false" targetId="76f9-f77f-8300-3b37" primary="false"/>
         <categoryLink id="183d-17cb-798a-d493" name="Infantry" hidden="false" targetId="96c1-32dc-d9dc-4678" primary="false"/>
-        <categoryLink id="b315-cd0f-12ee-b970" name="Deathwatch Veteran" hidden="false" targetId="4fba-7c76-7dc8-8a49" primary="false"/>
         <categoryLink id="1e62-6f48-beba-bb73" name="Model" hidden="false" targetId="50dd-a755-e02d-1c30" primary="false"/>
+        <categoryLink id="35d3-7de2-c77a-d6eb" name="Deathwatch Veteran" hidden="false" targetId="80dc-277c-5df2-1e92" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="4fb5-8f7c-ebe6-88a5" name="Frag and krak grenades" hidden="false" collective="false" import="true" targetId="cc75-b2ca-11ae-5e7f" type="selectionEntry"/>
@@ -2508,6 +2502,7 @@
               </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e2c4-85ec-c539-2340" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dc6e-daac-54a2-d7d5" type="max"/>
               </constraints>
             </entryLink>
             <entryLink id="00bf-474b-b198-a7fe" name="Combi-weapons" hidden="false" collective="false" import="true" targetId="03e3-689a-1443-24b0" type="selectionEntryGroup">
@@ -2552,6 +2547,9 @@
                 <constraint field="selections" scope="force" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="304c-90ba-a770-7185" type="max"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9377-38bd-8fad-c0b5" type="max"/>
               </constraints>
+              <costs>
+                <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="5.0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
@@ -2684,6 +2682,32 @@
         <entryLink id="a043-c082-45a0-29d6" name="Librarius Discipline" hidden="false" collective="false" import="true" targetId="c9a9-ab2f-e5e1-c419" type="selectionEntryGroup"/>
       </entryLinks>
     </selectionEntryGroup>
+    <selectionEntryGroup id="d5b1-2fc7-1197-1c00" name="Melee weapons" hidden="false" collective="false" import="true">
+      <entryLinks>
+        <entryLink id="d92f-e313-e481-f384" name="Lightning claw" hidden="false" collective="false" import="true" targetId="fa76-651f-322a-dee3" type="selectionEntry"/>
+        <entryLink id="3788-5208-0992-ff36" name="Power axe" hidden="false" collective="false" import="true" targetId="04f8-a3f8-7769-09fa" type="selectionEntry">
+          <costs>
+            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="2.0"/>
+          </costs>
+        </entryLink>
+        <entryLink id="54ef-1af9-e245-c39c" name="Power fist" hidden="false" collective="false" import="true" targetId="1689-c138-0775-3587" type="selectionEntry">
+          <costs>
+            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="4.0"/>
+          </costs>
+        </entryLink>
+        <entryLink id="a06a-12d9-09bb-9148" name="Power sword" hidden="false" collective="false" import="true" targetId="ecb3-8447-db60-da63" type="selectionEntry">
+          <costs>
+            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="2.0"/>
+          </costs>
+        </entryLink>
+        <entryLink id="a54f-395f-38b7-5e51" name="Thunder hammer" hidden="false" collective="false" import="true" targetId="0528-7cff-65ac-73f7" type="selectionEntry">
+          <costs>
+            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="8.0"/>
+          </costs>
+        </entryLink>
+        <entryLink id="d225-66c1-e994-a060" name="Astartes chainsword" hidden="false" collective="false" import="true" targetId="a4a3-5f51-7929-17df" type="selectionEntry"/>
+      </entryLinks>
+    </selectionEntryGroup>
   </sharedSelectionEntryGroups>
   <sharedProfiles>
     <profile id="2a62-fe9f-eb95-da50" name="And They Shall Know No Fear" hidden="false" typeId="1015-f0b1-9137-0060" typeName="Ability">

diff --git a/Space Marines.cat b/Space Marines.cat
@@ -35,6 +35,7 @@
     <categoryEntry id="7c9f-7633-8385-685f" name="Heavy Intercessor" hidden="false"/>
     <categoryEntry id="f689-a2c6-fc36-4dd0" name="Scout" hidden="false"/>
     <categoryEntry id="5a6d-4957-208c-738a" name="Bladeguard Veteran" hidden="false"/>
+    <categoryEntry id="80dc-277c-5df2-1e92" name="Deathwatch Veteran" hidden="false"/>
   </categoryEntries>
   <rules>
     <rule id="b9d3-f144-2eae-fe1b" name="Righteous Zeal (Black Templars)" hidden="false">
@@ -1068,7 +1069,7 @@
     </selectionEntry>
     <selectionEntry id="87cb-ba2f-b55c-b525" name="Combi-flamer" hidden="false" collective="false" import="true" type="upgrade">
       <modifiers>
-        <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="2">
+        <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="2.0">
           <conditions>
             <condition field="selections" scope="primary-catalogue" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7548-75cf-ab24-7e9c" type="instanceOf"/>
           </conditions>
@@ -1090,9 +1091,6 @@
         <infoLink id="cc5e-7c0b-6313-146d" name="Grav-gun" hidden="false" targetId="5f8c-dcfa-0a60-fe90" type="profile"/>
         <infoLink id="d66c-26b8-02db-03ce" name="Combi" hidden="false" targetId="bbac-ebf1-7aad-2858" type="profile"/>
       </infoLinks>
-      <costs>
-        <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="4.0"/>
-      </costs>
     </selectionEntry>
     <selectionEntry id="9458-28fc-1037-5630" name="Combi-melta" hidden="false" collective="false" import="true" type="upgrade">
       <modifiers>
@@ -8198,10 +8196,45 @@ The Primed Haywire Mine is represented by the Primed Haywire Mine model, but doe
     </selectionEntryGroup>
     <selectionEntryGroup id="03e3-689a-1443-24b0" name="Combi-weapons" hidden="false" collective="false" import="true">
       <entryLinks>
-        <entryLink id="4364-f1eb-2728-428d" name="Combi-flamer" hidden="false" collective="false" import="true" targetId="87cb-ba2f-b55c-b525" type="selectionEntry"/>
-        <entryLink id="0ecd-2a1f-92cf-a57a" name="Combi-grav" hidden="false" collective="false" import="true" targetId="4d41-aae8-4073-fcaf" type="selectionEntry"/>
-        <entryLink id="fda3-f932-e410-8321" name="Combi-melta" hidden="false" collective="false" import="true" targetId="9458-28fc-1037-5630" type="selectionEntry"/>
-        <entryLink id="ec54-8db8-f6ca-82d2" name="Combi-plasma" hidden="false" collective="false" import="true" targetId="e86f-4313-7f7b-ca18" type="selectionEntry"/>
+        <entryLink id="4364-f1eb-2728-428d" name="Combi-flamer" hidden="false" collective="false" import="true" targetId="87cb-ba2f-b55c-b525" type="selectionEntry">
+          <modifiers>
+            <modifier type="decrement" field="5291-dc2c-cfa5-a77f" value="2.0">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="80dc-277c-5df2-1e92" type="instanceOf"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </entryLink>
+        <entryLink id="0ecd-2a1f-92cf-a57a" name="Combi-grav" hidden="false" collective="false" import="true" targetId="4d41-aae8-4073-fcaf" type="selectionEntry">
+          <modifiers>
+            <modifier type="decrement" field="5291-dc2c-cfa5-a77f" value="2.0">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="80dc-277c-5df2-1e92" type="instanceOf"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+          <costs>
+            <cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="4.0"/>
+          </costs>
+        </entryLink>
+        <entryLink id="fda3-f932-e410-8321" name="Combi-melta" hidden="false" collective="false" import="true" targetId="9458-28fc-1037-5630" type="selectionEntry">
+          <modifiers>
+            <modifier type="decrement" field="5291-dc2c-cfa5-a77f" value="6.0">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="80dc-277c-5df2-1e92" type="instanceOf"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </entryLink>
+        <entryLink id="ec54-8db8-f6ca-82d2" name="Combi-plasma" hidden="false" collective="false" import="true" targetId="e86f-4313-7f7b-ca18" type="selectionEntry">
+          <modifiers>
+            <modifier type="decrement" field="5291-dc2c-cfa5-a77f" value="3.0">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="80dc-277c-5df2-1e92" type="instanceOf"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </entryLink>
         <entryLink id="a70c-f9ec-333a-dec2" name="Storm bolter" hidden="false" collective="false" import="true" targetId="fa76-84bc-7536-6c24" type="selectionEntry"/>
       </entryLinks>
     </selectionEntryGroup>
@@ -8257,17 +8290,11 @@ The Primed Haywire Mine is represented by the Primed Haywire Mine model, but doe
           </constraints>
         </entryLink>
         <entryLink id="fef3-6b28-40d0-7875" name="Power axe" hidden="false" collective="false" import="true" targetId="04f8-a3f8-7769-09fa" type="selectionEntry">
-          <modifiers>
-            <modifier type="set" field="5291-dc2c-cfa5-a77f" value="2"/>
-          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="da50-0f54-691f-1683" type="max"/>
           </constraints>
         </entryLink>
         <entryLink id="7b62-73b4-1a15-4014" name="Power fist" hidden="false" collective="false" import="true" targetId="1689-c138-0775-3587" type="selectionEntry">
-          <modifiers>
-            <modifier type="set" field="5291-dc2c-cfa5-a77f" value="4"/>
-          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="195d-7f34-470e-6fd6" type="max"/>
           </constraints>
@@ -8279,7 +8306,6 @@ The Primed Haywire Mine is represented by the Primed Haywire Mine model, but doe
                 <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="170b-c261-fa08-eb51" type="equalTo"/>
               </conditions>
             </modifier>
-            <modifier type="set" field="5291-dc2c-cfa5-a77f" value="1"/>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="54cc-3a0c-c3b7-a0c3" type="max"/>
@@ -8290,7 +8316,11 @@ The Primed Haywire Mine is represented by the Primed Haywire Mine model, but doe
         </entryLink>
         <entryLink id="8e4f-637c-9d60-7c34" name="Power sword" hidden="false" collective="false" import="true" targetId="ecb3-8447-db60-da63" type="selectionEntry">
           <modifiers>
-            <modifier type="set" field="5291-dc2c-cfa5-a77f" value="1"/>
+            <modifier type="set" field="5291-dc2c-cfa5-a77f" value="2.0">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="80dc-277c-5df2-1e92" type="instanceOf"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2df4-62aa-6fc3-c993" type="max"/>