Merge pull request #3264 from BSData/more-cities-fixes

fixes
BSData · Nov 4, 2023 · a0e6413 · a0e6413
2 parents cd2fd5e + 513113d
commit a0e6413
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 20 deletions.
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="132" 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="133" 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"/>
@@ -344,7 +344,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">
+            <selectionEntry type="upgrade" import="true" name="Allegiance: Cities of Sigmar" hidden="false" id="cf90-d04d-d766-96ad" defaultAmount="1">
               <selectionEntryGroups>
                 <selectionEntryGroup id="d9ac-8b28-8227-c3a5" name="Free Cities" hidden="false" collective="false" import="true" defaultSelectionEntryId="9966-bee3-772e-a50b">
                   <selectionEntries>
@@ -5991,7 +5991,7 @@ Each time you make an unmodified wound roll of 6 for Precise Shots, change the R
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e06d-49f7-7491-138a" type="max"/>
-        <constraint field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8c1b-14c8-7919-8917" type="min"/>
+        <constraint field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="8c1b-14c8-7919-8917" type="min"/>
       </constraints>
       <categoryLinks>
         <categoryLink id="1a43-575d-5a75-6d36" name="New CategoryLink" hidden="false" targetId="1974-3f49-7f0b-8422" primary="true"/>
@@ -6238,33 +6238,41 @@ Each time you make an unmodified wound roll of 6 for Precise Shots, change the R
                 <condition type="atLeast" value="1" field="selections" scope="parent" childId="8b93-6b7b-8e1d-5865" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
+            <modifier type="set" value="0" field="points">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="parent" childId="8b93-6b7b-8e1d-5865" 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="90"/>
+          </costs>
         </selectionEntry>
         <selectionEntry type="upgrade" import="true" name="3 Drakespawn Chariots" hidden="false" id="8b93-6b7b-8e1d-5865">
           <constraints>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="fa57-6d64-2f40-a26c"/>
           </constraints>
-          <modifiers>
-            <modifier type="set" value="270" field="points"/>
-          </modifiers>
           <profiles>
             <profile name="Champion" typeId="c924-5a68-471a-2fd5" typeName="Unit Abilities" hidden="false" id="b534-324-da7b-36c6">
               <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="270"/>
+          </costs>
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
         <entryLink id="6dcc-c021-d4dc-8603" name="Battalions" hidden="false" collective="false" import="true" targetId="0389-96f8-e8bd-4d7f" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="90"/>
+        <cost name="pts" typeId="points" value="0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6d05-8629-41a9-3343" name="Gyrobombers" hidden="false" collective="false" import="true" type="unit">
@@ -8573,37 +8581,42 @@ Each time you make an unmodified wound roll of 6 for Precise Shots, change the R
           <modifiers>
             <modifier type="set" field="name" value="3 Scourgerunner Chariots">
               <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="2e24-b62d-10d6-3518" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" value="0" field="points">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="parent" childId="2e24-b62d-10d6-3518" 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-effe" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dd81-8f55-8f59-789b" type="max"/>
           </constraints>
+          <costs>
+            <cost name="pts" typeId="points" value="80"/>
+          </costs>
         </selectionEntry>
         <selectionEntry type="upgrade" import="true" name="3 Scourgerunner Chariots" hidden="false" id="2e24-b62d-10d6-3518">
           <constraints>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="fa5d7-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="1bbf-c0ca-dcfd-6127">
               <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 High Beastmaster. 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>
         <entryLink id="f788-b531-e817-1df3" name="Battalions" hidden="false" collective="false" import="true" targetId="0389-96f8-e8bd-4d7f" type="selectionEntryGroup"/>
       </entryLinks>
-      <costs>
-        <cost name="pts" typeId="points" value="80"/>
-      </costs>
     </selectionEntry>
     <selectionEntry id="d377-9e2-915c-f06b" name="Kharibdyss" hidden="false" collective="false" import="true" type="unit">
       <profiles>
