Updated Separatist ship points, tags, and upgrade bars based on 2023-…

…09-08 Ship Points Document, excluding Standard Loadouts. Ship upgrades moved to pilot for easier syncing with point updates.
Baledin · Nov 12, 2023 · 86862b2 · 86862b2
1 parent 11751dd
commit 86862b2
Show file tree

Hide file tree

Showing 71 changed files with 300 additions and 235 deletions.
diff --git a/...l/Content/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/CaptainSear.cs b/...l/Content/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/CaptainSear.cs
@@ -1,6 +1,5 @@
 using ActionsList;
 using Arcs;
-using Content;
 using Ship;
 using System;
 using System.Collections.Generic;
@@ -19,12 +18,13 @@ public CaptainSear()
                 Faction.Separatists,
                 2,
                 5,
-                15,
+                17,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.CaptainSearAbility),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.TacticalRelay,
+                    UpgradeType.Modification,
                     UpgradeType.Modification
                 }
             );

diff --git a/...econdEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/FeethanOttrawAutopilot.cs b/...econdEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/FeethanOttrawAutopilot.cs
@@ -1,7 +1,5 @@
 using Content;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using Upgrade;
 
 namespace Ship.SecondEdition.Belbullab22Starfighter
@@ -20,7 +18,8 @@ public FeethanOttrawAutopilot()
                 5,
                 extraUpgradeIcons: new List<UpgradeType>
                 {
-                    UpgradeType.TacticalRelay
+                    UpgradeType.TacticalRelay,
+                    UpgradeType.Modification
                 },
                 tags: new List<Tags>
                 {

diff --git a/...ntent/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/GeneralGrievous.cs b/...ntent/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/GeneralGrievous.cs
@@ -1,5 +1,4 @@
 using BoardTools;
-using Content;
 using Ship;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,14 +17,15 @@ public GeneralGrievous()
                 Faction.Separatists,
                 4,
                 5,
-                12,
+                11,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.GeneralGrievousAbility),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
                     UpgradeType.Missile,
                     UpgradeType.Title,
+                    UpgradeType.Modification,
                     UpgradeType.Modification
                 }
             );

diff --git a/...el/Content/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/SkakoanAce.cs b/...el/Content/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/SkakoanAce.cs
@@ -18,6 +18,7 @@ public SkakoanAce()
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
+                    UpgradeType.Modification,
                     UpgradeType.Modification
                 }
             );

diff --git a/...del/Content/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/WatTambor.cs b/...del/Content/SecondEdition/Standard/Pilots/Separatists/Belbullab22Starfighter/WatTambor.cs
@@ -17,15 +17,16 @@ public WatTambor()
                 Faction.Separatists,
                 3,
                 4,
-                7,
+                9,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.WatTamborAbility),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
                     UpgradeType.TacticalRelay,
+                    UpgradeType.Modification,
                     UpgradeType.Modification
-                },
+                },                
                 skinName: "Wat Tambor"
             );
 

diff --git a/.../Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/ColicoidInterceptor.cs b/.../Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/ColicoidInterceptor.cs
@@ -14,11 +14,13 @@ public ColicoidInterceptor()
                 "",
                 Faction.Separatists,
                 1,
-                4,
+                3,
                 4,
                 extraUpgradeIcons: new List<UpgradeType>
                     {
-                        UpgradeType.Talent
+                        UpgradeType.Talent,
+                        UpgradeType.Modification,
+                        UpgradeType.Configuration
                     },
                 tags: new List<Tags>
                 {

diff --git a/...pts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/Dis347-SoC.cs b/...pts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/Dis347-SoC.cs
@@ -19,7 +19,7 @@ public Dis347SoC()
                 "Siege of Coruscant",
                 Faction.Separatists,
                 3,
-                4,
+                3,
                 0,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.Dis347Ability),

diff --git a/...Scripts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/Dis347.cs b/...Scripts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/Dis347.cs
@@ -18,16 +18,18 @@ public Dis347()
                 "Target Acquired",
                 Faction.Separatists,
                 3,
+                3,
                 4,
-                14,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.Dis347Ability),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
                     UpgradeType.Sensor,
                     UpgradeType.Missile,
-                    UpgradeType.Modification
+                    UpgradeType.Modification,
+                    UpgradeType.Modification,
+                    UpgradeType.Configuration
                 },
                 tags: new List<Tags>
                 {

diff --git a/...pts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/DisT81-SoC.cs b/...pts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/DisT81-SoC.cs
@@ -17,7 +17,7 @@ public DisT81SoC()
                 "Siege of Coruscant",
                 Faction.Separatists,
                 4,
-                5,
+                4,
                 0,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.DisT81SoCAbility),

