From b2abef79dc63944aa03322b4f73d4dbdd8aad77f Mon Sep 17 00:00:00 2001
From: vadersson <75230701+vadersson@users.noreply.github.com>
Date: Wed, 14 Apr 2021 20:41:39 -0400
Subject: [PATCH] Clone war updates

Begining of working in all new clone war cards
---
 Galactic Republic.cat | 102 +++++++++++++++++++++++++++++++++++++++---
 Star_Wars_Armada.gst  |  38 +++++++++++++---
 2 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/Galactic Republic.cat b/Galactic Republic.cat
index aaf084c..bf5ce51 100644
--- a/Galactic Republic.cat	
+++ b/Galactic Republic.cat	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <catalogue id="aa80-2c3e-6e78-52b4" name="Galactic Republic" revision="7" battleScribeVersion="2.03" authorName="vadersson" authorContact="vadersson or vadersson109 most places online" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="33" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Added last preview</comment>
-  <readme>Added Venator II</readme>
+  <comment>Added latest preview</comment>
+  <readme>Added Venator II and Pelta Titles</readme>
   <selectionEntries>
     <selectionEntry id="e5f4-441f-affd-1db8" name="Delta-7 Aethersprite" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -1184,6 +1184,37 @@ At the start of each Status Phase, you may recover 1 shield.</characteristic>
             <cost name="pts" typeId="points" value="4.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="5187-2bdf-bf83-75ce" name="Thermal Shields" hidden="false" collective="false" import="true" type="upgrade">
+          <modifiers>
+            <modifier type="set" field="hidden" value="false">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="034d-5d10-2acd-a23f" type="atLeast"/>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="28b9-dee2-dcc6-c2a7" type="atLeast"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aa76-0c3a-89db-29f9" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="f2b4-1577-7050-3cd4" name="Thermal Shields" hidden="false" typeId="c4ed-b3c1-3b29-236e" typeName="5.2 Defensive Retrofit">
+              <characteristics>
+                <characteristic name="Defensive Retrofit Ability" typeId="8539-a418-bf73-51cd">Medium or Large ship only.
+While defending, after the attacker gathers dice, you may spend 1 [Brace] token.  If you do, choose and remove half of the dice in the attack pool, rounded down.</characteristic>
+                <characteristic name="Setup" typeId="1177-d2f9-43f7-1773"/>
+                <characteristic name="Recur" typeId="7280-a06c-6155-cccd"/>
+                <characteristic name="Ready Cost" typeId="803e-a62b-9cf4-a6d3"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="5.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="bcac-a7c9-2ab5-23b5" name="Experimental Retrofit" hidden="false" collective="false" import="true">
@@ -3464,6 +3495,46 @@ Each of your hull zones cannot target the same ship or squadron more than once d
             <cost name="pts" typeId="points" value="6.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="d694-7a56-b4df-b356" name="•Mercy Mission" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8c30-4a5f-7fa4-9de4" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="971c-0149-f98f-0bdc" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="e1b9-0ea0-f440-cef5" name="•Mercy Mission" hidden="false" typeId="1310-5c89-5c82-8e3b" typeName="4.2 Fleet Command">
+              <characteristics>
+                <characteristic name="Fleet Command Ability" typeId="67d1-23ac-2af6-6b5a">Before deploying fleets, un-equip this card and choose 1 friendly small ship that is not your flagship.  Equipm this card to the choosen ship (even if it does not have a [Fleet Command] icon in its upgrade bar.)
+At the end of the game, if you are within the enemy deployment zone, increase your score by 40 points; if you were destroyed, increase your fleet value by 20 points.</characteristic>
+                <characteristic name="Setup" typeId="fe32-50a3-41a4-c521"/>
+                <characteristic name="Recur" typeId="90e2-ff61-cc26-03d7"/>
+                <characteristic name="Ready Cost" typeId="28f0-e3fe-0af2-dbab"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="0.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="aa78-63f1-5aba-f932" name="•Hot Landing" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ff7c-1a08-0816-1157" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="244c-6bda-5357-2989" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="d93e-bbc8-c9d4-c56a" name="•Hot Landing" hidden="false" typeId="1310-5c89-5c82-8e3b" typeName="4.2 Fleet Command">
+              <characteristics>
+                <characteristic name="Fleet Command Ability" typeId="67d1-23ac-2af6-6b5a">At the start of the Squadron Phase, friendly squadrons with Adept gain Grit until the end of the phase.
+When a friendly squadron with Adept is destroyed, you may choose 1 enemy ship at distance 1-2 of that squadron.  If you do, that ship gains 1 raid token of your choice.</characteristic>
+                <characteristic name="Setup" typeId="fe32-50a3-41a4-c521"/>
+                <characteristic name="Recur" typeId="90e2-ff61-cc26-03d7"/>
+                <characteristic name="Ready Cost" typeId="28f0-e3fe-0af2-dbab"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="de1c-158a-113c-72a6" name="Superweapon" hidden="false" collective="false" import="true">
@@ -3502,15 +3573,15 @@ Each of your hull zones cannot target the same ship or squadron more than once d
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f274-7d7b-5404-64a7" type="max"/>
       </constraints>
       <selectionEntries>
-        <selectionEntry id="1172-68da-40d1-876b" name="•Swift Return (temp2)" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="1172-68da-40d1-876b" name="•FB-88" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="644f-10bd-ad0c-5f57" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fc18-7dd4-c939-8bb2" type="max"/>
           </constraints>
           <profiles>
