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

NEO: Discover the Impossible and support (and StackDescription improvements)

Browse Source
This commit is contained in:
Tim Mocny
2022-02-20 04:18:43 +00:00
committed by Michael Kamensky
parent 912a77fece
commit a2a5fda9af
5 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -2967,19 +2967,23 @@ public class AbilityUtils {
List<SpellAbility> list = Lists.newArrayList(tgtCard.getBasicSpells()); List<SpellAbility> list = Lists.newArrayList(tgtCard.getBasicSpells());
CardState original = tgtCard.getState(CardStateName.Original); CardState original = tgtCard.getState(CardStateName.Original);
if (tgtCard.isLand()) { if (tgtCard.isFaceDown()) {
LandAbility la = new LandAbility(tgtCard, controller, null); list.addAll(Lists.newArrayList(tgtCard.getBasicSpells(original)));
la.setCardState(original); } else {
list.add(la); if (tgtCard.isLand()) {
}
if (tgtCard.isModal()) {
CardState modal = tgtCard.getState(CardStateName.Modal);
list.addAll(Lists.newArrayList(tgtCard.getBasicSpells(modal)));
if (modal.getType().isLand()) {
LandAbility la = new LandAbility(tgtCard, controller, null); LandAbility la = new LandAbility(tgtCard, controller, null);
la.setCardState(modal); la.setCardState(original);
list.add(la); list.add(la);
} }
if (tgtCard.isModal()) {
CardState modal = tgtCard.getState(CardStateName.Modal);
list.addAll(Lists.newArrayList(tgtCard.getBasicSpells(modal)));
if (modal.getType().isLand()) {
LandAbility la = new LandAbility(tgtCard, controller, null);
la.setCardState(modal);
list.add(la);
}
}
} }
for (SpellAbility s : list) { for (SpellAbility s : list) {

22
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -291,11 +291,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
Iterable<Card> tgts; Iterable<Card> tgts;
if (sa.usesTargeting()) { if (sa.usesTargeting()) {
tgts = sa.getTargets().getTargetCards(); tgts = sa.getTargets().getTargetCards();
} else { } else { // otherwise add self to list and go from there
// otherwise add self to list and go from there
tgts = sa.knownDetermineDefined(sa.getParam("Defined")); tgts = sa.knownDetermineDefined(sa.getParam("Defined"));
} }
sbTargets.append(" ").append(StringUtils.join(tgts, ", "));
sbTargets.append(" ").append(sa.getParamOrDefault("DefinedDesc", StringUtils.join(tgts, ", ")));
final String targetname = sbTargets.toString(); final String targetname = sbTargets.toString();
@@ -305,14 +305,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (destination.equals(ZoneType.Battlefield)) { if (destination.equals(ZoneType.Battlefield)) {
if (ZoneType.Graveyard.equals(origin)) { if (ZoneType.Graveyard.equals(origin)) {
sb.append("Return").append(targetname); sb.append("Return").append(targetname).append(fromGraveyard).append(" to the battlefield");
} else { } else {
sb.append("Put").append(targetname); sb.append("Put").append(targetname).append(" onto the battlefield");
}
if (ZoneType.Graveyard.equals(origin)) {
sb.append(fromGraveyard).append(" to the battlefield");
} else {
sb.append(" onto the battlefield");
} }
if (sa.hasParam("Tapped")) { if (sa.hasParam("Tapped")) {
sb.append(" tapped"); sb.append(" tapped");
@@ -324,11 +319,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
if (destination.equals(ZoneType.Hand)) { if (destination.equals(ZoneType.Hand)) {
sb.append("Return").append(targetname);
if (ZoneType.Graveyard.equals(origin)) { if (ZoneType.Graveyard.equals(origin)) {
sb.append(fromGraveyard); sb.append("Return").append(targetname).append(fromGraveyard).append(" to");
} else {
sb.append("Put").append(targetname).append(" in");
} }
sb.append(" to").append(pronoun).append("owner's hand."); sb.append(pronoun).append("owner's hand.");
} }
if (destination.equals(ZoneType.Library)) { if (destination.equals(ZoneType.Library)) {

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

@@ -12,13 +12,7 @@ import forge.game.GameEntityCounterTable;
import forge.game.ability.AbilityKey; import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card; import forge.game.card.*;
import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.card.CardZoneTable;
import forge.game.card.CounterType;
import forge.game.event.GameEventCombatChanged; import forge.game.event.GameEventCombatChanged;
import forge.game.player.DelayedReveal; import forge.game.player.DelayedReveal;
import forge.game.player.Player; import forge.game.player.Player;
@@ -40,12 +34,15 @@ public class DigEffect extends SpellAbilityEffect {
final Card host = sa.getHostCard(); final Card host = sa.getHostCard();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa); final int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
final int numToChange = (sa.hasParam("ChangeNum") ?
AbilityUtils.calculateAmount(host, sa.getParam("ChangeNum"), sa) : 1);
final List<Player> tgtPlayers = getTargetPlayers(sa); final List<Player> tgtPlayers = getTargetPlayers(sa);
String verb = " looks at "; String verb = " looks at ";
if (sa.hasParam("Reveal") && sa.getParam("Reveal").equals("True")) { if (sa.hasParam("Reveal") && sa.getParam("Reveal").equals("True")) {
verb = " reveals "; verb = " reveals ";
} else if (sa.hasParam("DestinationZone") && sa.getParam("DestinationZone").equals("Exile")) { } else if (sa.hasParam("DestinationZone") && sa.getParam("DestinationZone").equals("Exile") &&
numToDig == numToChange) {
verb = " exiles "; verb = " exiles ";
} }
sb.append(host.getController()).append(verb).append("the top "); sb.append(host.getController()).append(verb).append("the top ");
@@ -59,6 +56,27 @@ public class DigEffect extends SpellAbilityEffect {
} }
} }
sb.append("library."); sb.append("library.");
if (numToDig != numToChange) {
String destZone1 = sa.hasParam("DestinationZone") ?
sa.getParam("DestinationZone").toLowerCase() : "hand";
String destZone2 = sa.hasParam("DestinationZone2") ?
sa.getParam("DestinationZone2").toLowerCase() : "on the bottom of their library in any order.";
if (sa.hasParam("RestRandomOrder")) {
destZone2 = destZone2.replace("any", "a random");
}
String verb2 = "put ";
String where = "in their hand ";
if (destZone1.equals("exile")) {
verb2 = "exile ";
where = "";
}
sb.append(" They ").append(verb2).append(Lang.getNumeral(numToChange)).append(" of them ").append(where);
sb.append(sa.hasParam("ExileFaceDown") ? "face down " : "").append("and put the rest ");
sb.append(destZone2);
}
return sb.toString(); return sb.toString();
} }

19
forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
View File

@@ -50,17 +50,28 @@ public class PlayEffect extends SpellAbilityEffect {
@Override @Override
protected String getStackDescription(final SpellAbility sa) { protected String getStackDescription(final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(sa.getActivatingPlayer().toString()).append(" ");
sb.append("Play "); if (sa.hasParam("ValidSA")) {
final List<Card> tgtCards = getTargetCards(sa); sb.append(sa.hasParam("Optional") ? "may cast " : "cast ");
} else {
sb.append(sa.hasParam("Optional") ? "may play " : "plays ");
}
final List<Card> tgtCards = getDefinedCardsOrTargeted(sa);
if (sa.hasParam("Valid")) { if (sa.hasParam("Valid")) {
sb.append("cards"); sb.append("cards");
} else if (sa.hasParam("DefinedDesc")) {
sb.append(sa.getParam("DefinedDesc"));
} else { } else {
sb.append(StringUtils.join(tgtCards, ", ")); sb.append(Lang.joinHomogenous(tgtCards));
} }
if (sa.hasParam("WithoutManaCost")) { if (sa.hasParam("WithoutManaCost")) {
sb.append(" without paying the mana cost"); sb.append(" without paying ").append(tgtCards.size()==1 ? "its" : "their").append(" mana cost ");
}
if (sa.hasParam("IfDesc")) {
sb.append(sa.getParam("IfDesc"));
} }
sb.append("."); sb.append(".");
return sb.toString(); return sb.toString();

8
forge-gui/res/cardsfolder/upcoming/discover_the_impossible.txt Normal file
View File

@@ -0,0 +1,8 @@
Name:Discover the Impossible
ManaCost:2 U
Types:Instant
A:SP$ Dig | Defined$ You | DigNum$ 5 | DestinationZone$ Exile | ExileFaceDown$ True | RememberChanged$ True | RestRandomOrder$ True | SubAbility$ DBCast | SpellDescription$ Look at the top five cards of your library. Exile one of them face down and put the rest on the bottom of your library in a random order. You may cast the exiled card without paying its mana cost if it's an instant spell with mana value 2 or less. If you don't, put that card into your hand.
SVar:DBCast:DB$ Play | Optional$ True | Defined$ Remembered | DefinedDesc$ the exiled card | ValidSA$ Instant.cmcLE2 | WithoutManaCost$ True | IfDesc$ if it's an instant spell with mana value 2 or less | ForgetTargetRemembered$ True | SubAbility$ DBChangeZone
SVar:DBChangeZone:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | DefinedDesc$ that card | ForgetChanged$ True | ConditionDescription$ If not,
DeckHints:Types$Instant
Oracle:Look at the top five cards of your library. Exile one of them face down and put the rest on the bottom of your library in a random order. You may cast the exiled card without paying its mana cost if it's an instant spell with mana value 2 or less. If you don't, put that card into your hand.