Merge pull request #3355 from BSData/fixes

bugfixes
BSData · Feb 26, 2024 · d238653 · d238653
2 parents 69d3560 + 9f4128b
commit d238653
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 17 deletions.
diff --git a/Age of Sigmar.gst b/Age of Sigmar.gst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="e51d-b1a3-75fc-dc33" name="Age of Sigmar" revision="175" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" type="gameSystem">
+<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="e51d-b1a3-75fc-dc33" name="Age of Sigmar" revision="176" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" type="gameSystem">
   <publications>
     <publication id="e51d-b1a3-pubEC" name="The General&apos;s Handbook"/>
     <publication id="e51d-b1a3-pubEQ" name="Core Rules"/>
@@ -5744,6 +5744,7 @@ WIZARDS cannot be included in this battalion.</characteristic>
                       <conditions>
                         <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5fba-34f2-e66f-fbcb" type="greaterThan"/>
                         <condition field="selections" scope="ancestor" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="94b9-7eb-a81a-b892" type="instanceOf"/>
+                        <condition type="notInstanceOf" value="1" field="selections" scope="ancestor" childId="4f53-8230-2f02-9639" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>

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 xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="de06-0235-6a96-193b" name="Chaos - Skaven - Data" revision="98" 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="de06-0235-6a96-193b" name="Chaos - Skaven - Data" revision="99" 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="bcc4-c671-pubd1e1" name="Chaos Battletome: Skaven"/>
     <publication id="bcc4-c671-pubd1e30758" name="Warscroll Compendium: Skaven"/>
@@ -1348,6 +1348,11 @@ If the 3D6 roll was not 13, remove 1 dice of your choice and use the remaining 2
             <characteristic name="Save" typeId="f8dd-4f2a-8543-4f36">5+</characteristic>
           </characteristics>
         </profile>
+        <profile id="a574-ed35-e1d2-9803" name="Eshin Toxins" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">
+          <characteristics>
+            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">If the unmodified hit roll for an attack made by this unit is 6, the target suffers 1 mortal wound and the attack sequence ends (do not make a wound roll or save roll).</characteristic>
+          </characteristics>
+        </profile>
       </profiles>
       <infoLinks>
         <infoLink id="ff55-892f-2360-aef4" name="Elite" hidden="false" targetId="46ca-dc4f-b7a1-726d" type="profile"/>
@@ -1605,6 +1610,7 @@ If the 3D6 roll was not 13, remove 1 dice of your choice and use the remaining 2
         <selectionEntry id="e9cc-b659-7fda-1f8a" name="Warpstone Spikes" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="78cc-ee35-64a5-60d4" type="max"/>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="d5ac-d6ab-36c1-2a06"/>
           </constraints>
           <profiles>
             <profile id="5cd4-7a85-f5a1-2b4d" name="Warpstone Spikes" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">
@@ -4624,6 +4630,11 @@ If the 3D6 roll was not 13, remove 1 dice of your choice and use the remaining 2
             <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" field="category" value="8f5e-e464-221b-4f06">
+          <conditions>
+            <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9f95-f6dc-e866-90a0" type="greaterThan"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <profiles>
         <profile id="c943-a6d0-d886-d142" name="Warlock Engineer" hidden="false" typeId="1960-ca8e-67ce-2014" typeName="Unit">
@@ -6085,6 +6096,11 @@ At the start of the combat phase, if this unit is hidden, you can reveal it. In
             <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" field="category" value="8f5e-e464-221b-4f06">
+          <conditions>
+            <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9f95-f6dc-e866-90a0" type="greaterThan"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <profiles>
         <profile id="de3e-924d-2cb7-2c38" name="Warlock Bombardier" hidden="false" typeId="1960-ca8e-67ce-2014" typeName="Unit">

diff --git a/Endless Spells.cat b/Endless Spells.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="f0db-356d-9f9f-662d" name="Endless Spells" revision="37" 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="f0db-356d-9f9f-662d" name="Endless Spells" revision="38" 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="d1d1-5917-4fcf-8b1e" name="General&apos;s Handbook Pitched Battles 2022-23 - Season 1 September 2022 FAQ"/>
     <publication id="afcd-7621-7abc-1ba5" name="General&apos;s Handbook Pitched Battles 2022-23 - Season 2, Errata January 2023"/>
@@ -607,15 +607,15 @@ A unit cannot be removed and set up again in this way more than once per phase.
           <characteristics>
             <characteristic name="Casting Value" typeId="2508-b604-1258-a920">5</characteristic>
             <characteristic name="Range" typeId="5b5c-1fd1-4c0f-5705">18&quot;</characteristic>
-            <characteristic name="Description" typeId="76ff-781d-b8e6-5f27">If successfully cast, set up the parts of the endless spell wholly within range of the caster.</characteristic>
+            <characteristic name="Description" typeId="76ff-781d-b8e6-5f27">If successfully cast, set up 1 part of this endless spell within 1&quot; of the caster, then set up the other part wholly within range of the caster.</characteristic>
           </characteristics>
         </profile>
         <profile id="76f9-a893-a691-9452" name="Arcane Passage" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">
           <characteristics>
