Merge pull request #3332 from BSData/bugfixes

Bugfixes
BSData · Feb 9, 2024 · 818800c · 818800c
2 parents 796d3ef + a5d9d78
commit 818800c
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 47 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="172" 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="173" 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"/>
@@ -756,38 +756,6 @@
       </constraints>
       <forceEntries>
         <forceEntry id="24d6-500b-7e3f-1470" name="Allies" hidden="false">
-          <modifiers>
-            <modifier type="set" field="4783-9a05-8cfe-7af2" value="100">
-              <conditions>
-                <condition field="selections" scope="36b7-ee1e-0855-f23f" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e860-9b1e-36bd-a54f" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="4783-9a05-8cfe-7af2" value="400">
-              <conditions>
-                <condition field="selections" scope="36b7-ee1e-0855-f23f" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cea8-e4b2-c44f-c7b4" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="4783-9a05-8cfe-7af2" value="200">
-              <conditions>
-                <condition field="selections" scope="36b7-ee1e-0855-f23f" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e9fc-6b3a-1b9a-e807" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="4783-9a05-8cfe-7af2" value="520">
-              <conditions>
-                <condition field="selections" scope="78f3-8a59-699a-61e8" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="24c2-fff5-f17c-3d07" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="4783-9a05-8cfe-7af2" value="300">
-              <conditions>
-                <condition field="selections" scope="36b7-ee1e-0855-f23f" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a3cc-3b86-4778-0b11" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="4783-9a05-8cfe-7af2" value="600">
-              <conditions>
-                <condition field="selections" scope="36b7-ee1e-0855-f23f" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ef67-15fb-487c-397a" type="equalTo"/>
-              </conditions>
-            </modifier>
-          </modifiers>
           <constraints>
             <constraint field="points" scope="roster" value="-1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="4783-9a05-8cfe-7af2" type="max"/>
           </constraints>

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="142" 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="143" 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"/>
@@ -11337,12 +11337,12 @@ Power the Guns: Add 1 to the Attacks characteristic of this unit’s Steam Canno
         <profile id="e8d7-9b97-485c-4ffe" name="Great Cannon: Grapeshot" hidden="false" typeId="96df-ab28-5d72-bbb3" typeName="Weapon">
           <characteristics>
             <characteristic name="Type" typeId="655c-362e-a663-3e50">Missile</characteristic>
-            <characteristic name="Range" typeId="ee32-7f8e-ccd7-b7b0">24&quot;</characteristic>
-            <characteristic name="Attacks" typeId="0bd7-bded-a0e0-19a0">2</characteristic>
-            <characteristic name="To Hit" typeId="87f2-fb99-33f9-7269">4+</characteristic>
-            <characteristic name="To Wound" typeId="8842-17f1-9794-4efc">2+</characteristic>
-            <characteristic name="Rend" typeId="f578-d2a5-f0d3-b707">-2</characteristic>
-            <characteristic name="Damage" typeId="b5b6-4cbd-661d-1b70">D3+2</characteristic>
+            <characteristic name="Range" typeId="ee32-7f8e-ccd7-b7b0">12&quot;</characteristic>
+            <characteristic name="Attacks" typeId="0bd7-bded-a0e0-19a0">5</characteristic>
+            <characteristic name="To Hit" typeId="87f2-fb99-33f9-7269">3+</characteristic>
+            <characteristic name="To Wound" typeId="8842-17f1-9794-4efc">3+</characteristic>
+            <characteristic name="Rend" typeId="f578-d2a5-f0d3-b707">-1</characteristic>
+            <characteristic name="Damage" typeId="b5b6-4cbd-661d-1b70">2</characteristic>
           </characteristics>
         </profile>
       </profiles>

diff --git a/Order - Daughters of Khaine.cat b/Order - Daughters of Khaine.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="388b-16d3-8182-d6c0" name="Order - Daughters of Khaine" revision="142" 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="388b-16d3-8182-d6c0" name="Order - Daughters of Khaine" revision="143" 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="388b-16d3-pubN82262" name="Order Battletome: Daughters of Khaine (2022)"/>
     <publication id="bd99-1968-f56c-5ef0" name="Battletome: Daughters of Khaine Errata, June 2022"/>
@@ -4907,13 +4907,29 @@ In addition, if the roll was a 6, this invocation is removed from play at the en
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="increment" value="1" field="6c1f-efd8-5c07-55d9">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="parent" childId="53f8-bcf5-1662-e090" shared="true" includeChildSelections="true" includeChildForces="true"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6c1f-efd8-5c07-55d9" type="max"/>
       </constraints>
       <entryLinks>
         <entryLink id="08f1-a182-1a66-9bb7" name="Prayers of the Khainite Cult" hidden="false" collective="false" import="true" targetId="51b2-9944-dcd9-447f" type="selectionEntryGroup"/>
