From 11cd06f7263685aa6687c89295f2a70205552cb7 Mon Sep 17 00:00:00 2001
From: Mad-Spy <iainlaunchbury@gmail.com>
Date: Wed, 19 Apr 2023 21:12:17 +0100
Subject: [PATCH] Vashtorr Boarding Enhancements

Closes #12641
---
 Chaos - Daemons.cat     |  78 ++++++++++++++++++++++++++---
 Chaos - Death Guard.cat | 105 +++++++++++++++++++++++++++++++++-------
 Warhammer 40,000.gst    |  22 ++++++++-
 3 files changed, 178 insertions(+), 27 deletions(-)

diff --git a/Chaos - Daemons.cat b/Chaos - Daemons.cat
index 380354b757..0e5b0255c7 100644
--- a/Chaos - Daemons.cat	
+++ b/Chaos - Daemons.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="422a-a40e-3f7c-e8b3" name="Chaos - Daemons" revision="147" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="248" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="422a-a40e-3f7c-e8b3" name="Chaos - Daemons" revision="148" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="248" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="422a-a40e-pubN71142" name="Dataslate: Be&apos;lakor"/>
   </publications>
@@ -2575,7 +2575,19 @@
         <entryLink id="186e-a86a-b9d8-3fe3" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="b9a3-3f24-268b-3e64" name="Relics of the Brass Citadel" hidden="false" collective="false" import="true" targetId="7b80-5202-8ffe-a2b6" type="selectionEntry"/>
         <entryLink id="954d-5057-7c16-9640" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
-        <entryLink id="8d75-3028-97c4-9c4f" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="8d75-3028-97c4-9c4f" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <selectionEntries>
+            <selectionEntry id="a60c-3a68-6be2-a849" name="Unholy Fury" hidden="false" collective="false" import="true" type="upgrade">
+              <profiles>
+                <profile id="d539-5375-2ac5-bd65" name="Unholy Fury" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+                  <characteristics>
+                    <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">The bearer is eligible to declare a charge in a turn in which it Advanced or Fell Back.</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+            </selectionEntry>
+          </selectionEntries>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="90.0"/>
@@ -4677,7 +4689,19 @@ These powers are considered to have been manifested with a roll equal to their w
         <entryLink id="3410-5e65-3a2c-0765" name="Relics of the Impossible Fortress" hidden="false" collective="false" import="true" targetId="d5ec-65ed-9e3f-53fe" type="selectionEntry"/>
         <entryLink id="09d2-e815-af84-f06a" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="fc75-e3af-d449-cf7b" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
-        <entryLink id="6afe-ad64-ac0b-577e" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="6afe-ad64-ac0b-577e" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <selectionEntries>
+            <selectionEntry id="91f7-6a96-962a-7969" name="Incorporeal Form" hidden="false" collective="false" import="true" type="upgrade">
+              <profiles>
+                <profile id="52e1-769d-68ad-c89c" name="Incorporeal Form" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+                  <characteristics>
+                    <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">Each time an attack is made against the bearer, subtract 1 from that attack&apos;s wound roll.</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+            </selectionEntry>
+          </selectionEntries>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="80.0"/>
@@ -5447,7 +5471,11 @@ These powers are considered to have been manifested with a roll equal to their w
         <entryLink id="b107-e070-1cf2-5641" name="Relics of the Great Garden" hidden="false" collective="false" import="true" targetId="014e-34a7-724e-7a38" type="selectionEntry"/>
         <entryLink id="62ec-8037-2828-a8ee" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="41e7-edf5-2f39-aa42" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
-        <entryLink id="f5d5-0240-e1df-ac8d" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="f5d5-0240-e1df-ac8d" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <entryLinks>
+            <entryLink id="1460-6b09-a64f-edc4" name="The Endless Gift" hidden="false" collective="false" import="true" targetId="8f50-0a3c-0780-8193" type="selectionEntry"/>
+          </entryLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="90.0"/>
@@ -6674,7 +6702,11 @@ These powers are considered to have been manifested with a roll equal to their w
         <entryLink id="9052-4852-7b55-9c9c" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="00eb-b150-cb5c-683b" name="Exquisite Gifts" hidden="false" collective="false" import="true" targetId="f1f8-32e4-4e85-29ea" type="selectionEntry"/>
         <entryLink id="3b14-db55-8c0a-44f6" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
