external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- A more appropriate fix for Quicksmith Rebel / Quicksmith Spy.

Browse Source
This commit is contained in:
Agetian
2017-01-11 14:08:32 +00:00
parent 004ac7d91a
commit e86a709d72
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
View File

@@ -38,7 +38,7 @@ public class AnimateEffect extends AnimateEffectBase {
String animateRemembered = null;
//if host is not on the battlefield don't apply
if (sa.hasParam("UntilHostLeavesPlay")
if ((sa.hasParam("UntilHostLeavesPlay") || sa.hasParam("UntilLoseControlOfHost"))
&& !sa.getHostCard().isInPlay()) {
return;
}
@@ -301,6 +301,9 @@ public class AnimateEffect extends AnimateEffectBase {
game.getEndOfCombat().addUntil(unanimate);
} else if (sa.hasParam("UntilHostLeavesPlay")) {
source.addLeavesPlayCommand(unanimate);
} else if (sa.hasParam("UntilLoseControlOfHost")) {
sa.getHostCard().addLeavesPlayCommand(unanimate);
sa.getHostCard().addChangeControllerCommand(unanimate);
} else if (sa.hasParam("UntilYourNextUpkeep")) {
game.getUpkeep().addUntil(source.getController(), unanimate);
} else if (sa.hasParam("UntilTheEndOfYourNextUpkeep")) {

2
forge-gui/res/cardsfolder/upcoming/quicksmith_rebel.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 R
Types:Creature Human Artificer
PT:3/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, target artifact you control gains "{T}: This artifact deals 2 damage to target creature or player" for as long as you control CARDNAME.
SVar:TrigAnimate:AB$ Animate | Cost$ 0 | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Abilities$ ABDealDamage | UntilHostLeavesPlay$ True
SVar:TrigAnimate:AB$ Animate | Cost$ 0 | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Abilities$ ABDealDamage | UntilLoseControlOfHost$ True
SVar:ABDealDamage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
SVar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksmith_rebel.jpg

2
forge-gui/res/cardsfolder/upcoming/quicksmith_spy.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 U
Types:Creature Human Artificer
PT:2/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, target artifact you control gains "{T}: This artifact deals 2 damage to target creature or player" for as long as you control CARDNAME.
SVar:TrigAnimate:AB$ Animate | Cost$ 0 | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Abilities$ ABDraw | UntilHostLeavesPlay$ True
SVar:TrigAnimate:AB$ Animate | Cost$ 0 | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Abilities$ ABDraw | UntilLoseControlOfHost$ True
SVar:ABDraw:AB$Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card.
SVar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksmith_spy.jpg