From ee6b313d01789f10e9947d702fb44c962fee319d Mon Sep 17 00:00:00 2001
From: acebaur <acebaur@gmail.com>
Date: Fri, 22 Oct 2021 15:49:53 -0400
Subject: [PATCH] bugs

closes #10582
---
 Imperium - Black Templars.cat | 110 +++++++++++++++++++---------------
 Imperium - Space Marines.cat  |   6 --
 2 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/Imperium - Black Templars.cat b/Imperium - Black Templars.cat
index 9a2db59eaf..842459a362 100644
--- a/Imperium - Black Templars.cat	
+++ b/Imperium - Black Templars.cat	
@@ -1210,7 +1210,6 @@
       <selectionEntryGroups>
         <selectionEntryGroup id="301d-3c72-ac65-9646" name="Primaris Crusaders" hidden="false" collective="false" import="true">
           <constraints>
-            <constraint field="selections" scope="parent" value="20.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b1f2-681d-48d5-d099" type="max"/>
             <constraint field="selections" scope="parent" value="10.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aa1f-1ecf-81dd-fdba" type="min"/>
           </constraints>
           <selectionEntries>
@@ -1269,25 +1268,6 @@
                 <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="0eb7-4eef-f3d1-359d" name="Primaris Neophytes" hidden="false" collective="false" import="true" type="model">
-              <constraints>
-                <constraint field="selections" scope="parent" value="8.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1ae2-1637-a444-8d66" type="max"/>
-                <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8384-8de2-de39-f68f" type="min"/>
-              </constraints>
-              <entryLinks>
-                <entryLink id="adc8-7999-6997-410b" name="Frag &amp; Krak grenades" hidden="false" collective="false" import="true" targetId="cddf-945e-1335-e681" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7b38-31e6-f3ae-8c42" type="max"/>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="582d-53fb-b51b-1e29" type="min"/>
-                  </constraints>
-                </entryLink>
-              </entryLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="16.0"/>
-                <cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
-                <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
-              </costs>
-            </selectionEntry>
           </selectionEntries>
           <selectionEntryGroups>
             <selectionEntryGroup id="7289-6ca6-1375-4d15" name="Primaris Initiates" hidden="false" collective="false" import="true" defaultSelectionEntryId="3bcd-2ccb-2bfe-2712">
@@ -1387,6 +1367,9 @@
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="19.0"/>
+                  </costs>
                 </selectionEntry>
                 <selectionEntry id="3477-bd5f-b8f5-5df5" name="Primaris Initiate w/Pyreblaster" hidden="false" collective="false" import="true" type="model">
                   <modifiers>
@@ -1422,31 +1405,59 @@
                 </selectionEntry>
               </selectionEntries>
             </selectionEntryGroup>
