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

Merge branch 'companion2.0' into 'master'

Browse Source 
Update companion rules to move to hand for 3 mana

See merge request core-developers/forge!2933
This commit is contained in:
swordshine
2020-06-29 09:58:39 +00:00
parent 13350eee68 3c171b2cbc
commit 6da3c6dd4b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -3009,9 +3009,12 @@ public class Player extends GameEntity implements Comparable<Player> {
final String name = Lang.getPossesive(companion.getName()) + " Companion Effect";
DetachedCardEffect eff = new DetachedCardEffect(companion, name);
String mayBePlayedAbility = "Mode$ Continuous | EffectZone$ Command | MayPlay$ True | Affected$ Card.YouOwn+EffectSource | AffectedZone$ Command";
eff.addStaticAbility(mayBePlayedAbility);
// Probably remove this effect when the spell is cast via a static trigger
String addToHandAbility = "Mode$ Continuous | EffectZone$ Command | Affected$ Card.YouOwn+EffectSource | AffectedZone$ Command | AddAbility$ MoveToHand";
String moveToHand = "ST$ ChangeZone | Cost$ 3 | Defined$ Self | Origin$ Command | Destination$ Hand | ActivationZone$ Command | SpellDescription$ Companion - Put CARDNAME in to your hand";
eff.setSVar("MoveToHand", moveToHand);
eff.addStaticAbility(addToHandAbility);
// TODO Probably remove this effect when the moved to hand
return eff;
}

2
forge-gui/res/cardsfolder/m/mask_of_the_mimic.txt
View File

@@ -1,7 +1,7 @@
Name:Mask of the Mimic
ManaCost:U
Types:Instant
A:SP$ Pump | Cost$ U Sac<1/Creature> | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | Static$ True | StackDescription$ None | SubAbility$ DBChangeZone
A:SP$ Pump | Cost$ U Sac<1/Creature> | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | StackDescription$ None | SubAbility$ DBChangeZone
SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Targeted.sameName | ChangeNum$ 1 | Hidden$ True | StackDescription$ Search your library for a card with the same name as target nontoken creature and put that card onto the battlefield. | SpellDescription$ As an additional cost to cast CARDNAME, sacrifice a creature. Search your library for a card with the same name as target nontoken creature and put that card onto the battlefield. Then shuffle your library.
AI:RemoveDeck:All
SVar:Picture:http://www.wizards.com/global/images/magic/general/mask_of_the_mimic.jpg