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

- Cunning Giant will now interact correctly with planeswalkers

Browse Source
This commit is contained in:
moomarc
2013-02-06 06:03:50 +00:00
parent d3bb37a368
commit 53635ddc1a
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/c/cunning_giant.txt
View File

@@ -4,7 +4,9 @@ Types:Creature Giant
Text:no text
PT:4/4
R:Event$ DamageDone | ValidTarget$ Player.attackedBySourceThisCombat | ValidSource$ Card.Self+unblocked | IsCombat$ True | ReplaceWith$ ChooseVictim | Optional$ True | OptionalDecider$ You | Description$ If CARDNAME is unblocked, you may have it assign its combat damage to a creature defending player controls.
R:Event$ DamageDone | ValidTarget$ Planeswalker.attackedBySourceThisCombat | ValidSource$ Card.Self+unblocked | IsCombat$ True | ReplaceWith$ ChooseVictimPW | Optional$ True | OptionalDecider$ You | Secondary$ True | Description$ If CARDNAME is unblocked, you may have it assign its combat damage to a creature defending player controls.
SVar:ChooseVictim:DB$ ChooseCard | ChoiceZone$ Battlefield | Choices$ Creature.DefenderCtrl | Amount$ 1 | ChoiceTitle$ Choose a card to deal the damage to | SubAbility$ CunningDmg
SVar:ChooseVictimPW:DB$ ChooseCard | ChoiceZone$ Battlefield | Choices$ Creature.DefenderCtrl | Amount$ 1 | ChoiceTitle$ Choose a card to deal the damage to | SubAbility$ CunningDmg
SVar:CunningDmg:DB$ DealDamage | Defined$ ChosenCard | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ CunningX
SVar:CunningX:ReplaceCount$DamageAmount
SVar:RemAIDeck:True

7
src/main/java/forge/Card.java
View File

@@ -7007,6 +7007,13 @@ public class Card extends GameEntity implements Comparable<Card> {
if (this.isAttacking()) {
return false;
}
} else if (property.equals("attackedBySourceThisCombat")) {
final GameEntity defender = Singletons.getModel().getGame().getCombat().getDefenderByAttacker(source);
if (defender instanceof Card) {
if (!this.equals((Card) defender)) {
return false;
}
}
} else if (property.equals("blocking")) {
if (!this.isBlocking()) {
return false;