external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Attempting to improve feedback notification messages for Munda, Ambush Leader and other similar cards.

Browse Source
This commit is contained in:
Agetian
2017-06-26 19:25:07 +00:00
parent 3e8059db10
commit 83d34ee456
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -265,7 +265,9 @@ public class DigEffect extends SpellAbilityEffect {
chosen = chooser.getController().chooseSingleEntityForEffect(valid, shouldReveal ? delayedReveal : null, sa, prompt, anyNumber || optional, p);
}
else {
chooser.getController().notifyOfValue(sa, null, "No valid cards");
if (i == 0) {
chooser.getController().notifyOfValue(sa, null, "No valid cards");
}
}
if (chosen == null) {

7
forge-game/src/main/java/forge/util/MessageUtil.java
View File

@@ -54,7 +54,12 @@ public class MessageUtil {
String chooser = StringUtils.capitalize(mayBeYou(player, target));
return String.format("%s %s %s", chooser, Lang.joinVerb(chooser, "vote"), value);
default:
return String.format("%s effect's value for %s is %s", sa.getHostCard().getName(), mayBeYou(player, target), value);
String tgt = mayBeYou(player, target);
if (tgt.equals("(null)")) {
return String.format("%s effect's value is %s", sa.getHostCard().getName(), value);
} else {
return String.format("%s effect's value for %s is %s", sa.getHostCard().getName(), tgt, value);
}
}
}

2
forge-gui/res/cardsfolder/m/munda_ambush_leader.txt
View File

@@ -5,7 +5,7 @@ PT:3/4
K:Haste
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | OptionalDecider$ You | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under you control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order.
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDig | Secondary$ True | OptionalDecider$ You | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under you control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order.
SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 4 | AnyNumber$ | ChangeValid$ Ally | DestinationZone$ Library | LibraryPosition$ 0
SVar:TrigDig:DB$ Dig | DigNum$ 4 | AnyNumber$ True | ChangeValid$ Ally | DestinationZone$ Library | LibraryPosition$ 0
DeckHints:Type$Ally
SVar:Picture:http://www.wizards.com/global/images/magic/general/munda_ambush_leader.jpg
Oracle:Haste\nRally — Whenever Munda, Ambush Leader or another Ally enters the battlefield under you control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order.