From 8b3c54b42427657c03ace1587796ccd29f95e440 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Thu, 9 Nov 2023 17:24:24 +0000
Subject: [PATCH 01/16] Added selectable weapons to Brutes with only one option

---
 2022 - Imperialis Militia.cat | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/2022 - Imperialis Militia.cat b/2022 - Imperialis Militia.cat
index 22e8a57e..441878db 100644
--- a/2022 - Imperialis Militia.cat	
+++ b/2022 - Imperialis Militia.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f84d-94cf-5ce6-b393" name="2022 - Imperialis Militia" revision="23" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="f84d-94cf-5ce6-b393" name="2022 - Imperialis Militia" revision="24" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <categoryEntries>
     <categoryEntry id="58b3-196a-9732-2165" name="Rogue Psyker Daemons Restriction" publicationId="48c2-d023-0069-001a" page="15" hidden="false">
       <modifiers>
@@ -10291,7 +10291,6 @@ equal to the number of Militia Gunners in the unit when making a Shooting Attack
       <entryLinks>
         <entryLink import="true" name="Daemon Brute" hidden="false" type="selectionEntry" id="8838-1f4d-99ad-c5a6" targetId="e3e-4f46-2300-a35"/>
         <entryLink import="true" name="The Ætheric Dominion (Unit)" hidden="false" type="selectionEntryGroup" id="c199-83a6-b057-7da4" targetId="caad-e621-38e5-cb5f"/>
-        <entryLink import="true" name="Infernal Armaments" hidden="false" type="selectionEntry" id="c0e0-b555-d1dc-d25e" targetId="9abc-11e8-9031-d104"/>
       </entryLinks>
       <infoLinks>
         <infoLink id="ce10-5041-d503-82f7" name="Æthereal Invulnerability (X)" hidden="false" targetId="e05e-ed23-64fb-a535" type="rule">
@@ -10327,6 +10326,22 @@ equal to the number of Militia Gunners in the unit when making a Shooting Attack
           </conditions>
         </modifier>
       </modifiers>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Weapons" hidden="false" id="e674-e281-d84d-e736">
+          <entryLinks>
+            <entryLink import="true" name="Infernal Armaments" hidden="false" type="selectionEntry" id="f5a2-bcd2-185e-496c" targetId="9abc-11e8-9031-d104">
+              <constraints>
+                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="4d35-bc8b-6bd1-4fa3"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="bb25-d7e4-66aa-e8b9"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="3fc4-cecb-2f96-5f6c"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="614d-8756-bb8f-e6c"/>
+          </constraints>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Ruinstorm Daemon Swarms (Rogue Psyker)" hidden="false" id="35ce-dce-186d-4000">
       <costs>

From 9492751b35d7695d2340b05c6520739ee13088ff Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Thu, 9 Nov 2023 17:27:38 +0000
Subject: [PATCH 02/16] Made the same change to astartes

---
 2022 - Legiones Astartes.cat | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index 25be117c..d5eb3eae 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6393-649c-7213-a327" name="(HH V2) Legions Astartes" revision="159" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="6393-649c-7213-a327" name="(HH V2) Legions Astartes" revision="160" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <publications>
     <publication id="0594-a9b0-6f10-090e" name="Legion Javelin Squadron update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/hd7WOnm2lKCHkskG.pdf"/>
     <publication id="acdb-27b7-6b7e-932f" name="Legion Mastodon update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/AopGHpxowuowkwJw.pdf"/>
@@ -54915,7 +54915,6 @@ may choose to activate the Power of Chaos Eternal. Onc eactivated, Horus Ascende
       <entryLinks>
         <entryLink import="true" name="Daemon Brute" hidden="false" type="selectionEntry" id="41b0-3159-b8b-b771" targetId="e3e-4f46-2300-a35"/>
         <entryLink import="true" name="The Ætheric Dominion (Unit)" hidden="false" type="selectionEntryGroup" id="59a5-f924-927a-daab" targetId="caad-e621-38e5-cb5f"/>
-        <entryLink import="true" name="Infernal Armaments" hidden="false" type="selectionEntry" id="b2e-659-1f8b-5d8d" targetId="9abc-11e8-9031-d104"/>
       </entryLinks>
       <infoLinks>
         <infoLink id="2420-1679-83c5-d0a3" name="Æthereal Invulnerability (X)" hidden="false" targetId="e05e-ed23-64fb-a535" type="rule">
@@ -54951,6 +54950,17 @@ may choose to activate the Power of Chaos Eternal. Onc eactivated, Horus Ascende
           </conditions>
         </modifier>
       </modifiers>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Weapons" hidden="false" id="c38e-1036-d2b7-5a27">
+          <entryLinks>
+            <entryLink import="true" name="Infernal Armaments" hidden="false" type="selectionEntry" id="3708-c0ea-3bce-53b4" targetId="9abc-11e8-9031-d104" defaultAmount="3"/>
+          </entryLinks>
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="ea32-4405-9ceb-1532"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="188-2992-564e-aa5a"/>
+          </constraints>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Ruinstorm Daemon Swarms (Esoterist)" hidden="false" id="ba83-50a5-58b2-d96e">
       <costs>

From f4ebb7c0a09704e4e38ef9629e37519d99e22ddb Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Thu, 9 Nov 2023 17:43:52 +0000
Subject: [PATCH 03/16] Added same change to ruinstorm catalogue

---
 2022 - Daemons - Daemons of the Ruinstorm.cat | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/2022 - Daemons - Daemons of the Ruinstorm.cat b/2022 - Daemons - Daemons of the Ruinstorm.cat
