From e3d74a1fccd21561070538d344fabac026422a1c Mon Sep 17 00:00:00 2001
From: MCMBen <fleafa@gmail.com>
Date: Mon, 27 Nov 2023 16:29:47 +0000
Subject: [PATCH] minor fixes

---
 Bushido_Risen_Sun.gst |  3 ++-
 Jung_Pirates.cat      |  3 ++-
 Library-Ronin.cat     | 17 +++++++++++------
 Library-Types.cat     |  2 +-
 Shiho_Clan.cat        |  3 ++-
 Temple_of_Ro-Kan.cat  | 14 ++++++++++----
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Bushido_Risen_Sun.gst b/Bushido_Risen_Sun.gst
index 2599895..df5d07f 100644
--- a/Bushido_Risen_Sun.gst
+++ b/Bushido_Risen_Sun.gst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="62e4-ab79-1c4c-9ffe" name="Bushido: Risen Sun" revision="16" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="62e4-ab79-1c4c-9ffe" name="Bushido: Risen Sun" revision="17" battleScribeVersion="2.03" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <costTypes>
     <costType id="a111-8656-5c05-7415" name=" Rice" defaultCostLimit="-1.0" hidden="false"/>
   </costTypes>
@@ -274,6 +274,7 @@
     <categoryEntry id="d190-d7ff-d350-6425" name="Trap" hidden="false"/>
     <categoryEntry id="a614-eb85-43c8-7869" name="Filters" hidden="false"/>
     <categoryEntry id="728d-5909-6312-6d40" name="Additional Rules" hidden="false"/>
+    <categoryEntry id="6be3-5710-4a9e-0c9f" name="Exclude_Ronin_Enhancements" hidden="false"/>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="2150-40b1-52f8-4a8a" name="Risen Sun" hidden="true">
diff --git a/Jung_Pirates.cat b/Jung_Pirates.cat
index fe55090..2370dfe 100644
--- a/Jung_Pirates.cat
+++ b/Jung_Pirates.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="d615-aef7-31d5-367d" name="Jung Pirates" revision="26" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d615-aef7-31d5-367d" name="Jung Pirates" revision="27" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="258a-e1a8-8db1-9635" name="Ki&lt;2" hidden="true"/>
     <categoryEntry id="f6c9-50fa-a9d3-e9f3" name="Ranged Weapon" hidden="true"/>
@@ -3929,6 +3929,7 @@ If this model is included in your Warband you may also include Ronin Kami of Cho
         <categoryLink id="b327-3544-1e6c-a541" name="New CategoryLink" hidden="false" targetId="9fba-f50b-c8f7-8396" primary="true"/>
       </categoryLinks>
     </entryLink>
+    <entryLink id="9f0a-a82a-455c-f3cf" name="The Imperial March" hidden="false" collective="false" import="true" targetId="b94d-f7cb-a84c-4077" type="selectionEntry"/>
   </entryLinks>
   <sharedSelectionEntries>
     <selectionEntry id="a382-7e2d-9df9-d700" name="Korusea" hidden="false" collective="false" import="true" type="model">
diff --git a/Library-Ronin.cat b/Library-Ronin.cat
index 00c07d9..fb9c73f 100644
--- a/Library-Ronin.cat
+++ b/Library-Ronin.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b489-b304-948d-52d0" name="Library-Ronin" revision="38" battleScribeVersion="2.03" library="true" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b489-b304-948d-52d0" name="Library-Ronin" revision="39" battleScribeVersion="2.03" library="true" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="4e24-3a7e-77bc-dfed" name="Balance" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -9462,7 +9462,7 @@ This model can make only one Bird Strike Ranged Attack per turn.</characteristic
       <selectionEntries>
         <selectionEntry id="676b-9a72-81e1-6424" name="Plainsmen Falconer A" hidden="false" collective="false" import="true" type="model">
           <constraints>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1224-44b8-d9b1-0321" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1224-44b8-d9b1-0321" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="420d-6ae0-909a-3e4a" type="min"/>
           </constraints>
           <profiles>
