diff --git a/.gitattributes b/.gitattributes index cad9897ec1b..f317f510e2d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7250,6 +7250,7 @@ res/cardsfolder/n/natures_will.txt -text res/cardsfolder/n/natures_wrath.txt svneol=native#text/plain res/cardsfolder/n/nausea.txt svneol=native#text/plain res/cardsfolder/n/nav_squad_commandos.txt -text +res/cardsfolder/n/naya.txt -text res/cardsfolder/n/naya_battlemage.txt svneol=native#text/plain res/cardsfolder/n/naya_charm.txt -text res/cardsfolder/n/naya_hushblade.txt svneol=native#text/plain @@ -9177,6 +9178,7 @@ res/cardsfolder/s/sanctuary_cat.txt -text res/cardsfolder/s/sanctum_custodian.txt svneol=native#text/plain res/cardsfolder/s/sanctum_gargoyle.txt svneol=native#text/plain res/cardsfolder/s/sanctum_guardian.txt -text +res/cardsfolder/s/sanctum_of_serra.txt -text res/cardsfolder/s/sanctum_plowbeast.txt svneol=native#text/plain res/cardsfolder/s/sand_golem.txt -text res/cardsfolder/s/sand_silos.txt svneol=native#text/plain diff --git a/res/cardsfolder/n/naya.txt b/res/cardsfolder/n/naya.txt new file mode 100644 index 00000000000..cc46e004240 --- /dev/null +++ b/res/cardsfolder/n/naya.txt @@ -0,0 +1,10 @@ +Name:Naya +ManaCost:no cost +Types:Plane Alara +Text:You may play any number of additional lands on each of your turns. +T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, target red, green, or white creature you control gets +1/+1 until end of turn for each land you control. +SVar:RolledChaos:AB$ Pump | Cost$ 0 | ValidTgts$ Creature.Red+YouCtrl,Creature.Green+YouCtrl,Creature.White+YouCtrl | TgtPrompt$ Select target red, green, or white creature you control | NumAtt$ Y | NumDef$ Y | References$ Y +SVar:Y:Count$Valid Land.YouCtrl +SVar:Picture:http://www.wizards.com/global/images/magic/general/naya.jpg +Oracle:You may play any number of additional lands on each of your turns.\nWhenever you roll {C}, target red, green, or white creature you control gets +1/+1 until end of turn for each land you control. +SetInfo:HOP Common \ No newline at end of file diff --git a/res/cardsfolder/s/sanctum_of_serra.txt b/res/cardsfolder/s/sanctum_of_serra.txt new file mode 100644 index 00000000000..d99698e616a --- /dev/null +++ b/res/cardsfolder/s/sanctum_of_serra.txt @@ -0,0 +1,10 @@ +Name:Sanctum of Serra +ManaCost:no cost +Types:Plane Serra's Realm +T:Mode$ PlaneswalkedFrom | ValidCard$ Plane.Self | Execute$ TrigDestroy | TriggerDescription$ When you planeswalk away from CARDNAME, destroy all nonland permanents. +SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Permanent.nonLand | ValidDesc$ all nonland permanents +T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | OptionalDecider$ You | TriggerDescription$ Whenever you roll Chaos, you may have your life total become 20. +SVar:RolledChaos:AB$ SetLife | Cost$ 0 | Defined$ You | LifeAmount$ 20 +SVar:Picture:http://www.wizards.com/global/images/magic/general/sanctum_of_serra.jpg +Oracle:When you planeswalk away from Sanctum of Serra, destroy all nonland permanents.\nWhenever you roll {C}, you may have your life total become 20. +SetInfo:HOP Common \ No newline at end of file diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index c6fc95382c7..3f909f1945f 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -1853,7 +1853,7 @@ public class Player extends GameEntity implements Comparable { final int adjCheck = this.maxLandsToPlay + adjMax; // System.out.println("Max lands for player " + this.getName() + ": " + adjCheck); - return this.numLandsPlayed < adjCheck || this.isCardInPlay("Fastbond"); + return this.numLandsPlayed < adjCheck || this.isCardInPlay("Fastbond") || this.isCardInCommand("Naya"); } /**