From ef5594cdd357830fc5bda9afb05f1aa7cb7fc5a3 Mon Sep 17 00:00:00 2001
From: LevelX <ludwig.hirth@gmail>
Date: Sat, 11 Feb 2012 14:25:21 +0100
Subject: [PATCH] Some small improvements to text generation

---
 .../darkascension/VaultOfTheArchangel.java    |  4 ++--
 .../sets/magic2011/CaptivatingVampire.java    |  2 +-
 .../continious/GainAbilityAttachedEffect.java | 20 +++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java b/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java
index 7e04eca078..c0a6338e10 100644
--- a/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java
+++ b/Mage.Sets/src/mage/sets/darkascension/VaultOfTheArchangel.java
@@ -57,9 +57,9 @@ public class VaultOfTheArchangel extends CardImpl<VaultOfTheArchangel> {
         this.addAbility(new ColorlessManaAbility());
         // {2}{W}{B}, {tap}: Creatures you control gain deathtouch and lifelink until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false),
+                new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"), false),
                 new ManaCostsImpl("{2}{W}{B}"));
-        ability.addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false));
+        ability.addEffect(new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures"), false));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java
index 6d6a07a057..e3bd9ebb91 100644
--- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java
+++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java
@@ -58,7 +58,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class CaptivatingVampire extends CardImpl<CaptivatingVampire> {
 
 	private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Vampire creatures");
-	private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("untapped Vampire");
+	private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("untapped Vampires you control");
 
 	static {
 		filter1.getSubtype().add("Vampire");
diff --git a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java
index 1d9effd44f..6bd0034ac4 100644
--- a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java
@@ -77,12 +77,20 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl<GainAbilityA
 	}
 
 	private void setText() {
-        String prefix = "";
-        if (attachmentType == AttachmentType.AURA)
-            prefix = "Enchanted";
-        else if (attachmentType == AttachmentType.EQUIPMENT)
-            prefix = "Equipped";
-		staticText = prefix + " creature gains " + ability.getRule();
+        StringBuilder sb = new StringBuilder();
+        if (attachmentType == AttachmentType.AURA) {
+            sb.append("Enchanted"); 
+		} else if (attachmentType == AttachmentType.EQUIPMENT) {
+            sb.append("Equipped");
+		}
+		sb.append(" creature ");
+		if (duration == Duration.WhileOnBattlefield) {
+			sb.append("has ");	
+		} else {
+			sb.append("gains ");	
+		}
+		sb.append(ability.getRule());	
+		staticText = sb.toString();
 	}
 
 }