External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[HOU] Added 4 cards and some fixes.

Browse source
This commit is contained in:
LevelX2 2017-06-28 17:03:26 +02:00
parent 6a86cb6717
commit 886022fd19
9 changed files with 682 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java
View file

@ -32,6 +32,7 @@ import mage.abilities.Mode;
import mage.abilities.SpellAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.Cards;
@ -53,6 +54,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
protected boolean mayShuffleAfter = false;
protected boolean putOnTop = true; // if false on put rest back on bottom of library
protected Zone targetZoneLookedCards; // GRAVEYARD, LIBRARY
protected boolean backInRandomOrder = false;
public LookLibraryControllerEffect() {
this(1);
@ -93,6 +95,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
this.mayShuffleAfter = effect.mayShuffleAfter;
this.targetZoneLookedCards = effect.targetZoneLookedCards;
this.putOnTop = effect.putOnTop;
this.backInRandomOrder = effect.backInRandomOrder;
}
@Override
@ -147,6 +150,15 @@ public class LookLibraryControllerEffect extends OneShotEffect {
return true;
}
public boolean isBackInRandomOrder() {
return backInRandomOrder;
}
public Effect setBackInRandomOrder(boolean backInRandomOrder) {
this.backInRandomOrder = backInRandomOrder;
return this;
}
protected void cardLooked(Card card, Game game, Ability source) {
}
@ -167,6 +179,15 @@ public class LookLibraryControllerEffect extends OneShotEffect {
if (putOnTop) {
player.putCardsOnTopOfLibrary(cards, game, source, true);
} else {
if (backInRandomOrder) {
Cards newOrder = new CardsImpl();
while (!cards.isEmpty()) {
Card card = cards.getRandom(game);
newOrder.add(card);
cards.remove(card);
}
cards = newOrder;
}
player.putCardsOnBottomOfLibrary(cards, game, source, true);
}
break;
@ -182,6 +203,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
* Check to shuffle library if allowed
*
* @param player
* @param source
* @param game
*/
protected void mayShuffle(Player player, Ability source, Game game) {
@ -229,7 +251,11 @@ public class LookLibraryControllerEffect extends OneShotEffect {
if (!middleText.isEmpty()) {
sb.append(middleText);
} else if (numberLook > 1) {
sb.append(", then put them back in any order");
if (backInRandomOrder) {
sb.append(". Put the rest on the bottom of your library in a random order");
} else {
sb.append(", then put them back in any order");
}
}
if (this.mayShuffleAfter) {
sb.append(". You may shuffle your library");

26
Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
View file

@ -43,8 +43,15 @@ import mage.util.CardUtil;
*/
public class UntapTargetEffect extends OneShotEffect {
protected boolean useOnlyTargetPointer;
public UntapTargetEffect() {
this(true);
}
public UntapTargetEffect(boolean useOnlyTargetPointer) {
super(Outcome.Untap);
this.useOnlyTargetPointer = useOnlyTargetPointer;
}
public UntapTargetEffect(final UntapTargetEffect effect) {
@ -58,10 +65,21 @@ public class UntapTargetEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
for (UUID target : targetPointer.getTargets(game, source)) {
Permanent permanent = game.getPermanent(target);
if (permanent != null) {
permanent.untap(game);
if (!useOnlyTargetPointer && source.getTargets().size() > 1) {
source.getTargets().forEach((target) -> {
for (UUID targetId : target.getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
permanent.untap(game);
}
}
});
} else {
for (UUID target : targetPointer.getTargets(game, source)) {
Permanent permanent = game.getPermanent(target);
if (permanent != null) {
permanent.untap(game);
}
}
}
return true;