-        <entryLink id="cd17-b82e-6523-e468" name="Universal Prayer Scripture" hidden="false" collective="false" import="true" targetId="3674-103c-35c9-85a6" type="selectionEntryGroup"/>
+        <entryLink id="cd17-b82e-6523-e468" name="Universal Prayer Scripture" hidden="false" collective="false" import="true" targetId="3674-103c-35c9-85a6" type="selectionEntryGroup">
+          <modifiers>
+            <modifier type="increment" field="f9a1-f08a-825d-a001" value="1">
+              <repeats>
+                <repeat field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="24e6-c9b0-8d0d-02a2" repeats="1" roundUp="false"/>
+              </repeats>
+            </modifier>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f9a1-f08a-825d-a001" type="max"/>
+          </constraints>
+        </entryLink>
       </entryLinks>
     </selectionEntryGroup>
     <selectionEntryGroup id="3170-28ba-a091-950d" name="Spell Lores" hidden="false" collective="false" import="true">

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="19" 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="20" 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"/>
@@ -4233,6 +4233,9 @@ renown.</characteristic>
           </constraints>
         </selectionEntryGroup>
       </selectionEntryGroups>
+      <infoLinks>
+        <infoLink id="bb2d-fda9-d27c-5b3f" name="Unified" hidden="false" targetId="9439-c5f6-945d-2d65" type="profile"/>
+      </infoLinks>
     </selectionEntry>
     <selectionEntry type="upgrade" import="true" name="Ushoran, Mortarch of Delusion" hidden="false" id="d636-fcf-f4ea-2b22">
       <categoryLinks>
@@ -4655,6 +4658,9 @@ renown.</characteristic>
       <categoryLinks>
         <categoryLink targetId="6575-7d6c-ce4d-ada4" id="f58c-d416-6fe2-ff91" primary="true" name="Core Battalion"/>
       </categoryLinks>
+      <infoLinks>
+        <infoLink id="2b86-1003-d439-f486" name="Unified" hidden="false" targetId="9439-c5f6-945d-2d65" type="profile"/>
+      </infoLinks>
     </selectionEntry>
     <selectionEntry id="ff9-7ce8-1fb0-9130" name="Grave Guard" publicationId="7a08-6611-3750-6469" page="104" hidden="false" collective="false" import="true" type="unit">
       <profiles>
@@ -5120,6 +5126,9 @@ renown.</characteristic>
       <categoryLinks>
         <categoryLink targetId="6575-7d6c-ce4d-ada4" id="dba3-2034-769b-3a60" primary="true" name="Core Battalion"/>
       </categoryLinks>
+      <infoLinks>
+        <infoLink id="2577-f2b3-e4a8-cea1" name="Unified" hidden="false" targetId="9439-c5f6-945d-2d65" type="profile"/>
+      </infoLinks>
     </selectionEntry>
     <selectionEntry id="3582-901d-dea2-546b" name="Morghast Harbingers" page="135" hidden="false" collective="false" import="true" type="unit">
       <profiles>
@@ -5873,6 +5882,9 @@ If that unit is an IMMORTIS GUARD or NECROPOLIS STALKERS unit, you can either he
           </constraints>
         </selectionEntryGroup>
       </selectionEntryGroups>
+      <infoLinks>
+        <infoLink id="96f1-fa9f-d461-62db" name="Unified" hidden="false" targetId="9439-c5f6-945d-2d65" type="profile"/>
+      </infoLinks>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Regiment of Renown - The Sorrowmourne Choir" hidden="false" id="48ca-d15d-4e8b-be5b">
       <modifiers>
@@ -5937,6 +5949,9 @@ If that unit is an IMMORTIS GUARD or NECROPOLIS STALKERS unit, you can either he
           </constraints>
         </selectionEntryGroup>
       </selectionEntryGroups>
+      <infoLinks>
+        <infoLink id="da15-4b58-7684-b44" name="Unified" hidden="false" targetId="9439-c5f6-945d-2d65" type="profile"/>
+      </infoLinks>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Regiment of Renown - The Sternieste Garrison" hidden="false" id="1061-aedd-61af-3ef6">
       <modifiers>
@@ -5992,20 +6007,23 @@ If that unit is an IMMORTIS GUARD or NECROPOLIS STALKERS unit, you can either he
             <entryLink import="true" name="Fell Bats" hidden="false" type="selectionEntry" id="dfaa-96be-427a-9073" targetId="573e-37b9-17a7-bc26"/>
           </entryLinks>
           <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c02d-b5f6-2f45-e9ba" type="max"/>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d4e1-e3ae-67fc-50c8" type="min"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c02d-b5f6-2f45-e9ba" type="max"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4e1-e3ae-67fc-50c8" type="min"/>
           </constraints>
         </selectionEntryGroup>
         <selectionEntryGroup name="Fell Bats" hidden="false" id="ad1d-c88f-8bff-85bb">
           <entryLinks>
             <entryLink import="true" name="Fell Bats" hidden="false" type="selectionEntry" id="4e6b-6130-2dce-53da" targetId="573e-37b9-17a7-bc26"/>
           </entryLinks>
           <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dfb4-e97f-e807-589e" type="max"/>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ec1c-f582-b6bd-79f5" type="min"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dfb4-e97f-e807-589e" type="max"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ec1c-f582-b6bd-79f5" type="min"/>
           </constraints>
         </selectionEntryGroup>
       </selectionEntryGroups>
+      <infoLinks>
+        <infoLink id="3736-ed7b-f7-e96d" name="Unified" hidden="false" targetId="9439-c5f6-945d-2d65" type="profile"/>
+      </infoLinks>
     </selectionEntry>
     <selectionEntry id="2ae3-57f5-844c-e65d" name="Dreadscythe Harridans" publicationId="e320-d5ec-pubN65555" hidden="false" collective="false" import="true" type="unit">
       <modifiers>