Merge pull request #3230 from BSData/fixes

couple of bugfixes
BSData · Oct 9, 2023 · 6bf91e4 · 6bf91e4
2 parents d2f0b8f + 31d1251
commit 6bf91e4
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 10 deletions.
diff --git a/Age of Sigmar.gst b/Age of Sigmar.gst
@@ -6932,7 +6932,7 @@ Arcane Bolt, Mystic Shield and spells to summon endless spells on your army rost
         </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
-    <selectionEntryGroup name="Lore of Primal Frost" hidden="false" id="a1be-2190-f61f-d59a">
+    <selectionEntryGroup name="Lore of Primal Frost" hidden="true" id="a1be-2190-f61f-d59a">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
           <conditionGroups>

diff --git a/Chaos - Khorne.cat b/Chaos - Khorne.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="cac4-1eec-d548-b34d" name="Chaos - Khorne" 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">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="cac4-1eec-d548-b34d" name="Chaos - Khorne" revision="124" 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="cac4-1eec-pubN65537" name="Chaos Battletome: Blades of Khorne"/>
     <publication id="cac4-1eec-pubN107006" name="Forgeworld: Monstrous Arcanum"/>
@@ -218,6 +218,8 @@
     <entryLink id="6712-491c-da2e-7d32" name="Khorne Warscroll Battalion: Tyrants of Blood" hidden="false" collective="false" import="true" targetId="67ca-5f5f-1905-0fd9" type="selectionEntry"/>
     <entryLink id="725b-5662-1f31-7546" name="Khorne Warscroll Battalion: Wrath Hunt" hidden="false" collective="false" import="true" targetId="e39b-1ba5-7ce6-6f59" type="selectionEntry"/>
     <entryLink import="true" name="Regiment of Renown - Phulgoth&apos;s Shudderhood" hidden="false" type="selectionEntry" id="7047-8182-b950-b9fa" targetId="10de-6e02-9446-6700"/>
+    <entryLink import="true" name="Regiment of Renown - The Coven of Thryx" hidden="false" type="selectionEntry" id="cf89-1a0c-fedf-fbd5" targetId="66b0-4847-a04e-0375"/>
+    <entryLink import="true" name="Regiment of Renown - Hargax&apos;s Pit-beats" hidden="false" type="selectionEntry" id="f7ce-bfa1-c519-d53f" targetId="f5e6-6888-e003-118d"/>
   </entryLinks>
   <sharedSelectionEntries>
     <selectionEntry id="7ab9-de0a-88c2-4fd1" name="General" hidden="false" collective="false" import="true" type="upgrade">
@@ -5554,5 +5556,4 @@
     <catalogueLink id="2f08-844c-4a13-7640" name="Destruction - Sons of Behemat" targetId="f904-b52f-810a-e446" type="catalogue" importRootEntries="true"/>
     <catalogueLink id="ecd3-786c-7f00-9fac" name="Regiments of Renown" targetId="33cf-d309-6df3-50d6" type="catalogue" importRootEntries="true"/>
   </catalogueLinks>
-  <xmlns>http://www.battlescribe.net/schema/catalogueSchema</xmlns>
 </catalogue>
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="231" 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="232" 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"/>
@@ -3991,6 +3991,15 @@ For each roll of 5+, add 1 to the tally of new diseases kept by Epidemius, to a
         <entryLink id="a3bb-f6c0-ce0e-d46b" name="Battalions" hidden="false" collective="false" import="true" targetId="3301-c961-3e76-5cc7" type="selectionEntryGroup"/>
         <entryLink id="a733-a911-a242-d69c" name="Incarnate Bonding" hidden="false" collective="false" import="true" targetId="c890-acbd-0c80-55c9" type="selectionEntryGroup"/>
         <entryLink id="ae30-6e1f-090b-e576" name="Unique Enhancements" hidden="false" collective="false" import="true" targetId="d327-b794-76e4-172d" type="selectionEntryGroup"/>