index d90f3e78..0488fb7b 100644
--- a/2022 - Daemons - Daemons of the Ruinstorm.cat	
+++ b/2022 - Daemons - Daemons of the Ruinstorm.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="5" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="6" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <entryLinks>
     <entryLink import="false" name="Daemons of the Ruinstorm" hidden="false" type="selectionEntry" id="e271-f450-1c28-5b7b" targetId="afca-3047-fb26-d097">
       <constraints>
@@ -599,12 +599,6 @@
       </costs>
       <entryLinks>
         <entryLink import="true" name="The Ætheric Dominion (Unit)" hidden="false" type="selectionEntryGroup" id="b5cc-4b7f-66f9-183f" targetId="caad-e621-38e5-cb5f"/>
-        <entryLink import="true" name="Infernal Armaments" hidden="false" type="selectionEntry" id="c041-717-ac3f-5f0b" targetId="9abc-11e8-9031-d104">
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="273c-8b52-76b5-3306"/>
-            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="6458-ec95-34c5-701d"/>
-          </constraints>
-        </entryLink>
       </entryLinks>
       <categoryLinks>
         <categoryLink targetId="e699-d9cd-e68e-46d9" id="eddf-34f6-417f-401a" primary="false" name="Daemon Unit-type:"/>
@@ -643,6 +637,22 @@
           </conditions>
         </modifier>
       </modifiers>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Weapons" hidden="false" id="5b87-924a-4731-f695">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="b430-a8c3-3cb1-a0ad"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="f63-b8a8-f4d7-459e"/>
+          </constraints>
+          <entryLinks>
+            <entryLink import="true" name="Infernal Armaments" hidden="false" type="selectionEntry" id="88c4-a75e-482b-877e" targetId="9abc-11e8-9031-d104">
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="999c-2a3d-e550-3439"/>
+                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="18bf-736-c35b-c2cc"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Ruinstorm Daemon Beasts" hidden="false" id="69ad-927-c71b-6b24" publicationId="8775-88f5-cfdd-24f6" page="10">
       <costs>

From b9eda19f74ea95aabd27e0ee0eac255017f10ad1 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Sat, 11 Nov 2023 00:24:15 +0000
Subject: [PATCH 04/16] Removed fearless if they already had stubborn from Day
 of Sorrows as that's not how it works

---
 2022 - Horus Heresy.gst | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 93b90b11..7c061c52 100644
--- a/2022 - Horus Heresy.gst	
+++ b/2022 - Horus Heresy.gst	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="28d4-bd2e-4858-ece6" name="(HH V2) Horus Heresy (2022)" revision="86" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
+<gameSystem id="28d4-bd2e-4858-ece6" name="(HH V2) Horus Heresy (2022)" revision="87" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
   <publications>
     <publication name="GitHub" hidden="false" id="e2a4-ac85-1bef-22f5" publisherUrl="https://github.com/BSData/horus-heresy"/>
     <publication id="e77a-823a-da94-16b9" name="Warhammer: The Horus Heresy - Age of Darkness Rulebook" shortName="Main Rules" publicationDate="June 2022"/>
@@ -350,16 +350,6 @@ During Reactions made in any Phase, a unit equipped with Jump PAcks may not acti
             <modifier type="set" field="name" value="Fearless (in 6&quot; of Objective if they didn&apos;t already have Stubborn)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="4aea-a583-a545-cbc8" name="Fearless" hidden="false" targetId="b48c-d7e1-2a83-2f5b" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="name" value="Fearless (in 6&quot; of Objective if they had already had Stubborn)"/>
-          </modifiers>
-        </infoLink>
         <infoLink id="9afe-5527-9b81-e837" name="Line Sub-type" hidden="false" targetId="bc1e-9c95-f971-cd7b" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">

From 52ba248d9f719a09627f6c43a8a6dd31099cafdc Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Sat, 11 Nov 2023 00:32:35 +0000
Subject: [PATCH 05/16] Linked rule properly and added rename

---
 2022 - Horus Heresy.gst | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 7c061c52..92309fea 100644
--- a/2022 - Horus Heresy.gst	
+++ b/2022 - Horus Heresy.gst	
@@ -340,16 +340,6 @@ During Reactions made in any Phase, a unit equipped with Jump PAcks may not acti
             <modifier type="set" field="name" value="Heart of the Legion (if at 50% of less of unit size)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="0aec-717a-af00-d33e" name="Stubborn" hidden="false" targetId="7989-1f2c-a43d-82ae" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="name" value="Fearless (in 6&quot; of Objective if they didn&apos;t already have Stubborn)"/>
-          </modifiers>
-        </infoLink>
         <infoLink id="9afe-5527-9b81-e837" name="Line Sub-type" hidden="false" targetId="bc1e-9c95-f971-cd7b" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
@@ -1583,7 +1573,20 @@ Reactions:
             <constraint field="selections" scope="force" value="2" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8810-8109-85db-93e4" type="min"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="2545-86dd-f928-73f3" name="Infantry:" hidden="false" targetId="8b4f-bfe2-ce7b-f1b1" primary="false"/>
