From bf2a87abf99501846009ca6f4a2f0be9c5916993 Mon Sep 17 00:00:00 2001
From: exaegrum <exaegrum@gmail.com>
Date: Tue, 7 Nov 2023 17:35:34 -0500
Subject: [PATCH 1/4] skywing aas

---
 Chaos - Slaanesh.cat | 12 +++++++-----
 Order Data.cat       | 13 +++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Chaos - Slaanesh.cat b/Chaos - Slaanesh.cat
index d7e28ace..b1802153 100644
--- a/Chaos - Slaanesh.cat	
+++ b/Chaos - Slaanesh.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="357e-20c6-ad3a-d55d" name="Chaos - Slaanesh" revision="122" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="357e-20c6-ad3a-d55d" name="Chaos - Slaanesh" revision="123" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
   <publications>
     <publication id="357e-20c6-pubN65537" name="Grand Alliance Chaos"/>
     <publication id="357e-20c6-pubN71272" name="Grand Alliance: Chaos - Official Errata, December 2018"/>
@@ -1399,6 +1399,11 @@ If the HERO you picked has an artefact of power, instead of suffering 1 mortal w
             <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9f18-9ffb-0267-3e08" type="greaterThan"/>
           </conditions>
         </modifier>
+        <modifier type="add" value="3ece-0afb-a1b9-7b52" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="parent" childId="b745-17c4-8fbf-8b04" shared="true" includeChildSelections="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <profiles>
         <profile id="2dc4-eaf8-a208-7c9e" name="Lord of Pain" hidden="false" typeId="1960-ca8e-67ce-2014" typeName="Unit">
@@ -1429,7 +1434,6 @@ If the HERO you picked has an artefact of power, instead of suffering 1 mortal w
         <categoryLink id="44fb-f670-5b00-5538" name="Leader" hidden="false" targetId="6c6b-e787-f9b8-a510" primary="true"/>
         <categoryLink id="8e49-5183-e7af-3387" name="LORD OF PAIN" hidden="false" targetId="f7b0-38ad-722f-c43f" primary="false"/>
         <categoryLink id="ae4c-9c65-4a3a-ae4b" name="10 or less wounds Leader" hidden="false" targetId="a8ed-ca35-24e0-cf2e" primary="false"/>
-        <categoryLink id="5d87-85ee-1cc8-c856" name="Mortal General" hidden="false" targetId="3ece-0afb-a1b9-7b52" primary="false"/>
         <categoryLink targetId="94b9-7eb-a81a-b892" id="b271-9cff-a761-4123" primary="false" name="Champion"/>
       </categoryLinks>
       <selectionEntries>
@@ -3212,9 +3216,7 @@ Battle Round 5 – Digestif: You can re-roll casting, dispelling and unbinding r
         <profile name="Wizard" typeId="f55d-ee3a-1597-110f" typeName="Magic" hidden="false" id="d780-f13b-5f6f-654c">
           <characteristics>
             <characteristic name="Cast/Unbind" typeId="8294-f605-2c0f-8f92">Vashtiss the Coiled is a WIZARD. That model can attempt to cast 1 spell in your hero phase and attempt to unbind 1 spell in the enemy hero phase.</characteristic>
-            <characteristic name="Spells Known" typeId="dc9c-47d3-6931-859c">Arcane Bolt, Mystic Shield, Sublime Harmonies
-
-</characteristic>
+            <characteristic name="Spells Known" typeId="dc9c-47d3-6931-859c">Arcane Bolt, Mystic Shield, Sublime Harmonies</characteristic>
           </characteristics>
         </profile>
         <profile name="Sublime Harmonies" typeId="2e81-5e22-c6e1-73cb" typeName="Spell" hidden="false" id="7e7f-acc7-ad1b-5d66">
diff --git a/Order Data.cat b/Order Data.cat
index 6626c827..f2eccde4 100644
--- a/Order Data.cat	
+++ b/Order Data.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="1d4c-207e-6a42-ac7d" name="Order Data" revision="59" battleScribeVersion="2.03" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="159" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="1d4c-207e-6a42-ac7d" name="Order Data" revision="60" battleScribeVersion="2.03" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="159" type="catalogue">
   <publications>
     <publication id="4bb2-2339-a79f-51d7" name="Battletome: Cities of Sigmar"/>
     <publication id="6c99-1e0f-3bc1-11ae" name="Battletome: Stormcast Eternals (2nd Edition)"/>
