Merge pull request #3288 from BSData/misc-fixes

bugs
BSData · Dec 4, 2023 · dc385fb · dc385fb
2 parents 262b021 + cc45f82
commit dc385fb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/Destruction - Orruk Warclans.cat b/Destruction - Orruk Warclans.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="5419-b58f-5a39-0bfe" name="Destruction - Orruk Warclans" revision="137" 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="5419-b58f-5a39-0bfe" name="Destruction - Orruk Warclans" revision="138" 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="7e25-33bb-pubN65537" name="Destruction Battletome: Bonesplitterz"/>
     <publication id="7e25-33bb-pubN82863" name="Age of Sigmar: The Rules"/>
@@ -8774,7 +8774,7 @@ On a 1, that wound or mortal wound is allocated to this unit as normal. On a 2-5
           <modifiers>
             <modifier type="set" field="name" value="6 Brute Ragerz">
               <conditions>
-                <condition field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0a8d-cde8-fba1-6c0d" type="equalTo"/>
+                <condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0a8d-cde8-fba1-6c0d" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -8801,8 +8801,8 @@ On a 1, that wound or mortal wound is allocated to this unit as normal. On a 2-5
       <selectionEntryGroups>
         <selectionEntryGroup name="Weapon Selection" hidden="false" id="7a33-58d7-707d-ffaf">
           <constraints>
-            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="e6f-be66-7884-299-min"/>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="e6f-be66-7884-299-max"/>
+            <constraint type="min" value="3" field="selections" scope="parent" shared="true" id="e6f-be66-7884-299-min"/>
+            <constraint type="max" value="3" field="selections" scope="parent" shared="true" id="e6f-be66-7884-299-max"/>
           </constraints>
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Chain-smasha" hidden="false" id="ff85-b5d4-18e9-51d">
@@ -8819,9 +8819,6 @@ On a 1, that wound or mortal wound is allocated to this unit as normal. On a 2-5
                   </characteristics>
                 </profile>
               </profiles>
-              <constraints>
-                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1a48-c8a2-e806-2fdf"/>
-              </constraints>
             </selectionEntry>
             <selectionEntry type="upgrade" import="true" name="Mighty Gore-hacka" hidden="false" id="fbf8-a404-5682-6c0e">
               <profiles>
@@ -8837,9 +8834,6 @@ On a 1, that wound or mortal wound is allocated to this unit as normal. On a 2-5
                   </characteristics>
                 </profile>
               </profiles>
-              <constraints>
-                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="d980-471c-9f9-7970"/>
-              </constraints>
             </selectionEntry>
             <selectionEntry type="upgrade" import="true" name="Brute Crusha" hidden="false" id="df94-315e-3222-3cb7">
               <profiles>
@@ -8860,11 +8854,20 @@ On a 1, that wound or mortal wound is allocated to this unit as normal. On a 2-5
                   </characteristics>
                 </profile>
               </profiles>
-              <constraints>
-                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="55d5-f41a-cc86-5ecb"/>
-              </constraints>
             </selectionEntry>
           </selectionEntries>
+          <modifiers>
+            <modifier type="set" value="6" field="e6f-be66-7884-299-min">
+              <conditions>
+                <condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0a8d-cde8-fba1-6c0d" type="equalTo"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" value="6" field="e6f-be66-7884-299-max">
+              <conditions>
+                <condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0a8d-cde8-fba1-6c0d" type="equalTo"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <infoLinks>

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="136" 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="137" 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"/>
@@ -7867,29 +7867,37 @@ Each time you make an unmodified wound roll of 6 for Precise Shots, change the R
           <modifiers>
             <modifier type="set" field="name" value="3 Gyrocopters">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="8b93-6b7b-8e1d-5865" shared="true" includeChildSelections="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="parent" childId="b204-a2c4-2863-2e0c" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" value="0" field="points">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="parent" childId="b204-a2c4-2863-2e0c" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c0ec-656d-3909-efae" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dd81-8f55-8459-789b" type="max"/>
           </constraints>
+          <costs>
+            <cost name="pts" typeId="points" value="80"/>
+          </costs>
         </selectionEntry>
         <selectionEntry type="upgrade" import="true" name="3 Gyrocopters" hidden="false" id="b204-a2c4-2863-2e0c">
           <constraints>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="fa57-6d64-2f40-a26c"/>
           </constraints>
-          <modifiers>
-            <modifier type="set" value="240" field="points"/>
-          </modifiers>
           <profiles>
             <profile name="Champion" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities" hidden="false" id="be06-6d82-9e05-98f6">
               <characteristics>
                 <characteristic name="Ability Details" typeId="d4dc-8e81-bc0e-b8f0">If this unit has 2 or more models, 1 model in this unit can be a Squadron Leader. Add 1 to the Attacks characteristic of that model&apos;s missile weapons.</characteristic>
               </characteristics>
             </profile>
           </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="240"/>
+          </costs>
         </selectionEntry>
       </selectionEntries>
       <entryLinks>

diff --git a/Order - Kharadron Overlords - Data.cat b/Order - Kharadron Overlords - Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="3981-271d-5871-845b" name="Order - Kharadron Overlords - Data" revision="92" 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="3981-271d-5871-845b" name="Order - Kharadron Overlords - Data" revision="93" 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="e23c-3deb-pubN65537" name="Order Battletome: Kharadron Overlords"/>
     <publication id="e23c-3deb-pubN66862" name="Order Official FAQs and errata, Version 1.4"/>
@@ -2658,11 +2658,6 @@ count of 6 or less. Each unit must have a with a Wounds characteristic of 6 or l
                 </selectionEntryGroup>
                 <selectionEntryGroup name="Stick to the Code" hidden="false" id="8a26-da4-8f65-367">
                   <modifiers>
-                    <modifier type="set" value="0" field="41d9-a76f-d539-7403">
-                      <conditions>
-                        <condition type="atLeast" value="1" field="selections" scope="roster" childId="45a-1fa3-82e0-bf42" shared="true" includeChildSelections="true" includeChildForces="true"/>
-                      </conditions>
-                    </modifier>
                     <modifier type="set" value="true" field="hidden">
                       <conditions>
                         <condition type="atLeast" value="1" field="selections" scope="roster" childId="45a-1fa3-82e0-bf42" shared="true" includeChildSelections="true" includeChildForces="true"/>
@@ -2838,10 +2833,6 @@ count of 6 or less. Each unit must have a with a Wounds characteristic of 6 or l
                       </modifiers>
                     </selectionEntryGroup>
                   </selectionEntryGroups>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="41d9-a76f-d539-7403" type="min"/>
-                    <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fc75-f683-9a7c-f61b" type="max"/>
-                  </constraints>
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>

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="180" 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="181" 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)"/>
@@ -12623,8 +12623,8 @@ In addition, you can re-roll charge rolls for this unit if it was set-up on the
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="cf46-7b83-d97b-7663" shared="true"/>
-                <condition type="lessThan" value="1" field="selections" scope="parent" childId="26ae-0330-06d3-8f22" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="cf46-7b83-d97b-7663" shared="true" includeChildSelections="true"/>
+                <condition type="lessThan" value="1" field="selections" scope="roster" childId="26ae-0330-06d3-8f22" shared="true" includeChildSelections="true"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>