✨

star-wars-formatting.sty

@@ -161,7 +161,10 @@
     \tabular{p{3cm}}
       \rule{0pt}{10pt}\\
       \ifdim\nodeheight > 15pt
-        \rule{0pt}{10pt} \\
+        \rule{0pt}{8pt} \\
+      \fi
+      \ifdim\nodeheight > 30pt
+        \rule{0pt}{8pt} \\
       \fi
       \scriptsize #2 \\
     \endtabular
@@ -176,12 +179,15 @@
     \ifdim\nodeheight > 15pt
       \\ \phantom{t}
     \fi
+    \ifdim\nodeheight > 30pt
+      \\ \phantom{t}
+    \fi
   };
   \node[cost] {\tiny\texttn{COST \fpeval{5*\arabic{talenty}}}};
   \node[text=white,text width = 2.6cm] at ($(\arabic{talentx}*4.5,-\arabic{talenty}*4.9) + (0.5,-0.15)$) (t\alph{talentx}\alph{talenty}) {\footnotesize \texttn{\uppercase{#1}}};
 }
 
-\newenvironment{talenttree}[4]{%
+\newenvironment{talenttree}[5]{%
   \setcounter{talentx}{0}
   \setcounter{talenty}{1}
   \center
@@ -200,13 +206,19 @@
           \node[talentname] at (0,-0.8) {\footnotesize{}\texttn{ACTIVE}};
         \end{tikzpicture}
       }\\
-      \ifthenelse{\equal{\careerskills}{}}{}{
+      \ifthenelse{\equal{\careerskills}{}}{\phantom{t}\\}{
         \texttn{\footnotesize{}Career Skills:} \textltn{\footnotesize{}\careerskills}\\
       }
+      \ifthenelse{\equal{#2}{}}{\phantom{t}\\}{
         \texttn{\footnotesize{}Additional Carreer Skills:} \textltn{\footnotesize{}#2}\\
-      \ifthenelse{\equal{#4}{}}{}{%
+      }
-        \texttn{\footnotesize{}Gain Force Rating 1}
+      \ifthenelse{\equal{#4}{}}{
-      } \\ \\
+        \ifthenelse{\equal{#5}{}}{\phantom{t}\\}{%
+          \texttn{\footnotesize{}Prerequisite: Force Rating #5} \\
+        }
+      }{%
+        \texttn{\footnotesize{}Gain Force Rating #4} \\
+      }
     \endtabular
     \vspace*{20pt}
     \tikzpicture

star-wars-icons.sty

@@ -39,9 +39,9 @@
 \newcommand{\setback}{\icon[black]{E93D}}
 \newcommand{\boost}{\icon[boostblue]{E93D}}
 \newcommand{\difficulty}{\icon[difficultypurple]{E93F}}
-\newcommand{\ability}{\iconhuge[abilitygreen]{E93F}}
+\newcommand{\ability}{\icon[abilitygreen]{E93F}}
-\newcommand{\challenge}{\iconbig[challengered]{E941}}
+\newcommand{\challenge}{\icon[challengered]{E941}}
-\newcommand{\proficiency}{\iconbig[proficiencyyellow]{E941}}
+\newcommand{\proficiency}{\icon[proficiencyyellow]{E941}}
 \newcommand{\force}{\icon[black]{E942}}
 
 \newcommand{\lightforce}{\icon[black]{E909}}

star-wars-talents.sty

@@ -35,7 +35,7 @@
 \newcommand{\talent}[1]{%
   \def\tmptalent{\expandafter\talentdict{#1}}
   \ifthenelse{\equal{\tmptalent}{}}{%
-    \IfSubStr{\undeffed}{#1}{}{\append{\\ #1}}%
+    \IfSubStr{\undeffed}{(#1)}{}{\append{\\(#1)}}%
     \swtalent{#1}{}{}{}%
   }{%
     \tmptalent%
@@ -43,6 +43,9 @@
 }
 
 \DefineDictionary{talentdict}{%
+  {adaptable}:{
+    \swtalent{Adaptable}{When resolving a check that uses a skill in which they have no ranks, the character may spend one Destiny Point to remove \despair{} from the check or remove \threat{} equal to their ranks in Cool from the check.}{true}{true}
+  },%
   {against all odds}:{
     \swtalent{Against All Odds}{When incapacitated, perform Against All Odds action; making Hard (\difficulty\difficulty\difficulty) Resilience check with \force{} equal to Force rating. Heal wounds equal to \success{}. Spend \forcepoint{} to add \success{}.}{true}{true}
   },%
@@ -50,26 +53,53 @@
     \swtalent{Anatomy Lessons}{After making a successful attack, may spend 1 Destiny Point to add damage equal to Intellect to one hit.}{true}{}
   },%
   {animal bond}:{
-    \swtalent{Animal Bond}{Develop long-term bond with single animal of silhou ette no greater than half Force rating rounded down.}{}{true}
+    \swtalent{Animal Bond}{Develop long-term bond with single animal of silhouette no greater than half Force rating rounded down.}{}{true}
   },%
   {animal empathy}:{
     \swtalent{Animal Empathy}{When making checks to handle or tame animals, add \force{} no greater than Force rating to the check. Spend \forcepoint{} to add \success{} or \advantage{} to the check.}{}{true}
   },%
+  {another's treasure}:{
+    \swtalent{Another's Treasure}{The condition of an item does not affect the price the character receives when selling it. In addition, the character can always find a buyer for an item, no matter its condition or apparent value.}{}{}
+  },%
   {armor master}:{
     \swtalent{Armor Master}{When wearing armor, increase total soak value by 1.}{}{}
   },%
+  {armor master - improved}:{
+    \swtalent{Improved Armor Master}{When wearing armor with a soak value of 2 or higher, increase defense by 1}{}{}
+  },%
+  {assault drop}:{
+    \swtalent{Assault Drop}{Once per session while piloting a vehicle or ship, the character may perform the Assault Drop incidental. All passengers aboard or allies engaged with the vehicle or ship may immediately disembark or embark as an out-of-turn incidental.}{true}{}
+  },%
   {ataru technique}:{
     \swtalent{Ataru Technique}{When making a check using the Lightsaber skill, the character may use Agility instead of Brawn.}{}{true}
   },%
+  {backroom deal}:{
+    \swtalent{Backroom Deal}{Once per encounter, make a Hard (\difficulty\difficulty\difficulty) Negotiation check to reveal how previously unknown dealings have a meaningful impact on the current scene.}{true}{}
+  },%
   {bacta specialist}:{
     \swtalent{Bacta Specialist}{Patients regain 1 additional wound per rank of Bacta Specialist when they recover wounds from bacta tanks or long term}{}{}
   },%
+  {bad motivator}:{
+    \swtalent{Bad Motivator}{Once per session, may take a Bad Motivator action: make a Hard (\difficulty\difficulty\difficulty) Mechanics check to cause one targeted device to spontaneously fail.}{true}{}
+  },%
   {balance}:{
     \swtalent{Balance}{When the character recovers strain at the end of the encounter, he may add \force{} per Force rating. He recov ers additional strain equal to \forcepoint{} generated}{true}{true}
   },%
   {barrage}:{
     \swtalent{Barrage}{Add 1 damage per rank of Barrage to 1 hit of successful attack while using Ranged (Heavy) or Gunnery skills at long or extreme range.}{}{}
   },%
+  {barrel roll}:{
+    \swtalent{Barrel Roll}{While piloting a vehicle or starship of silhouette 3 or less, when hit by an attack, suffer 3 system strain to reduce damage of one hit by ranks in Piloting.}{true}{}
+  },%
+  {barrel roll - improved}:{
+    \swtalent{Improved Barrel Roll}{When the character takes the Barrel Roll Incidental, reduce the damage of all hits of the attack by ranks in Piloting.}{}{}
+  },%
+  {barrel roll - supreme}:{
+    \swtalent{Supreme Barrel Roll}{When using Barrel Roll against certain weapons, may spend \despair{} or \threat{}\threat{}\threat{} to inflict one hit on an enemy vehicle within close range, dealing base damage of the original attack.}{true}{}
+  },%
+  {beginner's luck}:{
+    \swtalent{Beginner's Luck}{Once per session when the character makes a check, may add \success{} equal to the number of light side Destiny Points in the Destiny pool to the results.}{true}{true}
+  },%
   {black market contacts}:{
     \swtalent{Black Market Contacts}{When purchasing illegal goods, may reduce rarity by 1 per rank of Black Market Contacts, increasing cost by 50 percent of base cost per reduction}{true}{}
   },%
@@ -79,9 +109,18 @@
   {body guard}:{
     \swtalent{Body Guard}{Once per round, perform the Body Guard maneuver to guard an engaged character. Suffer a number of strain no greater than ranks of Body Guard, then until the beginning of the next turn upgrade the difficulty of combat checks targeting the character by that number.}{true}{}
   },%
+  {body guard - improved}:{
+    \swtalent{Improved Body Guard}{Once per session, when an ally protected by the Body Guard maneuver suffers a hit, suffer the hit instead.}{true}{}
+  },%
   {brace}:{
     \swtalent{Brace}{Perform the Brace maneuver to remove \setback{} per rank of Brace from next Action. This may only remove \setback{} added by environmental circumstances}{true}{}
   },%
+  {brace - improved}:{
+    \swtalent{Improved Brace}{When the character performs the Brace maneuver, they may choose one environmental circumstance. The benefits of Brace apply to that circumstance until the end of the encounter.}{}{}
+  },%
+  {brace - supreme}:{
+    \swtalent{Supreme Brace}{When the character performs the brace maneuver, the benefits apply to all allies within short range.}{}{}
+  },%
   {brilliant evasion}:{
     \swtalent{Brilliant Evasion}{Once per encounter may take Brilliant Evasion action. Select 1 opponent and make Opposed Piloting (Planetary or Space) check to stop opponent from attacking character for rounds equal to Agility.}{true}{}
   },%
@@ -91,12 +130,24 @@
   {calming aura}:{
     \swtalent{Calming Aura}{When an opponent targets character with a Force power, reduce \forcepoint{} generated by 1.}{}{true}
   },%
+  {calming aura - improved}:{
+    \swtalent{Improved Calming Aura}{Spend a maneuver and suffer 2 strain to extend Calming Aura's effects to allies equal to Willpower at short range until start of next turn.}{true}{true}
+  },%
+  {careful planning}:{
+    \swtalent{Careful Planning}{Once per session, may introduce a "fact" into the narrative as if a Destiny Point had been spent.}{true}{}
+  },%
   {center of being}:{
     \swtalent{Center of Being}{Take a Center of Being maneuver. Until the beginning of next turn, attacks against the character increase their critical rating by 1 per rank of Center of Being.}{true}{true}
   },%
+  {center of being - improved}:{
+    \swtalent{Improved Center of Being}{Suffer 1 strain to perform Center of Being maneuver as an incidental.}{}{true}
+  },%
   {circle of shelter}:{
     \swtalent{Circle of Shelter}{When an engaged ally suffers a hit, may use Parry or Reflect incidental against the hit.}{}{true}
   },%
+  {clanker killer}:{
+    \swtalent{Clanker Killer}{Before rolling a combat check that targets a droid, remove \boost{} up to the character's rank in Clanker Killer from the pool and add an equal number of \success{} or \advantage{} to the results.}{true}{}
+  },%
   {codebreaker}:{
     \swtalent{Codebreaker}{Remove \setback{} per rank of Codebreaker from checks to break codes or decrypt communications. Decrease difficulty of checks to break codes or decrypt communications by 1.}{}{}
   },%
@@ -115,12 +166,24 @@
   {confidence}:{
     \swtalent{Confidence}{May decrease difficulty of Discipline checks to avoid fear by 1 per rank of Confidence.}{}{}
   },%
+  {consider our options}:{
+    \swtalent{Consider Our Options}{Take the Consider Our Options action: make a Hard (\difficulty\difficulty\difficulty) Negotiation check. Until the character's next turn, a character who attacks them first suffers 2 strain, plus 1 strain per \success{}\success{} on the character's check.}{true}{}
+  },%
+  {consider our options - improved}:{
+    \swtalent{Improved Consider Our Options}{Allies within short range may also benefit from Consider Our Options.}{true}{}
+  },%
   {contingency plan}:{
     \swtalent{Contingency Plan}{Spend 1 Destiny Point to recover strain equal to Cunning rating.}{true}{}
   },%
+  {contraption}:{
+    \swtalent{Contraption}{Once per session, take Contraption action; make a Hard (\difficulty\difficulty\difficulty) Mechanics check to fashion a device to solve a current problem using just the tools and parts on hand.}{true}{}
+  },%
   {convincing demeanor}:{
     \swtalent{Convincing Demeanor}{Remove \setback{} per rank of Convincing Demeanor from Deception or Skulduggery checks.}{}{}
   },%
+  {coordinated assault}:{
+    \swtalent{Coordinated Assault}{Take the Coordinated Assault maneuver: a number of engaged allies equal to Leadership ranks add \advantage{} to combat checks until beginning of next turn. Range increases per additional rank of Coordinated Assault.}{true}{}
+  },%
   {counterstrike}:{
     \swtalent{Counterstrike}{When an attack misses the character and generates \despair{} or \threat{}\threat{} may upgrade next Lightsaber (Cunning) check against attacker during enounter once.}{}{true}
   },%
@@ -130,6 +193,9 @@
   {dead to rights}:{
     \swtalent{Dead to Rights}{Spend 1 Destiny Point to add additional damage equal to half Agility (rounded up) to one hit of successful attack made with ship or vehicle-mounted weaponry}{true}{}
   },%
+  {dead to rights - improved}:{
+    \swtalent{Improved Dead to Rights}{Spend 1 Destiny Point to add additional damage equal to Agility (rounded up) to one hit of successful attack made with ship or vehicle-mounted weaponry}{true}{}
+  },%
   {deadly accuracy}:{
     \swtalent{Deadly Accuracy}{When acquired, choose 1 combat skill. Add damage equal to ranks in that skill to one hit of successful attack made using that skill}{}{}
   },%
@@ -145,6 +211,9 @@
   {defensive slicing}:{
     \swtalent{Defensive Slicing}{When defending computer systems, add \setback{} per rank of Defensive Slicing to opponents' checks.}{}{}
   },%
+  {defensive slicing - improved}:{
+    \swtalent{Improved Defensive Slicing}{Defensive Slicing now upgrades opponents' difficulty once per rank of Defensive Slicing; this replaces the usual benefits}{}{}
+  },%
   {defensive stance}:{
     \swtalent{Defensive Stance}{Once per round, may perform Defensive Stance maneuver and suffer a number of strain to upgrade difficulty of all incoming melee attacks by an equal number for the next round. Strain suffered this way cannot exceed ranks in Defensive Stance.}{true}{}
   },%
@@ -166,6 +235,9 @@
   {draw closer}:{
     \swtalent{Draw Closer}{Perform Draw Closer action; make a Lightsaber (Willpower) combat check against one silhouette 1 target within medium range, adding \force{} no greater than Force rating to check. Spend \forcepoint{} to move target one range band closer or to add \success{} to check.}{true}{true}
   },%
+  {dronance saturation}:{
+    \swtalent{Dronance Saturation}{When the character or certain allies activate the blast quality of a planetary scale weapon, all ships or vehicles within close range of th etarget suffer damage equal to the weapon's blast quality.}{}{}
+  },%
   {duelist's training}:{
     \swtalent{Duelist's Training}{Add \boost{} to Melee and Lightsaber checks when engaged with only one opponent.}{}{}
   },%
@@ -178,6 +250,15 @@
   {enhanced leader}:{
     \swtalent{Enhanced Leader}{When making a Leadership check, add \force{} no greater than Force rating. Spend \forcepoint{} to add \success{} or \advantage{} to the result.}{}{true}
   },%
+  {exceed specifications}:{
+    \swtalent{Exceed Specifications}{When making a check using an item, may add \boost{}. The GM may spend \threat{}\threat{} on the check to damage the item one step, or \despair{} to damage it beyond usability.}{true}{}
+  },%
+  {exceed specifications - improved}:{
+    \swtalent{Improved Exceed Specifications}{When the character takes the Exceed Specifications incidental, upgrade the ability of the check once instead of the standard effect.}{}{}
+  },%
+  {exceed specifications - supreme}:{
+    \swtalent{Supreme Exceed Specifications}{If a check benefitting from Exceed Specifications generates \triumph{}, may damage the item to roll additional \proficiency{} and add it to the check results. If the check generates \despair{}, add \challenge{} to the check results.}{true}{}
+  },%
   {exhaust port}:{
     \swtalent{Exhaust Port}{Before attacking a starship or vehicle, may spend 1 Destiny Point to ignore the effects of the Massive rule for the attack.}{true}{}
   },%
@@ -202,6 +283,9 @@
   {field commander}:{
     \swtalent{field commander}{Take the Field Commander action; make an Average (\difficulty\difficulty) Leadership check  A number of allies equal to Presence may immediately suffer 1 strain to perform 1 free maneuver.}{true}{}
   },%
+  {field commander - improved}:{
+    \swtalent{field commander}{Field Commander action affects allies equal to double Presence, and may spend \triumph{} to allow allies to suffer 1 strain and perform free action instead.}{}{}
+  },%
   {fine tuning}:{
     \swtalent{Fine Tuning}{When repairing system strain on a starship or vehicle, repair 1 additional system strain per rank of Fine Tuning.}{}{}
   },%
@@ -226,6 +310,12 @@
   {full throttle}:{
     \swtalent{Full Throttle}{Take a Full Throttle action; make a Hard (\difficulty\difficulty\difficulty) Piloting check to increase a vehicle's top speed by 1 for a number of rounds equal to Cunning.}{true}{}
   },%
+  {full throttle - improved}:{
+    \swtalent{Improved Full Throttle}{Suffer 1 strain to attempt Full Throttle as a maneuver and decrease its difficulty to Average (\difficulty\difficulty)}{true}{}
+  },%
+  {full throttle - supreme}:{
+    \swtalent{Supreme Full Throttle}{When performing Full Throttle, top speed increases by 2 instead of 1.}{}{}
+  },%
   {galaxy mapper}:{
     \swtalent{Galaxy Mapper}{Remove \setback{} per rank of Galaxy Mapper from Astrogation checks. Astrogation checks take half normal time.}{}{}
   },%
@@ -238,12 +328,18 @@
   {hard headed}:{
     \swtalent{Hard Headed}{When staggered or disoriented, perform the Hard Headed action; make a Daunting (\difficulty\difficulty\difficulty\difficulty) Discipline check to rernove status. Difficulty reduced per rank of Hard Headed.}{true}{}
   },%
+  {hard headed - improved}:{
+    \swtalent{Improved Hard Headed}{When incapacitated due to strain exceeding threshold, may take a more difficult Hard Headed action to reduce strain to I below threshold.}{true}{}
+  },%
   {hawk bat swoop}:{
     \swtalent{Hawk Bat Swoop}{Take the Hawk Bat Swoop action. Perform a Lightsaber (Agility) combat check against target within short range, adding \force{} no greater than Force rating. Spend \forcepoint{} to engage target and spend \forcepoint{} to add \advantage{} to check}{true}{true}
   },%
   {healing trance}:{
     \swtalent{Healing Trance}{Commit \force{}. for every full encounter \force{} remains committed, heal 1 wound per rank of Healing Trance.}{true}{true}
   },%
+  {healing trance - improved}:{
+    \swtalent{Improved Healing Trance}{When healing wounds due to Healing Trance, make a Resilience check to heal a Critical Injury. Difficulty of the check equals severity of the Critical Injury.}{}{true}
+  },%
   {heightened awareness}:{
     \swtalent{Heightened Awareness}{Allies within short range add \boost to Perception or Vigilance checks. Engaged  add \boost{}\boost{}.}{}{}
   },%
@@ -253,60 +349,15 @@
   {hidden storage}:{
     \swtalent{Hidden Storage}{Gain hidden storage in vehicles or equipment that holds items with total encumbrance equal to ranks in Hidden Storage}{}{}
   },%
+  {hold together}:{
+    \swtalent{Hold Together}{Spend 1 Destiny Point to perform a Hold Together incidental immediately after vehicle or starship takes damage to turn it into system strain}{true}{}
+  },%
   {hunter}:{
     \swtalent{Hunter}{Add \setback{} per rank of Hunter to all checks when interacting with beasts or animals (including combat checks). Add +10 to Critical Injury results against beasts or animals per rank of Hunter.}{}{}
   },%
   {imbue item}:{
     \swtalent{Imbue Item}{Take the Imbue Item maneuver; suffer 1 strain and commit \force{} to grant one weapon, piece of armor, or item an improvement while \force{} remains committed. Suffer 1 strain every round \force{} remains committed.}{true}{true}
   },%
-  {improved armor master}:{
-    \swtalent{Improved Armor Master}{When wearing armor with a soak value of 2 or higher, increase defense by 1}{}{}
-  },%
-  {improved body guard}:{
-    \swtalent{Improved Body Guard}{Once per session, when an ally protected by the Body Guard maneuver suffers a hit, suffer the hit instead.}{true}{}
-  },%
-  {improved calming aura}:{
-    \swtalent{Improved Calming Aura}{Spend a maneuver and suffer 2 strain to extend Calming Aura's effects to allies equal to Willpower at short range until start of next turn.}{true}{true}
-  },%
-  {improved center of being}:{
-    \swtalent{Improved Center of Being}{Suffer 1 strain to perform Center of Being maneuver as an incidental.}{}{true}
-  },%
-  {improved dead to rights}:{
-    \swtalent{Improved Dead to Rights}{Spend 1 Destiny Point to add additional damage equal to Agility (rounded up) to one hit of successful attack made with ship or vehicle-mounted weaponry}{true}{}
-  },%
-  {improved field commander}:{
-    \swtalent{improved field commander}{Field Commander action affects allies equal to double Presence, and may spend \triumph{} to allow allies to suffer 1 strain and perform free action instead.}{}{}
-  },%
-  {improved full throttle}:{
-    \swtalent{Improved Full Throttle}{Suffer 1 strain to attempt Full Throttle as a maneuver and decrease its difficulty to Average (\difficulty\difficulty)}{true}{}
-  },%
-  {improved hard headed}:{
-    \swtalent{Improved Hard Headed}{When incapacitated due to strain exceeding threshold, may take a more difficult Hard Headed action to reduce strain to I below threshold.}{true}{}
-  },%
-  {improved healing trance}:{
-    \swtalent{Improved Healing Trance}{When healing wounds due to Healing Trance, make a Resilience check to heal a Critical Injury. Difficulty of the check equals severity of the Critical Injury.}{}{true}
-  },%
-  {improved inspiring rhetoric}:{
-    \swtalent{Improved Inspiring Rhetoric}{Each ally affected by Inspiring Rhetoric gains \boost{} on all skill checks for a number of rounds equal to ranks in Leadership}{}{}
-  },%
-  {improved parry}:{
-    \swtalent{Improved Parry}{When parrying a hit that generated \despair{} or \threat{}\threat{}\threat{}. may hit attacker once with Lightsaber, Brawl, or Melee weapon (dealing base damage) after original attack resolves.}{}{}
-  },%
-  {improved reflect}:{
-    \swtalent{Improved Reflect}{When reflecting a hit that generated \despair{} or \threat{}\threat{}\threat{}, may hit one target in medium range with the same damage as the initial hit, after original attack resolves.}{}{true}
-  },%
-  {improved scathing tirade}:{
-    \swtalent{Scathing Tirade}{Each enemy affected by Scathing Tirade suffers \setback{} on all skill checks for a number of rounds equal to ranks in Coercion}{}{}
-  },%
-  {improved stim application}:{
-    \swtalent{Improved Stim Application}{When performing Stim Application Action, may increase difficulty of check to Hard (\difficulty\difficulty\difficulty), and target only suffers 1 strain.}{true}{}
-  },%
-  {improved stunning blow}:{
-    \swtalent{Improved Stunning Blow}{When dealing strain damage with Melee or Brawl checks. may spend \triumph{} to stagger target for 1 round per \triumph{}.}{true}{}
-  },%
-  {improved terrify}:{
-    \swtalent{Improved Terrify}{Reduce the difficulty of Terrify's check to Average (\difficulty\difficulty) and may spend to stagger an affected target.}{}{true}
-  },%
   {indistinguishable}:{
     \swtalent{Indistinguishable}{Upgrade difficulty of checks to identify character once per rank of Indistinguishable.}{}{}
   },%
@@ -316,6 +367,12 @@
   {inspiring rhetoric}:{
     \swtalent{Inspiring Rhetoric}{Take the Inspiring Rhetoric action; make an Average (\difficulty\difficulty) leadership check. Each \success{} causes 1 ally in close range to recover 1 strain. Spend \advantage{} to cause 1 affected ally to recover 1 additional strain.}{true}{}
   },%
+  {inspiring rhetoric - improved}:{
+    \swtalent{Improved Inspiring Rhetoric}{Each ally affected by Inspiring Rhetoric gains \boost{} on all skill checks for a number of rounds equal to ranks in Leadership}{}{}
+  },%
+  {inspiring rhetoric - supreme}:{
+    \swtalent{Supreme Inspiring Rhetoric}{Suffer 1 strain to perform Inspiring Rhetoric as a maneuver, not an action.}{true}{}
+  },%
   {intense focus}:{
     \swtalent{Intense Focus}{Perform an Intense Focus maneuver: suffer 1 strain and upgrade the ability of the next skill check once.}{true}{}
   },%
@@ -367,6 +424,9 @@
   {knowledgeable healing}:{
     \swtalent{Knowledgeable Healing}{When healing an ally, spend 1 Destiny Point to heal additional wounds equal to ranks in Knowledge (Xenology).}{}{}
   },%
+  {known schematic}:{
+    \swtalent{Known Schematic}{Once per session, may perform the Known Schematic maneuver; make a Hard (\difficulty\difficulty\difficulty) Knowledge (Education) check. Success grants familiarity with a building or ship's design.}{true}{}
+  },%
   {let's ride}:{
     \swtalent{Let's Ride}{Once per round. may mount or dismount a vehicle or beast, or enter a cockpit or weapon station on a vehicle, as an incidental}{true}{}
   },%
@@ -397,6 +457,9 @@
   {master pilot}:{
     \swtalent{Master Pilot}{Once per round, when piloting a stership, may suffer 2 strain to perform any action as a maneuver.}{true}{}
   },%
+  {master slicer}:{
+    \swtalent{Master Slicer}{Once per round, may take a Master Slicer incidental to suffer 2 strain and decrease difficulty of Computers or other slicing checks by 1, to a minimum of Easy (\difficulty)}{true}{}
+  },%
   {master starhopper}:{
     \swtalent{Master Starhopper}{Once per round, suffer 2 strain to decrease the difficulty of next Astrogation check by 1 to a minimum of Easy (\difficulty).}{true}{}
   },%
@@ -448,6 +511,9 @@
   {natural pilot}:{
     \swtalent{Natural Pilot}{Once per session, may reroll any 1 Piloting (Space) or Gunnery check.}{true}{}
   },%
+  {natural programmer}:{
+    \swtalent{Natural Programmer}{Once per session, may reroll any 1 Computers or Astrogation check.}{true}{}
+  },%
   {natural rogue}:{
     \swtalent{Natural Blademaster}{Once per session, may reroll any 1 Skulduggery or Stealth check.}{true}{}
   },%
@@ -478,6 +544,12 @@
   {parry}:{
     \swtalent{Parry}{When hit by a melee attack, suffer 3 strain to reduce damage by 2 plus ranks in Parry.}{true}{}
   },%
+  {parry - improved}:{
+    \swtalent{Improved Parry}{When parrying a hit that generated \despair{} or \threat{}\threat{}\threat{}. may hit attacker once with Lightsaber, Brawl, or Melee weapon (dealing base damage) after original attack resolves.}{}{}
+  },%
+  {parry - supreme}:{
+    \swtalent{Supreme Parry}{If the user did not make a combat check during his previous turn, may suffer 1 strain to use Parry.}{}{true}
+  },%
   {physician}:{
     \swtalent{Physician}{When making a Medicine check to help a character heal wounds, the target heals 1 additional strain per rank of Physician}{}{}
   },%
@@ -514,9 +586,18 @@
   {rapid recovery}:{
     \swtalent{Rapid Recovery}{When healing strain after an encounter, heal 1 additional strain per rank of Rapid Recovery.}{}{}
   },%
+  {redundant systems}:{
+    \swtalent{Redundant Systems}{Once per session, may take a Redundant Systems action; make an Easy (\difficulty) Mechanics check to harvest components from a functioning device to repair a broken one without breaking the first device}{true}{}
+  },%
   {reflect}:{
     \swtalent{Reflect}{When hit by a ranged attack, suffer 3 strain to reduce damage by 2 plus ranks in Reflect.}{true}{true}
   },%
+  {reflect - improved}:{
+    \swtalent{Improved Reflect}{When reflecting a hit that generated \despair{} or \threat{}\threat{}\threat{}, may hit one target in medium range with the same damage as the initial hit, after original attack resolves.}{}{true}
+  },%
+  {reflect - supreme}:{
+    \swtalent{Supreme Reflect}{If the user did not make a combat check during previous turn, may suffer 1 strain to use Reflect.}{}{true}
+  },%
   {researcher}:{
     \swtalent{Researcher}{Remove \setback{} per rank of Researcher from all Knowledge checks. Researching a subject takes half the time.}{}{}
   },%
@@ -541,6 +622,12 @@
   {scathing tirade}:{
     \swtalent{Scathing Tirade}{Take a Scathing Tirade action; make an Average (\difficulty\difficulty) Coercion check. Each \success causes one enemy in close range to suffer 1 strain. Spend \advantage{} to cause 1 affected enemy to suffer 1 additional strain.}{true}{}
   },%
+  {scathing tirade - improved}:{
+    \swtalent{Scathing Tirade}{Each enemy affected by Scathing Tirade suffers \setback{} on all skill checks for a number of rounds equal to ranks in Coercion}{}{}
+  },%
+  {scathing tirade - supreme}:{
+    \swtalent{Supreme Scathing Tirade}{Suffer 1 strain to perform Scathing Tirade as a maneuver, not an action.}{true}{}
+  },%
   {second wind}:{
     \swtalent{Second Wind}{Once per encounter, may use Second Wind incidental to recover strain equal to ranks in Second Wind.}{true}{}
   },%
@@ -574,6 +661,9 @@
   {skilled jockey}:{
     \swtalent{Skilled Jockey}{Remove \setback{} per rank of Skilled Jockey from all Piloting (Planetary) and Piloting (Space) checks the character attempts.}{}{}
   },%
+  {skilled slicer}:{
+    \swtalent{Skilled Slicer}{When making a Computers check may spend \triumph{} to make further Computers checks within this system as maneuvers.}{true}{}
+  },%
   {sleight of mind}:{
     \swtalent{Sleight of Mind}{Add \boost{} to all Stealth checks unless the opposition is immune to Force powers.}{}{true}
   },%
@@ -610,6 +700,12 @@
   {stim application}:{
     \swtalent{Stim Application}{Take the Stim Application Action; make an Average (\difficulty\difficulty) Medicine check. If successful. 1 engaged ally increases 1 characteristic by 1 for the remainder of the encounter and suffers 4 strain.}{true}{}
   },%
+  {stim application - improved}:{
+    \swtalent{Improved Stim Application}{When performing Stim Application Action, may increase difficulty of check to Hard (\difficulty\difficulty\difficulty), and target only suffers 1 strain.}{true}{}
+  },%
+  {stim application - supreme}:{
+    \swtalent{Supreme Stim Application}{When performing the Stim Application Action. spend \triumph{} to increase an additional Characteristic by 1}{}{}
+  },%
   {stimpack specialization}:{
     \swtalent{Stimpack Specialization}{Stimpacks heal 1 additional wound per rank of Stimpack Specialization.}{}{}
   },%
@@ -628,30 +724,15 @@
   {stunning blow}:{
     \swtalent{Stunning Blow}{When making Melee checks, may inflict damage as strain instead of wounds. This does not ignore soak.}{true}{}
   },%
+  {stunning blow - improved}:{
+    \swtalent{Improved Stunning Blow}{When dealing strain damage with Melee or Brawl checks. may spend \triumph{} to stagger target for 1 round per \triumph{}.}{true}{}
+  },%
   {sum djem}:{
     \swtalent{Sum Djem}{May spend \triumph{} or \advantage{}\advantage{} with successful Lightsaber check to disarm opponent.}{}{true}
   },%
   {superior reflexes}:{
     \swtalent{Superior Reflexes}{Gain +1 melee defense.}{}{}
   },%
-  {supreme full throttle}:{
-    \swtalent{Supreme Full Throttle}{When performing Full Throttle, top speed increases by 2 instead of 1.}{}{}
-  },%
-  {supreme inspiring rhetoric}:{
-    \swtalent{Supreme Inspiring Rhetoric}{Suffer 1 strain to perform Inspiring Rhetoric as a maneuver, not an action.}{true}{}
-  },%
-  {supreme parry}:{
-    \swtalent{Supreme Parry}{If the user did not make a combat check during his previous turn, may suffer 1 strain to use Parry.}{}{true}
-  },%
-  {supreme reflect}:{
-    \swtalent{Supreme Reflect}{If the user did not make a combat check during previous turn, may suffer 1 strain to use Reflect.}{}{true}
-  },%
-  {supreme scathing tirade}:{
-    \swtalent{Supreme Scathing Tirade}{Suffer 1 strain to perform Scathing Tirade as a maneuver, not an action.}{true}{}
-  },%
-  {supreme stim application}:{
-    \swtalent{Supreme Stim Application}{When performing the Stim Application Action. spend \triumph{} to increase an additional Characteristic by 1}{}{}
-  },%
   {surgeon}:{
     \swtalent{Surgeon}{When making a Medicine check to help a character heal wounds, the target heals 1 additional wound per rank of surgeon.}{}{}
   },%
@@ -667,6 +748,9 @@
   {terrify}:{
     \swtalent{Terrify}{Take the Terrify action; make a Hard (\difficulty\difficulty\difficulty) Coercion check, adding \force{} no greater than Force rating. Disorient one target within medium range per \success. Spend \advantage{}\advantage{} to extend duration and spend \forcepoint{} to immobilize affected target. Take 1 conflict at the start of each session.}{true}{true}
   },%
+  {terrify - improved}:{
+    \swtalent{Improved Terrify}{Reduce the difficulty of Terrify's check to Average (\difficulty\difficulty) and may spend to stagger an affected target.}{}{true}
+  },%
   {the force is my ally}:{
     \swtalent{The Force is My Ally}{Once per session, may suffer 2 strain to perform Force power action as maneuver.}{true}{true}
   },%
@@ -697,6 +781,9 @@
   {utility belt}:{
     \swtalent{Utility Belt}{Spend 1 Destiny Point to perform a Utility Belt incidental; produce a previously undocumented item or weapon (with restrictions) from a tool belt or a satchel}{true}{}
   },%
+  {utinni!}:{
+    \swtalent{Utinni!}{Remove \setback{} per rank of Utinni! from checks to find and or scavenge items or gear Such checks take half the time.}{}{}
+  },%
   {valuable facts}:{
     \swtalent{Valuable Facts}{Once per encounter, per form Valuable Facts action; make an Average (\difficulty\difficulty) Knowledge check If successful, add \triumph{} to one ally's skill check during the encounter.}{true}{}
   },%
@@ -706,4 +793,3 @@
   {wheel and deal}:{
     \swtalent{Wheel and Deal}{When selling goods legally, gain 10\% more credits per rank of Wheel and Deal.}{}{}
   }
-}

talent trees/bounty hunter.tex

@@ -1,6 +1,6 @@
 \setcareer{Bounty Hunter}{Athletics, Brawl, Perception, Piloting (Planetary), Piloting (Space), Ranged (Heavy), Streetwise, Vigilance}
 
-\begin{talenttree}{Assassin}{Melee, Ranged (Heavy), Skulduggery, Stealth}{Edge of the Empire p. 59}{}
+\begin{talenttree}{Assassin}{Melee, Ranged (Heavy), Skulduggery, Stealth}{Edge of the Empire p. 59}{}{}
   \talent{grit}
   \talent{lethal blows}
   \talent{stalker}
@@ -29,7 +29,7 @@
   \talentlines{||||/||||/||||/||||}{---/.-./-../...}
 \end{talenttree}
 
-\begin{talenttree}{Gadgeteer}{Brawl, Coercion, Mechanics, Ranged (Light)}{Edge of the Empire p. 60}{}
+\begin{talenttree}{Gadgeteer}{Brawl, Coercion, Mechanics, Ranged (Light)}{Edge of the Empire p. 60}{}{}
   \talent{brace}
   \talent{toughened}
   \talent{intimidating}
@@ -48,17 +48,17 @@
   \talent{jury rigged}
   \talent{tinkerer}
   \talent{deadly accuracy}
-  \talent{improved stunning blow}
+  \talent{stunning blow - improved}
 
   \talent{intimidating}
   \talent{dedication}
-  \talent{improved armor master}
+  \talent{armor master - improved}
   \talent{crippling blow}
 
   \talentlines{.|.|/.|.|/.|.|/.|.|}{--./--./--./--.}
 \end{talenttree}
 
-\begin{talenttree}{Survivalist}{Brawl, Coercion, Mechanics, Ranged (Light)}{Edge of the Empire p. 61}{}
+\begin{talenttree}{Survivalist}{Brawl, Coercion, Mechanics, Ranged (Light)}{Edge of the Empire p. 61}{}{}
   \talent{forager}
   \talent{stalker}
   \talent{outdoorsman}

talent trees/clone soldier.tex

@@ -0,0 +1,88 @@
+\setcareer{Clone Soldier}{Athletics, Brawl, Cool, Discipline, Medicine, Ranged (Heavy), Ranged (Light), Vigilance}
+
+\begin{talenttree}{Clone Officer}{Cool, Leadership, Knowledge (Outer Rim), Knowledge (Warfare)}{Rise of the Seperatists p. 21}{}{}
+  \talent{prime positions}
+  \talent{grit}
+  \talent{grit}
+  \talent{command}
+
+  \talent{tactical advance}
+  \talent{command}
+  \talent{first among brothers}
+  \talent{clanker killer}
+
+  \talent{prime positions}
+  \talent{coordinated assault}
+  \talent{coordinated assault}
+  \talent{toughened}
+
+  \talent{field commander}
+  \talent{tactical advance - improved}
+  \talent{first among brothers}
+  \talent{scrap 'em!}
+
+  \talent{field commander - improved}
+  \talent{dedication}
+  \talent{scrap 'em! - improved}
+  \talent{for the republic!}
+
+  \talentlines{|..|/||||/||||/|..|}{-.-/.../-.-/---}
+\end{talenttree}
+
+\begin{talenttree}{Clone Pilot}{Gunnery, Mechanics, Piloting (Planetary), Piloting (Space)}{Rise of the Seperatists p. 22}{}{}
+  \talent{let's ride}
+  \talent{fire support}
+  \talent{grit}
+  \talent{grit}
+
+  \talent{high-g training}
+  \talent{clanker killer}
+  \talent{high-g training}
+  \talent{skilled jockey}
+
+  \talent{assault drop}
+  \talent{tricky target}
+  \talent{full throttle}
+  \talent{barrel roll}
+
+  \talent{fire support}
+  \talent{natural operator}
+  \talent{barrel roll - improved}
+  \talent{barrel roll - supreme}
+
+  \talent{mission critical}
+  \talent{dedication}
+  \talent{master pilot}
+  \talent{toughened}
+
+  \talentlines{||||/||||/|.|./|||.}{-.-/-.-/---/..-}
+\end{talenttree}
+
+\begin{talenttree}{Clone Trooper}{Gunnery, Perception, Ranged (Heavy), Resilience}{Rise of the Seperatists p. 23}{}{}
+  \talent{grit}
+  \talent{physical training}
+  \talent{toughened}
+  \talent{brace}
+
+  \talent{supressing fire}
+  \talent{clanker killer}
+  \talent{brace}
+  \talent{toughened}
+
+  \talent{armor master}
+  \talent{deadly accuracy}
+  \talent{supressing fire}
+  \talent{brace - improved}
+
+  \talent{toughened}
+  \talent{clanker killer}
+  \talent{enduring}
+  \talent{brace - supreme}
+
+  \talent{armor master - improved}
+  \talent{natural trooper}
+  \talent{dedication}
+  \talent{lateral thinking}
+
+  \talentlines{|.|/.|.|/||.|/||||}{-.-/---/.../---}
+\end{talenttree}

talent trees/colonist.tex

@@ -1,6 +1,6 @@
 \setcareer{Colonist}{Charm, Deception, Knowledge (Core Worlds), Knowledge (Education), Knowledge (lore), Leadership, Negotiation, Streetwise}
 
-\begin{talenttree}{Doctor}{Cool, Knowledge (Education), Medicine, Resilience}{Edge of the Empire p. 65}{}
+\begin{talenttree}{Doctor}{Cool, Knowledge (Education), Medicine, Resilience}{Edge of the Empire p. 65}{}{}
   \talent{surgeon}
   \talent{bacta specialist}
   \talent{grit}
@@ -16,12 +16,12 @@
   \talent{bacta specialist}
   \talent{pressure point}
 
-  \talent{improved stim application}
+  \talent{stim application - improved}
   \talent{natural doctor}
   \talent{toughened}
   \talent{anatomy lessons}
 
-  \talent{supreme stim application}
+  \talent{stim application - supreme}
   \talent{master doctor}
   \talent{dedication}
   \talent{dodge}
@@ -29,7 +29,7 @@
   \talentlines{|.|./|.||/||||/||||}{---/--./.../--.}
 \end{talenttree}
 
-\begin{talenttree}{Politico}{Charm, Coercion, Deception, Knowledge (Core Worlds)}{Edge of the Empire p. 66}{}
+\begin{talenttree}{Politico}{Charm, Coercion, Deception, Knowledge (Core Worlds)}{Edge of the Empire p. 66}{}{}
   \talent{kill with kindness}
   \talent{grit}
   \talent{plausible deniability}
@@ -41,13 +41,13 @@
   \talent{plausible deniability}
 
   \talent{dodge}
-  \talent{improved inspiring rhetoric}
+  \talent{inspiring rhetoric - improved}
-  \talent{improved scathing tirade}
+  \talent{scathing tirade - improved}
   \talent{well rounded}
 
   \talent{grit}
-  \talent{supreme inspiring rhetoric}
+  \talent{inspiring rhetoric - supreme}
-  \talent{supreme scathing tirade}
+  \talent{scathing tirade - supreme}
   \talent{nobody's fool}
 
   \talent{steely nerves}
@@ -58,7 +58,7 @@
   \talentlines{||||/|..|/||||/|..|}{-.-/-.-/.../---}
 \end{talenttree}
 
-\begin{talenttree}{Scholar}{Knowledge (Outer Rim), Knowledge (Underworld), Knowledge (Xenology), Perception}{Edge of the Empire p. 67}{}
+\begin{talenttree}{Scholar}{Knowledge (Outer Rim), Knowledge (Underworld), Knowledge (Xenology), Perception}{Edge of the Empire p. 67}{}{}
   \talent{respected scholar}
   \talent{speaks binary}
   \talent{grit}

talent trees/consular.tex

@@ -1,5 +1,5 @@
 \setcareer{Consular}{Cool, Discipline, Knowledge (Education), Knowledge (Lore), Leadership, Negotiation}
-\begin{talenttree}{Healer}{Discipline, Knowledge (Education), Knowledge (Xenology), Medicine}{Force and Destiny p. 69}{1}
+\begin{talenttree}{Healer}{Discipline, Knowledge (Education), Knowledge (Xenology), Medicine}{Force and Destiny p. 69}{1}{}
   \talent{surgeon}
   \talent{healing trance}
   \talent{rapid recovery}
@@ -16,19 +16,19 @@
   \talent{rapid recovery}
 
   \talent{surgeon}
-  \talent{improved healing trance}
+  \talent{healing trance - improved}
   \talent{calming aura}
   \talent{toughened}
 
   \talent{dedication}
   \talent{natural doctor}
   \talent{force rating}
-  \talent{improved calming aura}
+  \talent{calming aura - improved}
 
   \talentlines{|||./||.|/||||/|.|.}{-.-/--./.../---}
 \end{talenttree}
 
-\begin{talenttree}{Niman Disciple}{Discipline, Leadership, Lightsaber, Negotiation}{Force and Destiny p. 70}{1}
+\begin{talenttree}{Niman Disciple}{Discipline, Leadership, Lightsaber, Negotiation}{Force and Destiny p. 70}{1}{}
   \talent{parry}
   \talent{nobody's fool}
   \talent{reflect}
@@ -52,12 +52,12 @@
   \talent{dedication}
   \talent{force assault}
   \talent{force rating}
-  \talent{improved center of being}
+  \talent{center of being - improved}
 
   \talentlines{.|../||||/||||/||.|}{-../---/---/-.-}
 \end{talenttree}
 
-\begin{talenttree}{Sage}{Astrogation, Charm, Cool, Knowledge (Lore)}{Force and Destiny p. 71}{1}
+\begin{talenttree}{Sage}{Astrogation, Charm, Cool, Knowledge (Lore)}{Force and Destiny p. 71}{1}{}
   \talent{grit}
   \talent{kill with kindness}
   \talent{researcher}
@@ -86,6 +86,6 @@
   \talentlines{.||./.||./.||./||||}{---/-.-/---/.-.}
 \end{talenttree}
 
-\begin{talenttree}{Teacher}{Knowledge (Education), Knowledge (Lore), Leadership, Perception}{Disciples of Harmony p. 27}
+\begin{talenttree}{Teacher}{Knowledge (Education), Knowledge (Lore), Leadership, Perception}{Disciples of Harmony p. 27}{}
 
 \end{talenttree}

talent trees/explorer.tex

@@ -1,6 +1,6 @@
 \setcareer{Explorer}{Astrogation, Cool, Knowledge (Lore), Knowledge (Outer Rim), Knowledge (Xenology), Perception, Piloting (Space), Survival}
 
-\begin{talenttree}{Fringer}{Astrogation, Coordination, Negotiation, Streetwise}{Edge of the Empire p. 71}{}
+\begin{talenttree}{Fringer}{Astrogation, Coordination, Negotiation, Streetwise}{Edge of the Empire p. 71}{}{}
   \talent{galaxy mapper}
   \talent{street smarts}
   \talent{rapid recovery}
@@ -29,7 +29,7 @@
   \talentlines{|.||/||||/..||/||.||}{-.-/-../--./-.-}
 \end{talenttree}
 
-\begin{talenttree}{Scout}{Athletics, Medicine, Piloting (Planetary), Survival}{Edge of the Empire p. 72}{}
+\begin{talenttree}{Scout}{Athletics, Medicine, Piloting (Planetary), Survival}{Edge of the Empire p. 72}{}{}
   \talent{rapid recovery}
   \talent{stalker}
   \talent{grit}
@@ -58,7 +58,7 @@
   \talentlines{||||/||||/||||/|.||}{---/.../.../--.}
 \end{talenttree}
 
-\begin{talenttree}{Trader}{Deception, Knowledge (Core Worlds), Knowledge (Underworld), Negotiation}{Edge of the Empire p. 73}{}
+\begin{talenttree}{Trader}{Deception, Knowledge (Core Worlds), Knowledge (Underworld), Negotiation}{Edge of the Empire p. 73}{}{}
   \talent{know somebody}
   \talent{convincing demeanor}
   \talent{wheel and deal}

talent trees/guardian.tex

@@ -1,6 +1,6 @@
 
   \setcareer{Guardian}{Brawl, Cool, Discipline, Melee, Resilience, Vigilance}
-  \begin{talenttree}{Peacekeeper}{Discipline, Leadership, Perception, Piloting (Planetary)}{Force and Destiny p. 75}{1}
+  \begin{talenttree}{Peacekeeper}{Discipline, Leadership, Perception, Piloting (Planetary)}{Force and Destiny p. 75}{1}{}
     \talent{command}
     \talent{confidence}
     \talent{second wind}
@@ -19,7 +19,7 @@
     \talent{steely nerves}
     \talent{second wind}
     \talent{toughened}
-    \talent{improved field commander}
+    \talent{field commander - improved}
 
     \talent{unity assault}
     \talent{dedication}
@@ -29,7 +29,7 @@
     \talentlines{|..|/.||./|..|/||||}{---/---/---/...}
   \end{talenttree}
 
-  \begin{talenttree}{Protector}{Athletics, Medicine, Ranged (Light), Resilience}{Force and Destiny p. 76}{1}
+  \begin{talenttree}{Protector}{Athletics, Medicine, Ranged (Light), Resilience}{Force and Destiny p. 76}{1}{}
     \talent{toughened}
     \talent{body guard}
     \talent{grit}
@@ -53,7 +53,7 @@
     \talent{center of being}
     \talent{force rating}
     \talent{dedication}
-    \talent{improved body guard}
+    \talent{body guard - improved}
 
     \talentline{ba}{bb}
     \talentline{da}{db}
@@ -61,7 +61,7 @@
     \talentlines{.|.|/||||/|||./.|||}{---/.--/.--/---}
   \end{talenttree}
 
-  \begin{talenttree}{Soresu Defender}{Discipline, Knowledge (Lore), Lightsaber, Vigilance}{Force and Destiny p. 77}{1}
+  \begin{talenttree}{Soresu Defender}{Discipline, Knowledge (Lore), Lightsaber, Vigilance}{Force and Destiny p. 77}{1}{}
     \talent{parry}
     \talent{parry}
     \talent{toughened}
@@ -73,7 +73,7 @@
     \talent{grit}
 
     \talent{confidence}
-    \talent{improved parry}
+    \talent{parry - improved}
     \talent{defensive circle}
     \talent{parry}
 
@@ -82,9 +82,9 @@
     \talent{reflect}
     \talent{defensive stance}
 
-    \talent{supreme parry}
+    \talent{parry - supreme}
     \talent{dedication}
-    \talent{improved reflect}
+    \talent{reflect - improved}
     \talent{strategic form}
 
     \talentlines{|..|/||||/||||/|.|.}{--./--./---/---}

talent trees/hired gun.tex

@@ -1,6 +1,6 @@
 \setcareer{Hired Gun}{Athletics, Brawl, Discipline, Melee, Piloting (Planetary), Ranged (Light), Resilience, Vigilance}
 
-\begin{talenttree}{Bodyguard}{Gunnery, Perception, Piloting (Planetary), Ranged (Heavy)}{Edge of the Empire p. 77}{}
+\begin{talenttree}{Bodyguard}{Gunnery, Perception, Piloting (Planetary), Ranged (Heavy)}{Edge of the Empire p. 77}{}{}
   \talent{toughened}
   \talent{barrage}
   \talent{durable}
@@ -24,12 +24,12 @@
   \talent{dedication}
   \talent{barrage}
   \talent{toughened}
-  \talent{improved hard headed}
+  \talent{hard headed - improved}
 
   \talentlines{.||./||||/|||./.|||}{---/.-./.--/--.}
 \end{talenttree}
 
-\begin{talenttree}{Marauder}{Coercion, Melee, Resilience, Survival}{Edge of the Empire p. 78}{}
+\begin{talenttree}{Marauder}{Coercion, Melee, Resilience, Survival}{Edge of the Empire p. 78}{}{}
   \talent{toughened}
   \talent{frenzied attack}
   \talent{feral strength}
@@ -58,7 +58,7 @@
   \talentlines{||||/.||./|..|/.||.}{---/---/---/---}
 \end{talenttree}
 
-\begin{talenttree}{Mercenary}{Discipline, Gunnery, Leadership, Ranged (Heavy)}{Edge of the Empire p. 79}{}
+\begin{talenttree}{Mercenary}{Discipline, Gunnery, Leadership, Ranged (Heavy)}{Edge of the Empire p. 79}{}{}
   \talent{command}
   \talent{second wind}
   \talent{point blank}
@@ -74,7 +74,7 @@
   \talent{natural marksman}
   \talent{sniper shot}
 
-  \talent{improved field commander}
+  \talent{field commander - improved}
   \talent{grit}
   \talent{toughened}
   \talent{lethal blows}

talent trees/jedi.tex

@@ -0,0 +1,59 @@
+\setcareer{Jedi}{Athletics, Cool, Discipline, Knowledge (Lore), Lightsaber, Piloting (Space)}
+
+\begin{talenttree}{Knight}{Cool, Leadership, Lightsaber, Negotiation}{Rise of the Seperatists p. 26}{}{2}
+  \talent{grit}
+  \talent{jump up}
+  \talent{researcher}
+  \talent{grit}
+
+  \talent{parry}
+  \talent{parry}
+  \talent{sense emotions}
+  \talent{researcher}
+
+  \talent{reflect - improved}
+  \talent{reflect}
+  \talent{parry - improved}
+  \talent{balance}
+
+  \talent{circle of shelter}
+  \talent{side by side}
+  \talent{reflect}
+  \talent{will of the force}
+
+  \talent{guardian of the republic}
+  \talent{saber throw}
+  \talent{dedication}
+  \talent{force rating}
+
+  \talentlines{.||./||.|/|.||/|..|}{..-/--./--./-.-}
+\end{talenttree}
+
+\begin{talenttree}{Padawan}{Coordination, Knowledge, Mechanics, Vigilance}{Rise of the Seperatists p. 27}{1}{}
+  \talent{parry}
+  \talent{toughened}
+  \talent{quick draw}
+  \talent{grit}
+
+  \talent{toughened}
+  \talent{reflect}
+  \talent{well rounded}
+  \talent{sense danger}
+
+  \talent{parry}
+  \talent{learning opportunity}
+  \talent{valuable facts}
+  \talent{force rating}
+
+  \talent{reflect}
+  \talent{grit}
+  \talent{something to prove}
+  \talent{adaptable}
+
+  \talent{beginner's luck}
+  \talent{temple training}
+  \talent{sincerest flattery}
+  \talent{dedication}
+
+  \talentlines{|.|./|.||/.|.|/||.|}{---/-.-/-.-/---}
+\end{talenttree}

talent trees/mystic.tex

@@ -1,6 +1,6 @@
 
   \setcareer{Mystic}{Charm, Coercion, Knowledge (Lore), Knowledge (Outer Rim), Perception, Vigilance}
-  \begin{talenttree}{Advisor}{Charm, Deception, Negotiation, Streetwise}{Force and Destiny p. 81}{1}
+  \begin{talenttree}{Advisor}{Charm, Deception, Negotiation, Streetwise}{Force and Destiny p. 81}{1}{}
     \talent{plausible deniability}
     \talent{know somebody}
     \talent{grit}
@@ -29,7 +29,7 @@
     \talentlines{||||/|..|/||||/|.||}{.../.--/---/--.}
   \end{talenttree}
 
-  \begin{talenttree}{Makashi Duelist}{Charm, Cool, Coordination, Lightsaber}{Force and Destiny p. 82}{1}
+  \begin{talenttree}{Makashi Duelist}{Charm, Cool, Coordination, Lightsaber}{Force and Destiny p. 82}{1}{}
     \talent{grit}
     \talent{resist disarm}
     \talent{grit}
@@ -46,7 +46,7 @@
     \talent{parry}
 
     \talent{intense presence}
-    \talent{improved parry}
+    \talent{parry - improved}
     \talent{grit}
     \talent{defensive training}
 
@@ -58,7 +58,7 @@
     \talentlines{.|../||||/||||/||.|}{---/--./-.-/-.-}
   \end{talenttree}
 
-  \begin{talenttree}{Seer}{Discipline, Knowledge (Lore), Surviual, Vigilance}{Force and Destiny p. 83}{1}
+  \begin{talenttree}{Seer}{Discipline, Knowledge (Lore), Surviual, Vigilance}{Force and Destiny p. 83}{1}{}
     \talent{forager}
     \talent{uncanny reactions}
     \talent{grit}

talent trees/seeker.tex

@@ -1,7 +1,7 @@
 
   \setcareer{Seeker}{Knowledge (Xenology), Piloting (Planetary), Piloting (Space), Ranged (Heavy), Survival, Vigilance}
 
-  \begin{talenttree}{Ataru Striker}{Athletics, Coordination, Lightsaber, Perception}{Force and Destiny p. 87}{1}
+  \begin{talenttree}{Ataru Striker}{Athletics, Coordination, Lightsaber, Perception}{Force and Destiny p. 87}{1}{}
     \talent{conditioned}
     \talent{parry}
     \talent{jump up}
@@ -15,7 +15,7 @@
     \talent{quick strike}
     \talent{reflect}
     \talent{parry}
-    \talent{improved parry}
+    \talent{parry - improved}
 
     \talent{dodge}
     \talent{hawk bat swoop}
@@ -30,7 +30,7 @@
     \talentlines{|.||/|||./||||/||||}{.-./.--/..-/--.}
   \end{talenttree}
 
-  \begin{talenttree}{Hunter}{Coordination, Ranged (Heavy), Stealth, Vigilance}{Force and Destiny p. 88}{1}
+  \begin{talenttree}{Hunter}{Coordination, Ranged (Heavy), Stealth, Vigilance}{Force and Destiny p. 88}{1}{}
     \talent{rapid recovery}
     \talent{hunter}
     \talent{expert tracker}
@@ -59,7 +59,7 @@
     \talentlines{|||./.||./||.|/||||}{-.-/.--/-.-/.--}
   \end{talenttree}
 
-  \begin{talenttree}{Patfinder}{Medicine, Ranged (Light), Resilience, Survival}{Force and Destiny p. 89}{1}
+  \begin{talenttree}{Patfinder}{Medicine, Ranged (Light), Resilience, Survival}{Force and Destiny p. 89}{1}{}
     \talent{grit}
     \talent{keen eyed}
     \talent{forager}

talent trees/sentinel.tex

@@ -1,7 +1,7 @@
 
   \setcareer{Sentinel}{Computers, Deception, Knowledge (Core Worlds), Perception, Skulduggery, Stealth}
 
-  \begin{talenttree}{Artisan}{Astrogation, Computers, Knowledge (Education), Mechanics}{Force and Destiny p. 93}{1}
+  \begin{talenttree}{Artisan}{Astrogation, Computers, Knowledge (Education), Mechanics}{Force and Destiny p. 93}{1}{}
     \talent{solid repairs}
     \talent{fine tuning}
     \talent{mental tools}
@@ -30,7 +30,7 @@
     \talentlines{||||/||.|/|..|/||||}{---/---/-.-/-.-}
   \end{talenttree}
 
-  \begin{talenttree}{Shadow}{Knowledge (Underworld), Skulduggery, Stealth, Streetwise}{Force and Destiny p. 94}{1}
+  \begin{talenttree}{Shadow}{Knowledge (Underworld), Skulduggery, Stealth, Streetwise}{Force and Destiny p. 94}{1}{}
     \talent{sleight of mind}
     \talent{street smarts}
     \talent{codebreaker}
@@ -59,7 +59,7 @@
     \talentlines{|||./|||./.|||/.||.}{..-/.-./---/-.-}
   \end{talenttree}
 
-  \begin{talenttree}{Shien Expert}{Athletics, Lightsaber, Resilience, Skulduggery}{Force and Destiny p. 95}{1}
+  \begin{talenttree}{Shien Expert}{Athletics, Lightsaber, Resilience, Skulduggery}{Force and Destiny p. 95}{1}{}
     \talent{side step}
     \talent{conditioned}
     \talent{street smarts}
@@ -73,7 +73,7 @@
     \talent{parry}
     \talent{counterstrike}
     \talent{grit}
-    \talent{improved reflect}
+    \talent{reflect - improved}
 
     \talent{djem so deflection}
     \talent{defensive stance}
@@ -83,7 +83,7 @@
     \talent{falling avalanche}
     \talent{dedication}
     \talent{disruptive strike}
-    \talent{supreme reflect}
+    \talent{reflect - supreme}
 
     \talentlines{.||./||||/||||/||||}{-.-/-.-/-.-/...}
   \end{talenttree}

talent trees/smuggler.tex

@@ -1,6 +1,6 @@
 \setcareer{Smuggler}{Coordination, Deception, Knowledge (Underworld), Perception, Piloting (Space), Skulduggery, Streetwise, Vigilance}
 
-\begin{talenttree}{Pilot}{Astrogation, Gunnery, Piloting (Planetary), Piloting (Space)}{Edge of the Empire p. 83}{}
+\begin{talenttree}{Pilot}{Astrogation, Gunnery, Piloting (Planetary), Piloting (Space)}{Edge of the Empire p. 83}{}{}
   \talent{full throttle}
   \talent{skilled jockey}
   \talent{galaxy mapper}
@@ -11,13 +11,13 @@
   \talent{galaxy mapper}
   \talent{rapid recovery}
 
-  \talent{improved full throttle}
+  \talent{full throttle - improved}
-  \talent{improved dead to rights}
+  \talent{dead to rights - improved}
   \talent{grit}
   \talent{natural pilot}
 
   \talent{grit}
-  \talent{supreme full throttle}
+  \talent{full throttle - supreme}
   \talent{tricky target}
   \talent{defensive driving}
 
@@ -29,7 +29,7 @@
   \talentlines{||||/||||/|.||/|.||}{-.-/..-/-../---}
 \end{talenttree}
 
-\begin{talenttree}{Scoundrel}{Charm, Cool, Deception, Ranged (Light)}{Edge of the Empire p. 84}{}
+\begin{talenttree}{Scoundrel}{Charm, Cool, Deception, Ranged (Light)}{Edge of the Empire p. 84}{}{}
   \talent{black market contacts}
   \talent{convincing demeanor}
   \talent{quick draw}
@@ -58,7 +58,7 @@
   \talentlines{|..|/||||/||||/||||}{.-./.-./.-./---}
 \end{talenttree}
 
-\begin{talenttree}{Thief}{Computers, Skulduggery, Stealth, Vigilance}{Edge of the Empire p. 85}{}
+\begin{talenttree}{Thief}{Computers, Skulduggery, Stealth, Vigilance}{Edge of the Empire p. 85}{}{}
   \talent{street smarts}
   \talent{black market contacts}
   \talent{indistinguishable}

talent trees/technician.tex

@@ -1,6 +1,6 @@
 \setcareer{Technician}{Astrogation, Computers, Coordination, Discipline, Knowledge (Outer Rim), Mechanics, Perception,Piloting (Planetary)}
 
-\begin{talenttree}{Mechanic}{Knowledge (Education), Knowledge (Underworld), Mechanics, Streetwise}{Edge of the Empire p. 89}{}
+\begin{talenttree}{Mechanic}{Knowledge (Education), Knowledge (Underworld), Mechanics, Streetwise}{Edge of the Empire p. 89}{}{}
   \talent{gearhead}
   \talent{toughened}
   \talent{fine tuning}
@@ -24,12 +24,12 @@
   \talent{natural tinkerer}
   \talent{hold together}
   \talent{dedication}
-  \talent{improved hard headed}
+  \talent{hard headed - improved}
 
   \talentlines{||||/||||/||||/||||}{---/---/--./...}
 \end{talenttree}
 
-\begin{talenttree}{Outlaw Tech}{Knowledge (Education), Knowledge (Underworld), Mechanics, Streetwise}{Edge of the Empire p. 90}{}
+\begin{talenttree}{Outlaw Tech}{Knowledge (Education), Knowledge (Underworld), Mechanics, Streetwise}{Edge of the Empire p. 90}{}{}
   \talent{tinkerer}
   \talent{utinni!}
   \talent{speaks binary}
@@ -58,7 +58,7 @@
   \talentlines{||||/||||/||||/|.||}{---/---/--./-.-}
 \end{talenttree}
 
-\begin{talenttree}{Slicer}{Computers, Knowledge (Education), Knowledge (Underworld), Stealth}{Edge of the Empire p. 91}{}
+\begin{talenttree}{Slicer}{Computers, Knowledge (Education), Knowledge (Underworld), Stealth}{Edge of the Empire p. 91}{}{}
   \talent{codebreaker}
   \talent{grit}
   \talent{technical aptitude}
@@ -75,7 +75,7 @@
   \talent{grit}
 
   \talent{defensive slicing}
-  \talent{improved defensive slicing}
+  \talent{defensive slicing - improved}
   \talent{codebreaker}
   \talent{resolve}
 

talent trees/universal.tex

@@ -1,5 +1,5 @@
 \setcareer{Universal}{}
-\begin{talenttree}{Force Sensitive Exile}{}{Edge of the Empire p. 227}{}
+\begin{talenttree}{Force Sensitive Exile}{}{Edge of the Empire p. 227}{1}{}
   \talent{uncanny senses}
   \talent{insight}
   \talent{forager}
@@ -28,56 +28,172 @@
   \talentlines{||||/||||/||||/||||}{.../.../---/---}
 \end{talenttree}
 
-\begin{talenttree}{Nightsister}{Discipline, Knowledge (Lore), Stealth, Survival}{Collapse of the Republic p. 31}{}
+\begin{talenttree}{Force Sensitive Outcast}{}{Rise of the Seperatists p. 29}{1}{}
-  \talent{witchcraft}
+  \talent{uncanny reactions}
-  \talent{summon item}
+  \talent{sense emotions}
   \talent{grit}
-  \talent{expert tracker}
+  \talent{uncanny senses}
 
-  \talent{sense advantage}
+  \talent{quick draw}
-  \talent{ichor blade}
+  \talent{quick strike}
-  \talent{intimidating}
+  \talent{disorient}
+  \talent{secrets of the force}
+
+  \talent{disorient}
+  \talent{prey on the weak}
+  \talent{renegade form}
+  \talent{parry}
+
+  \talent{prey on the weak}
+  \talent{sorry about the mess}
+  \talent{parry}
+  \talent{reflect}
+
+  \talent{dedication}
+  \talent{ravage}
+  \talent{grit}
+  \talent{force rating}
+
+  \talentlines{||.|/||.|/||||/.|.|}{.-./-.-/-../---}
+\end{talenttree}
+
+% \begin{talenttree}{Nightsister}{Discipline, Knowledge (Lore), Stealth, Survival}{Collapse of the Republic p. 31}{}{}
+%   \talent{witchcraft}
+%   \talent{summon item}
+%   \talent{grit}
+%   \talent{expert tracker}
+
+%   \talent{sense advantage}
+%   \talent{ichor blade}
+%   \talent{intimidating}
+%   \talent{toughened}
+
+%   \talent{balance}
+%   \talent{ichor blade - improved}
+%   \talent{grit}
+%   \talent{sixth sense}
+
+%   \talent{coven}
+%   \talent{ichor transfusion}
+%   \talent{survivor's instinct}
+%   \talent{intimidating}
+
+%   \talent{force rating}
+%   \talent{ichor reserve}
+%   \talent{force of will}
+%   \talent{dedication}
+
+%   \talentline{aa}{ab}
+%   \talentline{ba}{bb}
+%   \talentline{ca}{cb}
+%   \talentline{da}{db}
+
+%   \talentline{ab}{ac}
+%   \talentline{bb}{bc}
+%   \talentline{cb}{cc}
+%   \talentline{db}{dc}
+
+%   \talentline{cc}{dc}
+
+%   \talentline{ac}{ad}
+%   \talentline{bc}{bd}
+%   \talentline{cc}{cd}
+%   \talentline{dc}{dd}
+
+%   \talentline{bd}{cd}
+
+%   \talentline{ad}{ae}
+%   \talentline{bd}{be}
+%   \talentline{cd}{ce}
+%   \talentline{dd}{de}
+
+%   \talentline{ae}{be}
+%   \talentline{ce}{de}
+% \end{talenttree}
+
+\begin{talenttree}{Republic Navy Officer}{Astrogation, Discipline, Knowledge (Warfare), Leadership}{Rise of the Seperatists p. 31}{}{}
+  \talent{grit}
+  \talent{command}
+  \talent{commanding presence}
+  \talent{galaxy mapper}
+
+  \talent{command}
+  \talent{commanding presence}
+  \talent{grit}
+  \talent{known schematic}
+
+  \talent{dronance saturation}
+  \talent{steely nerves}
+  \talent{confidence}
   \talent{toughened}
 
-  \talent{balance}
+  \talent{fire when ready}
-  \talent{improved ichor blade}
+  \talent{on my order}
-  \talent{grit}
+  \talent{galaxy mapper}
-  \talent{sixth sense}
+  \talent{hyperspace assault}
 
-  \talent{coven}
+  \talent{natural leader}
-  \talent{ichor transfusion}
-  \talent{survivor's instinct}
-  \talent{intimidating}
-
-  \talent{force rating}
-  \talent{ichor reserve}
-  \talent{force of will}
   \talent{dedication}
+  \talent{careful planning}
+  \talent{outmaneuver}
 
-  \talentline{aa}{ab}
+  \talentlines{.|||/.|||/|||./..||}{-../.--/-../---}
-  \talentline{ba}{bb}
+\end{talenttree}
-  \talentline{ca}{cb}
+
-  \talentline{da}{db}
+\begin{talenttree}{Republic Representative}{Charm, Cool, Knowledge (chose any one), Negotiation}{Rise of the Seperatists p. 33}{}{}
-
+  \talent{grit}
-  \talentline{ab}{ac}
+  \talent{leverage}
-  \talentline{bb}{bc}
+  \talent{kill with kindness}
-  \talentline{cb}{cc}
+  \talent{respected delegate}
-  \talentline{db}{dc}
+
-
+  \talent{nobody's fool}
-  \talentline{cc}{dc}
+  \talent{kill with kindness}
-
+  \talent{respected delegate}
-  \talentline{ac}{ad}
+  \talent{smooth talker}
-  \talentline{bc}{bd}
+
-  \talentline{cc}{cd}
+  \talent{translation error}
-  \talentline{dc}{dd}
+  \talent{leverage}
-
+  \talent{smooth talker}
-  \talentline{bd}{cd}
+  \talent{nobody's fool}
-
+
-  \talentline{ad}{ae}
+  \talent{consider our options}
-  \talentline{bd}{be}
+  \talent{steely nerves}
-  \talentline{cd}{ce}
+  \talent{intense presence}
-  \talentline{dd}{de}
+  \talent{leverage}
-
+
-  \talentline{ae}{be}
+  \talent{consider our options - improved}
-  \talentline{ce}{de}
+  \talent{natural negotiator}
+  \talent{dedication}
+  \talent{backroom deal}
+
+  \talentlines{..||/||.|/||||/||.|}{---/-../.--/.--}
+\end{talenttree}
+
+\begin{talenttree}{Scavenger}{Mechanics, Perception, Streetwise, Survival}{Rise of the Seperatists p. 35}{}{}
+  \talent{grit}
+  \talent{forager}
+  \talent{utinni!}
+  \talent{street smarts}
+
+  \talent{grit}
+  \talent{rapid reaction}
+  \talent{tinkerer}
+  \talent{utinni!}
+
+  \talent{rapid reaction}
+  \talent{jury rigged}
+  \talent{exceed specifications}
+  \talent{one person's trash}
+
+  \talent{sixth sense}
+  \talent{exceed specifications - supreme}
+  \talent{exceed specifications - improved}
+  \talent{another's treasure}
+
+  \talent{utility belt - improved}
+  \talent{utility belt}
+  \talent{dedication}
+  \talent{contraption}
+
+  \talentlines{.|||/|.||/|.||/.||.}{-../.--/.../---}
 \end{talenttree}

talent trees/warrior.tex

@@ -1,7 +1,7 @@
 
   \setcareer{Warrior}{Athletics, Brawl, Cool, Melee, Perception, Survival}
 
-  \begin{talenttree}{Aggressor}{Coercion, Knowledge (Underworld), Ranged (Light), Streetwise}{Force and Destiny p. 99}{1}
+  \begin{talenttree}{Aggressor}{Coercion, Knowledge (Underworld), Ranged (Light), Streetwise}{Force and Destiny p. 99}{1}{}
     \talent{intimidating}
     \talent{plausible deniability}
     \talent{grit}
@@ -18,7 +18,7 @@
     \talent{toughened}
 
     \talent{grit}
-    \talent{improved terrify}
+    \talent{terrify - improved}
     \talent{prey on the weak}
     \talent{heroic fortitude}
 
@@ -30,7 +30,7 @@
     \talentlines{||||/||||/||||/||||}{--./-.-/-../--.}
   \end{talenttree}
 
-  \begin{talenttree}{Shii-Cho Knight}{Athletics, Coordination, Lightsaber, Melee}{Force and Destiny p. 100}{1}
+  \begin{talenttree}{Shii-Cho Knight}{Athletics, Coordination, Lightsaber, Melee}{Force and Destiny p. 100}{1}{}
     \talent{parry}
     \talent{second wind}
     \talent{toughened}
@@ -48,7 +48,7 @@
 
     \talent{natural blademaster}
     \talent{sarlacc sweep}
-    \talent{improved parry}
+    \talent{parry - improved}
     \talent{sum djem}
 
     \talent{center of being}
@@ -59,7 +59,7 @@
     \talentlines{||||/||||/||||/||..}{--./.--/-.-/---}
   \end{talenttree}
 
-  \begin{talenttree}{Starfighter Ace}{Astrogation, Gunnery, Mechanics, Piloting (Space)}{Force and Destiny p. 101}{1}
+  \begin{talenttree}{Starfighter Ace}{Astrogation, Gunnery, Mechanics, Piloting (Space)}{Force and Destiny p. 101}{1}{}
     \talent{grit}
     \talent{skilled jockey}
     \talent{rapid reaction}

talent-trees.tex

@@ -3,16 +3,18 @@
 
 \begin{document}
   % \input{talent trees/bounty hunter.tex}
+  \input{talent trees/clone soldier.tex}
   % \input{talent trees/colonist.tex}
   % \input{talent trees/consular.tex}
   % \input{talent trees/explorer.tex}
   % \input{talent trees/guardian.tex}
   % \input{talent trees/hired gun.tex}
+  \input{talent trees/jedi.tex}
   % \input{talent trees/mystic.tex}
   % \input{talent trees/seeker.tex}
   % \input{talent trees/sentinel.tex}
   % \input{talent trees/smuggler.tex}
-  \input{talent trees/technician.tex}
+  % \input{talent trees/technician.tex}
   % \input{talent trees/warrior.tex}
   \input{talent trees/universal.tex}