Merge pull request #1379 from BSData/cartag

Cartag
BSData · Jul 13, 2020 · 0452916 · 0452916
2 parents 4b8b238 + 7781678
commit 0452916
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 1,645 deletions.
diff --git a/Age of Sigmar.gst b/Age of Sigmar.gst
diff --git a/Chaos - Beasts of Chaos - Data.cat b/Chaos - Beasts of Chaos - Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="a990-882b-7e62-27e9" name="Chaos - Beasts of Chaos - Data" revision="20" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="59" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="a990-882b-7e62-27e9" name="Chaos - Beasts of Chaos - Data" revision="21" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="59" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="c9b2-1fe6-pubN65537" name="Battletome: Beasts of Chaos"/>
     <publication id="c9b2-1fe6-pubN83353" name="1"/>
@@ -1677,7 +1677,7 @@
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="100.0"/>
+        <cost name="pts" typeId="points" value="90.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="463c-335b-796c-ffb2" name="Chaos Spawn" hidden="false" collective="false" import="true" type="unit">
@@ -2411,7 +2411,7 @@
         <entryLink id="4aeb-723f-4f52-a4a5" name="Spell Lores" hidden="false" collective="false" import="true" targetId="55d3-fe2c-594d-4e2b" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="180.0"/>
+        <cost name="pts" typeId="points" value="170.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6bec-d4e0-72ef-77e0" name="Dragon Ogors" hidden="false" collective="false" import="true" type="unit">
@@ -2456,7 +2456,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9cd6-4be4-5df8-d324" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="140.0"/>
+            <cost name="pts" typeId="points" value="130.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="c50b-7992-04c5-da5a" name="Raking Foreclaws" hidden="false" collective="false" import="true" type="upgrade">
@@ -3645,7 +3645,7 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f34d-9042-2836-caaf" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="190.0"/>
+            <cost name="pts" typeId="points" value="160.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3856,7 +3856,7 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d677-ed5d-3500-a6c8" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="190.0"/>
+            <cost name="pts" typeId="points" value="180.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3959,7 +3959,7 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4408-dc31-e170-b9f7" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="200.0"/>
+            <cost name="pts" typeId="points" value="180.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4230,7 +4230,7 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1bc1-cf51-0057-2f37" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="200.0"/>
+            <cost name="pts" typeId="points" value="180.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>

diff --git a/Chaos - Khorne.cat b/Chaos - Khorne.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="cac4-1eec-d548-b34d" name="Chaos - Khorne" revision="50" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="cac4-1eec-d548-b34d" name="Chaos - Khorne" revision="52" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="61" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="cac4-1eec-pubN65537" name="Chaos Battletome: Blades of Khorne"/>
     <publication id="cac4-1eec-pubN105675" name="Grand Alliance: Chaos"/>
@@ -4515,7 +4515,7 @@
         <entryLink id="1e73-3155-1e65-365a" name="General" hidden="false" collective="false" import="true" targetId="7ab9-de0a-88c2-4fd1" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="440.0"/>
+        <cost name="pts" typeId="points" value="410.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3c49-5d28-4581-6b78" name="Chaos Spawn" hidden="false" collective="false" import="true" type="unit">
@@ -5655,7 +5655,7 @@
         <entryLink id="1621-6d75-5b8f-5328" name="General" hidden="false" collective="false" import="true" targetId="7ab9-de0a-88c2-4fd1" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="1200.0"/>
+        <cost name="pts" typeId="points" value="1100.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3ea1-ebd3-bfcf-a0e9" name="Hellblade" hidden="false" collective="false" import="true" type="upgrade">
@@ -5866,14 +5866,6 @@
         <cost name="pts" typeId="points" value="60.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="1a7b-d364-e46d-4dcc" name="Test1" hidden="false" collective="false" import="true" type="upgrade">
-      <categoryLinks>
-        <categoryLink id="1873-596c-222c-ed14" name="BLOOD WARRIORS" hidden="false" targetId="e144-e909-7174-c464" primary="false"/>
-      </categoryLinks>
-      <costs>
-        <cost name="pts" typeId="points" value="0.0"/>
-      </costs>
-    </selectionEntry>
   </sharedSelectionEntries>
   <sharedSelectionEntryGroups>
     <selectionEntryGroup id="0740-e91a-e615-4ac9" name="Artefacts" hidden="false" collective="false" import="true">

