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

Updates to keywords

Browse Source 
So it's not the End of the World
This commit is contained in:
Indigo Dragon
2017-09-06 12:47:46 +00:00
parent 6498250114
commit 8f57a55286
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1539,13 +1539,13 @@ public class Card extends GameEntity implements Comparable<Card> {
}
sb.append(")");
} else if (keyword.equals("Convoke") || keyword.equals("Dethrone")|| keyword.equals("Cascade")
|| keyword.equals("Melee") || keyword.equals("Improvise")|| keyword.equals("Conspire")
|| keyword.equals("Devoid") || keyword.equals("Epic")|| keyword.equals("Evolve")
|| keyword.equals("Melee") || keyword.equals("Improvise")|| keyword.equals("Shroud")
|| keyword.equals("Devoid") || keyword.equals("Intimidate")|| keyword.equals("Evolve")
|| keyword.equals("Exalted") || keyword.equals("Extort")|| keyword.equals("Flanking")
|| keyword.equals("Horsemanship") || keyword.equals("Infect")|| keyword.equals("Persist")
|| keyword.equals("Phasing") || keyword.equals("Shadow")|| keyword.equals("Skulk")
|| keyword.equals("Sunburst") || keyword.equals("Undying")|| keyword.equals("Wither")
|| keyword.equals("Fear") || keyword.equals("Intimidate")|| keyword.equals("Banding")) {
|| keyword.equals("Undying")|| keyword.equals("Wither")
|| keyword.equals("Fear") || keyword.equals("Banding")) {
if (sb.length() != 0) {
sb.append("\r\n");
}

6
forge-game/src/main/java/forge/game/keyword/Keyword.java
View File

@@ -24,7 +24,7 @@ public enum Keyword {
BLOODTHIRST(KeywordWithAmount.class, false, "If an opponent was dealt damage this turn, this creature enters the battlefield with {%d:+1/+1 counter} on it."),
BUSHIDO(KeywordWithAmount.class, false, "Whenever this creature blocks or becomes blocked, it gets +%1$d/+%1$d until end of turn."),
BUYBACK(KeywordWithCost.class, false, "You may pay an additional %s as you cast this spell. If you do, put it into your hand instead of your graveyard as it resolves."),
CASCADE(SimpleKeyword.class, false, "When you cast this spell, exile cards from the top of your library until you exile a nonland card whose converted mana cost is less than this spell's converted mana cost. You may cast that card without paying its mana cost. Then put all cards exiled this way that weren't cast on the bottom of your library in a random order."),
CASCADE(SimpleKeyword.class, false, "When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order."),
CHAMPION(KeywordWithType.class, false, "When this enters the battlefield, sacrifice it unless you exile another %s you control. When this leaves the battlefield, that card returns to the battlefield."),
CHANGELING(SimpleKeyword.class, true, "This card is every creature type."),
CIPHER(SimpleKeyword.class, true, "Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost."),
@@ -103,7 +103,7 @@ public enum Keyword {
POISONOUS(KeywordWithAmount.class, false, "Whenever this creature deals combat damage to a player, that player gets {%d:poison counter}."),
PRESENCE(KeywordWithType.class, false, "As an additional cost to cast CARDNAME, you may reveal a %s card from your hand."),
PROTECTION(Protection.class, false, "This creature can't be blocked, targeted, dealt damage, or equipped/enchanted by %s."),
PROVOKE(SimpleKeyword.class, false, "Whenever this creature attacks, you may choose to have target creature defending player controls block this creature this combat if able. If you do, untap that creature."),
PROVOKE(SimpleKeyword.class, false, "Whenever this creature attacks, you may have target creature defending player controls untap and block it if able."),
PROWESS(SimpleKeyword.class, false, "Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn."),
PROWL(KeywordWithCost.class, false, "You may cast this card by paying %s rather than paying its mana cost if you dealt combat damage to a player this turn with a creature that shares any of this spell's creature types."),
RAMPAGE(KeywordWithAmount.class, false, "Whenever this creature becomes blocked, it gets +%1$d/+%1$d until end of turn for each creature blocking it beyond the first."),
@@ -139,7 +139,7 @@ public enum Keyword {
UNLEASH(SimpleKeyword.class, true, "You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it."),
VANISHING(KeywordWithAmount.class, false, "This permanent enters the battlefield with %d time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it."),
VIGILANCE(SimpleKeyword.class, true, "Attacking doesn't cause this creature to tap."),
WITHER(SimpleKeyword.class, true, "This creature deals damage to creatures in the form of -1/-1 counters.");
WITHER(SimpleKeyword.class, true, "This deals damage to creatures in the form of -1/-1 counters.");
protected final Class<? extends KeywordInstance<?>> type;
protected final boolean isMultipleRedundant;