@@ -9497,7 +9497,7 @@ This model can make only one Bird Strike Ranged Attack per turn.</characteristic
         </selectionEntry>
         <selectionEntry id="8eb7-c6d0-1b21-08d9" name="Plainsmen Falconer B" hidden="false" collective="false" import="true" type="model">
           <constraints>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d259-da80-a0dd-cabe" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d259-da80-a0dd-cabe" type="max"/>
           </constraints>
           <profiles>
             <profile id="3a39-e982-8414-c8ae" name="Plainsmen Falconer B" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -9640,9 +9640,14 @@ This model can make only one Bird Strike Ranged Attack per turn.</characteristic
     <selectionEntryGroup id="f486-4498-03e3-c397" name="Enhancements" hidden="false" collective="false" import="true">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5073-f00b-a8f6-5e3b" type="instanceOf"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="6be3-5710-4a9e-0c9f" type="atLeast"/>
+                <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5073-f00b-a8f6-5e3b" type="instanceOf"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <selectionEntryGroups>
diff --git a/Library-Types.cat b/Library-Types.cat
index d4f1f93..39b0fac 100644
--- a/Library-Types.cat
+++ b/Library-Types.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="a766-d7f3-5f9a-4098" name="Library-Types" revision="14" battleScribeVersion="2.03" library="true" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="15" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="a766-d7f3-5f9a-4098" name="Library-Types" revision="15" battleScribeVersion="2.03" library="true" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="c382-9ab3-9924-e30a" name="Animal" hidden="false"/>
     <categoryEntry id="c48e-5e32-f0b0-1cfe" name="Asura" hidden="false"/>
diff --git a/Shiho_Clan.cat b/Shiho_Clan.cat
index c161e17..9e57d5b 100644
--- a/Shiho_Clan.cat
+++ b/Shiho_Clan.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="2276-2df6-78a7-841d" name="Shiho Clan" revision="28" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="2276-2df6-78a7-841d" name="Shiho Clan" revision="29" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="7fa5-7ef0-59c5-f657" name="Tanaka" hidden="false"/>
   </categoryEntries>
@@ -1750,6 +1750,7 @@ Exclusion [Ronin Special Cards]</characteristic>
       <categoryLinks>
         <categoryLink id="bd8e-fde4-783a-d754" name="Theme Cards" hidden="false" targetId="477a-e693-0888-08f7" primary="true"/>
         <categoryLink id="bfe1-73bd-4d40-abc2" name="The Black Eagle&apos;s Coalition" hidden="false" targetId="ec59-5e92-0626-3540" primary="false"/>
+        <categoryLink id="353d-4ca6-746a-a1e8" name="ExcludeIf" hidden="false" targetId="6be3-5710-4a9e-0c9f" primary="false"/>
       </categoryLinks>
       <costs>
         <cost name=" Rice" typeId="a111-8656-5c05-7415" value="0.0"/>
diff --git a/Temple_of_Ro-Kan.cat b/Temple_of_Ro-Kan.cat
index 0c3351b..3bbeed6 100644
--- a/Temple_of_Ro-Kan.cat
+++ b/Temple_of_Ro-Kan.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4213-717c-2228-e731" name="Temple of Ro-Kan" revision="31" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="4213-717c-2228-e731" name="Temple of Ro-Kan" revision="32" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="5048-3a52-5689-6d0b" name="Spiritual Harmony" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -4541,6 +4541,7 @@ This model may be recruited into any Warband that includes Taiki.</characteristi
         <categoryLink id="21c9-583f-2313-3d96" name="Unique" hidden="false" targetId="afd4-8041-e359-223c" primary="false"/>
         <categoryLink id="5dd8-6d8a-5ca1-88d7" name="Villager" hidden="false" targetId="9389-c90b-a833-f68d" primary="false"/>
         <categoryLink id="b7bb-3d10-82f0-0772" name="Monk" hidden="false" targetId="57a9-2b8a-3729-1ad8" primary="false"/>
+        <categoryLink id="a6bd-12f0-ccb4-c8a8" name="Taiki" hidden="false" targetId="ed70-8a71-46a4-51ea" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="7181-d461-574a-e030" name="Enhancements" hidden="false" collective="false" import="true" targetId="d716-36e8-af1d-0a1f" type="selectionEntryGroup"/>
@@ -8463,9 +8464,14 @@ If it fails, its Activation ends and it loses one Activation Counter.</character
         <entryLink id="ee77-ccc5-223d-53b2" name="!DRAFT Finesse" hidden="false" collective="false" import="true" targetId="e916-ca9f-75ef-1c24" type="selectionEntry">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f62f-dd0b-4f06-06a6" type="instanceOf"/>
-              </conditions>
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f62f-dd0b-4f06-06a6" type="instanceOf"/>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4280-5c0d-17ff-1d18" type="instanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
           </modifiers>
         </entryLink>