+        <categoryLink id="2545-86dd-f928-73f3" name="Infantry:" hidden="false" targetId="8b4f-bfe2-ce7b-f1b1" primary="false">
+          <infoLinks>
+            <infoLink name="Stubborn" hidden="false" type="rule" id="986d-7ecf-f212-2602" targetId="7989-1f2c-a43d-82ae">
+              <modifiers>
+                <modifier type="set" field="hidden" value="true">
+                  <conditions>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" value="Stubborn (if one model is within 6&quot; of an objective)" field="name"/>
+              </modifiers>
+            </infoLink>
+          </infoLinks>
+        </categoryLink>
         <categoryLink id="dc87-6668-f349-2a8c" name="LoW &amp; Primarchs (25% Limit)" hidden="false" targetId="2eaf-32d6-9d1d-d906" primary="false">
           <modifiers>
             <modifier type="increment" field="d9f7-954e-b8d3-7a39" value="1">

From d93081ed53274207be7dfb24dbeae62c72ff08f4 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Sat, 11 Nov 2023 23:19:59 +0000
Subject: [PATCH 06/16] Fixed the cargo-8s pintle mounted weapons being added
 automatically

---
 2022 - Horus Heresy.gst       | 47 +++++++++++------------------------
 2022 - Imperialis Militia.cat | 46 +++++++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 93b90b11..f3007a9f 100644
--- a/2022 - Horus Heresy.gst	
+++ b/2022 - Horus Heresy.gst	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="28d4-bd2e-4858-ece6" name="(HH V2) Horus Heresy (2022)" revision="86" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
+<gameSystem id="28d4-bd2e-4858-ece6" name="(HH V2) Horus Heresy (2022)" revision="87" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
   <publications>
     <publication name="GitHub" hidden="false" id="e2a4-ac85-1bef-22f5" publisherUrl="https://github.com/BSData/horus-heresy"/>
     <publication id="e77a-823a-da94-16b9" name="Warhammer: The Horus Heresy - Age of Darkness Rulebook" shortName="Main Rules" publicationDate="June 2022"/>
@@ -340,26 +340,6 @@ During Reactions made in any Phase, a unit equipped with Jump PAcks may not acti
             <modifier type="set" field="name" value="Heart of the Legion (if at 50% of less of unit size)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="0aec-717a-af00-d33e" name="Stubborn" hidden="false" targetId="7989-1f2c-a43d-82ae" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="name" value="Fearless (in 6&quot; of Objective if they didn&apos;t already have Stubborn)"/>
-          </modifiers>
-        </infoLink>
-        <infoLink id="4aea-a583-a545-cbc8" name="Fearless" hidden="false" targetId="b48c-d7e1-2a83-2f5b" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="set" field="name" value="Fearless (in 6&quot; of Objective if they had already had Stubborn)"/>
-          </modifiers>
-        </infoLink>
         <infoLink id="9afe-5527-9b81-e837" name="Line Sub-type" hidden="false" targetId="bc1e-9c95-f971-cd7b" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
@@ -1593,7 +1573,20 @@ Reactions:
             <constraint field="selections" scope="force" value="2" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8810-8109-85db-93e4" type="min"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="2545-86dd-f928-73f3" name="Infantry:" hidden="false" targetId="8b4f-bfe2-ce7b-f1b1" primary="false"/>
+        <categoryLink id="2545-86dd-f928-73f3" name="Infantry:" hidden="false" targetId="8b4f-bfe2-ce7b-f1b1" primary="false">
+          <infoLinks>
+            <infoLink name="Stubborn" hidden="false" type="rule" id="986d-7ecf-f212-2602" targetId="7989-1f2c-a43d-82ae">
+              <modifiers>
+                <modifier type="set" field="hidden" value="true">
+                  <conditions>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" value="Stubborn (if one model is within 6&quot; of an objective)" field="name"/>
+              </modifiers>
+            </infoLink>
+          </infoLinks>
+        </categoryLink>
         <categoryLink id="dc87-6668-f349-2a8c" name="LoW &amp; Primarchs (25% Limit)" hidden="false" targetId="2eaf-32d6-9d1d-d906" primary="false">
           <modifiers>
             <modifier type="increment" field="d9f7-954e-b8d3-7a39" value="1">
@@ -7217,16 +7210,6 @@ A unit that makes a Shooting Attack as part of a Scornful Fire Reaction may not
       </costs>
     </selectionEntry>
     <selectionEntry id="f227-a61a-3215-932b" name="Heavy Stubber" publicationId="bde1-6db1-163b-3b76" page="114" hidden="false" collective="false" import="true" type="upgrade">
-      <profiles>
-        <profile id="129d-1b6c-7ba2-29ec" name="Heavy Stubber" hidden="false" typeId="1a1a-e592-2849-a5c0" typeName="Weapon">
-          <characteristics>
-            <characteristic name="Range" typeId="95ba-cda7-b831-6066">36&quot;</characteristic>
-            <characteristic name="Strength" typeId="24d9-b8e1-a355-2458">4</characteristic>
-            <characteristic name="AP" typeId="f7a6-e0d8-7973-cd8d">6</characteristic>
-            <characteristic name="Type" typeId="2f86-c8b4-b3b4-3ff9">Heavy 3</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
diff --git a/2022 - Imperialis Militia.cat b/2022 - Imperialis Militia.cat
index 22e8a57e..117d7e2f 100644
--- a/2022 - Imperialis Militia.cat	
+++ b/2022 - Imperialis Militia.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f84d-94cf-5ce6-b393" name="2022 - Imperialis Militia" revision="23" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="f84d-94cf-5ce6-b393" name="2022 - Imperialis Militia" revision="24" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <categoryEntries>
     <categoryEntry id="58b3-196a-9732-2165" name="Rogue Psyker Daemons Restriction" publicationId="48c2-d023-0069-001a" page="15" hidden="false">
       <modifiers>