+            <selectionEntryGroup id="5723-2430-c491-f6cb" name="Primaris Neophytes" hidden="false" collective="false" import="true">
+              <constraints>
+                <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4764-8d32-5a7c-057b" type="min"/>
+              </constraints>
+              <selectionEntries>
+                <selectionEntry id="fec2-b7bf-58a9-dc76" name="Primaris Neophytes" hidden="false" collective="false" import="true" type="model">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="8.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fd3c-a909-e626-665e" type="max"/>
+                    <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5abe-dc42-f52b-c008" type="min"/>
+                  </constraints>
+                  <entryLinks>
+                    <entryLink id="0c55-c8ed-840f-3195" name="Frag &amp; Krak grenades" hidden="false" collective="false" import="true" targetId="cddf-945e-1335-e681" type="selectionEntry">
+                      <constraints>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0562-356e-e432-64c5" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b8e8-e630-fece-e6cd" type="min"/>
+                      </constraints>
+                    </entryLink>
+                  </entryLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="16.0"/>
+                    <cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
+                    <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="1f43-bd31-6d41-d7b0" name="Weapons (Neophytes)" hidden="false" collective="false" import="true">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3883-926e-4a15-fbf5" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6587-7ff0-9811-1ded" type="min"/>
+                  </constraints>
+                  <selectionEntries>
+                    <selectionEntry id="1ee6-d8ff-c230-7644" name="Bolt Pistol and Astartes Chainsword" hidden="false" collective="false" import="true" type="upgrade">
+                      <infoLinks>
+                        <infoLink id="6a9c-f43d-ed7f-f31c" name="Astartes Chainsword" hidden="false" targetId="9155-5815-056b-9fd9" type="profile"/>
+                        <infoLink id="acc3-ff60-740f-cefc" name="Bolt pistol" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile"/>
+                      </infoLinks>
+                      <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>
+                  <entryLinks>
+                    <entryLink id="d660-7238-f187-4850" name="Bolt Carbine" hidden="false" collective="false" import="true" targetId="ca81-c3ca-0c66-38db" type="selectionEntry"/>
+                    <entryLink id="a41e-5915-4d9f-1cee" name="Astartes shotgun" hidden="false" collective="false" import="true" targetId="2b29-bc1f-cebc-3d95" type="selectionEntry"/>
+                  </entryLinks>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
+            </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="27c1-3244-b6b2-a983" name="Weapons (Neophytes)" hidden="false" collective="false" import="true" defaultSelectionEntryId="9141-6bfb-612c-73d5">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0021-377a-187b-8637" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b23e-7e66-07d0-eaee" type="min"/>
-          </constraints>
-          <selectionEntries>
-            <selectionEntry id="9141-6bfb-612c-73d5" name="Bolt Pistol and Astartes Chainsword" hidden="false" collective="true" import="true" type="upgrade">
-              <infoLinks>
-                <infoLink id="6c2b-dc1f-cec8-e14c" name="Astartes Chainsword" hidden="false" targetId="9155-5815-056b-9fd9" type="profile"/>
-                <infoLink id="928f-87a9-c1aa-0f2c" name="Bolt pistol" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile"/>
-              </infoLinks>
-              <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>
-          <entryLinks>
-            <entryLink id="5be8-a33b-16c4-0ab4" name="Bolt Carbine" hidden="false" collective="false" import="true" targetId="ca81-c3ca-0c66-38db" type="selectionEntry"/>
-            <entryLink id="a151-7640-1f1b-52a5" name="Astartes shotgun" hidden="false" collective="false" import="true" targetId="2b29-bc1f-cebc-3d95" type="selectionEntry"/>
-          </entryLinks>
-        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink id="1b34-19c4-2bda-8961" name="Relic Bearers" hidden="false" collective="false" import="true" targetId="0f93-1988-1ae0-0720" type="selectionEntryGroup"/>
@@ -3224,7 +3235,7 @@ Until the end of the battle, all units from your army with the Templar Vows abil
                       <conditions>
                         <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c6a1-e0c4-c1b1-dce1" type="equalTo"/>
                         <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="28bf-34eb-d9b2-2ba6" type="equalTo"/>
-                        <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1ac4-5be9-b51b-6a7e" type="equalTo"/>
+                        <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1ac4-5be9-b51b-6a7e" type="equalTo"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -3466,9 +3477,14 @@ Until the end of the battle, all units from your army with the Templar Vows abil
     <selectionEntryGroup id="0f93-1988-1ae0-0720" name="Relic Bearers" hidden="false" collective="false" import="true">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="c3f5-f3b2-bdbb-4742" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="c3f5-f3b2-bdbb-4742" type="equalTo"/>
+                <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="6a29-a8c3-7b22-c00f" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <constraints>
diff --git a/Imperium - Space Marines.cat b/Imperium - Space Marines.cat
index e9071296d9..229e242100 100644
--- a/Imperium - Space Marines.cat	
+++ b/Imperium - Space Marines.cat	
@@ -16111,9 +16111,6 @@ Weapon: Purgatorus</characteristic>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c09f-d2b0-27d4-7e02" type="min"/>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="948b-e55b-7225-c9b9" type="max"/>
                   </constraints>
-                  <costs>
-                    <cost name="pts" typeId="points" value="5.0"/>
-                  </costs>
                 </entryLink>
               </entryLinks>
               <costs>
@@ -16176,9 +16173,6 @@ Weapon: Purgatorus</characteristic>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="17bb-654a-27d0-64de" type="min"/>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="d736-b809-7bac-5526" type="max"/>
                   </constraints>
-                  <costs>
-                    <cost name="pts" typeId="points" value="5.0"/>
-                  </costs>
                 </entryLink>
               </entryLinks>
               <costs>