[EOE] various text fixes

Mage.Sets/src/mage/cards/a/AuxiliaryBoosters.java

@@ -28,7 +28,7 @@ public final class AuxiliaryBoosters extends CardImpl {
         this.subtype.add(SubType.EQUIPMENT);
 
         // When this Equipment enters, create a 2/2 colorless Robot artifact creature token and attach this Equipment to it.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenAttachSourceEffect(new RobotToken())));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenAttachSourceEffect(new RobotToken(), " and")));
 
         // Equipped creature gets +1/+2 and has flying.
         Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 2));

Mage.Sets/src/mage/cards/d/DiplomaticRelations.java

@@ -21,7 +21,8 @@ public final class DiplomaticRelations extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}");
 
         // Target creature you control gets +1/+0 and gains vigilance until end of turn. It deals damage equal to its power to target creature an opponent controls.
-        this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0));
+        this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0)
+                .setText("target creature you control gets +1/+0"));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance())
                 .setText("and gains vigilance until end of turn"));
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());

Mage.Sets/src/mage/cards/k/KavaronTurbodrone.java

@@ -32,7 +32,7 @@ public final class KavaronTurbodrone extends CardImpl {
         // {T}: Target creature you control gets +1/+1 and gains haste until end of turn. Activate only as a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(
                 new BoostTargetEffect(1, 1, Duration.EndOfTurn)
-                        .setText("Target creature gets +1/+1"),
+                        .setText("Target creature you control gets +1/+1"),
                 new TapSourceCost()
         );
         ability.addEffect(new GainAbilityTargetEffect(

Mage.Sets/src/mage/cards/m/MechanShieldmate.java

@@ -37,7 +37,7 @@ public final class MechanShieldmate extends CardImpl {
                         new ConditionalAsThoughEffect(
                                 new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield),
                                 ArtifactEnteredUnderYourControlCondition.instance
-                        ).setText("As long as an artifact entered the battlefield under your control this turn,"
+                        ).setText("As long as an artifact entered the battlefield under your control this turn, "
                                 + "this creature can attack as though it didn't have defender")
                 ).addHint(new ConditionHint(ArtifactEnteredUnderYourControlCondition.instance)),
                 new ArtifactEnteredControllerWatcher()

Mage.Sets/src/mage/cards/m/MentalModulation.java

@@ -21,7 +21,7 @@ import java.util.UUID;
 public final class MentalModulation extends CardImpl {
 
     public MentalModulation(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
 
         // This spell costs {1} less to cast during your turn.
         Ability ability = new SimpleStaticAbility(

Mage.Sets/src/mage/cards/o/OrbitalPlunge.java

@@ -43,7 +43,7 @@ class OrbitalPlungeEffect extends OneShotEffect {
     OrbitalPlungeEffect() {
         super(Outcome.Benefit);
         staticText = "{this} deals 6 damage to target creature. " +
-                "If excess damage was dealt to a permanent this way, create a Lander token.";
+                "If excess damage was dealt this way, create a Lander token.";
     }
 
     private OrbitalPlungeEffect(final OrbitalPlungeEffect effect) {

Mage.Sets/src/mage/cards/p/PerigeeBeckoner.java

@@ -32,7 +32,7 @@ public final class PerigeeBeckoner extends CardImpl {
 
         // When this creature enters, until end of turn, another target creature you control gets +2/+0 and gains "When this creature dies, return it to the battlefield tapped under its owner's control."
         Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0)
-                .setText("another target creature you control gets +2/+0"));
+                .setText("until end of turn, another target creature you control gets +2/+0"));
         ability.addEffect(new GainAbilityTargetEffect(new DiesSourceTriggeredAbility(
                 new ReturnSourceFromGraveyardToBattlefieldEffect(true, true), false
         ), Duration.EndOfTurn, "and gains \"When this creature dies, " +

Mage.Sets/src/mage/cards/p/PinnacleStarcage.java

@@ -104,7 +104,7 @@ class PinnacleStarcageTokenEffect extends OneShotEffect {
     PinnacleStarcageTokenEffect() {
         super(Outcome.Benefit);
         staticText = "put each card exiled with this artifact into its owner's graveyard, " +
-                "then create a 2/2 colorless Robot artifact token for each card put into a graveyard this way";
+                "then create a 2/2 colorless Robot artifact creature token for each card put into a graveyard this way";
     }
 
     private PinnacleStarcageTokenEffect(final PinnacleStarcageTokenEffect effect) {

Mage.Sets/src/mage/cards/r/RigForWar.java

@@ -7,7 +7,6 @@ import mage.abilities.keyword.ReachAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Duration;
 import mage.target.common.TargetCreaturePermanent;
 
 import java.util.UUID;
@@ -21,12 +20,12 @@ public final class RigForWar extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}");
 
         // Target creature gets +3/+0 and gains first strike and reach until end of turn.
-        getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)
+        getSpellAbility().addEffect(new BoostTargetEffect(3, 0)
                 .setText("target creature gets +3/+0"));
-        getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)
+        getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance())
                 .setText("and gains first strike"));
-        getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn)
+        getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance())
-                .setText("and first reach until end of turn"));
+                .setText("and reach until end of turn"));
         getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 

Mage.Sets/src/mage/cards/s/SelfcraftMechan.java

@@ -32,7 +32,7 @@ public final class SelfcraftMechan extends CardImpl {
 
         // When this creature enters, you may sacrifice an artifact. When you do, put a +1/+1 counter on target creature and draw a card.
         ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false);
-        ability.addEffect(new DrawCardSourceControllerEffect(1));
+        ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid(
                 ability, new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN),

Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java

@@ -161,7 +161,6 @@ public class VerifyCardDataTest {
 
         // color
         // skipListAddName(SKIP_LIST_COLOR, set, cardName);
-        skipListAddName(SKIP_LIST_COLOR, "FIN", "Summon: Alexander");
 
         // cost
         // skipListAddName(SKIP_LIST_COST, set, cardName);