@@ -5988,20 +5988,6 @@ Note that only Militia Medicae selected as part of a Detachment with the Ogryn C
                   <infoLinks>
                     <infoLink id="dbc6-b655-39ee-d9fa" name="Infantry Transport" hidden="false" targetId="0c6b-9cc1-5801-3e83" type="rule"/>
                   </infoLinks>
-                  <entryLinks>
-                    <entryLink id="8f22-cfce-88a0-ab05" name="Heavy Stubber" hidden="false" collective="false" import="true" targetId="f227-a61a-3215-932b" type="selectionEntry">
-                      <modifiers>
-                        <modifier type="set" field="name" value="Pintle-mounted Heavy Stubber"/>
-                      </modifiers>
-                      <constraints>
-                        <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4d28-b338-c19a-a25b" type="min"/>
-                        <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="42b5-0e8e-e2a0-caa7" type="max"/>
-                      </constraints>
-                      <costs>
-                        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
-                      </costs>
-                    </entryLink>
-                  </entryLinks>
                   <costs>
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                   </costs>
@@ -6037,6 +6023,36 @@ Note that only Militia Medicae selected as part of a Detachment with the Ogryn C
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
+            <selectionEntryGroup name="3) Additional Pintle-mounted Heavy Stubber(s)" hidden="false" id="4e2f-805c-4917-5310">
+              <selectionEntries>
+                <selectionEntry type="upgrade" import="true" name="Additional Pintle-mounted Heavy Stubber" hidden="false" id="64f1-91c1-a87a-39f6">
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+                  </costs>
+                  <profiles>
+                    <profile name="Heavy Stubber" typeId="1a1a-e592-2849-a5c0" typeName="Weapon" hidden="false" id="2711-e057-d0a-7c91">
+                      <characteristics>
+                        <characteristic name="Range" typeId="95ba-cda7-b831-6066">36&quot;</characteristic>
+                        <characteristic name="Strength" typeId="24d9-b8e1-a355-2458">4</characteristic>
+                        <characteristic name="AP" typeId="f7a6-e0d8-7973-cd8d">6</characteristic>
+                        <characteristic name="Type" typeId="2f86-c8b4-b3b4-3ff9">Heavy 3</characteristic>
+                      </characteristics>
+                    </profile>
+                  </profiles>
+                  <constraints>
+                    <constraint type="max" value="2" field="selections" scope="parent" shared="true" id="d5f4-6d43-d2f1-944f"/>
+                    <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="3a48-fa0c-8ccb-9db5"/>
+                  </constraints>
+                </selectionEntry>
+              </selectionEntries>
+              <modifiers>
+                <modifier type="set" value="true" field="hidden">
+                  <conditions>
+                    <condition type="lessThan" value="1" field="selections" scope="parent" childId="4ebb-e505-d38f-637b" shared="true"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </selectionEntryGroup>
           </selectionEntryGroups>
           <entryLinks>
             <entryLink id="fc31-4313-90e5-ed30" name="Searchlights" hidden="false" collective="false" import="true" targetId="4ae3-79b4-6051-505e" type="selectionEntry">

From ad8afcae920de220f6635650fa237b626f6338cd Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Mon, 13 Nov 2023 16:29:03 +0000
Subject: [PATCH 07/16] Added carsoran weapons to despoilers, destroyers. and
 assault destroyers

---
 2022 - LA - Sons of Horus.cat |  2 +-
 2022 - Legiones Astartes.cat  | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/2022 - LA - Sons of Horus.cat b/2022 - LA - Sons of Horus.cat
index 35c8db60..0a8732d9 100644
--- a/2022 - LA - Sons of Horus.cat	
+++ b/2022 - LA - Sons of Horus.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="34" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <entryLinks>
     <entryLink id="c2a2-9b6d-b384-3f43" name="XVI: Sons of Horus" hidden="false" collective="false" import="false" targetId="01b4-57c7-bf61-2abf" type="selectionEntry">
       <modifiers>
diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index 25be117c..0f1a6cb4 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6393-649c-7213-a327" name="(HH V2) Legions Astartes" revision="159" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="6393-649c-7213-a327" name="(HH V2) Legions Astartes" revision="160" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <publications>
     <publication id="0594-a9b0-6f10-090e" name="Legion Javelin Squadron update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/hd7WOnm2lKCHkskG.pdf"/>
     <publication id="acdb-27b7-6b7e-932f" name="Legion Mastodon update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/AopGHpxowuowkwJw.pdf"/>
@@ -18238,6 +18238,16 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                           </costs>
                         </entryLink>
+                        <entryLink id="e9eb-8b1a-95fe-9289" name="Carsoran Power Axe" hidden="false" collective="false" import="true" targetId="fa70-f0d0-b06d-5413" type="selectionEntry">
+                          <costs>
+                            <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+                          </costs>
+                        </entryLink>
+                        <entryLink id="415-35d3-e227-f673" name="Carsoran Power Tabar" hidden="false" collective="false" import="true" targetId="ef4f-80d4-1bba-77fb" type="selectionEntry">
+                          <costs>
+                            <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+                          </costs>
+                        </entryLink>
                       </entryLinks>
                     </selectionEntryGroup>
                     <selectionEntryGroup id="de17-4528-898f-933a" name="One in ten may exchange their Chainsword for:" hidden="true" collective="false" import="true">
@@ -47766,6 +47776,16 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                           </costs>
                         </entryLink>