-            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">Once per turn, when a Wizard within 1&quot; of this endless spell attempts to cast a spell, the commanding player can say that the spell will be sent through the portal. If they do so, the range, visibility and effect of that spell can be measured from 1 part of this endless spell instead of the caster, and that part of the endless spell is considered to be the caster of the spell for the purposes of unbinding. Spells that summon endless spells do not benefit from this effect.
+            <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">Once per turn, when a WIZARD within 1&quot; of this endless spell attempts to cast a spell, the commanding player can say that the spell will be sent through the portal. If they do so, the range, visibility and effect of that spell can be measured from 1 part of this endless spell instead of the caster, and that part of the endless spell is considered to be the caster of the spell for the purposes of unbinding. Spells that summon endless spells do not benefit from this effect.
+
 
-In addition, once per turn, if a predatory endless spell starts a move wholly within 6&quot; of this endless spell, instead of making a move with it, the commanding player can remove
-that predatory endless spell from the battlefield and set it up again anywhere wholly within 6&quot; of the other part of this endless spell. An endless spell set up in this manner does not count as having moved but cannot move until the next hero phase</characteristic>
+In addition, once per turn, if a predatory endless spell starts a move wholly within 6&quot; of this endless spell, instead of making a move with it, the commanding player can remove that predatory endless spell from the battlefield and set it up again anywhere wholly within 6&quot; of the other part of this endless spell. An endless spell set up in this manner does not count as having moved but cannot move until the next hero phase.</characteristic>
           </characteristics>
         </profile>
       </profiles>

diff --git a/Order - Stormcast Eternals - Data.cat b/Order - Stormcast Eternals - Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="82b4-f6e1-3e37-5ea1" name="Order - Stormcast Eternals - Data" revision="190" 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="82b4-f6e1-3e37-5ea1" name="Order - Stormcast Eternals - Data" revision="191" 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="ed04-877b-pubN65537" name="Order Battletome: Stormcast Eternals (2nd Edition)"/>
     <publication id="ed04-877b-pubN71576" name="Battletome: Stormcast Eternals (2nd Edition)"/>
@@ -8047,10 +8047,10 @@ If you choose its shields, until the end of that phase, this unit has a ward of
       <profiles>
         <profile id="8e52-7ac9-fdd1-2258" name="Gardus Steel Soul" hidden="false" typeId="1960-ca8e-67ce-2014" typeName="Unit">
           <characteristics>
-            <characteristic name="Move" typeId="8655-6213-2824-1752">6&quot;</characteristic>
-            <characteristic name="Wounds" typeId="cd0e-fea6-411f-904d">5</characteristic>
+            <characteristic name="Move" typeId="8655-6213-2824-1752">5&quot;</characteristic>
+            <characteristic name="Wounds" typeId="cd0e-fea6-411f-904d">6</characteristic>
             <characteristic name="Bravery" typeId="0c85-bf79-836b-759e">10</characteristic>
-            <characteristic name="Save" typeId="f8dd-4f2a-8543-4f36">4+</characteristic>
+            <characteristic name="Save" typeId="f8dd-4f2a-8543-4f36">3+</characteristic>
           </characteristics>
         </profile>
         <profile id="0f02-0e61-d70f-d44d" name="Aura of Purity" hidden="false" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities">

diff --git a/Order - Sylvaneth - Data.cat b/Order - Sylvaneth - Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ab8b-39f3-ebc0-e9ab" name="Order - Sylvaneth - Data" revision="134" battleScribeVersion="2.03" authorContact="@BSData" 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="ab8b-39f3-ebc0-e9ab" name="Order - Sylvaneth - Data" revision="135" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="159" type="catalogue">
   <publications>
     <publication id="0ab2-9698-def7-3126" name="Battletome: Sylvaneth Errata, July 2021"/>
     <publication id="b366-6e64-4cd5-0c51" name="Order Battletome: Sylvaneth 2022" publicationDate="June 2022"/>
@@ -2154,9 +2154,14 @@ If this unit is Embittered, its Swarm of Squirmlings has an Attacks characterist
           </conditions>
         </modifier>
         <modifier type="add" field="category" value="8f5e-e464-221b-4f06">
-          <conditions>
-            <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9f95-f6dc-e866-90a0" type="greaterThan"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9f95-f6dc-e866-90a0" type="greaterThan"/>
+                <condition type="atLeast" value="1" field="selections" scope="self" childId="9918-5a46-2468-35e2" shared="true"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <profiles>

diff --git 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="61" 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="62" 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)"/>
@@ -897,9 +897,16 @@ At the start of your hero phase, you can heal 1 wound allocated to each friendly
                 <conditionGroup type="or">
                   <conditions>
                     <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="e82b-43a4-90b3-1d15" type="equalTo"/>
-                    <condition field="selections" scope="ancestor" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4f53-8230-2f02-9639" type="notInstanceOf"/>
                     <condition type="atLeast" value="1" field="selections" scope="parent" childId="a662-793e-a010-1dec" shared="true"/>
                   </conditions>
+                  <conditionGroups>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition field="selections" scope="ancestor" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4f53-8230-2f02-9639" type="notInstanceOf"/>
+                        <condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9918-5a46-2468-35e2" type="lessThan"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
                 </conditionGroup>
               </conditionGroups>
             </modifier>