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

Merge branch 'mill' into 'master'

Browse Source 
Fix optional Mill

See merge request core-developers/forge!6016
This commit is contained in:
Michael Kamensky
2022-01-05 16:17:40 +00:00
parent 886bc51db7 62bc1b4ecd
commit 7e804c11a5
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
View File

@@ -40,7 +40,8 @@ public class MillEffect extends SpellAbilityEffect {
if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) { if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) {
if (sa.hasParam("Optional")) { if (sa.hasParam("Optional")) {
final String prompt = TextUtil.concatWithSpace(Localizer.getInstance().getMessage("lblDoYouWantPutLibraryCardsTo", destination.getTranslatedName())); final String prompt = TextUtil.concatWithSpace(Localizer.getInstance().getMessage("lblDoYouWantPutLibraryCardsTo", destination.getTranslatedName()));
if (!p.getController().confirmAction(sa, null, prompt)) { // CR 701.13b
if (numCards > p.getZone(ZoneType.Library).size() || !p.getController().confirmAction(sa, null, prompt)) {
continue; continue;
} }
} }

4
forge-gui/res/cardsfolder/c/crawling_infestation.txt
View File

@@ -1,8 +1,8 @@
Name:Crawling Infestation Name:Crawling Infestation
ManaCost:2 G ManaCost:2 G
Types:Enchantment Types:Enchantment
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may mill two cards. (You may put the top two cards of your library into your graveyard.) T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may mill two cards. (You may put the top two cards of your library into your graveyard.)
SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You | Optional$ True
T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | PlayerTurn$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from anywhere during your turn, create a 1/1 green Insect creature token. This ability triggers only once each turn. T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | PlayerTurn$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from anywhere during your turn, create a 1/1 green Insect creature token. This ability triggers only once each turn.
SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_insect SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_insect
DeckHas:Ability$Mill & Ability$Token DeckHas:Ability$Mill & Ability$Token

4
forge-gui/res/cardsfolder/c/crawling_sensation.txt
View File

@@ -1,8 +1,8 @@
Name:Crawling Sensation Name:Crawling Sensation
ManaCost:2 G ManaCost:2 G
Types:Enchantment Types:Enchantment
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may mill two cards. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may mill two cards.
SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You | Optional$ True
T:Mode$ ChangesZone | ValidCard$ Land.YouOwn | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere for the first time each turn, create a 1/1 green Insect creature token. T:Mode$ ChangesZone | ValidCard$ Land.YouOwn | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere for the first time each turn, create a 1/1 green Insect creature token.
SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_insect | TokenOwner$ You SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_insect | TokenOwner$ You
DeckHints:Ability$Delirium DeckHints:Ability$Delirium

4
forge-gui/res/cardsfolder/c/crop_sigil.txt
View File

@@ -1,8 +1,8 @@
Name:Crop Sigil Name:Crop Sigil
ManaCost:G ManaCost:G
Types:Enchantment Types:Enchantment
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may mill a card. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may mill a card.
SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | Optional$ True
A:AB$ ChangeZone | Cost$ 2 G Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouOwn | SubAbility$ DBReturn | Activation$ Delirium | PrecostDesc$ Delirium — | SpellDescription$ Return up to one target creature card and up to one target land card from your graveyard to your hand. Activate only if there are four or more card types among cards in your graveyard. A:AB$ ChangeZone | Cost$ 2 G Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouOwn | SubAbility$ DBReturn | Activation$ Delirium | PrecostDesc$ Delirium — | SpellDescription$ Return up to one target creature card and up to one target land card from your graveyard to your hand. Activate only if there are four or more card types among cards in your graveyard.
SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Land.YouOwn | TgtPrompt$ Select target land card in your graveyard SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Land.YouOwn | TgtPrompt$ Select target land card in your graveyard
DeckHints:Ability$Graveyard & Ability$Discard DeckHints:Ability$Graveyard & Ability$Discard

4
forge-gui/res/cardsfolder/s/shard_of_broken_glass.txt
View File

@@ -2,7 +2,7 @@ Name:Shard of Broken Glass
ManaCost:1 ManaCost:1
Types:Artifact Equipment Types:Artifact Equipment
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0. S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0.
T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigMill | OptionalDecider$ You | TriggerDescription$ Whenever equipped creature attacks, you may mill two cards. T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigMill | TriggerDescription$ Whenever equipped creature attacks, you may mill two cards.
SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You | Optional$ True
K:Equip:1 K:Equip:1
Oracle:Equipped creature gets +1/+0.\nWhenever equipped creature attacks, you may mill two cards.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) Oracle:Equipped creature gets +1/+0.\nWhenever equipped creature attacks, you may mill two cards.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)

4
forge-gui/res/cardsfolder/w/world_shaper.txt
View File

@@ -2,8 +2,8 @@ Name:World Shaper
ManaCost:3 G ManaCost:3 G
Types:Creature Merfolk Shaman Types:Creature Merfolk Shaman
PT:3/3 PT:3/3
T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, you may mill three cards. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, you may mill three cards.
SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | Optional$ True
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZoneAll | TriggerController$ TriggeredCardController | TriggerDescription$ When World Shaper dies, put all land cards from your graveyard onto the battlefield tapped. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZoneAll | TriggerController$ TriggeredCardController | TriggerDescription$ When World Shaper dies, put all land cards from your graveyard onto the battlefield tapped.
SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Land.YouCtrl | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Land.YouCtrl | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
DeckHints:Ability$Graveyard DeckHints:Ability$Graveyard