+        <entryLink id="54c5-e74f-c711-68ea" name="Prayers" hidden="true" collective="false" import="true" targetId="44f1-249e-24ca-fadb" type="selectionEntryGroup">
+          <modifiers>
+            <modifier type="set" field="hidden" value="false">
+              <conditions>
+                <condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4d98-bef9-c0cb-8138" type="equalTo"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="190"/>
@@ -17080,6 +17089,19 @@ Before attempting to cast this spell, you can say that the caster will project t
               </conditionGroups>
             </modifier>
             <modifier type="add" field="category" value="bbc8-3154-75f0-f8e2"/>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditionGroups>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="812a-a8b3-7158-4adb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
           </modifiers>
           <profiles>
             <profile id="6fa0-8cae-5e87-b39d" name="Slay Worthy Foes" publicationId="f3a5-ccd1-53af-9748" hidden="true" typeId="f71f-b0a4-730e-ced3" typeName="Command Abilities">
@@ -17120,11 +17142,22 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
                         <condition field="selections" scope="ancestor" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4e0e-664d-51ea-0929" type="instanceOf"/>
                       </conditions>
                     </conditionGroup>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="b541-3b22-08bb-d772" 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>
+                    </conditionGroup>
                   </conditionGroups>
                 </conditionGroup>
               </conditionGroups>
             </modifier>
             <modifier type="add" field="category" value="f22b-976f-fc38-366a"/>
+            <modifier type="set" value="1" field="1484-5568-afcf-32d3">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="b541-3b22-08bb-d772" shared="true" includeChildForces="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <profiles>
             <profile id="60db-451c-3aa4-f5c7" name="Let the Blood Flow" hidden="true" typeId="f71f-b0a4-730e-ced3" typeName="Command Abilities">
@@ -17146,10 +17179,32 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
           <costs>
             <cost name="pts" typeId="points" value="0"/>
           </costs>
+          <constraints>
+            <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="1484-5568-afcf-32d3"/>
+          </constraints>
         </selectionEntry>
         <selectionEntry id="70c6-90c1-1bfb-f467" name="Mark of Tzeentch" hidden="false" collective="false" import="true" type="upgrade">
           <modifiers>
             <modifier type="add" field="category" value="7d12-f4c5-3832-0f19"/>
+            <modifier type="set" value="1" field="a278-a03a-633c-2704">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="065f-c64d-3eb7-79d2" shared="true"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditionGroups>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="065f-c64d-3eb7-79d2" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="812a-a8b3-7158-4adb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
           </modifiers>
           <infoLinks>
             <infoLink id="0fa7-e3a5-716c-76e7" name="Mark of Tzeentch" hidden="false" targetId="ec39-bb5d-e478-58e3" type="profile"/>
@@ -17166,10 +17221,32 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
           <costs>
             <cost name="pts" typeId="points" value="0"/>
           </costs>
+          <constraints>
+            <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="a278-a03a-633c-2704"/>
+          </constraints>
         </selectionEntry>
         <selectionEntry id="ecc1-8de5-e07f-fc07" name="Mark of Nurgle" hidden="false" collective="false" import="true" type="upgrade">
           <modifiers>
             <modifier type="add" field="category" value="dd77-19a5-28eb-cbec"/>
+            <modifier type="set" value="1" field="67ef-ee00-f7d7-7856">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="ff93-966b-c16d-8149" shared="true" includeChildSelections="true" includeChildForces="true"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditionGroups>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="ff93-966b-c16d-8149" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="812a-a8b3-7158-4adb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
           </modifiers>
           <profiles>
             <profile id="2eb6-38a7-ad3b-ee06" name="Bestow Contagion" hidden="true" typeId="f71f-b0a4-730e-ced3" typeName="Command Abilities">
@@ -17191,10 +17268,32 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
           <costs>
             <cost name="pts" typeId="points" value="0"/>
           </costs>
+          <constraints>
+            <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="67ef-ee00-f7d7-7856"/>
+          </constraints>
         </selectionEntry>
         <selectionEntry id="782a-8e0a-0b2f-8692" name="Mark of Slaanesh" hidden="false" collective="false" import="true" type="upgrade">
           <modifiers>
             <modifier type="add" field="category" value="3963-2e99-aa63-c65e"/>
+            <modifier type="set" value="1" field="4031-8b9d-d873-e81f">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="d7d9-b723-6fdb-51cb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditionGroups>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="d7d9-b723-6fdb-51cb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="roster" childId="812a-a8b3-7158-4adb" shared="true" includeChildForces="true" includeChildSelections="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
           </modifiers>
           <profiles>
             <profile id="dfd0-4e3c-b3ea-69aa" name="Close in for the Kill" hidden="true" typeId="f71f-b0a4-730e-ced3" typeName="Command Abilities">
