Revert "Merge pull request #288 from BSData/bugfix/princeps-seniores-…

…leaking" This reverts commit 0a1e114, reversing changes made to 49c4670.
BSData · Jul 12, 2024 · e9c1b8b · e9c1b8b
1 parent e016273
commit e9c1b8b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/Adeptus Titanicus 2018.gst b/Adeptus Titanicus 2018.gst
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="975a-00f4-df37-b565" name="Adeptus Titanicus 2018" revision="76" battleScribeVersion="2.03" authorName="Play Titanicus BS Team" authorContact="You can find us on the Discord Server for comments and feedback:  https://discord.com/invite/UrrPB3T" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
-  <comment>Now no longer compatible with BS, please switch to NR.</comment>
-  <readme>IMPORTANT: If you are still using Battlescribe to edit your rosters, please switch to NewRecruit. NR introduces new features that allows us to fix longstanding issues with the data, which can&apos;t be fixed with BS.
-Apologies for the inconvenience but BS has been dead for years now.
+<gameSystem id="975a-00f4-df37-b565" name="Adeptus Titanicus 2018" revision="75" battleScribeVersion="2.03" authorName="Play Titanicus BS Team" authorContact="You can find us on the Discord Server for comments and feedback:  https://discord.com/invite/UrrPB3T" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
+  <comment>Now with a whole lot less STRUCTURE</comment>
+  <readme>Create a Legio Battlegroup by adding a Battlegroup to your Roster. Maniples and Reinforcements can be added directly to a Legio Battlegroup!
 
+To create a Household Battlegroup add a Household to your Roster. Each Lance is a separate Force that needs to be added to your Household. Reinforcements can then be added directly to your Household, or each of your added Lance forces!
 
-Create a Legio Battlegroup by adding a Battlegroup to your Roster. Maniples and Reinforcements can be added directly to a Legio Battlegroup!
+NOTE: On mobile, the &apos;add force&apos; dialog adds a Lance automatically when selecting the &apos;Household&apos; catalog in the &apos;Select Catalogue&apos; step (so basically you select &apos;Household&apos; twice). This is more clear on the desktop version of the app where you can clearly see you are selecting a Lance. This is an issue with BS, most likely because there is only 1 Force to choose from.
 
-To create a Household Battlegroup add a Household to your Roster. Each Lance is a separate Force that needs to be added to your Household. Reinforcements can then be added directly to your Household, or each of your added Lance forces!
-</readme>
+NOTE 2: If after this you can see the Lance,but can&apos;t add any banners to it, please make sure that the &apos;force navigation&apos; option from the kebab menu (top right), is NOT set to merged. &apos;Nested&apos; will make the Lance clickable and you then you can add banners, or if you set it to &apos;flattened&apos; everything will work normally.</readme>
   <publications>
     <publication id="975a-00f4-pubN65537" name="Adeptus Titanicus 2018"/>
     <publication id="975a-00f4-pubN87630" name="Titandeath"/>
@@ -17848,16 +17847,10 @@ For example, if the Reaver from a Venator Light Maniple was replaced with a Warl
             <condition field="selections" scope="ancestor" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6982-2d18-55cb-61e5" type="notInstanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set" value="2" field="52f0-7a81-15a5-b780">
-          <conditions>
-            <condition type="atLeast" value="1" field="selections" scope="unit" childId="4225-27f8-9c8b-e56e" shared="true" includeChildSelections="true"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="unit" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="52f0-7a81-15a5-b780" type="max"/>
-        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="d4fb-c096-d797-e4ea" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-        <constraint type="min" value="1" field="selections" scope="unit" shared="true" id="9769-4600-28eb-2cf7" includeChildSelections="true"/>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="52f0-7a81-15a5-b780" type="max"/>
+        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="2337-45e1-87e4-f282" type="max"/>
       </constraints>
       <rules>
         <rule id="69df-cbc9-f278-290d" name="Princeps Seniores" publicationId="975a-00f4-pubN65537" page="55" hidden="false">

diff --git a/Battlegroup.cat b/Battlegroup.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7c04-d50d-bc70-52f3" name="Battlegroup" revision="16" battleScribeVersion="2.03" library="false" gameSystemId="975a-00f4-df37-b565" gameSystemRevision="72" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="7c04-d50d-bc70-52f3" name="Battlegroup" revision="15" battleScribeVersion="2.03" library="false" gameSystemId="975a-00f4-df37-b565" gameSystemRevision="72" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <publications>
     <publication id="7c04-d50d-pubN65537" name="Adeptus Titanicus 2018"/>
   </publications>
@@ -18,6 +18,20 @@
         <categoryLink id="0606-1d0c-defb-d6e6" name="Banner" hidden="false" targetId="917a-77ef-30e4-b812" primary="false"/>
         <categoryLink id="4f07-d070-7d91-0291" name="Stratagem Hand" hidden="false" targetId="b539-a35c-fe3f-9c34" primary="true"/>
         <categoryLink id="8870-d6d8-5519-9eb0" name="Squadron" hidden="false" targetId="fb16-4d89-30b7-fbb8" primary="false"/>
+        <categoryLink id="3546-6658-7a79-214d" name="Princeps Seniores" publicationId="975a-00f4-pubN65537" hidden="false" targetId="c130-1260-4c15-147a" primary="false">
+          <modifiers>
+            <modifier type="increment" field="bf78-6b8f-80d8-996a" value="1">
+              <repeats>
+                <repeat field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6982-2d18-55cb-61e5" repeats="1" roundUp="false"/>
+                <repeat field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4225-27f8-9c8b-e56e" repeats="1" roundUp="false"/>
+              </repeats>
+            </modifier>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="f28c-fa09-7512-e0c7" type="min"/>
+            <constraint field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="bf78-6b8f-80d8-996a" type="max"/>
+          </constraints>
+        </categoryLink>
       </categoryLinks>
     </forceEntry>
   </forceEntries>