-            <profile id="aaf4-22bf-b607-dea5" name="•Swift Return (temp2)" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+            <profile id="aaf4-22bf-b607-dea5" name="•FB-88" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
               <characteristics>
-                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">During your Determine Course step, if you are at distance 1-2 of an obstacle, you may change your speed by 1 or increased 1 yaw value by 1.</characteristic>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">Before you reveal a command, you may discard your top command dial.</characteristic>
                 <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
                 <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
                 <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
@@ -3518,7 +3589,26 @@ Each of your hull zones cannot target the same ship or squadron more than once d
             </profile>
           </profiles>
           <costs>
-            <cost name="pts" typeId="points" value="3.0"/>
+            <cost name="pts" typeId="points" value="4.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="c99d-ed39-182a-742d" name="•TB-73" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="a4a7-9b9a-09cf-3f84" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d2ec-6e11-7228-1289" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="e1bb-dae0-3aaa-dcf3" name="•TB-73" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">After you deploy, gain 1 additional [evade] defense token.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="5.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
diff --git a/Star_Wars_Armada.gst b/Star_Wars_Armada.gst
index 51f1bff..f2bf3b5 100644
--- a/Star_Wars_Armada.gst
+++ b/Star_Wars_Armada.gst
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="4007-48b0-a016-7a8e" name="Star_Wars_Armada" revision="33" battleScribeVersion="2.03" authorName="Brian Black - with additional work by vadersson" authorContact="Brian_Black on BGG or FFG forums   vadersson or vadersson109 on reddit, BGG, FFG, etc." xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
-  <comment>Fixed messed up data files.</comment>
-  <readme>Fixed some messed up data files.</readme>
+<gameSystem id="4007-48b0-a016-7a8e" name="Star_Wars_Armada" revision="34" battleScribeVersion="2.03" authorName="vadersson - initial work by Brian Black" authorContact="vadersson or vadersson109 on reddit, BGG, FFG, etc.
+Brian_Black on BGG or FFG forums   " xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+  <comment>Added more campaign objectives
+Added remaining Clone Wars Wave 2 data</comment>
+  <readme>Slowly adding Campaign Objectives
+Trying to work out a solution to the limit on unique squadrons.
+Updated Clone War wave 2 data.</readme>
   <costTypes>
     <costType id="points" name="pts" defaultCostLimit="0.0" hidden="false"/>
   </costTypes>
@@ -1149,13 +1153,37 @@ After deploying fleets, the second player may choose 1 enemy ship. That ship mus
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="55ed-6fa9-bf3b-876e" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="0369-b900-da6a-91a1" name="Hyperlane Raid" hidden="false" collective="false" import="true" type="model">
+            <selectionEntry id="0369-b900-da6a-91a1" name="Base Defense:  Ion Cannon" hidden="false" collective="false" import="true" type="model">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fbdf-d7b5-0e0e-1dc5" type="max"/>
                 <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="1639-842a-3b7b-1ef4" type="max"/>
               </constraints>
               <profiles>
-                <profile id="bcbd-fabb-208e-0c67" name="Hyperlane Raid" hidden="false" typeId="6aab-c5a8-8550-5f3a" typeName="8.4 Campaign Objective">
+                <profile id="bcbd-fabb-208e-0c67" name="Base Defense:  Ion Cannon" hidden="false" typeId="6aab-c5a8-8550-5f3a" typeName="8.4 Campaign Objective">
+                  <characteristics>
+                    <characteristic name="Setup" typeId="fa59-8161-5e62-2ef5">The second player must deploy all of his ships and squadron before the first player.  After deploying fleets, the second player places  3 objective tokens anywhere in the play area.</characteristic>
+                    <characteristic name="Special Rule" typeId="fc66-e901-6b99-d3cb">At the end of the Command Phase, the second player may select 1 enemy ship at distance 1-3 of an objective token and perform an attack against that ship.  The attacker is treated as if it is a ship with a battery armament of 4 blue dice, but is not friendly to any ship or squadrons.  The attack is treated as being at medium range, cannot be obstructed, can target any of the defender&apos;s hull zones. and has the following critical effect:
+Blue [Crit]:  The defender must choose and exhaust 1 of his defense tokens.</characteristic>
+                    <characteristic name="End of Round" typeId="fe21-e9ae-c56c-1f06"/>
+                    <characteristic name="End of Game" typeId="8566-c967-8a18-6c6b"></characteristic>
+                    <characteristic name="Victory Token Value" typeId="0b8c-5722-b073-5bf4"></characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <categoryLinks>
+                <categoryLink id="d2cd-f4ba-79da-7fd6" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="6b39-c2f9-f8b0-12de" name="Hyperlane Raid" hidden="false" collective="false" import="true" type="model">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9c30-7a57-5ed5-29d5" type="max"/>
+                <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="e704-bf69-417b-06d9" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="36bb-6e51-e88c-ccb0" name="Hyperlane Raid" hidden="false" typeId="6aab-c5a8-8550-5f3a" typeName="8.4 Campaign Objective">
                   <characteristics>
                     <characteristic name="Setup" typeId="fa59-8161-5e62-2ef5">After deploying fleets, each player chooses 1 of his ships to be an objective ship, starting with the first player.</characteristic>
                     <characteristic name="Special Rule" typeId="fc66-e901-6b99-d3cb">The first player&apos;s objective ship may perform each of its attacks from the same hull zone. It cannot target the same hull zone or squadron more than once each round with that hull zone. The second player&apos;s objective ship may perform each of its attacks from the same hull zone, and it may do so against the same targets.</characteristic>