@@ -17216,6 +17315,9 @@ attacks made with melee weapons by that unit that target an enemy HERO or MONSTE
           <costs>
             <cost name="pts" typeId="points" value="0"/>
           </costs>
+          <constraints>
+            <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="4031-8b9d-d873-e81f"/>
+          </constraints>
         </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>

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="54" 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="55" 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"/>
@@ -3574,6 +3574,7 @@ To make a judgement roll, roll a dice. If the roll is less than the number of th
         <categoryLink targetId="c21c-0e74-70a9-18bb" id="a806-2739-5871-b3e9" primary="false" name="MALIGNANT"/>
         <categoryLink targetId="740e-2e73-948d-375a" id="9562-fc90-a8fb-9077" primary="false" name="GRIEVING LEGION"/>
         <categoryLink targetId="d5d-810f-dd0d-1424" id="a9d0-5cad-8c2-c2d1" primary="false" name="HEADSMEN&apos;S CURSE"/>
+        <categoryLink targetId="065e-fda7-fd27-1f40" id="6b62-f545-9a00-2696" primary="true" name="Other"/>
       </categoryLinks>
       <profiles>
         <profile name="The Headsmen&apos;s Curse" typeId="1960-ca8e-67ce-2014" typeName="Unit" hidden="false" id="7592-cd77-46a0-68fb">
@@ -3586,9 +3587,7 @@ To make a judgement roll, roll a dice. If the roll is less than the number of th
         </profile>
         <profile name="Furious Indictment" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities" hidden="false" id="5225-e28e-2d5-d084">
           <characteristics>
-            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">In your hero phase, you can pick 1 enemy unit within 12&quot; of this unit and roll a dice. On a 2+, that enemy unit is condemned until the start of your next hero phase. While an enemy unit is condemned, roll 1 fewer dice when making a charge roll for that unit, to a minimum of 1 dice.
-
-</characteristic>
+            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">In your hero phase, you can pick 1 enemy unit within 12&quot; of this unit and roll a dice. On a 2+, that enemy unit is condemned until the start of your next hero phase. While an enemy unit is condemned, roll 1 fewer dice when making a charge roll for that unit, to a minimum of 1 dice.</characteristic>
           </characteristics>
         </profile>
         <profile name="Summoned to Court" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities" hidden="false" id="98e8-438-2669-c36">

diff --git 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="127" 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="522a-d5b0-4c7e-321d" name="Order - Cities of Sigmar" revision="128" 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="deec-d475-pubN65537" name="Grand Alliance: Order"/>
     <publication id="e440-9199-1072-a7a0" name="Cities of Sigmar Battletome"/>
@@ -311,6 +311,8 @@
     </entryLink>
     <entryLink id="d36a-23f4-ee22-f071" name="Regiment of Renown - Elthwin&apos;s Thorns" hidden="false" collective="false" import="true" targetId="66f8-b848-40fa-a08d" type="selectionEntry"/>
     <entryLink import="true" name="Regiment of Renown - Fjori&apos;s Flamebearers" hidden="false" type="selectionEntry" id="4ed5-dde8-40e4-e06a" targetId="679-2ac4-81f1-ac2"/>
+    <entryLink import="true" name="Haskel Hexbane" hidden="false" type="selectionEntry" id="6a32-1ae2-d00c-40d4" targetId="64b2-e97d-b34a-c921"/>
+    <entryLink import="true" name="Hexbane&apos;s Hunters" hidden="false" type="selectionEntry" id="f9f0-bd4b-adbe-3288" targetId="f78a-5e3a-6785-fa95"/>
   </entryLinks>
   <sharedSelectionEntries>
     <selectionEntry id="d618-803c-36f8-0a3a" name="General" hidden="false" collective="false" import="true" type="upgrade">
@@ -16331,5 +16333,4 @@ Each time you make an unmodified wound roll of 6 for Precise Shots, change the R
     <catalogueLink id="d87d-0bb5-2576-4143" name="Endless Spells" targetId="f0db-356d-9f9f-662d" type="catalogue" importRootEntries="true"/>
     <catalogueLink id="ec46-bafb-445a-b152" name="Regiments of Renown" targetId="33cf-d309-6df3-50d6" type="catalogue" importRootEntries="true"/>
   </catalogueLinks>
-  <xmlns>http://www.battlescribe.net/schema/catalogueSchema</xmlns>
 </catalogue>