github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2015-11-26 01:31:03 +01:00
commit 623d3490b0
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/legions/GoblinGoon.java
View file

@ -123,7 +123,7 @@ class GoblinGoonCantBlockEffect extends RestrictionEffect {
GoblinGoonCantBlockEffect() {
super(Duration.WhileOnBattlefield);
staticText = "Goblin Goon can't block unless you control more creatures than attacking player";
staticText = "{this} can't block unless you control more creatures than attacking player";
}
GoblinGoonCantBlockEffect(final GoblinGoonCantBlockEffect effect) {

21
Mage.Sets/src/mage/sets/odyssey/RitesOfInitiation.java
View file

@ -31,17 +31,13 @@ import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCardInHand;
/**
*
@ -86,19 +82,10 @@ class RitesOfInitiationEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
Target target = new TargetCardInHand(0, Integer.MAX_VALUE, new FilterCard("cards to discard"));
while (player.canRespond() && !target.isChosen()) {
target.choose(Outcome.BoostCreature, player.getId(), source.getSourceId(), game);
}
int numDiscarded = 0;
for (UUID targetId : target.getTargets()) {
Card card = player.getHand().get(targetId, game);
if (player.discard(card, source, game)) {
numDiscarded++;
}
}
game.addEffect(new BoostControlledEffect(numDiscarded, 0, Duration.EndOfTurn), source);
if (player != null) {
int numToDiscard = player.getAmount(0, player.getHand().size(), "Discard how many cards at random?", game);
player.discard(numToDiscard, true, source, game);
game.addEffect(new BoostControlledEffect(numToDiscard, 0, Duration.EndOfTurn), source);
return true;
}
return false;