diff --git a/Chaos - Nurgle.cat b/Chaos - Nurgle.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6894-a70d-7327-b3c3" name="Chaos - Nurgle" revision="49" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="59" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="6894-a70d-7327-b3c3" name="Chaos - Nurgle" revision="50" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="59" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="6894-a70d-pubN65537" name="Chaos Battletome: Maggotkin of Nurgle"/>
     <publication id="6894-a70d-pubN78755" name="Compendium: Tamurkhan&apos;s Horde"/>
@@ -714,7 +714,7 @@
         <entryLink id="86ee-c644-9f15-9727" name="Lores of Nurgle" hidden="false" collective="false" import="true" targetId="98af-9a06-6b8b-4712" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="420.0"/>
+        <cost name="pts" typeId="points" value="380.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="857a-93de-02d0-ee3b" name="Morbidex Twiceborn" publicationId="6894-a70d-pubN65537" page="97" hidden="false" collective="false" import="true" type="unit">
@@ -1174,24 +1174,14 @@
     </selectionEntry>
     <selectionEntry id="836e-91bb-9065-5b5c" name="Putrid Blightkings" publicationId="6894-a70d-pubN65537" page="102" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="decrement" field="points" value="160">
-          <conditions>
-            <condition field="selections" scope="836e-91bb-9065-5b5c" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="13d4-a001-17b5-05b4" type="greaterThan"/>
-          </conditions>
-        </modifier>
-        <modifier type="increment" field="points" value="160">
-          <repeats>
-            <repeat field="selections" scope="836e-91bb-9065-5b5c" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="13d4-a001-17b5-05b4" repeats="1" roundUp="false"/>
-          </repeats>
-        </modifier>
-        <modifier type="decrement" field="points" value="60">
+        <modifier type="set-primary" field="category" value="065e-fda7-fd27-1f40">
           <conditions>
-            <condition field="selections" scope="836e-91bb-9065-5b5c" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="13d4-a001-17b5-05b4" type="equalTo"/>
+            <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="78f3-8a59-699a-61e8" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set-primary" field="category" value="065e-fda7-fd27-1f40">
+        <modifier type="decrement" field="points" value="60.0">
           <conditions>
-            <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="78f3-8a59-699a-61e8" type="instanceOf"/>
+            <condition field="selections" scope="836e-91bb-9065-5b5c" value="4.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="equalTo"/>
           </conditions>
         </modifier>
       </modifiers>
@@ -1234,7 +1224,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6cdc-61c6-7f48-bb42" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="0.0"/>
+            <cost name="pts" typeId="points" value="140.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="7657-f0c1-8ad0-908a" name="Icon Bearer" hidden="false" collective="false" import="true" type="upgrade">

diff --git a/Chaos - Skaven - Data.cat b/Chaos - Skaven - Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="de06-0235-6a96-193b" name="Chaos - Skaven Data" revision="11" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://gitter.im/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="59" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="de06-0235-6a96-193b" name="Chaos - Skaven Data" revision="13" battleScribeVersion="2.03" authorName="https://gitter.im/BSData/warhammer-age-of-sigmar" authorContact="@BSData" authorUrl="https://gitter.im/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="61" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="bcc4-c671-pubd1e1" name="Chaos Battletome: Skaven"/>
     <publication id="bcc4-c671-pubd1e6847" name="Forgeworld: Monstrous Arcanum"/>
