Merge pull request #238 from BSData/s2d

S2d
BSData · Dec 3, 2024 · ca4b111 · ca4b111
2 parents e4bd4b7 + c62e31b
commit ca4b111
Show file tree

Hide file tree

Showing 34 changed files with 3,318 additions and 550 deletions.
diff --git a/Age of Sigmar 4.0.gst b/Age of Sigmar 4.0.gst
diff --git a/Beasts of Chaos.cat b/Beasts of Chaos.cat
@@ -266,7 +266,7 @@
                 <characteristic name="Effect" typeId="1cb9-a-1345-907f">Until the start of your next turn:
 • The target unit has a maximum control score of 1.
 • The target cannot use commands.
-• Each time the target moves, it must end that move closer to the caster.</characteristic>
+• Each time the target moves, if the caster is on the battlefield, the target must end that move no further from the caster than it was at the start of the move.’</characteristic>
                 <characteristic name="Keywords" typeId="353f-565e-c351-1cf2">**^^Spell^^**</characteristic>
               </characteristics>
             </profile>

diff --git a/Blades of Khorne - Library.cat b/Blades of Khorne - Library.cat
@@ -556,10 +556,10 @@
       </profiles>
       <categoryLinks>
         <categoryLink name="CHAOS" hidden="false" id="960c-7cc4-5ca3-a0e7" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="bf12-70e5-f55c-1db1" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="CHAMPION" hidden="false" id="e957-991c-e908-95aa" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="BLOODBOUND" hidden="false" id="1c3c-15b6-41d4-8028" targetId="971a-1bec-c9dc-f9c4" primary="false"/>
         <categoryLink name="INFANTRY" hidden="false" id="c706-7e8-ca18-c841" targetId="75d6-6995-dfcc-3898" primary="true"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="30ec-3feb-3f6a-d8e3" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -808,10 +808,10 @@
       <categoryLinks>
         <categoryLink name="WARD (6+)" hidden="false" id="ddd0-71ec-8667-5764" targetId="70a4-383f-421f-52cd" primary="false"/>
         <categoryLink name="CHAOS" hidden="false" id="952b-8c9f-c420-2ffb" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="2272-d19c-517a-c3bb" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="INFANTRY" hidden="false" id="29af-eb15-bd25-8eed" targetId="75d6-6995-dfcc-3898" primary="true"/>
         <categoryLink name="CHAMPION (1/8)" hidden="false" id="37d3-1177-a8a5-afe3" targetId="d131-3bfe-3ff4-a703" primary="false"/>
         <categoryLink name="BLOODBOUND" hidden="false" id="ff7f-ce69-41c4-1852" targetId="971a-1bec-c9dc-f9c4" primary="false"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="b948-edea-f728-48b0" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -898,12 +898,12 @@
       </profiles>
       <categoryLinks>
         <categoryLink name="CHAOS" hidden="false" id="7a9c-a87c-4be6-ce61" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="26db-19ba-6416-fd16" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="INFANTRY" hidden="false" id="9404-c361-9ce-de0f" targetId="75d6-6995-dfcc-3898" primary="true"/>
         <categoryLink name="CHAMPION" hidden="false" id="de75-98da-f896-b859" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="STANDARD BEARER (1/10)" hidden="false" id="684f-a8e3-6fc4-2830" targetId="1f17-ad98-ada0-ccf" primary="false"/>
         <categoryLink name="MUSICIAN (1/10)" hidden="false" id="c6a1-f6cd-ad14-6d5a" targetId="eeed-ef77-b0d-fa9d" primary="false"/>
         <categoryLink name="BLOODBOUND" hidden="false" id="ffd6-695f-ce00-4f88" targetId="971a-1bec-c9dc-f9c4" primary="false"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="b55b-9536-b81c-0823" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -1149,8 +1149,8 @@
         <categoryLink name="BEAST" hidden="false" id="c81c-44ff-543c-9630" targetId="b224-8c8e-ca93-9860" primary="true"/>
         <categoryLink name="CHAMPION (1/5)" hidden="false" id="e1d8-5efb-f53a-403c" targetId="11c3-dbff-a3f7-ab" primary="false"/>
         <categoryLink name="CHAOS" hidden="false" id="d907-4fb7-f8e3-7d73" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="1d75-4e90-6316-b622" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="DAEMON" hidden="false" id="f7f4-1f1b-a733-bb73" targetId="dc0b-e417-51f4-10f0" primary="false"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="30cd-0fd2-ac4a-27ca" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -1813,12 +1813,12 @@ of that weapon for the rest of the battle.</characteristic>
       <categoryLinks>
         <categoryLink name="WARD (6+)" hidden="false" id="6ad3-a78f-44b7-a0c0" targetId="70a4-383f-421f-52cd" primary="false"/>
         <categoryLink name="CHAOS" hidden="false" id="66d-c559-18de-b0a5" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="b718-aa56-5d4d-8fc6" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="DAEMON" hidden="false" id="7b98-22b-f870-51b9" targetId="dc0b-e417-51f4-10f0" primary="false"/>
         <categoryLink name="INFANTRY" hidden="false" id="460a-d18a-ad3f-ce43" targetId="75d6-6995-dfcc-3898" primary="true"/>
         <categoryLink name="CHAMPION" hidden="false" id="f446-bac5-7453-bfa7" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="STANDARD BEARER (1/10)" hidden="false" id="390b-11b4-f078-d9d4" targetId="1f17-ad98-ada0-ccf" primary="false"/>
         <categoryLink name="MUSICIAN (1/10)" hidden="false" id="a948-d269-a021-d1b3" targetId="eeed-ef77-b0d-fa9d" primary="false"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="f4c0-08d4-5995-ba5f" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -1928,12 +1928,12 @@ of that weapon for the rest of the battle.</characteristic>
       <categoryLinks>
         <categoryLink name="WARD (6+)" hidden="false" id="9e40-49a2-a92f-5bbe" targetId="70a4-383f-421f-52cd" primary="false"/>
         <categoryLink name="CHAOS" hidden="false" id="29d8-97b3-9b72-e73e" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="a2a1-14c5-b2a8-3b70" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="DAEMON" hidden="false" id="a5ae-b55d-3780-e6d" targetId="dc0b-e417-51f4-10f0" primary="false"/>
         <categoryLink name="CHAMPION" hidden="false" id="145d-f8eb-fa53-3db8" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="MUSICIAN (1/3)" hidden="false" id="72fe-1cf-e971-22e2" targetId="6cae-9aa2-6245-ab11" primary="false"/>
         <categoryLink name="STANDARD BEARER (1/3)" hidden="false" id="317b-83cc-eab8-23ab" targetId="9072-b48-3dd7-2cbc" primary="false"/>
         <categoryLink name="CAVALRY" hidden="false" id="d47e-4c0e-23a2-1b00" targetId="926c-df8c-6841-d49e" primary="true"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="22ac-f3b9-c9b3-46b3" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -2060,12 +2060,12 @@ of that weapon for the rest of the battle.</characteristic>
       </profiles>
       <categoryLinks>
         <categoryLink name="CHAOS" hidden="false" id="4898-c94a-fe7f-558a" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="9ca6-1476-4671-d375" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="CHAMPION" hidden="false" id="f309-255c-51de-ea4f" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="MUSICIAN (1/3)" hidden="false" id="1d01-582d-9a77-6dd7" targetId="6cae-9aa2-6245-ab11" primary="false"/>
         <categoryLink name="STANDARD BEARER (1/3)" hidden="false" id="cd14-a317-54f3-4b8a" targetId="9072-b48-3dd7-2cbc" primary="false"/>
         <categoryLink name="CAVALRY" hidden="false" id="540b-adf2-af4e-aa7b" targetId="926c-df8c-6841-d49e" primary="true"/>
         <categoryLink name="BLOODBOUND" hidden="false" id="e6f9-d4c0-7f94-836c" targetId="971a-1bec-c9dc-f9c4" primary="false"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="0987-61eb-0136-8e68" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>