+                        <entryLink id="a22e-5752-b883-4826" name="Carsoran Power Axe" hidden="false" collective="false" import="true" targetId="fa70-f0d0-b06d-5413" type="selectionEntry" defaultAmount="">
+                          <costs>
+                            <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                          </costs>
+                        </entryLink>
+                        <entryLink id="d6a6-98-8519-9b7a" name="Carsoran Power Tabar" hidden="false" collective="false" import="true" targetId="ef4f-80d4-1bba-77fb" type="selectionEntry">
+                          <costs>
+                            <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                          </costs>
+                        </entryLink>
                       </entryLinks>
                     </selectionEntryGroup>
                   </selectionEntryGroups>
@@ -49223,6 +49243,16 @@ During a Reaction made in any Phase, a player may not choose to activate a model
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                           </costs>
                         </entryLink>
+                        <entryLink id="9b10-b2a4-2bd-97f4" name="Carsoran Power Axe" hidden="false" collective="false" import="true" targetId="fa70-f0d0-b06d-5413" type="selectionEntry">
+                          <costs>
+                            <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+                          </costs>
+                        </entryLink>
+                        <entryLink id="be86-b66b-9e1a-d958" name="Carsoran Power Tabar" hidden="false" collective="false" import="true" targetId="ef4f-80d4-1bba-77fb" type="selectionEntry">
+                          <costs>
+                            <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+                          </costs>
+                        </entryLink>
                       </entryLinks>
                     </selectionEntryGroup>
                   </selectionEntryGroups>

From 9c26d6703d62089b7fa54cef135e7c417c6343b9 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Mon, 13 Nov 2023 16:41:01 +0000
Subject: [PATCH 08/16] Removed increase to SoH catalogue as I didn't actually
 change anything in there

---
 2022 - LA - Sons of Horus.cat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2022 - LA - Sons of Horus.cat b/2022 - LA - Sons of Horus.cat
index 0a8732d9..35c8db60 100644
--- a/2022 - LA - Sons of Horus.cat	
+++ b/2022 - LA - Sons of Horus.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="34" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <entryLinks>
     <entryLink id="c2a2-9b6d-b384-3f43" name="XVI: Sons of Horus" hidden="false" collective="false" import="false" targetId="01b4-57c7-bf61-2abf" type="selectionEntry">
       <modifiers>

From 4b61366f81ceb18c011c26c2bf893dff73861684 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 12:42:22 +0000
Subject: [PATCH 09/16] Added selection to aetheric conduit

---
 2022 - Daemons - Daemons of the Ruinstorm.cat | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/2022 - Daemons - Daemons of the Ruinstorm.cat b/2022 - Daemons - Daemons of the Ruinstorm.cat
index d90f3e78..b34065e1 100644
--- a/2022 - Daemons - Daemons of the Ruinstorm.cat	
+++ b/2022 - Daemons - Daemons of the Ruinstorm.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="5" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="6" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <entryLinks>
     <entryLink import="false" name="Daemons of the Ruinstorm" hidden="false" type="selectionEntry" id="e271-f450-1c28-5b7b" targetId="afca-3047-fb26-d097">
       <constraints>
@@ -2001,6 +2001,43 @@ The End and the Death – When fighting in a Challenge, successful Invulnerable
       <constraints>
         <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ee05-19f1-809e-d0a0"/>
       </constraints>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Psychic Discipline" hidden="false" id="1e24-9782-7fd9-9fe2">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="6a6e-f5da-92d7-93c0"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="7b70-6b79-ac99-1650"/>
+          </constraints>
+          <selectionEntries>
+            <selectionEntry type="upgrade" import="true" name="Psychic Discipline: Diabolism" hidden="false" id="a284-22ef-923f-e64f">
+              <profiles>
+                <profile name="A Dark and Terrible Power" typeId="5405-b3c6-e8d0-4e77" typeName="Psychic Power" hidden="false" id="e838-7f7d-ba1-fe40">
+                  <characteristics>
+                    <characteristic name="Description" typeId="4c0f-7e2f-586c-9305">When a Charge is declared for a model with this power, or for a unit that includes a model with this power, the Controlling player may choose to make a Psychic check for the model before any dice are rolled to determine the Charge Distance of that Charge. If the Psychic check is successful then the model with this power gains the Hammer of Wrath (3) special rule and increases both their Strength and Toughness characteristics by +1 for the duration of that Assault Phase. If the Check is failed then the model suffers Perils of the Warp, and once that has been resolved gains +1 to both its Strength and Toughness Characteristics until the start of the controlling players next turn</characteristic>
+                  </characteristics>
+                </profile>
+                <profile name="Hellfire" typeId="cede-0217-1b10-2a34" typeName="Psychic Weapon" hidden="false" id="e312-fa31-f947-3096">
+                  <characteristics>
+                    <characteristic name="Range" typeId="62ec-fbf5-5252-0d17">Template</characteristic>
+                    <characteristic name="Strength" typeId="17ff-12e7-77d3-2fbe">7</characteristic>
+                    <characteristic name="AP" typeId="f431-a7b9-d9d0-36c9">4</characteristic>
+                    <characteristic name="Type" typeId="2159-62b6-4337-d516">Assault 1, Rending (6+), Deflagrate, Psychic Focus</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <entryLinks>
+                <entryLink import="true" name="Hammer of Wrath (X)" hidden="false" type="rule" id="9251-2ac7-f3a1-1e76" targetId="aec0-c3aa-1e4e-1779"/>
+                <entryLink import="true" name="Psychic Focus" hidden="false" type="rule" id="3390-c2e5-384d-cb1c" targetId="bff3-3548-b2b8-72f1"/>
+                <entryLink import="true" name="Rending (X)" hidden="false" type="rule" id="5c93-d982-43e0-b772" targetId="0ac9-fab7-aef3-de1d"/>
+              </entryLinks>
+            </selectionEntry>
+          </selectionEntries>
+          <entryLinks>
+            <entryLink import="true" name="Psychic Discipline: Biomancy" hidden="false" type="selectionEntry" id="5b55-33a3-ebc1-906d" targetId="861c-3744-c4ff-ef6c"/>
+            <entryLink import="true" name="Psychic Discipline: Pyromancy" hidden="false" type="selectionEntry" id="ed57-38da-c088-8da5" targetId="c73a-8c52-4780-71e1"/>
+            <entryLink import="true" name="Psychic Discipline: Telepathy" hidden="false" type="selectionEntry" id="3eb1-c56b-1469-1ff6" targetId="b751-a605-75e8-dd6f"/>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
     </selectionEntry>
     <selectionEntry type="upgrade" import="true" name="Ætheric Flight" hidden="false" id="7647-8112-eaf7-fbea">
       <profiles>

