From 8cdc76427e33c6d9df7a0762322ec8bbed890daa Mon Sep 17 00:00:00 2001 From: Sloth Date: Wed, 29 Jan 2014 19:58:07 +0000 Subject: [PATCH] - Added Kraken of the Straits and Meletis Astronomer. --- .gitattributes | 2 ++ forge-game/src/main/java/forge/game/card/Card.java | 4 +++- forge-gui/res/cardsfolder/k/kraken_of_the_straits.txt | 7 +++++++ forge-gui/res/cardsfolder/m/meletis_astronomer.txt | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 forge-gui/res/cardsfolder/k/kraken_of_the_straits.txt create mode 100644 forge-gui/res/cardsfolder/m/meletis_astronomer.txt diff --git a/.gitattributes b/.gitattributes index daf4e0c817c..966da6c4ccc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6905,6 +6905,7 @@ forge-gui/res/cardsfolder/k/kozileks_predator.txt svneol=native#text/plain forge-gui/res/cardsfolder/k/kragma_butcher.txt -text forge-gui/res/cardsfolder/k/kragma_warcaller.txt -text forge-gui/res/cardsfolder/k/kraken_hatchling.txt svneol=native#text/plain +forge-gui/res/cardsfolder/k/kraken_of_the_straits.txt -text forge-gui/res/cardsfolder/k/krakens_eye.txt svneol=native#text/plain forge-gui/res/cardsfolder/k/krakilin.txt svneol=native#text/plain forge-gui/res/cardsfolder/k/kranioceros.txt svneol=native#text/plain @@ -7679,6 +7680,7 @@ forge-gui/res/cardsfolder/m/melancholy.txt svneol=native#text/plain forge-gui/res/cardsfolder/m/melee.txt -text forge-gui/res/cardsfolder/m/melek_izzet_paragon.txt -text forge-gui/res/cardsfolder/m/melesse_spirit.txt svneol=native#text/plain +forge-gui/res/cardsfolder/m/meletis_astronomer.txt -text forge-gui/res/cardsfolder/m/meletis_charlatan.txt -text forge-gui/res/cardsfolder/m/melira_sylvok_outcast.txt -text forge-gui/res/cardsfolder/m/meliras_keepers.txt svneol=native#text/plain diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 6161d1c0c59..b0ecc119d6c 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -2148,6 +2148,8 @@ public class Card extends GameEntity implements Comparable { if (part.startsWith("with")) { positive = !part.startsWith("without"); postponedAdjectives.add(Pair.of(positive, part.substring(positive ? 4 : 7))); + } else if (part.startsWith("powerLEX")) {// Kraken of the Straits + postponedAdjectives.add(Pair.of(true, "power less than the number of islands you control")); } else if (part.startsWith("power")) { int kwLength = 5; String opName = Expressions.operatorName(part.substring(kwLength, kwLength + 2)); @@ -2199,7 +2201,7 @@ public class Card extends GameEntity implements Comparable { } orClauses.add(sbShort.toString()); } - return byClause + StringUtils.join(orClauses, " or "); + return byClause + StringUtils.join(orClauses, " or ") + "."; } // get the text of the abilities of a card diff --git a/forge-gui/res/cardsfolder/k/kraken_of_the_straits.txt b/forge-gui/res/cardsfolder/k/kraken_of_the_straits.txt new file mode 100644 index 00000000000..0089c438602 --- /dev/null +++ b/forge-gui/res/cardsfolder/k/kraken_of_the_straits.txt @@ -0,0 +1,7 @@ +Name:Kraken of the Straits +ManaCost:5 U U +Types:Creature Kraken +PT:6/6 +K:CantBeBlockedBy Creature.powerLEX +SVar:X:Count$TypeYouCtrl.Island +SVar:Picture:http://www.wizards.com/global/images/magic/general/kraken_of_the_straits.jpg \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/m/meletis_astronomer.txt b/forge-gui/res/cardsfolder/m/meletis_astronomer.txt new file mode 100644 index 00000000000..ee424ae4c54 --- /dev/null +++ b/forge-gui/res/cardsfolder/m/meletis_astronomer.txt @@ -0,0 +1,7 @@ +Name:Meletis Astronomer +ManaCost:1 U +Types:Creature Human Wizard +PT:1/3 +T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Heroic - Whenever you cast a spell that targets CARDNAME, look at the top three cards of your library. You may reveal an enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in any order. +SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 3 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Enchantment +SVar:Picture:http://www.wizards.com/global/images/magic/general/meletis_astronomer.jpg \ No newline at end of file