Merge pull request #3326 from BSData/nr-patch

unit dupe fix
BSData · Feb 6, 2024 · b29b43b · b29b43b
2 parents c2d5adb + 3e4deb9
commit b29b43b
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 40 deletions.
diff --git a/Death - Data.cat b/Death - Data.cat
@@ -6992,13 +6992,13 @@ If the unit completes the plot, it gains the corresponding plot abilities for t
       </categoryLinks>
       <entryLinks>
         <entryLink id="f45f-ed15-f211-b9a8" name="Universal Grand Strategy" hidden="false" collective="false" import="true" targetId="1e64-bcdc-3709-7ec7" type="selectionEntryGroup"/>
-        <entryLink id="6995-c869-7a82-9ac6" name="Soulblight Grand Strategy" hidden="false" collective="false" import="true" targetId="cb45-d8e9-9b35-e1c9" type="selectionEntryGroup"/>
+        <entryLink id="6995-c869-7a82-9ac6" name="Vampiric Conquerors" hidden="false" collective="false" import="true" targetId="cb45-d8e9-9b35-e1c9" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="0"/>
       </costs>
       <selectionEntryGroups>
-        <selectionEntryGroup name="Scions of Nulahmia Grand Strategy" hidden="false" id="441c-5fcf-b1bd-e75e">
+        <selectionEntryGroup name="Courtly Intrigues" hidden="false" id="441c-5fcf-b1bd-e75e">
           <modifiers>
             <modifier type="set" value="true" field="hidden">
               <conditions>
@@ -7812,7 +7812,7 @@ Spirit of the Fallen: If an attack made by this unit wounds the target, that att
         <entryLink id="edb5-a95b-d46f-a2fa" name="Relics of Gallet" hidden="false" collective="false" import="true" targetId="d27f-9ad5-990c-2915" type="selectionEntryGroup"/>
       </entryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup name="Artefacts: Scions of Nulahmia" hidden="false" id="bd91-f069-129f-da63">
+        <selectionEntryGroup name="Artefacts: The Vaults of Nulahmia" hidden="false" id="bd91-f069-129f-da63">
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Crown of Command" hidden="false" id="a31e-4735-bae2-372a">
               <profiles>
@@ -8525,7 +8525,7 @@ Spirit of the Fallen: If an attack made by this unit wounds the target, that att
         <entryLink import="true" name="Universal Command Traits" hidden="false" type="selectionEntryGroup" id="88fc-6e2b-84bc-eb9b" targetId="e372-6ace-3568-54e7"/>
       </entryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup name="Command Traits: Scions of Nulahmia" hidden="false" id="d2c9-d801-d5d9-33ed">
+        <selectionEntryGroup name="Command Traits: Favoured Fangs" hidden="false" id="d2c9-d801-d5d9-33ed">
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Keeper of the Royal Menagerie" hidden="false" id="348b-3759-f0ae-f4cd">
               <profiles>
@@ -10190,7 +10190,7 @@ You can set up 1 unit in the Crimson Keep for each unit you have set up on the b
         </selectionEntryGroup>
       </selectionEntryGroups>
     </selectionEntryGroup>
-    <selectionEntryGroup id="cb45-d8e9-9b35-e1c9" name="Soulblight Grand Strategy" hidden="true" collective="false" import="true">
+    <selectionEntryGroup id="cb45-d8e9-9b35-e1c9" name="Vampiric Conquerers" hidden="true" collective="false" import="true">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
           <conditions>

diff --git a/Death - Soulblight Gravelords.cat b/Death - Soulblight Gravelords.cat
@@ -1098,7 +1098,7 @@ If the unit uses this ability, it does not benefit from the Serpentine Agility a
         </profile>
       </profiles>
     </selectionEntry>
-    <selectionEntry type="upgrade" import="true" name="Battle Tacics: Scions of Nulahmia" hidden="false" id="747e-22fd-6c6d-b84a">
+    <selectionEntry type="upgrade" import="true" name="Battle Tacics: Displays of Dominance" hidden="false" id="747e-22fd-6c6d-b84a">
       <profiles>
         <profile name="No Sacred Ground" typeId="eba0-4bf6-65fe-fdbc" typeName="Battle Tactic" hidden="false" id="ada0-83c3-254d-3ef">
           <characteristics>

diff --git a/Order - Idoneth Deepkin - Data.cat b/Order - Idoneth Deepkin - Data.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="b713-a274-2a46-fe02" name="Order - Idoneth Deepkin - Data" revision="107" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="b713-a274-2a46-fe02" name="Order - Idoneth Deepkin - Data" revision="108" battleScribeVersion="2.03" authorContact="@BSData" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="true" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
   <publications>
     <publication id="0d25-2712-pubN65537" name="Order Battletome: Idoneth Deepkin"/>
     <publication id="5d07-d069-7e85-50e0" name="Battletome: Idoneth Deepkin Errata January 2023"/>
@@ -2940,17 +2940,53 @@ This faction terrain feature consists of 2 scenery pieces. When you set it up, y
       <categoryLinks>
         <categoryLink id="353f-eabc-fbef-6de3" name="New CategoryLink" hidden="false" targetId="e9f2-765a-b7b8-ce8e" primary="true"/>
       </categoryLinks>
-      <entryLinks>
-        <entryLink id="c3be-a15a-1e72-2696" name="Akhelian Allopexes" hidden="false" collective="false" import="true" targetId="ae34-b407-ec32-9dc8" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="0184-4ace-c143-6c06" type="min"/>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="147a-388c-228d-426f" type="max"/>
-          </constraints>
-        </entryLink>
-      </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="450"/>
       </costs>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Akhelian Allopex" hidden="false" id="2247-19c6-2639-5f16">
+          <entryLinks>
+            <entryLink id="c3be-a15a-1e72-2696" name="Akhelian Allopexes" hidden="false" collective="false" import="true" targetId="ae34-b407-ec32-9dc8" type="selectionEntry">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="0184-4ace-c143-6c06" type="min"/>
+                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="147a-388c-228d-426f" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a622-4b07-9511-d42d" type="min"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c318-dd10-728a-dbc0" type="max"/>
+          </constraints>
+        </selectionEntryGroup>
+        <selectionEntryGroup name="Akhelian Allopex" hidden="false" id="131f-e3dc-30b2-58be">
+          <entryLinks>
+            <entryLink id="b99f-7151-5ef0-9c5d" name="Akhelian Allopexes" hidden="false" collective="false" import="true" targetId="ae34-b407-ec32-9dc8" type="selectionEntry">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="fa8d-4111-441b-8319" type="min"/>
+                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="42c3-5e98-e91d-ed23" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="d6c3-e8b9-12b8-9205" type="min"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="e4de-cf5d-e4b2-ca86" type="max"/>
+          </constraints>
+        </selectionEntryGroup>
+        <selectionEntryGroup name="Akhelian Allopex" hidden="false" id="344a-74a6-e3d1-5347">
+          <entryLinks>
+            <entryLink id="c238-44a0-ab3c-dc04" name="Akhelian Allopexes" hidden="false" collective="false" import="true" targetId="ae34-b407-ec32-9dc8" type="selectionEntry">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ee88-f7db-f163-ce4f" type="min"/>
+                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="9a71-5b45-c9a8-33ae" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c18b-7289-2733-4961" type="min"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4631-4c1d-548d-70e" type="max"/>
+          </constraints>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
     </selectionEntry>
     <selectionEntry type="upgrade" import="true" name="Cyreni of the Abyss" hidden="false" id="4cda-6c88-a6be-7280">
       <costs>