@@ -36,7 +36,7 @@
             </modifier>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="cf46-7b83-d97b-7663" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="cf46-7b83-d97b-7663" shared="true" includeChildSelections="true" includeChildForces="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -51,7 +51,7 @@
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="cf46-7b83-d97b-7663" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="cf46-7b83-d97b-7663" shared="true" includeChildSelections="true" includeChildForces="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -63,7 +63,7 @@
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="cf46-7b83-d97b-7663" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="cf46-7b83-d97b-7663" shared="true" includeChildSelections="true" includeChildForces="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -440,10 +440,7 @@ At the start of your hero phase, you can heal 1 wound allocated to each friendly
 -For each friendly EVERGREEN HUNT unit wholly within the same large quarter of the battlefield as the quarry.
 
 
--For each quarry destroyed during the battle.
-
-
-</characteristic>
+-For each quarry destroyed during the battle.</characteristic>
                   </characteristics>
                 </profile>
                 <profile name="2 - Tuneful" typeId="c137-4d1f-9d1a-524d" typeName="Battle Trait" hidden="false" id="531c-a209-ac74-e0de">

From 68da5a72ce0c0375ad31148f9f3094a64e92a192 Mon Sep 17 00:00:00 2001
From: exaegrum <exaegrum@gmail.com>
Date: Tue, 7 Nov 2023 17:37:47 -0500
Subject: [PATCH 2/4] subcommanders

---
 Death - Nighthaunt.cat       |  4 ++--
 Order - Cities of Sigmar.cat | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Death - Nighthaunt.cat b/Death - Nighthaunt.cat
index 4226cea5..173256ea 100644
--- a/Death - Nighthaunt.cat	
+++ b/Death - Nighthaunt.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2a46-0cf8-0cf4-e8b2" name="Death - Nighthaunt" revision="56" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2a46-0cf8-0cf4-e8b2" name="Death - Nighthaunt" revision="57" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
   <publications>
     <publication id="8b16-7c07-1657-3c2c" name="Arena of Shades"/>
     <publication id="6b18-1555-02e7-68ec" name="Battletome: Nighthaunt Errata, June 2022"/>
@@ -3046,7 +3046,7 @@ To make a judgement roll, roll a dice. If the roll is less than the number of th
             <characteristic name="Move" typeId="8655-6213-2824-1752">8&quot;</characteristic>
             <characteristic name="Wounds" typeId="cd0e-fea6-411f-904d">1</characteristic>
             <characteristic name="Bravery" typeId="0c85-bf79-836b-759e">10</characteristic>
-            <characteristic name="Save" typeId="f8dd-4f2a-8543-4f36">5+</characteristic>
+            <characteristic name="Save" typeId="f8dd-4f2a-8543-4f36">4+</characteristic>
           </characteristics>
         </profile>
         <profile id="93eb-6a3a-389d-eb6c" name="Champion" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">
diff --git a/Order - Cities of Sigmar.cat b/Order - Cities of Sigmar.cat
index 128dde4c..a39eb159 100644
--- a/Order - Cities of Sigmar.cat	
+++ b/Order - Cities of Sigmar.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="522a-d5b0-4c7e-321d" name="Order - Cities of Sigmar" revision="134" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="159" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="522a-d5b0-4c7e-321d" name="Order - Cities of Sigmar" revision="135" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="159" type="catalogue">
   <publications>
     <publication id="deec-d475-pubN65537" name="Grand Alliance: Order"/>
     <publication id="e440-9199-1072-a7a0" name="Cities of Sigmar Battletome"/>
@@ -240,8 +240,16 @@
     <entryLink import="true" name="Assassin" hidden="false" type="selectionEntry" id="13e5-35fe-556f-733b" targetId="9237-a635-1cc0-9b21"/>
     <entryLink import="true" name="Black Ark Fleetmaster" hidden="false" type="selectionEntry" id="977e-47aa-309b-e6a8" targetId="471e-af18-1fa9-247b"/>
     <entryLink import="true" name="Cogsmith" hidden="false" type="selectionEntry" id="303e-30f2-ef6d-74ba" targetId="7010-ecce-b54a-7e2d"/>