@@ -2189,11 +2189,11 @@ of that weapon for the rest of the battle.</characteristic>
       </profiles>
       <categoryLinks>
         <categoryLink name="CHAOS" hidden="false" id="cecb-7047-8a13-54e" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="KHORNE" hidden="false" id="d305-e6bf-364d-57c4" targetId="2fe7-eb4-81bd-bdcd" primary="false"/>
         <categoryLink name="CHAMPION" hidden="false" id="b1ed-523e-2a65-ac9" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="BLOODBOUND" hidden="false" id="6540-da7b-4bd4-c7de" targetId="971a-1bec-c9dc-f9c4" primary="false"/>
         <categoryLink name="INFANTRY" hidden="false" id="e69e-61f4-e55d-9768" targetId="75d6-6995-dfcc-3898" primary="true"/>
         <categoryLink name="STANDARD BEARER (1/5)" hidden="false" id="96eb-5340-35a6-939" targetId="73c-8e22-9dde-f97" primary="false"/>
+        <categoryLink name="BLADES OF KHORNE" hidden="false" id="bd25-8ff5-d695-4106" targetId="34e2-3c11-76bc-a2e" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name="⬤" typeId="1dd2-2af7-76a2-2423" value="0"/>

diff --git a/Bonesplitterz.cat b/Bonesplitterz.cat
@@ -602,9 +602,9 @@
               <profiles>
                 <profile name="One Wiv&apos; Da Beast" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="ad8c-3aa8-17f2-fcf1">
                   <characteristics>
