diff --git a/.gitattributes b/.gitattributes index 48dbde6f7e4..fa674c8c5ba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1185,6 +1185,7 @@ res/cardsfolder/c/captivating_vampire.txt svneol=native#text/plain res/cardsfolder/c/captive_flame.txt svneol=native#text/plain res/cardsfolder/c/capture_of_jingzhou.txt svneol=native#text/plain res/cardsfolder/c/captured_sunlight.txt svneol=native#text/plain +res/cardsfolder/c/carapace.txt -text res/cardsfolder/c/carapace_forger.txt svneol=native#text/plain res/cardsfolder/c/caravan_escort.txt svneol=native#text/plain res/cardsfolder/c/caravan_hurda.txt svneol=native#text/plain diff --git a/res/cardsfolder/c/carapace.txt b/res/cardsfolder/c/carapace.txt new file mode 100644 index 00000000000..e6ae97022db --- /dev/null +++ b/res/cardsfolder/c/carapace.txt @@ -0,0 +1,14 @@ +Name:Carapace +ManaCost:G +Types:Enchantment Aura +Text:no text +K:Enchant creature +A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 2 | Description$ Enchanted creature gets +0/+2. +A:AB$ Regenerate | Cost$ Sac<1/CARDNAME> | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/carapace.jpg +SetInfo:HML|Common|http://magiccards.info/scans/en/hl/54.jpg +SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/143.jpg +Oracle:Enchant creature\nEnchanted creature gets +0/+2.\nSacrifice Carapace: Regenerate enchanted creature. +End \ No newline at end of file diff --git a/res/cardsfolder/g/gorilla_war_cry.txt b/res/cardsfolder/g/gorilla_war_cry.txt index 542849aa284..f19c406a181 100644 --- a/res/cardsfolder/g/gorilla_war_cry.txt +++ b/res/cardsfolder/g/gorilla_war_cry.txt @@ -8,4 +8,6 @@ SVar:Blocking:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN C SVar:PlayMain1:TRUE SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/gorilla_war_cry.jpg +SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/108.jpg +Oracle:Cast Gorilla War Cry only during combat before blockers are declared.\nCreatures can't be blocked this turn except by two or more creatures.\nDraw a card at the beginning of the next turn's upkeep. End \ No newline at end of file diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index 2b5a3b21def..66bebdf26fe 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/src/main/java/forge/card/cost/CostSacrifice.java @@ -125,6 +125,7 @@ public class CostSacrifice extends CostPartWithList { */ @Override public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) { + this.addListToHash(ability, "Sacrificed"); for (final Card c : this.getList()) { AllZone.getGameAction().sacrifice(c); }