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

Merge branch 'mic_25' into 'master'

Browse Source 
MIC - 25 Sep

See merge request core-developers/forge!5438
This commit is contained in:
Michael Kamensky
2021-09-26 17:55:08 +00:00
parent 8755cebaa3 82c06711e5
commit 00dba3b946
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
View File

@@ -147,7 +147,7 @@ public class CharmEffect extends SpellAbilityEffect {
@Override
protected String getStackDescription(SpellAbility sa) {
// TODO Build StackDescription based on Chosen SubAbilities
// StackDescription based on Chosen SubAbilities allowed in chainAbilities
return "";
}
@@ -228,8 +228,10 @@ public class CharmEffect extends SpellAbilityEffect {
// update ActivatingPlayer
clone.setActivatingPlayer(sa.getActivatingPlayer());
// make StackDescription be the SpellDescription
clone.putParam("StackDescription", "SpellDescription");
// make StackDescription be the SpellDescription if it doesn't already have one
if (!clone.hasParam("StackDescription")) {
clone.putParam("StackDescription", "SpellDescription");
}
// do not forget what was targeted by the subability
SpellAbility ssa = sub;

8
forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt Normal file
View File

@@ -0,0 +1,8 @@
Name:Cleaver Skaab
ManaCost:3 U
Types:Creature Zombie Horror
PT:2/4
A:AB$ CopyPermanent | Cost$ 3 T Sac<1/Zombie.Other/another zombie> | Defined$ Sacrificed | NumCopies$ 2
DeckNeeds:Type$Zombie
DeckHas:Ability$Sacrifice & Ability$Token
Oracle:{3}, {T}, Sacrifice another Zombie: Create two tokens that are copies of the sacrificed creature.

11
forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt Normal file
View File

@@ -0,0 +1,11 @@
Name:Drown in Dreams
ManaCost:X 2 U
Types:Instant
A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ W | Choices$ DBDraw,DBMill | AdditionalDescription$ . If you control a commander as you cast this spell, you may choose both.
SVar:DBDraw:DB$ Draw | ValidTgts$ Player | TgtPrompt$ Select target player to draw cards | NumCards$ X | StackDescription$ {p:ThisTargetedPlayer} draws X cards. | SpellDescription$ Target player draws X cards.
SVar:DBMill:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player to mill cards | NumCards$ Z | StackDescription$ {p:ThisTargetedPlayer} mills twice X cards. | SpellDescription$ Target player mills twice X cards.
SVar:W:Count$Compare Y GE1.2.1
SVar:X:Count$xPaid
SVar:Y:Count$Valid Card.IsCommander+YouCtrl
SVar:Z:Count$xPaid/Twice
Oracle:Choose one. If you control a commander as you cast this spell, you may choose both.\n• Target player draws X cards.\n• Target player mills twice X cards.

12
forge-gui/res/cardsfolder/upcoming/shadow_kin.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Shadow Kin
ManaCost:3 U
Types:Creature Shapeshifter
PT:2/2
K:Flash
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMillSK | TriggerDescription$ At the beginning of your upkeep, each player mills three cards. You may exile a creature card from among the cards milled this way. If you do, CARDNAME becomes a copy of that card, except it has this ability.
SVar:TrigMillSK:DB$ Mill | Defined$ Player | NumCards$ 3 | RememberMilled$ True | SubAbility$ DBExileSK
SVar:DBExileSK:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Hidden$ True | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Imprint$ True | ForgetOtherRemembered$ True | SelectPrompt$ You may exile a creature card from among the cards milled this way. | SubAbility$ DBCloneSK
SVar:DBCloneSK:DB$ Clone | ConditionDefined$ Imprinted | ConditionZone$ Exile | ConditionPresent$ Card | Defined$ Imprinted | GainThisAbility$ True
DeckHas:Ability$Mill
DeckHints:Ability$Graveyard
Oracle:Flash\nAt the beginning of your upkeep, each player mills three cards. You may exile a creature card from among the cards milled this way. If you do, Shadow Kin becomes a copy of that card, except it has this ability.