-        <entryLink id="be71-67eb-bf90-c88f" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="be71-67eb-bf90-c88f" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <entryLinks>
+            <entryLink id="629b-127e-b3d1-ed0d" name="Fatal Caress" hidden="false" collective="false" import="true" targetId="a3a9-bc3d-7cf8-590e" type="selectionEntry"/>
+          </entryLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="70.0"/>
@@ -11509,7 +11541,11 @@ If the result of the Psychic test was 9 or more, you can select which result app
         <entryLink id="9bfe-159c-37a2-e6ad" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="653a-7b14-4384-0efc" name="Relics of the Great Garden" hidden="false" collective="false" import="true" targetId="014e-34a7-724e-7a38" type="selectionEntry"/>
         <entryLink id="e403-1fb1-c6c4-dc51" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
-        <entryLink id="ee2d-6010-219e-2b4a" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="ee2d-6010-219e-2b4a" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <entryLinks>
+            <entryLink id="6a99-389c-dd03-38ad" name="The Endless Gift" hidden="false" collective="false" import="true" targetId="8f50-0a3c-0780-8193" type="selectionEntry"/>
+          </entryLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="5.0"/>
@@ -11624,7 +11660,11 @@ If the result of the Psychic test was 9 or more, you can select which result app
         <entryLink id="538d-e94d-a772-7aa7" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="8943-498b-8e8d-34b5" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="2de1-0e27-f0dc-8f61" name="Relics of the Great Garden" hidden="false" collective="false" import="true" targetId="014e-34a7-724e-7a38" type="selectionEntry"/>
-        <entryLink id="f321-e02e-f695-9f6a" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="f321-e02e-f695-9f6a" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <entryLinks>
+            <entryLink id="ed62-7719-da24-1167" name="The Endless Gift" hidden="false" collective="false" import="true" targetId="8f50-0a3c-0780-8193" type="selectionEntry"/>
+          </entryLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="5.0"/>
@@ -12265,7 +12305,11 @@ If any enemy models are destroyed as a result of these mortal wounds, gain one W
         <entryLink id="b1c5-e21e-568c-54cd" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="fdd8-3e1f-94a1-77bd" name="Exquisite Gifts" hidden="false" collective="false" import="true" targetId="f1f8-32e4-4e85-29ea" type="selectionEntry"/>
         <entryLink id="0f48-7129-7514-be71" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
-        <entryLink id="bbcd-5749-44ae-9ffe" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="bbcd-5749-44ae-9ffe" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup">
+          <entryLinks>
+            <entryLink id="f25a-e2e5-7867-1005" name="Fatal Caress" hidden="false" collective="false" import="true" targetId="a3a9-bc3d-7cf8-590e" type="selectionEntry"/>
+          </entryLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="4.0"/>
@@ -13801,6 +13845,24 @@ At the end of your Movement phase, this model can start to perform this action.
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="8f50-0a3c-0780-8193" name="The Endless Gift" hidden="false" collective="false" import="true" type="upgrade">
+      <profiles>
+        <profile id="6326-3381-ba9a-b0da" name="The Endless Gift" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+          <characteristics>
+            <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">At the start of your Command phase, the bearer regains up to a number of wounds equal to the current battle round number.</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+    </selectionEntry>
+    <selectionEntry id="a3a9-bc3d-7cf8-590e" name="Fatal Caress" hidden="false" collective="false" import="true" type="upgrade">
+      <profiles>
+        <profile id="2b13-8832-3ae5-7814" name="Fatal Caress" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+          <characteristics>
+            <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">Each time the bearer makes a melee attack, on an unmodifed successful wound roll of 5+, invulnerable saving throws cannot be made against that attack.</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedSelectionEntryGroups>
     <selectionEntryGroup id="d7f7-3b26-0f3a-8e1e" name="Daemonic Allegiance" hidden="false" collective="false" import="true">
