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

Merge branch 'vazal' into 'master'

Browse Source 
Vazal the Compleat

See merge request core-developers/forge!3882
This commit is contained in:
Michael Kamensky
2021-02-18 05:14:49 +00:00
parent 3376a25536 6c3f1e5f2f
commit c2e31a28dc
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1964,7 +1964,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
|| keyword.equals("Foretell") // for the ones without cost
|| keyword.equals("Hideaway") || keyword.equals("Ascend")
|| keyword.equals("Totem armor") || keyword.equals("Battle cry")
|| keyword.equals("Devoid") || keyword.equals("Riot")){
|| keyword.equals("Devoid") || keyword.equals("Riot")
|| keyword.equals("Megalegendary")){
sbLong.append(keyword).append(" (").append(inst.getReminderText()).append(")");
} else if (keyword.startsWith("Partner:")) {
final String[] k = keyword.split(":");

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

@@ -92,6 +92,7 @@ public enum Keyword {
LIFELINK("Lifelink", SimpleKeyword.class, true, "Damage dealt by this creature also causes its controller to gain that much life."),
LIVING_WEAPON("Living weapon", SimpleKeyword.class, true, "When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it."),
MADNESS("Madness", KeywordWithCost.class, false, "If you discard this card, discard it into exile. When you do, cast it for %s or put it into your graveyard."),
MEGALEGENDARY("Megalegendary", SimpleKeyword.class, true, "Your deck can have only one copy of this card."),
MELEE("Melee", SimpleKeyword.class, false, "Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat."),
MENTOR("Mentor", SimpleKeyword.class, false, "Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power."),
MENACE("Menace", SimpleKeyword.class, true, "This creature can't be blocked except by two or more creatures."),