diff --git a/forge-gui/res/cardsfolder/f/fully_grown.txt b/forge-gui/res/cardsfolder/f/fully_grown.txt index ca5c0b7643a..0bbf6c7c7be 100644 --- a/forge-gui/res/cardsfolder/f/fully_grown.txt +++ b/forge-gui/res/cardsfolder/f/fully_grown.txt @@ -2,6 +2,6 @@ Name:Fully Grown ManaCost:2 G Types:Instant A:SP$ Pump | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SubAbility$ PutCounter | SpellDescription$ Target creature gets +3/+3 until end of turn. Put a trample counter on it. -SVar:PutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ TRAMPLE | CounterNum$ 1 +SVar:PutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Trample | CounterNum$ 1 DeckHas:Ability$Counters Oracle:Target creature gets +3/+3 until end of turn. Put a trample counter on it. diff --git a/forge-gui/res/cardsfolder/h/hornbash_mentor.txt b/forge-gui/res/cardsfolder/h/hornbash_mentor.txt index 291ecbd0dfa..c72ddd3c0af 100755 --- a/forge-gui/res/cardsfolder/h/hornbash_mentor.txt +++ b/forge-gui/res/cardsfolder/h/hornbash_mentor.txt @@ -3,7 +3,7 @@ ManaCost:2 G Types:Creature Human Warrior PT:3/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters the battlefield, put a trample counter on target non-Human creature you control. -SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.nonHuman+YouCtrl | TgtPrompt$ Select target non-Human creature you control | CounterType$ TRAMPLE | CounterNum$ 1 +SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.nonHuman+YouCtrl | TgtPrompt$ Select target non-Human creature you control | CounterType$ Trample | CounterNum$ 1 A:AB$ PutCounterAll | Cost$ 2 G T | ValidCards$ Creature.YouCtrl+withTrample | CounterType$ P1P1 | CounterNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Put a +1/+1 counter on each creature you control with trample. DeckHas:Ability$Counters Oracle:When Hornbash Mentor enters the battlefield, put a trample counter on target non-Human creature you control.\n{2}{G}, {T}: Put a +1/+1 counter on each creature you control with trample. diff --git a/forge-gui/res/cardsfolder/t/titanoth_rex.txt b/forge-gui/res/cardsfolder/t/titanoth_rex.txt index 676282a0ac4..24d952cad44 100755 --- a/forge-gui/res/cardsfolder/t/titanoth_rex.txt +++ b/forge-gui/res/cardsfolder/t/titanoth_rex.txt @@ -5,6 +5,6 @@ PT:11/11 K:Trample K:Cycling:1 G T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When you cycle CARDNAME, put a trample counter on target creature you control. -SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ TRAMPLE | CounterNum$ 1 +SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ Trample | CounterNum$ 1 DeckHas:Ability$Counters Oracle:Trample\nCycling {1}{G} ({1}{G}, Discard this card: Draw a card.)\nWhen you cycle Titanoth Rex, put a trample counter on target creature you control. diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 3675ca588c5..83d3e0453c5 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -296,6 +296,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont for (final Entry e : result.entrySet()) { if (gameCacheBlockers.containsKey(e.getKey())) { map.put(gameCacheBlockers.get(e.getKey()), e.getValue()); + } else if (e.getKey() == null || e.getKey().getId() == -1) { + // null key or key with -1 means defender + map.put(null, e.getValue()); } } } else {