From 43a98b8772e14053a49cc5218ddc9eb5e4c01c72 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:21:05 +0000
Subject: [PATCH 10/16] Incremented daemons catalogue counter

---
 2022 - Daemons - Daemons of the Ruinstorm.cat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2022 - Daemons - Daemons of the Ruinstorm.cat b/2022 - Daemons - Daemons of the Ruinstorm.cat
index b34065e1..012e248e 100644
--- a/2022 - Daemons - Daemons of the Ruinstorm.cat	
+++ b/2022 - Daemons - Daemons of the Ruinstorm.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="6" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="7" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <entryLinks>
     <entryLink import="false" name="Daemons of the Ruinstorm" hidden="false" type="selectionEntry" id="e271-f450-1c28-5b7b" targetId="afca-3047-fb26-d097">
       <constraints>

From f83938c6d22c6e92ae07bcb574fd0531dcecec56 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:44:43 +0000
Subject: [PATCH 11/16] removed diabolism

---
 2022 - Daemons - Daemons of the Ruinstorm.cat | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/2022 - Daemons - Daemons of the Ruinstorm.cat b/2022 - Daemons - Daemons of the Ruinstorm.cat
index 012e248e..239d162b 100644
--- a/2022 - Daemons - Daemons of the Ruinstorm.cat	
+++ b/2022 - Daemons - Daemons of the Ruinstorm.cat	
@@ -2007,30 +2007,6 @@ The End and the Death – When fighting in a Challenge, successful Invulnerable
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="6a6e-f5da-92d7-93c0"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="7b70-6b79-ac99-1650"/>
           </constraints>
-          <selectionEntries>
-            <selectionEntry type="upgrade" import="true" name="Psychic Discipline: Diabolism" hidden="false" id="a284-22ef-923f-e64f">
-              <profiles>
-                <profile name="A Dark and Terrible Power" typeId="5405-b3c6-e8d0-4e77" typeName="Psychic Power" hidden="false" id="e838-7f7d-ba1-fe40">
-                  <characteristics>
-                    <characteristic name="Description" typeId="4c0f-7e2f-586c-9305">When a Charge is declared for a model with this power, or for a unit that includes a model with this power, the Controlling player may choose to make a Psychic check for the model before any dice are rolled to determine the Charge Distance of that Charge. If the Psychic check is successful then the model with this power gains the Hammer of Wrath (3) special rule and increases both their Strength and Toughness characteristics by +1 for the duration of that Assault Phase. If the Check is failed then the model suffers Perils of the Warp, and once that has been resolved gains +1 to both its Strength and Toughness Characteristics until the start of the controlling players next turn</characteristic>
-                  </characteristics>
-                </profile>
-                <profile name="Hellfire" typeId="cede-0217-1b10-2a34" typeName="Psychic Weapon" hidden="false" id="e312-fa31-f947-3096">
-                  <characteristics>
-                    <characteristic name="Range" typeId="62ec-fbf5-5252-0d17">Template</characteristic>
-                    <characteristic name="Strength" typeId="17ff-12e7-77d3-2fbe">7</characteristic>
-                    <characteristic name="AP" typeId="f431-a7b9-d9d0-36c9">4</characteristic>
-                    <characteristic name="Type" typeId="2159-62b6-4337-d516">Assault 1, Rending (6+), Deflagrate, Psychic Focus</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
-              <entryLinks>
-                <entryLink import="true" name="Hammer of Wrath (X)" hidden="false" type="rule" id="9251-2ac7-f3a1-1e76" targetId="aec0-c3aa-1e4e-1779"/>
-                <entryLink import="true" name="Psychic Focus" hidden="false" type="rule" id="3390-c2e5-384d-cb1c" targetId="bff3-3548-b2b8-72f1"/>
-                <entryLink import="true" name="Rending (X)" hidden="false" type="rule" id="5c93-d982-43e0-b772" targetId="0ac9-fab7-aef3-de1d"/>
-              </entryLinks>
-            </selectionEntry>
-          </selectionEntries>
           <entryLinks>
             <entryLink import="true" name="Psychic Discipline: Biomancy" hidden="false" type="selectionEntry" id="5b55-33a3-ebc1-906d" targetId="861c-3744-c4ff-ef6c"/>
             <entryLink import="true" name="Psychic Discipline: Pyromancy" hidden="false" type="selectionEntry" id="ed57-38da-c088-8da5" targetId="c73a-8c52-4780-71e1"/>