diff --git a/...Scripts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/DisT81.cs b/...Scripts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/DisT81.cs
@@ -19,16 +19,18 @@ public DisT81()
                 "Clever Circuits",
                 Faction.Separatists,
                 4,
-                4,
-                12,
+                3,
+                3,
                 isLimited: true,
                 abilityType: typeof(Abilities.SecondEdition.DisT81Ability),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
                     UpgradeType.Sensor,
                     UpgradeType.Cannon,
-                    UpgradeType.Modification
+                    UpgradeType.Modification,
+                    UpgradeType.Modification,
+                    UpgradeType.Configuration
                 },
                 tags: new List<Tags>
                 {

diff --git a/...del/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/FearsomePredator.cs b/...del/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/FearsomePredator.cs
@@ -20,16 +20,18 @@ public FearsomePredator()
                 "Fixated Pursuit",
                 Faction.Separatists,
                 3,
-                4,
-                16,
+                3,
+                3,
                 limited: 3,
                 abilityType: typeof(Abilities.SecondEdition.FearsomePredatorAbility),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
                     UpgradeType.Sensor,
                     UpgradeType.Missile,
-                    UpgradeType.Modification
+                    UpgradeType.Modification,
+                    UpgradeType.Modification,
+                    UpgradeType.Configuration
                 },
                 tags: new List<Tags>
                 {

diff --git a/...ontent/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/PhlacArphoccPrototype.cs b/...ontent/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/PhlacArphoccPrototype.cs
@@ -18,16 +18,18 @@ public PhlacArphoccPrototype()
                 "Predictive Analysis Protocol",
                 Faction.Separatists,
                 5,
-                5,
-                14,
+                3,
+                6,
                 limited: 2,
                 abilityType: typeof(Abilities.SecondEdition.PhlacArphoccPrototypeAbility),
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
                     UpgradeType.Sensor,
                     UpgradeType.Missile,
-                    UpgradeType.Modification
+                    UpgradeType.Modification,
+                    UpgradeType.Modification,
+                    UpgradeType.Configuration
                 },
                 tags: new List<Tags>
                 {

diff --git a/...ontent/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/SeparatistInterceptor.cs b/...ontent/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/SeparatistInterceptor.cs
@@ -14,12 +14,14 @@ public SeparatistInterceptor()
                 "",
                 Faction.Separatists,
                 3,
-                4,
+                3,
                 3,
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
-                    UpgradeType.Missile
+                    UpgradeType.Missile,
+                    UpgradeType.Modification,
+                    UpgradeType.Configuration
                 },
                 tags: new List<Tags>
                 {

diff --git a/...ripts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/VolanDas.cs b/...ripts/Model/Content/SecondEdition/Standard/Pilots/Separatists/DroidTriFighter/VolanDas.cs
@@ -27,8 +27,8 @@ public VolanDas()
                 extraUpgradeIcons: new List<UpgradeType>
                 {
                     UpgradeType.Talent,
-                    UpgradeType.Sensor,
                     UpgradeType.Missile,
+                    UpgradeType.Illicit,
                     UpgradeType.Modification
                 },
                 affectedByStandardized: false,

diff --git a/.../Content/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/AurraSing.cs b/.../Content/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/AurraSing.cs
@@ -1,13 +1,12 @@
 using BoardTools;
 using Content;
+using Ship;
+using SubPhases;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEngine;
-using Upgrade;
 using Tokens;
-using SubPhases;
-using Ship;
-using System;
+using Upgrade;
 
 namespace Ship
 {
@@ -23,20 +22,24 @@ public AurraSing() : base()
                     "Bane of the Jedi",
                     Faction.Separatists,
                     4,
-                    8,
-                    18,
+                    7,
+                    10,
                     isLimited: true,
                     force: 1,
                     abilityType: typeof(Abilities.SecondEdition.AurraSingAbility),
                     extraUpgradeIcons: new List<UpgradeType>
                     {
-                        UpgradeType.Crew,
+                        UpgradeType.Talent,
+                        UpgradeType.Cannon,
+                        UpgradeType.Cannon,
+                        UpgradeType.Device,
                         UpgradeType.Illicit,
                         UpgradeType.Modification,
                         UpgradeType.Title
                     },
                     tags: new List<Tags>
                     {
+                        Tags.DarkSide,
                         Tags.BountyHunter
                     },
                     skinName: "Jango Fett"

diff --git a/...ontent/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/BobaFettSep.cs b/...ontent/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/BobaFettSep.cs
@@ -25,7 +25,10 @@ public BobaFettSep() : base()
                     abilityType: typeof(Abilities.SecondEdition.BobaFettSeparatistAbility),
                     extraUpgradeIcons: new List<UpgradeType>
                     {
+                        UpgradeType.Cannon,
+                        UpgradeType.Missile,
                         UpgradeType.Crew,
+                        UpgradeType.Device,
                         UpgradeType.Illicit,
                         UpgradeType.Modification,
                         UpgradeType.Title

diff --git a/.../Content/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/JangoFett.cs b/.../Content/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/JangoFett.cs
@@ -18,13 +18,16 @@ public JangoFett() : base()
                     Faction.Separatists,
                     6,
                     8,
-                    27,
+                    22,
                     isLimited: true,
                     abilityType: typeof(Abilities.SecondEdition.JangoFettAbility),
                     extraUpgradeIcons: new List<UpgradeType>
                     {
                         UpgradeType.Talent,
+                        UpgradeType.Cannon,
+                        UpgradeType.Missile,
                         UpgradeType.Crew,
+                        UpgradeType.Device,
                         UpgradeType.Illicit,
                         UpgradeType.Illicit,
                         UpgradeType.Modification,

diff --git a/...econdEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/SeparatistRacketeer.cs b/...econdEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/SeparatistRacketeer.cs
@@ -1,4 +1,7 @@
-namespace Ship
+using System.Collections.Generic;
+using Upgrade;
+
+namespace Ship
 {
     namespace SecondEdition.FiresprayClassPatrolCraft
     {
@@ -14,6 +17,12 @@ public SeparatistRacketeer() : base()
                     2,
                     7,
                     10,
+                    extraUpgradeIcons: new List<UpgradeType>
+                    {
+                        UpgradeType.Cannon,
+                        UpgradeType.Missile,
+                        UpgradeType.Device
+                    },
                     skinName: "Jango Fett"
                 );
 

diff --git a/.../Content/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/ZamWesell.cs b/.../Content/SecondEdition/Standard/Pilots/Separatists/FiresprayClassPatrolCraft/ZamWesell.cs
@@ -22,15 +22,18 @@ public ZamWesell() : base()
                     "Clawdite Changeling",
                     Faction.Separatists,
                     5,
-                    9,
+                    8,
                     22,
                     isLimited: true,
                     abilityType: typeof(Abilities.SecondEdition.ZamWesellPilotAbility),
                     charges: 4,
                     extraUpgradeIcons: new List<UpgradeType>
                     {
                         UpgradeType.Talent,
+                        UpgradeType.Cannon,
+                        UpgradeType.Missile,
                         UpgradeType.Crew,
+                        UpgradeType.Device,
                         UpgradeType.Illicit,
                         UpgradeType.Modification,
                         UpgradeType.Title

diff --git a/...tent/SecondEdition/Standard/Pilots/Separatists/GauntletFighter/BoKatanKryzeSeparatists.cs b/...tent/SecondEdition/Standard/Pilots/Separatists/GauntletFighter/BoKatanKryzeSeparatists.cs
@@ -21,8 +21,8 @@ public BoKatanKryzeSeparatists() : base()
                     "Vizsla's Lieutenant",
                     Faction.Separatists,
                     4,
-                    7,
-                    20,
+                    6,
+                    12,
                     isLimited: true,
                     charges: 1,
                     regensCharges: 1,
@@ -31,10 +31,9 @@ public BoKatanKryzeSeparatists() : base()
                     {
                         UpgradeType.Talent,
                         UpgradeType.Crew,
-                        UpgradeType.Missile,
-                        UpgradeType.Missile,
                         UpgradeType.Gunner,
                         UpgradeType.Device,
+                        UpgradeType.Illicit,
                         UpgradeType.Modification,
                         UpgradeType.Modification,
                         UpgradeType.Configuration,

diff --git a/...el/Content/SecondEdition/Standard/Pilots/Separatists/GauntletFighter/DeathWatchWarrior.cs b/...el/Content/SecondEdition/Standard/Pilots/Separatists/GauntletFighter/DeathWatchWarrior.cs
@@ -1,5 +1,4 @@
 using Content;
-using System;
 using System.Collections.Generic;
 using Upgrade;
 
@@ -26,6 +25,7 @@ public DeathWatchWarrior() : base()
                         UpgradeType.Crew,
                         UpgradeType.Gunner,
                         UpgradeType.Device,
+                        UpgradeType.Illicit,
                         UpgradeType.Modification,
                         UpgradeType.Configuration
                     },