diff --git a/.gitattributes b/.gitattributes index b73504c4c95..5133f73b7a5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5541,6 +5541,7 @@ forge-gui/res/cardsfolder/d/duergar_hedge_mage.txt svneol=native#text/plain forge-gui/res/cardsfolder/d/duergar_mine_captain.txt svneol=native#text/plain forge-gui/res/cardsfolder/d/dukhara_peafowl.txt -text forge-gui/res/cardsfolder/d/dukhara_scavenger.txt -text +forge-gui/res/cardsfolder/d/dulcet_sirens.txt -text forge-gui/res/cardsfolder/d/dune_beetle.txt -text forge-gui/res/cardsfolder/d/dune_brood_nephilim.txt svneol=native#text/plain forge-gui/res/cardsfolder/d/dune_diviner.txt -text diff --git a/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java index 5d8e95be4ed..595a2bd82ea 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java @@ -54,6 +54,8 @@ public class MustAttackEffect extends SpellAbilityEffect { entity = sa.getHostCard(); } else if (defender.equals("You")) { entity = sa.getActivatingPlayer(); + } else if (defender.equals("ParentTargeted")) { + entity = (GameEntity)sa.getParent().getTargets().getFirstTargetedPlayer(); } else { throw new RuntimeException("Illegal defender " + defender + " for MustAttackEffect in card " + sa.getHostCard()); } diff --git a/forge-gui/res/cardsfolder/d/dulcet_sirens.txt b/forge-gui/res/cardsfolder/d/dulcet_sirens.txt new file mode 100644 index 00000000000..a990a7de0c3 --- /dev/null +++ b/forge-gui/res/cardsfolder/d/dulcet_sirens.txt @@ -0,0 +1,10 @@ +Name:Dulcet Sirens +ManaCost:2 U +Types:Creature Siren +PT:1/3 +K:Morph:U +A:AB$ Pump | Cost$ U T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBMustAttack | SpellDescription$ Target creature attacks target opponent this turn if able. +SVar:DBMustAttack:DB$ MustAttack | ValidTgts$ Creature | TgtPrompt$ Select target creature | Defender$ ParentTargeted | ThisTurn$ True +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/dulcet_sirens.jpg +Oracle:{U}, {T}: Target creature attacks target opponent this turn if able.\nMorph {U} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) diff --git a/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt b/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt index 84fa4d56873..cbf84afd614 100644 --- a/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt +++ b/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt @@ -3,7 +3,7 @@ ManaCost:no cost Types:Vanguard HandLifeModifier:+0/-6 A:AB$ ChooseSource | Cost$ 0 | ActivationZone$ Command | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBTargetOpp | ActivationLimit$ 1 | SpellDescription$ If damage would be dealt to you this turn by a source of your choice, prevent that damage. CARDNAME deals damage to you and target opponent equal to half the damage prevented this way, rounded up. Activate this ability only once each turn. -SVar:DBTargetOpp:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to give damamge | RememberObjects$ Targeted | StackDescription$ None | SubAbility$ DBEffect +SVar:DBTargetOpp:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to give damage | RememberObjects$ Targeted | StackDescription$ None | SubAbility$ DBEffect SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | RememberObjects$ Remembered | SVars$ DamageEffectYou,DamageEffectPlayer,X | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | PreventionEffect$ True | ReplaceWith$ DamageEffectYou | Description$ If damage would be dealt to you this turn by a source of your choice, prevent that damage. Stuffy Doll Avatar deals damage to you and target opponent equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.