From eb43f1ac344740f56fbf0ec473397c0054348e4c Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:51:51 +0000
Subject: [PATCH 12/16] Moved diabolism to core rules so daemons can inherit it

---
 2022 - Horus Heresy.gst | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 93b90b11..012d0054 100644
--- a/2022 - Horus Heresy.gst	
+++ b/2022 - Horus Heresy.gst	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="28d4-bd2e-4858-ece6" name="(HH V2) Horus Heresy (2022)" revision="86" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
+<gameSystem id="28d4-bd2e-4858-ece6" name="(HH V2) Horus Heresy (2022)" revision="87" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
   <publications>
     <publication name="GitHub" hidden="false" id="e2a4-ac85-1bef-22f5" publisherUrl="https://github.com/BSData/horus-heresy"/>
     <publication id="e77a-823a-da94-16b9" name="Warhammer: The Horus Heresy - Age of Darkness Rulebook" shortName="Main Rules" publicationDate="June 2022"/>
@@ -10514,6 +10514,31 @@ Once all models in the unit have moved onto the battlefield, the Warp Rift marke
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="7517-a238-aecb-60e9" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" type="upgrade">
+      <profiles>
+        <profile id="c739-c662-d9f1-c146" name="A Dark and Terrible Power" hidden="false" typeId="5405-b3c6-e8d0-4e77" typeName="Psychic Power">
+          <characteristics>
+            <characteristic name="Description" typeId="4c0f-7e2f-586c-9305">When a Charge is declared for a model with this power, or for a unit that includes a model with this power, the Controlling player may choose to make a Psychic check for the model before any dice are rolled to determine the Charge Distance of that Charge. If the Psychic check is successful then the model with this power gains the Hammer of Wrath (3) special rule and increases both their Strength and Toughness characteristics by +1 for the duration of that Assult Phase. If the Check is failed then the model suffers Perils of the Warp, and once that has been resolved gains +1 to both its Strength and Toughness Characteristics until the start of the controlling players next turn</characteristic>
+          </characteristics>
+        </profile>
+        <profile id="4c31-2f32-2d30-fc5e" name="Hellfire" hidden="false" typeId="cede-0217-1b10-2a34" typeName="Psychic Weapon">
+          <characteristics>
+            <characteristic name="Range" typeId="62ec-fbf5-5252-0d17">Template</characteristic>
+            <characteristic name="Strength" typeId="17ff-12e7-77d3-2fbe">7</characteristic>
+            <characteristic name="AP" typeId="f431-a7b9-d9d0-36c9">4</characteristic>
+            <characteristic name="Type" typeId="2159-62b6-4337-d516">Assault 1, Rending (6+), Deflagrate, Psychic Focus</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <infoLinks>
+        <infoLink id="3380-3ab-8c69-61d8" name="Hammer of Wrath (X)" hidden="false" targetId="aec0-c3aa-1e4e-1779" type="rule"/>
+        <infoLink id="72e1-d6ce-337d-fbee" name="Rending (X)" hidden="false" targetId="0ac9-fab7-aef3-de1d" type="rule"/>
+        <infoLink id="1804-acb9-a81b-1cd1" name="Psychic Focus (?? Where is this?)" hidden="false" targetId="bff3-3548-b2b8-72f1" type="rule"/>
+      </infoLinks>
+      <costs>
+        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
+      </costs>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedSelectionEntryGroups>
     <selectionEntryGroup id="4a48-4935-246d-0c2e" name="Legion" hidden="false" collective="false" import="true">

From e2684d34db16bb974b5319381f320c95c9e63e87 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:52:15 +0000
Subject: [PATCH 13/16] Updated reference to new diabolism object

---
 2022 - LA - Word Bearers.cat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/2022 - LA - Word Bearers.cat b/2022 - LA - Word Bearers.cat
index a43ff711..9ee0ebb2 100644
--- a/2022 - LA - Word Bearers.cat	
+++ b/2022 - LA - Word Bearers.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="1df7-bbbc-b70e-6a3f" name="LA -  XVII: Word Bearers" revision="31" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="1df7-bbbc-b70e-6a3f" name="LA -  XVII: Word Bearers" revision="32" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <categoryEntries>
     <categoryEntry id="821c-0c83-5ed0-ff6b" name="Harbinger of Chaos Restriction" hidden="false">
       <modifiers>
@@ -3969,7 +3969,7 @@ In addition, once per battle, one friendly unit composed entirely of models with
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5441-6776-963e-d456" type="min"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="816c-e774-eae3-5cd8" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="cc56-0599-fe21-9352" type="selectionEntry">
+                <entryLink id="816c-e774-eae3-5cd8" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="7517-a238-aecb-60e9" type="selectionEntry">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a3b9-16bc-12b5-b645" type="max"/>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="77ae-9d37-22eb-568b" type="min"/>

From dc63dd0487d68d8e3a8ca183f3b2be1ec9cc8656 Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:52:32 +0000
Subject: [PATCH 14/16] Updated reference to new diabolism obbject

---
 2022 - Legiones Astartes.cat | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index 25be117c..cc81e3f6 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6393-649c-7213-a327" name="(HH V2) Legions Astartes" revision="159" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="6393-649c-7213-a327" name="(HH V2) Legions Astartes" revision="160" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <publications>
     <publication id="0594-a9b0-6f10-090e" name="Legion Javelin Squadron update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/hd7WOnm2lKCHkskG.pdf"/>
     <publication id="acdb-27b7-6b7e-932f" name="Legion Mastodon update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/AopGHpxowuowkwJw.pdf"/>
