R2-D2 Fan Much Needed Kit Touch up

This is a true Star Wars Hero here, and I feel he needs a decent touch up to better himself and other teams. He is mainly now to be apart of GL Leia's team. There are some counters with GL Leia that takes him out cause of his unique cleansing. I feel its time to touch this guy up to be more plug in play friendly then he was before. I try my best to not make him broken, but he still has plenty of potential for sure. Changes are in Red. I also added the support of being with General Skywalker and Jedi Master Luke since they were his master at one point in time. 

Electroshock Prod:

Deal Physical damage to target enemy and Stun for 1 turn. This attack deals 30% more damage to Burning targets and Target Lock Targets.

Smoke Screen:

Target ally gains Foresight, Critical Avoidance Up, and Advantage for 2 turns and all other allies gain Stealth and Advantage for 2 turns. R2-D2 gains 40% Turn Meter. If C-3P0 is an ally he also gains 40% Turn Meter and all these Buffs for 3 turns. 

Combat Analysis:

While R2-D2 is active, all allies gain 10% Critical Chance, Health Steal, Critical Avoidance, and 10% Accuracy, doubled for Light Side and Droid Allies. While R2-D2 is active, whenever a Light Side ally or Droid Ally scores a Critical Hit, dispel all debuffs on them. When R2-D2 scores a Critical Hit inflict Target Lock for 2 turns and dispel all debuffs on ally C-3P0.

Number Crunch: (GAC Omicron)

At the start of battle, R2-D2 gains 10% Max Protection for each Droid ally, 10% Offense for each Galactic Republic ally, 10% Max Health for each Rebel ally, and 10% Potency for each Resistance ally.

At the start of battle, and when R2-D2 revives, other Droid, Galactic Republic, Rebel, and Resistance allies gain 10% of R2-D2's Max Protection, Offense, Max Health, and Potency until R2-D2 is defeated. Double all these stats above as long as there is no Galactic Legend Leia Organa present. 

If Jedi Master Luke is in the leader slot, R2-D2 gains the Jedi Tag and Jedi Master Luke Gains the Resistance Tag. 

If General Skywalker is in the leader slot and all other allies are 501st allies, R2-D2 gains the 501st Tag.

If Queen Amidala is in the leader slot, Triple the stats above instead. 

While in Grand Arena:  Quadruple the stats above and remove the Galactic Legend Leia Organa Restriction.