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 fd82c25ec8e..1e3df37597c 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -1422,7 +1422,8 @@ public class CardProperty { return false; } } else if (property.startsWith("power") || property.startsWith("toughness") || property.startsWith("cmc") - || property.startsWith("totalPT") || property.startsWith("numColors")) { + || property.startsWith("totalPT") || property.startsWith("numColors") + || property.startsWith("basePower") || property.startsWith("baseToughness")) { int x; int y = 0; String rhs = ""; @@ -1430,9 +1431,15 @@ public class CardProperty { if (property.startsWith("power")) { rhs = property.substring(7); y = card.getNetPower(); + } else if (property.startsWith("basePower")) { + rhs = property.substring(11); + y = card.getCurrentPower(); } else if (property.startsWith("toughness")) { rhs = property.substring(11); y = card.getNetToughness(); + } else if (property.startsWith("baseToughness")) { + rhs= property.substring(15); + y = card.getCurrentToughness(); } else if (property.startsWith("cmc")) { rhs = property.substring(5); y = card.getCMC(); diff --git a/forge-gui/res/cardsfolder/upcoming/bess_soul_nourisher.txt b/forge-gui/res/cardsfolder/upcoming/bess_soul_nourisher.txt new file mode 100644 index 00000000000..d040f0220ab --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/bess_soul_nourisher.txt @@ -0,0 +1,14 @@ +Name:Bess, Soul Nourisher +ManaCost:1 G W +Types:Legendary Creature Human Citizen +PT:1/1 +T:Mode$ ChangesZoneAll | ValidCards$ Creature.basePowerEQ1+baseToughnessEQ1+Other | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more other creatures with base power and toughness 1/1 enter the battlefield under your control, put a +1/+1 counter on CARDNAME. +SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Whenever NICKNAME attacks, each other creature you control with base power and toughness 1/1 gets +X/+X until end of turn, where X is the number of +1/+1 counters on NICKNAME. +SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.basePowerEQ1+baseToughnessEQ1+Other | NumAtt$ +X | NumDef$ +X +SVar:X:Count$CardCounters.P1P1 +DeckHas:Ability$Counters +DeckHints:Type$Citizen +SVar:HasAttackEffect:TRUE +SVar:BuffedBy:Creature.powerEQ1,Creature.toughnessEQ1 +Oracle:Whenever one or more other creatures with base power and toughness 1/1 enter the battlefield under your control, put a +1/+1 counter on Bess, Soul Nourisher.\nWhenever Bess attacks, each other creature you control with base power and toughness 1/1 gets +X/+X until end of turn, where X is the number of +1/+1 counters on Bess.