Merge pull request #3283 from BSData/misc-fixes

Misc fixes
BSData · Dec 1, 2023 · bdc0efe · bdc0efe
2 parents fd8484a + b6fed34
commit bdc0efe
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 41 deletions.
diff --git a/Chaos - Slaves to Darkness Data.cat b/Chaos - Slaves to Darkness Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="e0d8-b631-6934-ee34" name="Chaos - Slaves to Darkness Data" revision="140" 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="e0d8-b631-6934-ee34" name="Chaos - Slaves to Darkness Data" revision="141" 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">
   <profileTypes>
     <profileType id="56f6-e336-faed-bb00" name="Aura of Chaos Power">
       <characteristicTypes>
@@ -8092,6 +8092,7 @@ The unit can receive the following commands if they are issued by its master:</c
             </modifier>
           </modifiers>
         </entryLink>
+        <entryLink id="8f48-101-a2a8-7a8" name="Spell Lores" hidden="false" collective="false" import="true" targetId="857e-5b81-8516-9b50" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="210"/>
@@ -8218,6 +8219,7 @@ The unit can receive the following commands if they are issued by its master:</c
             </modifier>
           </modifiers>
         </entryLink>
+        <entryLink id="b794-f7bb-6803-d13d" name="Spell Lores" hidden="false" collective="false" import="true" targetId="857e-5b81-8516-9b50" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="240"/>
@@ -8886,6 +8888,7 @@ If this unit has fulfilled its oath, the range of this spell is 18&quot; instead
         <entryLink id="5e5e-6381-bd69-a966" name="Mystic Shield" hidden="false" collective="false" import="true" targetId="5fdd-6634-f9f8-068a" type="selectionEntry"/>
         <entryLink id="3b71-1da1-e5e4-8366" name="Battalions" hidden="false" collective="false" import="true" targetId="f862-da0a-22bb-e3c1" type="selectionEntryGroup"/>
         <entryLink id="cd03-3c7d-e71b-e3c4" name="Incarnate Bonding" hidden="false" collective="false" import="true" targetId="c890-acbd-0c80-55c9" type="selectionEntryGroup"/>
+        <entryLink id="9a-73f5-3026-4f4a" name="Spell Lores" hidden="false" collective="false" import="true" targetId="857e-5b81-8516-9b50" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="180"/>

diff --git 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="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">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="0339-0157-6910-d29c" name="Chaos Data" revision="236" 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"/>
@@ -15296,6 +15296,29 @@ Before attempting to cast this spell, you can say that the caster will project t
                 </conditionGroup>
               </conditionGroups>
             </modifier>
+            <modifier type="increment" field="de67-159a-1873-e82e" value="1">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="6298-ee44-c8f2-522e" type="greaterThan"/>
+                  </conditions>
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="1080-2582-0880-dd78" shared="true" includeChildSelections="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="c132-1271-a655-1e16" shared="true" includeChildSelections="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="3088-d1cf-74b8-1a54" shared="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e703-9ed7-ccd0-b0c7" shared="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="3cb1-8ae1-fc85-7c95" shared="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e738-e1c8-30a0-ef8c" shared="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="f418-c3b6-2ff2-05fd" shared="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="ef2f-5128-8625-da03" shared="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9463-58e7-ff20-d0ed" type="max"/>
@@ -17108,7 +17131,7 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
             <cost name="pts" typeId="points" value="0"/>
           </costs>
           <infoGroups>
-            <infoGroup name="Mark of Chaos Abilities" hidden="true" id="a0c7-247b-6334-24ce">
+            <infoGroup name="Mark of Chaos Abilities" hidden="false" id="a0c7-247b-6334-24ce">
               <modifiers>
                 <modifier type="set" value="true" field="hidden">
                   <conditions>
@@ -17158,11 +17181,11 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
             <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="1484-5568-afcf-32d3"/>
           </constraints>
           <infoGroups>
-            <infoGroup name="Mark of Chaos Abilities" hidden="true" id="784d-156b-72a4-8af3">
+            <infoGroup name="Mark of Chaos Abilities" hidden="false" id="784d-156b-72a4-8af3">
               <modifiers>
                 <modifier type="set" value="true" field="hidden">
                   <conditions>
-                    <condition type="lessThan" value="1" field="selections" scope="roster" childId="812a-a8b3-7158-4adb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="roster" childId="812a-a8b3-7158-4adb" shared="true" includeChildSelections="true" includeChildForces="true"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -17216,7 +17239,7 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
             <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="a278-a03a-633c-2704"/>
           </constraints>
           <infoGroups>
-            <infoGroup name="Mark of Chaos Abilities" hidden="true" id="bb0c-2ad0-6843-3b1f">
+            <infoGroup name="Mark of Chaos Abilities" hidden="false" id="bb0c-2ad0-6843-3b1f">
               <modifiers>
                 <modifier type="set" value="true" field="hidden">
                   <conditions>
@@ -17269,7 +17292,7 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
             <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="67ef-ee00-f7d7-7856"/>
           </constraints>
           <infoGroups>
-            <infoGroup name="Mark of Chaos Abilities" hidden="true" id="20cd-f8e3-3915-2d9e">
+            <infoGroup name="Mark of Chaos Abilities" hidden="false" id="20cd-f8e3-3915-2d9e">
               <modifiers>
                 <modifier type="set" value="true" field="hidden">
                   <conditions>
@@ -17327,7 +17350,7 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
             <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="4031-8b9d-d873-e81f"/>
           </constraints>
           <infoGroups>