diff --git a/Chaos - Death Guard.cat b/Chaos - Death Guard.cat
index 3b8b9fa0f7..7a9ac1ece4 100644
--- a/Chaos - Death Guard.cat	
+++ b/Chaos - Death Guard.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="157" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="248" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="158" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="248" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="ce57-cc1c-pubN85391" name="Index: Chaos FAQ"/>
     <publication id="ce57-cc1c-pubN108736" name="Codex: Heretic Astartes - Death Guard" publicationDate="23/01/2021"/>
@@ -4090,7 +4090,7 @@ Battle Round 4 - 9&quot;</description>
         <entryLink id="8860-89a7-4e8e-bb05" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="c5eb-43f8-f6eb-5d14" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="1953-7954-d3f9-ed5c" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="c82d-7454-1eec-fea9" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="c82d-7454-1eec-fea9" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="105.0"/>
@@ -4519,7 +4519,7 @@ Battle Round 4 - 9&quot;</description>
         <entryLink id="26cc-c0d3-c87c-61cd" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="2375-4545-5fb7-9241" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="36c0-f76a-1e26-64e0" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="696c-d863-1824-5783" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="696c-d863-1824-5783" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="110.0"/>
@@ -5538,7 +5538,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="a1e9-8b02-c66a-00c1" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="e33e-afc9-0790-a9d2" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="e1a3-d9f1-ee47-4cec" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="fcd1-eec5-157a-7713" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="fcd1-eec5-157a-7713" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="120.0"/>
@@ -5812,7 +5812,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="b083-05c1-9465-474d" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="5f5a-1315-7677-1395" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="0788-08a8-9fd2-fcb2" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="4788-3dff-23ff-d61d" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="4788-3dff-23ff-d61d" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="90.0"/>
@@ -6240,7 +6240,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="0952-7229-67dc-7e9d" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="faed-506b-4e00-24ac" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="59be-23ba-6ada-e9ec" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="4622-bf77-c239-e7a9" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="4622-bf77-c239-e7a9" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="55.0"/>
@@ -9272,7 +9272,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="6db2-b24c-1baa-9f8e" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="53be-1cb0-1bae-e253" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="99d8-dcc9-1d47-d0ec" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="25ae-797b-c657-5c4e" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="25ae-797b-c657-5c4e" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="4.0"/>
@@ -9452,7 +9452,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="185e-b988-4f76-5218" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="65c2-dc13-1aad-4a26" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="bbb1-f67d-a094-d742" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="7582-8610-99a0-0bd1" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="7582-8610-99a0-0bd1" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="4.0"/>
@@ -9625,7 +9625,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="2c19-13e1-dfe4-345c" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="9c11-3877-e1f7-30d8" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="eae9-f8cd-969b-9fd8" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="ebfe-637b-0fc6-d7cb" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="ebfe-637b-0fc6-d7cb" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="65.0"/>
@@ -9825,18 +9825,14 @@ plague companies in the same Detachment, without preventing other units in that
           </constraints>
         </entryLink>
         <entryLink id="006d-a77c-ac7a-b93d" name="Relics of Decay" hidden="false" collective="false" import="true" targetId="0435-2d8f-2e4e-28c3" type="selectionEntryGroup"/>
-        <entryLink id="b37f-0654-7ae0-98b6" name="Warlord" hidden="false" collective="false" import="true" targetId="a840-f0b3-abac-6d1c" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a946-103d-b966-9661" type="max"/>
-          </constraints>
-        </entryLink>
+        <entryLink id="b37f-0654-7ae0-98b6" name="Warlord" hidden="false" collective="false" import="true" targetId="a840-f0b3-abac-6d1c" type="selectionEntry"/>
         <entryLink id="a141-3b64-5320-6a66" name="Warlord Traits" hidden="false" collective="false" import="true" targetId="d59b-974a-122c-6f79" type="selectionEntryGroup"/>
         <entryLink id="a08a-ab32-03c4-6b1c" name="Plaguechosen" hidden="false" collective="false" import="true" targetId="90c0-072b-69b2-1bcf" type="selectionEntry"/>
         <entryLink id="c54b-2de4-24a7-01a3" name="Deadly Pathogens" hidden="false" collective="false" import="true" targetId="9550-e166-97c9-770f" type="selectionEntryGroup"/>
         <entryLink id="0ebc-4d55-d4df-4f13" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="1a72-7bad-1eac-54e6" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="23d8-b2af-796d-03c0" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="2275-ae06-9e73-bfe6" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="2275-ae06-9e73-bfe6" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="5.0"/>
