From 77dbab7f41c07322a05820c71d462f05a0b533c8 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 3 Jan 2019 15:24:12 +0100
Subject: [PATCH] * Vedalken Engineer - Fixed a problem that the promt to
 choose a color was unintended shown if player got priority.

---
 .../src/mage/cards/v/VedalkenEngineer.java    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/v/VedalkenEngineer.java b/Mage.Sets/src/mage/cards/v/VedalkenEngineer.java
index 3d07356eb4b..5b573e53f2f 100644
--- a/Mage.Sets/src/mage/cards/v/VedalkenEngineer.java
+++ b/Mage.Sets/src/mage/cards/v/VedalkenEngineer.java
@@ -1,6 +1,7 @@
-
 package mage.cards.v;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 import mage.ConditionalMana;
 import mage.MageInt;
@@ -36,7 +37,7 @@ public final class VedalkenEngineer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {tap}: Add two mana of any one color. Spend this mana only to cast artifact spells or activate abilities of artifacts.
+        // {T}: Add two mana of any one color. Spend this mana only to cast artifact spells or activate abilities of artifacts.
         this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new VedalkenEngineerEffect(2, new VedalkenEngineerManaBuilder()), new TapSourceCost()));
     }
 
@@ -76,10 +77,7 @@ class VedalkenEngineerManaCondition implements Condition {
     @Override
     public boolean apply(Game game, Ability source) {
         MageObject object = game.getObject(source.getSourceId());
-        if (object != null && object.isArtifact()) {
-            return true;
-        }
-        return false;
+        return object != null && object.isArtifact();
     }
 }
 
@@ -87,11 +85,17 @@ class VedalkenEngineerEffect extends ManaEffect {
 
     private final int amount;
     private final ConditionalManaBuilder manaBuilder;
+    protected final ArrayList<Mana> netMana = new ArrayList<>();
 
     public VedalkenEngineerEffect(int amount, ConditionalManaBuilder manaBuilder) {
         super();
         this.amount = amount;
         this.manaBuilder = manaBuilder;
+        netMana.add(Mana.GreenMana(amount));
+        netMana.add(Mana.BlueMana(amount));
+        netMana.add(Mana.BlackMana(amount));
+        netMana.add(Mana.WhiteMana(amount));
+        netMana.add(Mana.RedMana(amount));
         staticText = "Add " + amount + " mana of any one color. " + manaBuilder.getRule();
     }
 
@@ -99,6 +103,7 @@ class VedalkenEngineerEffect extends ManaEffect {
         super(effect);
         this.amount = effect.amount;
         this.manaBuilder = effect.manaBuilder;
+        this.netMana.addAll(effect.netMana);
     }
 
     @Override
@@ -117,12 +122,16 @@ class VedalkenEngineerEffect extends ManaEffect {
         return false;
     }
 
+    @Override
+    public List<Mana> getNetMana(Game game, Ability source) {
+        return netMana;
+    }
+
     @Override
     public Mana produceMana(boolean netMana, Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         ChoiceColor choiceColor = new ChoiceColor(true);
         if (controller != null && controller.choose(Outcome.Benefit, choiceColor, game)) {
-
             Mana condMana = manaBuilder.setMana(choiceColor.getMana(amount), source, game).build();
             return condMana;
         }