diff --git a/.gitattributes b/.gitattributes index f52582b86d3..cb4aadaf24d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1468,6 +1468,7 @@ res/cardsfolder/c/caller_of_gales.txt svneol=native#text/plain res/cardsfolder/c/caller_of_the_claw.txt svneol=native#text/plain res/cardsfolder/c/callous_deceiver.txt svneol=native#text/plain res/cardsfolder/c/callous_giant.txt svneol=native#text/plain +res/cardsfolder/c/callous_oppressor.txt -text res/cardsfolder/c/callow_jushi_jaraku_the_interloper.txt -text res/cardsfolder/c/calming_licid.txt -text res/cardsfolder/c/calming_verse.txt svneol=native#text/plain diff --git a/res/cardsfolder/b/back_from_the_brink.txt b/res/cardsfolder/b/back_from_the_brink.txt index 2c137884b68..a6279936271 100644 --- a/res/cardsfolder/b/back_from_the_brink.txt +++ b/res/cardsfolder/b/back_from_the_brink.txt @@ -3,5 +3,5 @@ ManaCost:4 U U Types:Enchantment Text:no text A:AB$ CopyPermanent | Cost$ ExileAndPay | Defined$ Exiled | SorcerySpeed$ True | SpellDescription$ Put a token onto the battlefield that's a copy of that card. Activate this ability only any time you could cast a sorcery. -SetInfo:ISD Rare Oracle:Exile a creature card from your graveyard and pay its mana cost: Put a token onto the battlefield that's a copy of that card. Activate this ability only any time you could cast a sorcery. +SetInfo:ISD Rare \ No newline at end of file diff --git a/res/cardsfolder/c/callous_oppressor.txt b/res/cardsfolder/c/callous_oppressor.txt new file mode 100644 index 00000000000..dbaf1c532b5 --- /dev/null +++ b/res/cardsfolder/c/callous_oppressor.txt @@ -0,0 +1,13 @@ +Name:Callous Oppressor +ManaCost:1 U U +Types:Creature Cephalid +PT:1/2 +K:You may choose not to untap CARDNAME during your untap step. +K:ETBReplacement:Other:DBChooseOpp +SVar:DBChooseOpp:DB$ ChoosePlayer | ChoiceTitle$ Choose an opponent | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, an opponent chooses a creature type. | SubAbility$ DBChooseType +SVar:DBChooseType:DB$ ChooseType | Defined$ Player.Chosen | Type$ Creature | AILogic$ MostProminentComputerControls +A:AB$ GainControl | Cost$ T | ValidTgts$ Creature.IsNotChosenType | TgtPrompt$ Select target creature that isn't of the chosen type | LoseControl$ Untap,LeavesPlay | SpellDescription$ Gain control of target creature that isn't of the chosen type for as long as CARDNAME remains tapped. +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/callous_oppressor.jpg +Oracle:You may choose not to untap Callous Oppressor during your untap step.\nAs Callous Oppressor enters the battlefield, an opponent chooses a creature type.\n{T}: Gain control of target creature that isn't of the chosen type for as long as Callous Oppressor remains tapped. +SetInfo:ONS Rare \ No newline at end of file diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index d1911193e3f..2d604096343 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -6467,6 +6467,10 @@ public class Card extends GameEntity implements Comparable { if (!this.isType(source.getChosenType())) { return false; } + } else if (property.equals("IsNotChosenType")) { + if (this.isType(source.getChosenType())) { + return false; + } } else if (property.equals("IsCommander")) { if(!this.isCommander) { return false;