-                    <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Battle (Army), Reaction: You declared a **^^Spell^^** ability for a friendly **^^Bonesplitterz Wizard^^**</characteristic>
+                    <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Battle (Army), Any Hero Phase</characteristic>
                     <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb"/>
-                    <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">Instead of making a casting roll for this unit, you can use a value of 6 for the roll that cannot be modified.</characteristic>
+                    <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">The next time this phase that this unit uses a **^^Spell^^** ability, instead of making a casting roll for this unit, you can use a value of 6 for the roll that cannot be modified.</characteristic>
                     <characteristic name="Keywords" typeId="12e8-3214-7d8f-1d0f"/>
                     <characteristic name="Used By" typeId="1b32-c9d6-3106-166b"/>
                   </characteristics>

diff --git a/Cities of Sigmar - Library.cat b/Cities of Sigmar - Library.cat
@@ -168,12 +168,6 @@
             <characteristic name="Effect" typeId="fd7f-888d-3257-a12b">Each time this unit uses a **^^Shoot^^** ability, if it is in a fortified position, pick either the **Cannonball** or **Grapeshot** weapon characteristics for all the attacks it makes with its **Great Cannon**. If it is not in a fortified position, use the **Grapeshot** weapon characteristics.</characteristic>
           </characteristics>
         </profile>
-        <profile name="Aura of Protection" typeId="907f-a48-6a04-f788" typeName="Ability (Passive)" hidden="false" id="5d8f-f01f-a852-625f">
-          <characteristics>
-            <characteristic name="Keywords" typeId="b977-7c5e-33b2-428e"/>
-            <characteristic name="Effect" typeId="fd7f-888d-3257-a12b">Friendly **^^Cities of Sigmar^^** units have **^^Ward (6+)^^** while they are wholly within 12&quot; of this unit.</characteristic>
-          </characteristics>
-        </profile>
       </profiles>
       <selectionEntries>
         <selectionEntry type="model" import="true" name="Ironweld Great Cannon" hidden="false" id="4354-5236-2cfe-4ff4">
@@ -1539,12 +1533,12 @@
                 <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="2405-bc20-b29e-329a"/>
               </constraints>
               <entryLinks>
-                <entryLink import="true" name="Champion" hidden="false" id="e4c0-89c0-a274-142f" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1,0">
+                <entryLink import="true" name="Champion" hidden="false" id="e4c0-89c0-a274-142f" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1,0,0,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="e0b6-cd1a-833e-3ff3" shared="true" id="b98b-7f5e-7250-2884" includeChildSelections="true"/>
                   </constraints>
                 </entryLink>
-                <entryLink import="true" name="Standard Bearer" hidden="false" id="8a67-cd70-3b08-b528" type="selectionEntry" targetId="7f34-77c9-597-62c3" defaultAmount="1">
+                <entryLink import="true" name="Standard Bearer" hidden="false" id="8a67-cd70-3b08-b528" type="selectionEntry" targetId="7f34-77c9-597-62c3" defaultAmount="0,0,1,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="e0b6-cd1a-833e-3ff3" shared="true" id="8ab3-f95a-4a3b-cc1e" includeChildSelections="true"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="56d5-4694-6784-5e6d"/>
@@ -1557,7 +1551,7 @@
                     </modifier>
                   </modifiers>
                 </entryLink>
-                <entryLink import="true" name="Musician" hidden="false" id="1d7a-9cf8-2ddc-4081" type="selectionEntry" targetId="2475-183b-3802-4431" defaultAmount="1">
+                <entryLink import="true" name="Musician" hidden="false" id="1d7a-9cf8-2ddc-4081" type="selectionEntry" targetId="2475-183b-3802-4431" defaultAmount="0,1,0,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="85a4-364c-8b82-b8fe" shared="true" id="3997-5492-4ad-5b92" includeChildSelections="true"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="cdb3-91bd-48bf-7157"/>