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

- Added the property NotEnchantedBy to fix Bravado.

Browse Source
This commit is contained in:
Sloth
2011-10-19 20:56:05 +00:00
parent 88d3df76f6
commit 4169dfd545
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/b/bravado.txt
View File

@@ -5,7 +5,7 @@ Text:no text
K:Enchant creature
A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets +1/+1 for each other creature you control.
SVar:X:Count$Valid Creature.YouCtrl/Minus.1
SVar:X:Count$Valid Creature.NotEnchantedBy+YouCtrl
SVar:BuffedBy:Creature
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/bravado.jpg

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

@@ -5043,6 +5043,8 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!equipping.contains(source) && !source.equals(enchanting)) return false;
} else if (Property.startsWith("EnchantedBy")) {
if (!enchantedBy.contains(source)) return false;
} else if (Property.startsWith("NotEnchantedBy")) {
if (enchantedBy.contains(source)) return false;
} else if (Property.startsWith("Enchanted")) {
if (!source.equals(enchanting)) return false;
} else if (Property.startsWith("EquippedBy")) {

2
src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
View File

@@ -860,7 +860,7 @@ public final class AbilityFactory_Combat {
list = list.getValidCards(abTgt.getValidTgts(), source.getController(), source);
list = list.filter(new CardListFilter() {
public boolean addCard(Card c) {
if (!CombatUtil.canBlock(source, c, AllZone.getCombat()))
if (!CombatUtil.canBlock(source, c))
return false;
if (CombatUtil.canDestroyAttacker(source, c, AllZone.getCombat(), false))
return false;