diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index d2be541192c..d0575e1e793 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -1395,7 +1395,8 @@ public class CardProperty { return false; } } else if (property.startsWith("power") || property.startsWith("toughness") - || property.startsWith("cmc") || property.startsWith("totalPT")) { + || property.startsWith("cmc") || property.startsWith("totalPT") + || property.startsWith("effectiveToughness")) { int x; int y = 0; String rhs = ""; @@ -1406,6 +1407,9 @@ public class CardProperty { } else if (property.startsWith("toughness")) { rhs = property.substring(11); y = card.getNetToughness(); + } else if (property.startsWith("effectiveToughness")) { + rhs = property.substring(20); + y = card.getNetToughness() - card.getDamage(); } else if (property.startsWith("cmc")) { rhs = property.substring(5); y = card.getCMC(); diff --git a/forge-gui/res/cardsfolder/t/tilonallis_crown.txt b/forge-gui/res/cardsfolder/t/tilonallis_crown.txt index 602db178f0d..6a30dbc3e03 100644 --- a/forge-gui/res/cardsfolder/t/tilonallis_crown.txt +++ b/forge-gui/res/cardsfolder/t/tilonallis_crown.txt @@ -2,7 +2,7 @@ Name:Tilonalli's Crown ManaCost:1 R Types:Enchantment Aura K:Enchant creature -A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump | AITgts$ Creature.YouCtrl+toughnessGT1 +A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump | AITgts$ Creature.YouCtrl+effectiveToughnessGT1 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to enchanted creature. SVar:TrigDealDamage:DB$ DealDamage | Defined$ Enchanted | NumDmg$ 1 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Enchanted creature gets +3/+0 and has trample.