@@ -10390,7 +10403,7 @@ Designer’s Note: The Relic Envoy’s miniature isn’t considered to be a mode
           <modifiers>
             <modifier type="set" field="95f2-6885-756f-9ea5" value="2">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="roster" childId="57c6-1c7-afa9-47ac" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="524d-49f2-3f8f-710" shared="true"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -10892,7 +10905,7 @@ Cast Out Evil: Roll a dice for each enemy WIZARD and PRIEST on the battlefield.
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1e50-1fc5-35c3-eafa" type="max"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="points" value="150"/>
+            <cost name="pts" typeId="points" value="100"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -10906,7 +10919,7 @@ Cast Out Evil: Roll a dice for each enemy WIZARD and PRIEST on the battlefield.
             </modifier>
           </modifiers>
           <costs>
-            <cost name="pts" typeId="points" value="150"/>
+            <cost name="pts" typeId="points" value="100"/>
           </costs>
         </entryLink>
         <entryLink id="7b17-946c-b829-8c51" name="Battalions" hidden="false" collective="false" import="true" targetId="0389-96f8-e8bd-4d7f" type="selectionEntryGroup"/>
@@ -11733,7 +11746,7 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
       <modifiers>
         <modifier type="set-primary" value="e9f2-765a-b7b8-ce8e" field="category">
           <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="parent" childId="c43d-6084-b475-bb0a" shared="true"/>
+            <condition type="atLeast" value="1" field="selections" scope="roster" childId="c43d-6084-b475-bb0a" shared="true" includeChildSelections="true" includeChildForces="true"/>
           </conditions>
         </modifier>
       </modifiers>
@@ -12192,7 +12205,7 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
       <selectionEntries>
         <selectionEntry id="e207-7ead-cfbd-c232" name="Exemplar of the Academae Martial" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="6491-455f-5f04-4dea" type="max"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6491-455f-5f04-4dea" type="max"/>
           </constraints>
           <profiles>
             <profile name="Exemplar of the Academae Martial" typeId="9c01-ec20-32c1-0948" typeName="Grand Strategy" hidden="false" id="ebff-e23a-4a66-dad9">
@@ -12219,6 +12232,9 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
               </characteristics>
             </profile>
           </profiles>
+          <categoryLinks>
+            <categoryLink targetId="5dff-3614-49fd-c3e4" id="fa53-9d4d-1564-9c1a" primary="false" name="Grand Strategy"/>
+          </categoryLinks>
         </selectionEntry>
         <selectionEntry type="upgrade" import="true" name="Hold the High Ground" hidden="false" id="a024-e702-aeb4-5195">
           <constraints>
@@ -12231,6 +12247,9 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
               </characteristics>
             </profile>
           </profiles>
+          <categoryLinks>
+            <categoryLink targetId="5dff-3614-49fd-c3e4" id="14dc-907a-f562-1cfb" primary="false" name="Grand Strategy"/>
+          </categoryLinks>
         </selectionEntry>
         <selectionEntry type="upgrade" import="true" name="Banners Held High" hidden="false" id="444-e4ce-45e-9da3">
           <constraints>
@@ -12243,6 +12262,9 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
               </characteristics>
             </profile>
           </profiles>
+          <categoryLinks>
+            <categoryLink targetId="5dff-3614-49fd-c3e4" id="f265-48ed-b0b-495d" primary="false" name="Grand Strategy"/>
+          </categoryLinks>
         </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>

diff --git a/Regiments of Renown.cat b/Regiments of Renown.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="33cf-d309-6df3-50d6" name="Regiments of Renown" revision="8" battleScribeVersion="2.03" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="157" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="33cf-d309-6df3-50d6" name="Regiments of Renown" revision="9" battleScribeVersion="2.03" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="157" type="catalogue">
   <categoryEntries>
     <categoryEntry id="70bf-3963-c8b1-948f" name="ORRUK WARCLANS" hidden="false"/>
     <categoryEntry id="c391-fa3d-48c4-136f" name="ORRUK" hidden="false"/>
@@ -3583,6 +3583,9 @@ Nasty Poisons: You can only pick this effect while this unit has a Spiker.  Pick
           </conditions>
         </modifier>
       </modifiers>
+      <categoryLinks>
+        <categoryLink targetId="6575-7d6c-ce4d-ada4" id="69a8-d07-e577-f0ba" primary="true" name="Core Battalion"/>
+      </categoryLinks>
     </selectionEntry>
   </sharedSelectionEntries>
   <catalogueLinks>