Merge pull request #1198 from BSData/fixes

Fixes
BSData · Sep 12, 2024 · 22bacb3 · 22bacb3
2 parents f9a0071 + ffd5379
commit 22bacb3
Show file tree

Hide file tree

Showing 8 changed files with 403 additions and 192 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: BSData/check-datafiles@v1
       id: check
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       with:
         name: artifact
         path: ${{ steps.check.outputs.staging-path }}
diff --git a/empireOfSonnstahl.cat b/empireOfSonnstahl.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7458-561b-2f1f-bb55" name="Empire of Sonnstahl" revision="6" battleScribeVersion="2.03" authorName="DarkSky" library="false" gameSystemId="8c9a-3026-84b4-cf16" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7458-561b-2f1f-bb55" name="Empire of Sonnstahl" revision="7" battleScribeVersion="2.03" authorName="DarkSky" library="false" gameSystemId="8c9a-3026-84b4-cf16" gameSystemRevision="7" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="ad88-58e2-e12d-1a38" name="Core Cavalry" hidden="false"/>
     <categoryEntry id="0730-0fd0-cf63-4684" name="Imperial Auxiliaries" hidden="false"/>
@@ -1825,9 +1825,12 @@
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8c18-0772-9edf-ff6a" type="max"/>
+          </constraints>
           <entryLinks>
-            <entryLink id="2c0c-fc8b-37bc-2902" name="[EoS] Banner Enchantments (Parent)" hidden="true" collective="false" import="true" targetId="8f63-b258-8e49-9545" type="selectionEntryGroup"/>
-            <entryLink id="9878-fab3-51f3-be91" name="Banner Enchantments" hidden="true" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
+            <entryLink id="2c0c-fc8b-37bc-2902" name="[EoS] Banner Enchantments (Parent)" hidden="false" collective="false" import="true" targetId="8f63-b258-8e49-9545" type="selectionEntryGroup"/>
+            <entryLink id="9878-fab3-51f3-be91" name="[AC] Banner Enchantments" hidden="false" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2324,9 +2327,12 @@
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a14b-c607-20fc-a25e" type="max"/>
+          </constraints>
           <entryLinks>
-            <entryLink id="848c-4857-9532-f82a" name="[EoS] Banner Enchantments" hidden="true" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
-            <entryLink id="0646-3505-f2d6-09cf" name="Banner Enchantments" hidden="true" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
+            <entryLink id="848c-4857-9532-f82a" name="[EoS] Banner Enchantments" hidden="false" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
+            <entryLink id="0646-3505-f2d6-09cf" name="[AC] Banner Enchantments" hidden="false" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2433,9 +2439,12 @@
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5e2a-d54f-9ed4-0347" type="max"/>
+          </constraints>
           <entryLinks>
-            <entryLink id="76cd-80f2-56b7-f5c4" name="[EoS] Banner Enchantments" hidden="true" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
-            <entryLink id="82cc-1b0f-e620-2a48" name="Banner Enchantments" hidden="true" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
+            <entryLink id="76cd-80f2-56b7-f5c4" name="[EoS] Banner Enchantments" hidden="false" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
+            <entryLink id="82cc-1b0f-e620-2a48" name="[AC] Banner Enchantments" hidden="false" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2518,9 +2527,12 @@
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ea22-ab7f-bb15-1957" type="max"/>
+          </constraints>
           <entryLinks>
-            <entryLink id="8742-7e9a-d395-d807" name="[EoS] Banner Enchantments" hidden="true" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
-            <entryLink id="9e04-5fff-acc3-0076" name="Banner Enchantments" hidden="true" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
+            <entryLink id="8742-7e9a-d395-d807" name="[EoS] Banner Enchantments" hidden="false" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
+            <entryLink id="9e04-5fff-acc3-0076" name="[AC] Banner Enchantments" hidden="false" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2585,9 +2597,12 @@
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="b954-710f-e52c-75e2" type="max"/>
+          </constraints>
           <entryLinks>
-            <entryLink id="10a7-87ad-4c36-bf1f" name="[EoS] Banner Enchantments (Parent)" hidden="true" collective="false" import="true" targetId="8f63-b258-8e49-9545" type="selectionEntryGroup"/>
-            <entryLink id="bff0-a405-844d-ac39" name="Banner Enchantments" hidden="true" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
+            <entryLink id="10a7-87ad-4c36-bf1f" name="[EoS] Banner Enchantments (Parent)" hidden="false" collective="false" import="true" targetId="8f63-b258-8e49-9545" type="selectionEntryGroup"/>
+            <entryLink id="bff0-a405-844d-ac39" name="[AC] Banner Enchantments" hidden="false" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2598,7 +2613,7 @@
         <cost name="pts" typeId="24fd-8af8-0c78-001c" value="-70.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="f234-dc8c-76e3-6e78" name="Knights of the Sun Griffon" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="fe4d-98d6-360c-0d92" name="Knights of the Sun Griffon" hidden="false" collective="false" import="true" type="unit">
       <constraints>
         <constraint field="24fd-8af8-0c78-001c" scope="parent" value="600.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="668a-0dde-9b03-71f3" type="max"/>
       </constraints>
@@ -2651,9 +2666,12 @@
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4c42-5ea3-4bfb-b0d4" type="max"/>
+          </constraints>
           <entryLinks>
-            <entryLink id="f785-f9dc-f2b2-a534" name="[EoS] Banner Enchantments" hidden="true" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
-            <entryLink id="182a-34d1-4f3b-bda2" name="Banner Enchantments" hidden="true" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
+            <entryLink id="f785-f9dc-f2b2-a534" name="[EoS] Banner Enchantments" hidden="false" collective="false" import="true" targetId="1395-1a1a-49a0-9c1b" type="selectionEntryGroup"/>
+            <entryLink id="182a-34d1-4f3b-bda2" name="[AC] Banner Enchantments" hidden="false" collective="false" import="true" targetId="4eb1-cabb-a838-a005" type="selectionEntryGroup"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2701,7 +2719,7 @@
             <constraint field="selections" scope="parent" value="8.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8a27-4e58-762c-014a" type="min"/>
           </constraints>
           <costs>
-            <cost name="pts" typeId="24fd-8af8-0c78-001c" value="11.0"/>
+            <cost name="pts" typeId="24fd-8af8-0c78-001c" value="10.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -2761,7 +2779,8 @@
       <selectionEntryGroups>
         <selectionEntryGroup id="6a36-a379-2eaa-877e" name="Artillery Weapon" hidden="false" collective="false" import="true">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0848-4042-57d7-ae4d" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0848-4042-57d7-ae4d" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1e9e-f470-892d-849a" type="max"/>
           </constraints>
           <selectionEntries>
             <selectionEntry id="3d89-486f-b6e2-228a" name="Mortar" hidden="false" collective="false" import="true" type="upgrade">