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

[KHM] Implemented The Raven's Warning (#7425)

Browse source
This commit is contained in:
Daniel Bomar 2021-01-22 12:13:20 -06:00 • committed by GitHub
parent ca05fb9253
commit a26d9b2fd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 134 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java
View file

@ -31,7 +31,7 @@ public class LookAtTargetPlayerHandEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player you = game.getPlayer(source.getControllerId());
Player targetPlayer = game.getPlayer(source.getFirstTarget());
Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source));
MageObject sourceObject = game.getObject(source.getSourceId());
if (you != null && targetPlayer != null) {
you.lookAtCards(sourceObject != null ? sourceObject.getIdName() : null, targetPlayer.getHand(), game);

20
Mage/src/main/java/mage/abilities/effects/common/WishEffect.java
View file

@ -25,6 +25,7 @@ public class WishEffect extends OneShotEffect {
private final boolean reveal;
private final boolean alsoFromExile;
private final String choiceText;
private final boolean topOfLibrary;
public WishEffect() {
this(new FilterCard());
@ -39,16 +40,20 @@ public class WishEffect extends OneShotEffect {
}
public WishEffect(FilterCard filter, boolean reveal, boolean alsoFromExile) {
this(filter, reveal, alsoFromExile, false);
}
public WishEffect(FilterCard filter, boolean reveal, boolean alsoFromExile, boolean topOfLibrary) {
super(Outcome.DrawCard);
this.filter = filter;
this.alsoFromExile = alsoFromExile;
this.reveal = reveal;
choiceText = "Choose " + filter.getMessage() + " you own from outside the game"
this.topOfLibrary = topOfLibrary;
choiceText = (topOfLibrary ? "Put " : "Choose ") + filter.getMessage() + " you own from outside the game"
+ (alsoFromExile ? " or in exile" : "")
+ (reveal ? ", reveal that card," : "")
+ " and put it into your hand.";
staticText = "You may c" + choiceText.substring(1, choiceText.length() - 1);
+ (topOfLibrary ? " on top of your library." : " and put it into your hand.");
staticText = "You may " + Character.toLowerCase(choiceText.charAt(0)) + choiceText.substring(1, choiceText.length() - 1);
}
public WishEffect(final WishEffect effect) {
@ -57,6 +62,7 @@ public class WishEffect extends OneShotEffect {
this.alsoFromExile = effect.alsoFromExile;
this.reveal = effect.reveal;
this.choiceText = effect.choiceText;
this.topOfLibrary = effect.topOfLibrary;
}
@Override
@ -103,7 +109,11 @@ public class WishEffect extends OneShotEffect {
card = game.getCard(target.getFirstTarget());
}
if (card != null) {
card.moveToZone(Zone.HAND, source, game, false);
if (topOfLibrary) {
controller.putCardsOnTopOfLibrary(card, game, source, true);
} else {
card.moveToZone(Zone.HAND, source, game, false);
}
if (reveal) {
Cards revealCard = new CardsImpl();
revealCard.add(card);