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

Fix sacrifice cost with blockedBy target

Browse Source
This commit is contained in:
Bug Hunter
2021-02-26 15:01:46 +00:00
committed by Michael Kamensky
parent d6badf3b1e
commit ad218ee1f0
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -1533,6 +1533,8 @@ public class CardProperty {
// Nex predicates refer to past combat and don't need a reference to actual combat
else if (property.equals("blocked")) {
return null != combat && combat.isBlocked(card);
} else if (property.startsWith("blockedBySourceLKI")) {
return null != combat && combat.isBlocking(game.getChangeZoneLKIInfo(source), card);
} else if (property.startsWith("blockedBySource")) {
return null != combat && combat.isBlocking(source, card);
} else if (property.startsWith("blockedThisTurn")) {

2
forge-gui/res/cardsfolder/t/tinder_wall.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Plant Wall
PT:0/3
K:Defender
A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySource | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature it's blocking.
A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySourceLKI | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature it's blocking.
AI:RemoveDeck:All
SVar:Picture:http://www.wizards.com/global/images/magic/general/tinder_wall.jpg
Oracle:Defender (This creature can't attack.)\nSacrifice Tinder Wall: Add {R}{R}.\n{R}, Sacrifice Tinder Wall: It deals 2 damage to target creature it's blocking.

2
forge-gui/res/cardsfolder/w/wall_of_corpses.txt
View File

@@ -3,6 +3,6 @@ ManaCost:1 B
Types:Creature Wall
PT:0/2
K:Defender
A:AB$ Destroy | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySource | TgtPrompt$ Select target creature Wall of Corpses is blocking | SpellDescription$ Destroy target creature CARDNAME is blocking.
A:AB$ Destroy | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySourceLKI | TgtPrompt$ Select target creature Wall of Corpses is blocking | SpellDescription$ Destroy target creature CARDNAME is blocking.
SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_corpses.jpg
Oracle:Defender (This creature can't attack.)\n{B}, Sacrifice Wall of Corpses: Destroy target creature Wall of Corpses is blocking.