@@ -901,7 +901,7 @@
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="160.0"/>
+        <cost name="pts" typeId="points" value="150.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2434-ca8e-36d2-4af0" name="Giant Rats" publicationId="bcc4-c671-pubd1e1" page="123" hidden="false" collective="false" import="true" type="unit">
@@ -1409,7 +1409,7 @@
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="240.0"/>
+        <cost name="pts" typeId="points" value="220.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9113-2b30-d50d-71d8" name="Doom Glaive" hidden="false" collective="false" import="true" type="upgrade">
@@ -2456,7 +2456,7 @@
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="160.0"/>
+        <cost name="pts" typeId="points" value="150.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="082e-175f-0ccd-15c2" name="Prehensile Tails" hidden="false" collective="false" import="true" type="upgrade">
@@ -2548,7 +2548,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1438-f972-2400-ab2a" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="100.0"/>
+            <cost name="pts" typeId="points" value="90.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="a217-b481-97f6-189f" name="Warpfire Guns" hidden="false" collective="false" import="true" type="upgrade">
@@ -2966,7 +2966,7 @@
     </selectionEntry>
     <selectionEntry id="c1d1-fc15-9135-142b" name="Skryre Acolytes" publicationId="bcc4-c671-pubd1e1" page="109" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="points" value="320.0">
+        <modifier type="set" field="points" value="200.0">
           <conditions>
             <condition field="selections" scope="c1d1-fc15-9135-142b" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2fd3-c35d-85c5-aab3" type="equalTo"/>
           </conditions>
@@ -3035,15 +3035,15 @@
       <selectionEntries>
         <selectionEntry id="2fd3-c35d-85c5-aab3" name="5 Acolytes" hidden="false" collective="false" import="true" type="model">
           <modifiers>
-            <modifier type="set" field="points" value="0">
+            <modifier type="set" field="points" value="0.0">
               <conditions>
-                <condition field="selections" scope="c1d1-fc15-9135-142b" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2fd3-c35d-85c5-aab3" type="equalTo"/>
+                <condition field="selections" scope="c1d1-fc15-9135-142b" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2fd3-c35d-85c5-aab3" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6012-84b7-604d-cc35" type="min"/>
-            <constraint field="selections" scope="parent" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6c20-6161-30aa-b52c" type="max"/>
+            <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6c20-6161-30aa-b52c" type="max"/>
           </constraints>
           <costs>
             <cost name="pts" typeId="points" value="60.0"/>
@@ -3417,7 +3417,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5877-a41f-9693-d9d3" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="120.0"/>
+            <cost name="pts" typeId="points" value="100.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="f68c-6727-492c-4a78" name="Rusty Halberds" hidden="false" collective="false" import="true" type="upgrade">
@@ -3732,7 +3732,7 @@
         <entryLink id="40d0-95d4-c479-f2c3" name="Command Traits" hidden="false" collective="false" import="true" targetId="d469-f2fa-07d9-bd12" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="400.0"/>
+        <cost name="pts" typeId="points" value="390.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0afb-be63-f27c-0b71" name="Verminlord Corruptor" publicationId="e316-99a9-2860-3a7c" page="" hidden="false" collective="false" import="true" type="unit">
@@ -4453,7 +4453,7 @@
         <entryLink id="69c1-c3bb-6f57-6a46" name="Lore of Warpvolt Galvanism (Clans Skyre)" hidden="false" collective="false" import="true" targetId="0bb6-f967-1481-802f" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="100.0"/>
+        <cost name="pts" typeId="points" value="110.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7e9c-c40a-d0cf-353e" name="Warp Lightning Cannon" publicationId="bcc4-c671-pubd1e1" page="109" hidden="false" collective="false" import="true" type="unit">
@@ -5077,7 +5077,7 @@
         <entryLink id="0b82-eeee-87b3-496c" name="Command Traits" hidden="false" collective="false" import="true" targetId="d469-f2fa-07d9-bd12" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="260.0"/>
+        <cost name="pts" typeId="points" value="270.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="db27-7a01-58ca-09c7" name="Battalion: Congregation of Filth" publicationId="bcc4-c671-pubd1e1" page="93" hidden="false" collective="false" import="true" type="upgrade">
@@ -6677,7 +6677,7 @@
         <categoryLink id="ca07-c612-061e-44db" name="New CategoryLink" hidden="false" targetId="eecb-ed66-d474-9ddd" primary="true"/>
       </categoryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="100.0"/>
+        <cost name="pts" typeId="points" value="80.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4fe6-46f9-96bb-8673" name="Endless Spell: Bell of Doom" publicationId="bcc4-c671-pubd1e1" page="126" hidden="false" collective="false" import="true" type="upgrade">