Merge origin/master

Mage.Sets/src/mage/sets/arabiannights/CityInABottle.java

@@ -0,0 +1,54 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.arabiannights;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author emerald000
+ */
+public class CityInABottle extends mage.sets.vintagemasters.CityInABottle {
+
+    public CityInABottle(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 74;
+        this.expansionSetCode = "ARN";
+        this.rarity = Rarity.RARE;
+    }
+
+    public CityInABottle(final CityInABottle card) {
+        super(card);
+    }
+
+    @Override
+    public CityInABottle copy() {
+        return new CityInABottle(this);
+    }
+}

Mage.Sets/src/mage/sets/betrayersofkamigawa/ShireiShizosCaretaker.java

@@ -65,7 +65,7 @@ public class ShireiShizosCaretaker extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield under your control at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.
+        // Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.
         this.addAbility(new ShireiShizosCaretakerTriggeredAbility(this.getId()));
     }
 
@@ -118,7 +118,7 @@ class ShireiShizosCaretakerTriggeredAbility extends TriggeredAbilityImpl {
     
     @Override
     public String getRule() {
-        return "Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield under your control at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.";
+        return "Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.";
     }
 }
 
@@ -128,7 +128,7 @@ class ShireiShizosCaretakerEffect extends OneShotEffect {
     
     ShireiShizosCaretakerEffect(UUID shireiId) {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "you may return that card to the battlefield under your control at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.";
+        this.staticText = "you may return that card to the battlefield at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.";
         this.shireiId = shireiId;
     }
     
@@ -147,7 +147,7 @@ class ShireiShizosCaretakerEffect extends OneShotEffect {
         Card card = game.getCard(this.getTargetPointer().getFirst(game, source));
         if (card != null) {
             Effect effect = new ShireiShizosCaretakerReturnEffect(shireiId);
-            effect.setText("return that card to the battlefield under your control if Shirei, Shizo's Caretaker is still on the battlefield");
+            effect.setText("return that card to the battlefield if Shirei, Shizo's Caretaker is still on the battlefield");
             DelayedTriggeredAbility delayedAbility = new AtEndOfTurnDelayedTriggeredAbility(effect);
             delayedAbility.setSourceId(source.getSourceId());
             delayedAbility.setControllerId(source.getControllerId());

Mage.Sets/src/mage/sets/commander2013/HoodedHorror.java

@@ -56,7 +56,7 @@ public class HoodedHorror extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
-        // Hooded Horror can't be blocked if defending player controls the most creatures or is tied for the most.
+        // Hooded Horror can't be blocked as long as defending player controls the most creatures or is tied for the most.
       this.addAbility(new SimpleEvasionAbility(new HoodedHorrorCantBeBlockedEffect()));
     }
 
@@ -76,7 +76,7 @@ class HoodedHorrorCantBeBlockedEffect extends RestrictionEffect {
 
     public HoodedHorrorCantBeBlockedEffect() {
         super(Duration.WhileOnBattlefield);
-        staticText = "{this} can't be blocked if defending player controls the most creatures or is tied for the most";
+        staticText = "{this} can't be blocked as long as defending player controls the most creatures or is tied for the most";
     }
 
     public HoodedHorrorCantBeBlockedEffect(final HoodedHorrorCantBeBlockedEffect effect) {

Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java

@@ -72,7 +72,7 @@ public class LeechBonder extends CardImpl {
         // Leech Bonder enters the battlefield with two -1/-1 counters on it.
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2))));
 
-        // {U}, {untap}: Move a counter from target creature onto another target creature.
+        // {U}, {untap}: Move a counter from target creature onto a second target creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LeechBonderEffect(), new ManaCostsImpl("{U}"));
         ability.addCost(new UntapSourceCost());
         ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature to remove counter from")));
@@ -95,7 +95,7 @@ class LeechBonderEffect extends OneShotEffect {
 
     public LeechBonderEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Move a counter from target creature onto another target creature";
+        this.staticText = "Move a counter from target creature onto a second target creature";
     }
 
     public LeechBonderEffect(final LeechBonderEffect effect) {