-            <infoGroup name="Mark of Chaos Abilities" hidden="true" id="e095-a726-888d-c21c">
+            <infoGroup name="Mark of Chaos Abilities" hidden="false" id="e095-a726-888d-c21c">
               <modifiers>
                 <modifier type="set" value="true" field="hidden">
                   <conditions>

diff --git 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="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">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2a46-0cf8-0cf4-e8b2" name="Death - Nighthaunt" revision="58" 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"/>
@@ -840,7 +840,7 @@ Once per turn, in your shooting phase, if the value of the dice beside this unit
         </profile>
         <profile id="832e-4961-1c55-e5d4" name="Slasher Crone" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">
           <characteristics>
-            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">1 in every 5 models in this unit can be a Slasher Crone. Add 1 to the Attacks characteristic of that model’s Scythed Limbs.</characteristic>
+            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">1 model in this unit can be a Slasher Crone. Add 1 to the Attacks characteristic of that model’s Scythed Limbs.</characteristic>
           </characteristics>
         </profile>
         <profile id="995d-3b24-b6b8-9e16" name="Harrowing Shriek" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">

diff --git a/Destruction - Gloomspite Gitz.cat b/Destruction - Gloomspite Gitz.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="750c-157c-3186-61d3" name="Destruction - Gloomspite Gitz" revision="135" 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="750c-157c-3186-61d3" name="Destruction - Gloomspite Gitz" revision="136" 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="36cf-97ac-7da2-5927" name="Battletome: Gloomspite Gitz 2023"/>
     <publication id="9487-1927-1352-5d84" name="Battletome: Gloomspite Gitz Errata, February 2023"/>
@@ -465,17 +465,6 @@
       </modifiers>
     </entryLink>
     <entryLink id="ea2f-c76d-217b-a3db" name="Kragnos, The End of Empires" hidden="false" collective="false" import="false" targetId="4eea-4e53-1088-fb6c" type="selectionEntry">
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="3323-24e9-4b23-a6e7" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
       <entryLinks>
         <entryLink id="26f7-6ca-46d2-da32" name="General" hidden="false" collective="false" import="true" targetId="3323-24e9-4b23-a6e7" type="selectionEntry">
           <categoryLinks>
@@ -629,6 +618,8 @@
     </entryLink>
     <entryLink import="true" name="Rabble-Rowza" hidden="false" type="selectionEntry" id="1279-7a3f-53c3-5395" targetId="1a31-bfa0-b7f-897e"/>
     <entryLink import="true" name="Trugg, the Troggoth King" hidden="false" type="selectionEntry" id="f421-e567-909f-7864" targetId="4f62-33be-e388-3574"/>
+    <entryLink import="true" name="Battle Tactics: Nasty Tricks" hidden="false" type="selectionEntry" id="2e73-22b0-c371-e8c3" targetId="a06d-f6f6-49b9-900e"/>
+    <entryLink import="true" name="Battle Tactics: Momentary Distractions" hidden="false" type="selectionEntry" id="6f3d-64ae-4267-a31e" targetId="65c9-aa9f-a3c7-f205"/>
   </entryLinks>
   <sharedSelectionEntries>
     <selectionEntry id="73c2-8a55-9faa-bb56" name="Squig Hoppers" publicationId="36cf-97ac-7da2-5927" page="104" hidden="false" collective="false" import="true" type="unit">
@@ -1519,13 +1510,25 @@ This effect is in addition to the normal effect of All-out Attack.</characterist
       <costs>
         <cost name="pts" typeId="points" value="0"/>
       </costs>
+      <modifiers>
+        <modifier type="set-primary" value="e9f2-765a-b7b8-ce8e" field="category">
+          <conditions>
+            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a96f-e0af-64b7-cb92" type="equalTo"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="5286-aa44-42ef-756f" name="Rockgut Troggoths" publicationId="36cf-97ac-7da2-5927" page="108" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set-primary" field="category" value="e9f2-765a-b7b8-ce8e">
-          <conditions>
-            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc62-4b00-9336-deff" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a96f-e0af-64b7-cb92" type="equalTo"/>
+                <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc62-4b00-9336-deff" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="add" field="category" value="7ede-19c1-7261-f88b">
           <conditionGroups>
@@ -1664,9 +1667,14 @@ This effect is in addition to the normal effect of All-out Attack.</characterist
     <selectionEntry id="1532-280f-10d7-576e" name="Fellwater Troggoths" publicationId="36cf-97ac-7da2-5927" page="108" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set-primary" field="category" value="e9f2-765a-b7b8-ce8e">
-          <conditions>
-            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc62-4b00-9336-deff" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc62-4b00-9336-deff" type="equalTo"/>
+                <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a96f-e0af-64b7-cb92" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="add" field="category" value="7ede-19c1-7261-f88b">
           <conditionGroups>
@@ -2635,13 +2643,6 @@ Before you allocate a wound or mortal wound to this unit, or instead of making a
       <costs>
         <cost name="pts" typeId="points" value="130"/>
       </costs>
-      <modifiers>
-        <modifier type="set" value="true" field="hidden">
-          <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="roster" childId="a96f-e0af-64b7-cb92" shared="true" includeChildForces="true" includeChildSelections="true"/>
-          </conditions>
-        </modifier>
-      </modifiers>
     </selectionEntry>
     <selectionEntry id="acdd-a781-ffe2-69b1" name="Scuttleboss on Gigantic Spider" publicationId="36cf-97ac-7da2-5927" page="109" hidden="false" collective="false" import="true" type="unit">
       <profiles>