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

Merge remote-tracking branch 'remotes/core/master' into newBranch

Browse Source
This commit is contained in:
Anthony Calosa
2020-04-15 17:48:41 +08:00
parent bd6a1f3a2b ca6873d893
commit ebd0e12bee
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1591,6 +1591,10 @@ public class AbilityUtils {
if (root.isTrigger()) { if (root.isTrigger()) {
Trigger t = root.getTrigger(); Trigger t = root.getTrigger();
if (t == null) {
return 0;
}
// 107.3k If an object’s enters-the-battlefield triggered ability or replacement effect refers to X, // 107.3k If an object’s enters-the-battlefield triggered ability or replacement effect refers to X,
// and the spell that became that object as it resolved had a value of X chosen for any of its costs, // and the spell that became that object as it resolved had a value of X chosen for any of its costs,
// the value of X for that ability is the same as the value of X for that spell, although the value of X for that permanent is 0. // the value of X for that ability is the same as the value of X for that spell, although the value of X for that permanent is 0.

6
forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -473,13 +473,13 @@ public class WrappedAbility extends Ability {
TriggerHandler th = game.getTriggerHandler(); TriggerHandler th = game.getTriggerHandler();
// set Trigger
sa.setTrigger(regtrig);
if (decider != null && !decider.getController().confirmTrigger(this, triggerParams, this.isMandatory())) { if (decider != null && !decider.getController().confirmTrigger(this, triggerParams, this.isMandatory())) {
return; return;
} }
// set Trigger
sa.setTrigger(regtrig);
if (!triggerParams.containsKey("NoTimestampCheck")) { if (!triggerParams.containsKey("NoTimestampCheck")) {
timestampCheck(); timestampCheck();
} }

8
forge-gui/res/cardsfolder/upcoming/call_of_the_death_dweller.txt Executable file
View File

@@ -0,0 +1,8 @@
Name:Call of the Death-Dweller
ManaCost:2 B
Types:Sorcery
A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 2 | MaxTotalTargetCMC$ 3 | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select up to two target creature cards with total converted mana cost 3 or less | SubAbility$ DBPutCounter | RememberChanged$ True | StackDescription$ SpellDescription | SpellDescription$ Return up to two target creature cards with total converted mana cost 3 or less from your graveyard to the battlefield. Put a deathtouch counter on either of them. Then put a menace counter on either of them.
SVar:DBPutCounter:DB$ PutCounter | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose a creature to put a deathtouch counter on | CounterType$ DEATHTOUCH | CounterNum$ 1 | SubAbility$ DBPutCounter2 | StackDescription$ None
SVar:DBPutCounter2:DB$ PutCounter | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose a creature to put a menace counter on | CounterType$ MENACE | CounterNum$ 1 | SubAbility$ DBCleanup | StackDescription$ None
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Return up to two target creature cards with total converted mana cost 3 or less from your graveyard to the battlefield. Put a deathtouch counter on either of them. Then put a menace counter on either of them.