@@ -10368,7 +10364,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="9dbe-cc68-daed-2d72" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="7b26-53de-b62b-905b" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="4977-42d4-e498-f3da" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="ab13-2e31-371b-8ae6" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="f5e6-d2d3-2717-9bff" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="85.0"/>
@@ -10679,7 +10675,7 @@ plague companies in the same Detachment, without preventing other units in that
         <entryLink id="3862-79ca-b006-8dca" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
         <entryLink id="612d-f9a8-15b0-211f" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
         <entryLink id="04c1-0804-7862-c246" name="Stratagem: Gifts of Decay" hidden="false" collective="false" import="true" targetId="7906-7754-69cd-1c2c" type="selectionEntry"/>
-        <entryLink id="9c9c-7328-a285-ccf6" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+        <entryLink id="9c9c-7328-a285-ccf6" name="Boarding Action Enhancements" hidden="false" collective="false" import="true" targetId="4acb-0c4c-464d-06a4" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name=" PL" typeId="e356-c769-5920-6e14" value="6.0"/>
@@ -12701,6 +12697,81 @@ Each time the bearer shoots or fights, after making its attacks, select one enem
         </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
+    <selectionEntryGroup id="4acb-0c4c-464d-06a4" name="Boarding Action Enhancements" hidden="false" collective="false" import="true">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditions>
+            <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a840-f0b3-abac-6d1c" type="equalTo"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b456-69a9-d4c7-c9bf" type="max"/>
+      </constraints>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="3c9c-1b74-f736-b5f5" name="Death Guard Enhancements" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0d23-e42e-5e7f-3c49" type="max"/>
+          </constraints>
+          <selectionEntries>
+            <selectionEntry id="30fe-7aea-5545-6de0" name="Plague Skull of Glothila" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8a86-6549-cf7c-2393" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="a811-69e6-08e9-a4ef" name="Plague Skull of Glothila" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+                  <characteristics>
+                    <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">Once per battle, at the end of your Movement phase, the bearer can use this Enhancement. If it does so, select one enemy unti with 6&quot; of the bearer and roll seven D6s: for each 4+, that unit suffers 1 mortal wound (to a maximum of 3 mortal wounds if that enemy unit has the CHARACTER keyword).</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <costs>
+                <cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="537d-eccc-cb3d-a6e3" name="Plague Vector" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9227-6ef8-add4-5e3d" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="38ff-a19f-d6a6-8875" name="Plague Vector" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+                  <characteristics>
+                    <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">The bearer gains their Plague Company&apos;s Warlord Trait. If the bearer gains the Shamblerot Warlord Trait, when rolling to see if an enemy unit suffers mortal wounds as a result of Shamblerot, that unit only suffers 1 mortal wound on a roll of 6, instead of D3 mortal wounds.</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <costs>
+                <cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="c95e-5e98-2c29-51ac" name="Plentiful Pestilence" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2180-1993-7673-a802" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="de7c-6e18-c757-14f8" name="Plentiful Pestilence" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
+                  <characteristics>
+                    <characteristic name="Description" typeId="21befb24-fc85-4f52-a745-64b2e48f8228">Each time the bearer would lose a wound, roll one D6: on a 5+, that wound is not lost.</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <costs>
+                <cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink id="8380-a19e-b2fa-e0ef" name="Boarding Action Enhancements - Common" hidden="false" collective="false" import="true" targetId="4c50-9343-b5fb-872d" type="selectionEntryGroup"/>
+      </entryLinks>
+    </selectionEntryGroup>
   </sharedSelectionEntryGroups>
   <sharedRules>
     <rule id="80db-bdd6-db65-1744" name="Contagions of Nurgle" hidden="false">
