diff --git a/.gitattributes b/.gitattributes index 2602b2e89c3..0f841b16701 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11163,6 +11163,7 @@ res/cardsfolder/w/white_ward.txt svneol=native#text/plain res/cardsfolder/w/whitemane_lion.txt svneol=native#text/plain res/cardsfolder/w/whiteout.txt -text res/cardsfolder/w/whitesuns_passage.txt svneol=native#text/plain +res/cardsfolder/w/wicked_akuba.txt -text res/cardsfolder/w/wicked_pact.txt svneol=native#text/plain res/cardsfolder/w/wicked_reward.txt svneol=native#text/plain res/cardsfolder/w/wicker_warcrawler.txt svneol=native#text/plain diff --git a/res/cardsfolder/a/absorb_vis.txt b/res/cardsfolder/a/absorb_vis.txt index fd64f22fe77..cece8df9c62 100644 --- a/res/cardsfolder/a/absorb_vis.txt +++ b/res/cardsfolder/a/absorb_vis.txt @@ -4,7 +4,7 @@ Types:Sorcery Text:no text K:TypeCycling:Basic:1 B A:SP$ LoseLife | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 4 life and you gain 4 life. -SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 4 +SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/absorb_vis.jpg SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/40.jpg diff --git a/res/cardsfolder/i/ill_gotten_gains.txt b/res/cardsfolder/i/ill_gotten_gains.txt index 51f2521658a..c1b3bf678dc 100644 --- a/res/cardsfolder/i/ill_gotten_gains.txt +++ b/res/cardsfolder/i/ill_gotten_gains.txt @@ -4,8 +4,8 @@ Types:Sorcery Text:no text A:SP$ Discard | Cost$ 2 B B | Mode$ Hand | Defined$ Each | SubAbility$ DBExile | SpellDescription$ Exile CARDNAME. Each player discards his or her hand, then returns up to three cards from his or her graveyard to his or her hand. SVar:DBExile:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ DBChangeZoneChoose -SVar:DBChangeZoneChoose:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeNum$ 3 | ChangeType$ Card | SubAbility$ DBChangeZonePC | Hidden$ True -SVar:DBChangeZonePC:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeNum$ 3 | ChangeType$ Card | Defined$ Opponent | Hidden$ True +SVar:DBChangeZoneChoose:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeNum$ 3 | ChangeType$ Card.YouCtrl | SubAbility$ DBChangeZonePC | Hidden$ True +SVar:DBChangeZonePC:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeNum$ 3 | ChangeType$ Card | DefinedPlayer$ Opponent | Hidden$ True SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/ill_gotten_gains.jpg diff --git a/res/cardsfolder/o/orzhov_euthanist.txt b/res/cardsfolder/o/orzhov_euthanist.txt index 1431e95a05b..e9f758eb29e 100644 --- a/res/cardsfolder/o/orzhov_euthanist.txt +++ b/res/cardsfolder/o/orzhov_euthanist.txt @@ -4,8 +4,8 @@ Types:Creature Human Assassin Text:no text PT:2/2 K:Haunt:TrigDestroy:Destroy target creature that was dealt damage this turn. -SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn. -Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Euthanist enters the battlefield or the creature it haunts dies, destroy target creature that was dealt damage this turn. +SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn. SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_euthanist.jpg SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/54.jpg +Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Euthanist enters the battlefield or the creature it haunts dies, destroy target creature that was dealt damage this turn. End \ No newline at end of file diff --git a/res/cardsfolder/w/wicked_akuba.txt b/res/cardsfolder/w/wicked_akuba.txt new file mode 100644 index 00000000000..e26fee065dc --- /dev/null +++ b/res/cardsfolder/w/wicked_akuba.txt @@ -0,0 +1,10 @@ +Name:Wicked Akuba +ManaCost:B B +Types:Creature Spirit +Text:no text +PT:2/2 +A:AB$ LoseLife | Cost$ B | ValidTgts$ Player.wasDealtDamageBySourceThisTurn | TgtPrompt$ Select target player that was dealt damage this turn | LifeAmount$ 1 | SpellDescription$ Target player dealt damage by CARDNAME this turn loses 1 life. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/wicked_akuba.jpg +SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/150.jpg +End \ 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 2d66a2d9d46..2e121d8c4b1 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -2371,6 +2371,10 @@ public abstract class Player extends GameEntity implements Comparable { if (!source.getDamageHistory().getThisGameDamaged().contains(this)) { return false; } + } else if (property.equals("wasDealtDamageBySourceThisTurn")) { + if (!source.getDamageHistory().getThisTurnDamaged().contains(this)) { + return false; + } } else if (property.startsWith("wasDealtDamageThisTurn")) { if (this.assignedDamage.isEmpty()) { return false;