-    <entryLink import="true" name="Freeguild Marshal and Relic Envoy" hidden="false" type="selectionEntry" id="4016-636e-8c11-113d" targetId="92a8-400d-ee72-8815"/>
-    <entryLink import="true" name="Freeguild Cavalier-Marshal" hidden="false" type="selectionEntry" id="40f-4a90-b958-dacf" targetId="d24e-d272-78a0-8944"/>
+    <entryLink import="true" name="Freeguild Marshal and Relic Envoy" hidden="false" type="selectionEntry" id="4016-636e-8c11-113d" targetId="92a8-400d-ee72-8815">
+      <categoryLinks>
+        <categoryLink targetId="a8ed-ca35-24e0-cf2e" id="3a97-db91-8dfd-99c8" primary="false" name="9 or less wounds Leader"/>
+      </categoryLinks>
+    </entryLink>
+    <entryLink import="true" name="Freeguild Cavalier-Marshal" hidden="false" type="selectionEntry" id="40f-4a90-b958-dacf" targetId="d24e-d272-78a0-8944">
+      <categoryLinks>
+        <categoryLink targetId="a8ed-ca35-24e0-cf2e" id="34a6-f088-15f9-7798" primary="false" name="9 or less wounds Leader"/>
+      </categoryLinks>
+    </entryLink>
     <entryLink import="true" name="Fusil-major on Ogor Warhulk" hidden="false" type="selectionEntry" id="165c-6eec-6cac-f0a0" targetId="4aa4-9e5e-5bcc-75f6"/>
     <entryLink import="true" name="Haskel Hexbane" hidden="false" type="selectionEntry" id="1750-49ac-101f-a1eb" targetId="56c1-5bc1-ea8e-9fde"/>
     <entryLink import="true" name="Hexbane&apos;s Hunters" hidden="false" type="selectionEntry" id="e427-1219-a0a6-e057" targetId="f1a0-d261-da9a-8de0"/>
@@ -308,7 +316,7 @@
         <cost name="pts" typeId="points" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="87f8-d0f2-e2c7-0668" name="Allegiance" hidden="false" collective="false" import="true" type="upgrade" defaultAmount="">
+    <selectionEntry id="87f8-d0f2-e2c7-0668" name="Allegiance" hidden="false" collective="false" import="true" type="upgrade">
       <modifiers>
         <modifier type="set" field="06ec-3221-cc77-09c5" value="0">
           <conditionGroups>
@@ -342,7 +350,7 @@
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d2c6-67a8-82e1-ac3c" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry type="upgrade" import="true" name="Allegiance: Cities of Sigmar" hidden="false" id="cf90-d04d-d766-96ad" defaultAmount="">
+            <selectionEntry type="upgrade" import="true" name="Allegiance: Cities of Sigmar" hidden="false" id="cf90-d04d-d766-96ad">
               <selectionEntryGroups>
                 <selectionEntryGroup id="d9ac-8b28-8227-c3a5" name="Free Cities" hidden="false" collective="false" import="true" defaultSelectionEntryId="9966-bee3-772e-a50b">
                   <selectionEntries>

From 13bcc73f358ca79f880742854e7962264e56bf84 Mon Sep 17 00:00:00 2001
From: exaegrum <exaegrum@gmail.com>
Date: Tue, 7 Nov 2023 17:43:16 -0500
Subject: [PATCH 3/4] slaaneshi grand strategies (again)

---
 Chaos Data.cat | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Chaos Data.cat b/Chaos Data.cat
index 2da12b7d..9f7abd4f 100644
--- a/Chaos Data.cat	
+++ b/Chaos Data.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="0339-0157-6910-d29c" name="Chaos Data" revision="234" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="0339-0157-6910-d29c" name="Chaos Data" revision="235" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
   <publications>
     <publication id="c9b2-1fe6-pubN65537" name="Battletome: Beasts of Chaos" publicationDate="2023"/>
     <publication id="6894-a70d-pubN65537" name="Chaos Battletome: Maggotkin of Nurgle"/>
@@ -16285,6 +16285,9 @@ Before attempting to cast this spell, you can say that the caster will project t
               <costs>
                 <cost name="pts" typeId="points" value="0"/>
               </costs>
+              <categoryLinks>
+                <categoryLink targetId="5dff-3614-49fd-c3e4" id="5098-256b-60f9-4f94" primary="false" name="Grand Strategy"/>
+              </categoryLinks>
             </selectionEntry>
             <selectionEntry id="9eab-3a51-a228-4706" name="Glutton for Depravity" hidden="false" collective="false" import="true" type="upgrade">
               <constraints>
@@ -16300,6 +16303,9 @@ Before attempting to cast this spell, you can say that the caster will project t
               <costs>
                 <cost name="pts" typeId="points" value="0"/>
               </costs>
+              <categoryLinks>
+                <categoryLink targetId="5dff-3614-49fd-c3e4" id="f3fb-b367-e962-2b5a" primary="false" name="Grand Strategy"/>
+              </categoryLinks>
             </selectionEntry>
             <selectionEntry id="ac17-bec3-792a-7c5a" name="Arch-tempter" hidden="false" collective="false" import="true" type="upgrade">
               <constraints>