diff --git a/Warhammer 40,000.gst b/Warhammer 40,000.gst
index c0060a4fb5..77d7b6692f 100644
--- a/Warhammer 40,000.gst	
+++ b/Warhammer 40,000.gst	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="28ec-711c-d87f-3aeb" name="Warhammer 40,000 9th Edition" revision="248" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WH40k Data Dev" authorUrl="https://www.bsdata.net/contact" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="28ec-711c-d87f-3aeb" name="Warhammer 40,000 9th Edition" revision="249" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WH40k Data Dev" authorUrl="https://www.bsdata.net/contact" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <readme>This is the game system file for Warhammer 40,000, supporting the 9th edition of the game.  It is required for all other catalogues to function.</readme>
   <publications>
     <publication id="28ec-711c-pubN72690" name="Warhammer 40,000 Core Book" shortName="BRB" publisher="Games Workshop" publicationDate="2020-07-25" publisherUrl="https://www.games-workshop.com/Warhammer-40000-9th-Rulebook-EN-2020"/>
@@ -9254,7 +9254,7 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
         </selectionEntryGroup>
       </selectionEntryGroups>
     </selectionEntryGroup>
-    <selectionEntryGroup id="4c50-9343-b5fb-872d" name="Boarding Action Enhancements" hidden="true" collective="false" import="true" defaultSelectionEntryId="848c-ae22-09ee-f4ef">
+    <selectionEntryGroup id="4c50-9343-b5fb-872d" name="Boarding Action Enhancements - Common" hidden="true" collective="false" import="true" defaultSelectionEntryId="848c-ae22-09ee-f4ef">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
           <conditionGroups>
@@ -9272,6 +9272,9 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
       </constraints>
       <selectionEntries>
         <selectionEntry id="848c-ae22-09ee-f4ef" name="Superior Boarding Tactics" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="edb0-69c8-78fa-dc95" type="max"/>
+          </constraints>
           <profiles>
             <profile id="0a82-160e-63b4-fdc1" name="Superior Boarding Tactics" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
               <characteristics>
@@ -9286,6 +9289,9 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
           </costs>
         </selectionEntry>
         <selectionEntry id="5a97-6862-1d9f-73bd" name="Close-quarters Killer" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a8f6-a520-fe2d-01ef" type="max"/>
+          </constraints>
           <profiles>
             <profile id="1c05-0930-7d2b-4eb8" name="Close-quarters Killer" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
               <characteristics>
@@ -9300,6 +9306,9 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
           </costs>
         </selectionEntry>
         <selectionEntry id="c4eb-d498-1994-a4b5" name="Defensive Lynchpin" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7fd4-0477-9c9f-17ab" type="max"/>
+          </constraints>
           <profiles>
             <profile id="82aa-ca29-ddb3-d591" name="Defensive Lynchpin (Aura)" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
               <characteristics>
@@ -9314,6 +9323,9 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
           </costs>
         </selectionEntry>
         <selectionEntry id="a75d-0e21-f383-e63f" name="Expert Breacher" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ea41-fba4-38b5-ce92" type="max"/>
+          </constraints>
           <profiles>
             <profile id="ac76-47a5-5644-c4ab" name="Expert Breacher" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
               <characteristics>
@@ -9328,6 +9340,9 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
           </costs>
         </selectionEntry>
         <selectionEntry id="4f03-ef75-783a-5024" name="Personal Teleporter" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c2e1-2f5d-45e9-61b9" type="max"/>
+          </constraints>
           <profiles>
             <profile id="3296-cb7d-d606-2947" name="Personal Teleporter" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
               <characteristics>
@@ -9342,6 +9357,9 @@ their charge, this unit can fire Dverwatch [and will score hits on unmodified ro
           </costs>
         </selectionEntry>
         <selectionEntry id="b967-2534-2585-2ecd" name="Trademark Weapon" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4780-1d4b-f8ae-2b18" type="max"/>
+          </constraints>
           <profiles>
             <profile id="84db-5fa5-ec3b-f40a" name="Trademark Weapon" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
               <characteristics>