@@ -3624,31 +3624,6 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="cc56-0599-fe21-9352" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" type="upgrade">
-      <profiles>
-        <profile id="b121-c216-00a4-2334" name="A Dark and Terrible Power" hidden="false" typeId="5405-b3c6-e8d0-4e77" typeName="Psychic Power">
-          <characteristics>
-            <characteristic name="Description" typeId="4c0f-7e2f-586c-9305">When a Charge is declared for a model with this power, or for a unit that includes a model with this power, the Controlling player may choose to make a Psychic check for the model before any dice are rolled to determine the Charge Distance of that Charge. If the Psychic check is successful then the model with this power gains the Hammer of Wrath (3) special rule and increases both their Strength and Toughness characteristics by +1 for the duration of that Assult Phase. If the Check is failed then the model suffers Perils of the Warp, and once that has been resolved gains +1 to both its Strength and Toughness Characteristics until the start of the controlling players next turn</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="91cf-469e-cfb1-6961" name="Hellfire" hidden="false" typeId="cede-0217-1b10-2a34" typeName="Psychic Weapon">
-          <characteristics>
-            <characteristic name="Range" typeId="62ec-fbf5-5252-0d17">Template</characteristic>
-            <characteristic name="Strength" typeId="17ff-12e7-77d3-2fbe">7</characteristic>
-            <characteristic name="AP" typeId="f431-a7b9-d9d0-36c9">4</characteristic>
-            <characteristic name="Type" typeId="2159-62b6-4337-d516">Assault 1, Rending (6+), Deflagrate, Psychic Focus</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <infoLinks>
-        <infoLink id="e16b-d1b5-84ce-cbbb" name="Hammer of Wrath (X)" hidden="false" targetId="aec0-c3aa-1e4e-1779" type="rule"/>
-        <infoLink id="9100-4393-e67f-ab61" name="Rending (X)" hidden="false" targetId="0ac9-fab7-aef3-de1d" type="rule"/>
-        <infoLink id="155a-1364-a726-a78e" name="Psychic Focus (?? Where is this?)" hidden="false" targetId="bff3-3548-b2b8-72f1" type="rule"/>
-      </infoLinks>
-      <costs>
-        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="7d72-7f6d-6330-6871" name="Shrapnel Pistol" hidden="true" collective="false" import="true" type="upgrade">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
@@ -55928,7 +55903,7 @@ Legion Only: Paladin of Hekatonystika (Dark Angels), Phoenix Warden (Emperor&apo
             </modifier>
           </modifiers>
           <entryLinks>
-            <entryLink id="dd82-61d5-165c-b8ce" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="cc56-0599-fe21-9352" type="selectionEntry">
+            <entryLink id="dd82-61d5-165c-b8ce" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="7517-a238-aecb-60e9" type="selectionEntry">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0e63-f0d1-ca74-cc1f" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a780-cb6f-45f1-b563" type="max"/>

From cce20eae695d99ec27fb7c83bec2a8fefe44aebb Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:52:58 +0000
Subject: [PATCH 15/16] Updated reference to new diabolism obbject

---
 2022 - Legiones Astartes.cat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index cc81e3f6..1c903e16 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -54364,7 +54364,7 @@ Invulnerable saves granted by a combat shield or boarding shield do not stack wi
         </rule>
       </rules>
       <entryLinks>
-        <entryLink id="50a6-a14c-19d1-2502" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="cc56-0599-fe21-9352" type="selectionEntry">
+        <entryLink id="50a6-a14c-19d1-2502" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="7517-a238-aecb-60e9" type="selectionEntry">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8054-2eff-b1ff-3870" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1326-4f89-ddbf-ce5e" type="max"/>

From 904066780183b5442afba9d37e1fddecdceb1e6e Mon Sep 17 00:00:00 2001
From: Monty Coyle <monty.coyle19@gmail.com>
Date: Wed, 15 Nov 2023 14:53:22 +0000
Subject: [PATCH 16/16] Updated reference to new diabolism obbject

---
 2022 - Daemons - Daemons of the Ruinstorm.cat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/2022 - Daemons - Daemons of the Ruinstorm.cat b/2022 - Daemons - Daemons of the Ruinstorm.cat
index 239d162b..efca5472 100644
--- a/2022 - Daemons - Daemons of the Ruinstorm.cat	
+++ b/2022 - Daemons - Daemons of the Ruinstorm.cat	
@@ -2011,6 +2011,7 @@ The End and the Death – When fighting in a Challenge, successful Invulnerable
             <entryLink import="true" name="Psychic Discipline: Biomancy" hidden="false" type="selectionEntry" id="5b55-33a3-ebc1-906d" targetId="861c-3744-c4ff-ef6c"/>
             <entryLink import="true" name="Psychic Discipline: Pyromancy" hidden="false" type="selectionEntry" id="ed57-38da-c088-8da5" targetId="c73a-8c52-4780-71e1"/>
             <entryLink import="true" name="Psychic Discipline: Telepathy" hidden="false" type="selectionEntry" id="3eb1-c56b-1469-1ff6" targetId="b751-a605-75e8-dd6f"/>
+            <entryLink import="true" name="Psychic Discipline: Diabolism" hidden="false" type="selectionEntry" id="8be8-8673-ba2d-29a5" targetId="7517-a238-aecb-60e9"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>