@@ -16315,6 +16321,9 @@ Before attempting to cast this spell, you can say that the caster will project t
               <costs>
                 <cost name="pts" typeId="points" value="0"/>
               </costs>
+              <categoryLinks>
+                <categoryLink targetId="5dff-3614-49fd-c3e4" id="a6d5-c0c7-ffd1-91ed" primary="false" name="Grand Strategy"/>
+              </categoryLinks>
             </selectionEntry>
           </selectionEntries>
         </selectionEntryGroup>

From 339de5d5c7c4eb2f541620b886403f3c41edc7df Mon Sep 17 00:00:00 2001
From: exaegrum <exaegrum@gmail.com>
Date: Tue, 7 Nov 2023 20:40:55 -0500
Subject: [PATCH 4/4] cities fixes

---
 Chaos Data.cat               | 10 +++++-----
 Order - Cities of Sigmar.cat | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Chaos Data.cat b/Chaos Data.cat
index 9f7abd4f..3bc638dd 100644
--- a/Chaos Data.cat	
+++ b/Chaos Data.cat	
@@ -1026,6 +1026,11 @@ If you have any Fate Points at the end of your movement phase, you can summon 1
     </selectionEntry>
     <selectionEntry id="a43e-ee01-c76d-d3a7" name="General" hidden="false" collective="false" import="true" type="upgrade">
       <modifiers>
+        <modifier type="set" field="8fb5-ebdb-2224-f679" value="10">
+          <conditions>
+            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="e211-0580-4d0d-40eb" type="equalTo"/>
+          </conditions>
+        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
@@ -1044,11 +1049,6 @@ If you have any Fate Points at the end of your movement phase, you can summon 1
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set" field="8fb5-ebdb-2224-f679" value="10">
-          <conditions>
-            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="e211-0580-4d0d-40eb" type="equalTo"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d02c-40ae-7a75-2578" type="max"/>
diff --git a/Order - Cities of Sigmar.cat b/Order - Cities of Sigmar.cat
index a39eb159..76c1feb2 100644
--- a/Order - Cities of Sigmar.cat	
+++ b/Order - Cities of Sigmar.cat	
@@ -11796,6 +11796,10 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
         <entryLink id="ee22-02a8-8b60-152b" name="Universal Command Traits" hidden="false" collective="false" import="true" targetId="b6b8-914a-dfca-18ee" type="selectionEntryGroup"/>
         <entryLink import="true" name="Universal Command Traits" hidden="false" type="selectionEntryGroup" id="1c56-6967-ed6d-4dd2" targetId="e372-6ace-3568-54e7"/>
       </entryLinks>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="c282-8784-16c-156e"/>
+        <constraint type="min" value="1" field="selections" scope="roster" shared="true" id="b972-5631-1ecb-310a" includeChildSelections="true" includeChildForces="true"/>
+      </constraints>
     </selectionEntryGroup>
     <selectionEntryGroup id="0dcd-02fa-3297-c0aa" name="Artefacts" hidden="false" collective="false" import="true">
       <modifiers>
@@ -11812,9 +11816,15 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="increment" field="56d9-5c9c-62bc-57be" value="1">
+          <repeats>
+            <repeat field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2a8b-93fa-e1b9-4102" repeats="1" roundUp="false"/>
+          </repeats>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="56d9-5c9c-62bc-57be" type="max"/>
+        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="324d-69e0-f3c8-7581" includeChildSelections="true" includeChildForces="true"/>
       </constraints>
       <entryLinks>
         <entryLink id="0139-a38d-acdb-fee3" name="Universal Artefacts of Power" hidden="false" collective="false" import="true" targetId="11c4-fd82-92a7-de8a" type="selectionEntryGroup"/>
@@ -12800,7 +12810,6 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
       </constraints>
       <entryLinks>
         <entryLink import="true" name="Universal Spell Lore" hidden="false" type="selectionEntryGroup" id="ef65-7448-af8c-74b9" targetId="20c3-23a0-9d79-b491"/>
-        <entryLink import="true" name="Lore of Primal Frost" hidden="false" type="selectionEntryGroup" id="f09f-fa8b-9b8-93a4" targetId="a1be-2190-f61f-d59a"/>
         <entryLink import="true" name="Cities of Sigmar Spell Lores" hidden="false" type="selectionEntryGroup" id="45ff-afd6-8717-eff3" targetId="2d94-2cdd-f7f5-a50b"/>
       </entryLinks>
     </selectionEntryGroup>