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

PlayerControllerHuman: fix trample assign to defender, fix trample counter

Browse Source
This commit is contained in:
Hans Mackowiak
2020-06-06 09:10:05 +02:00
parent f60fdf3fa5
commit 653d214027
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/cardsfolder/f/fully_grown.txt
View File

@@ -2,6 +2,6 @@ Name:Fully Grown
ManaCost:2 G ManaCost:2 G
Types:Instant 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. 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 DeckHas:Ability$Counters
Oracle:Target creature gets +3/+3 until end of turn. Put a trample counter on it. Oracle:Target creature gets +3/+3 until end of turn. Put a trample counter on it.

2
forge-gui/res/cardsfolder/h/hornbash_mentor.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 G
Types:Creature Human Warrior Types:Creature Human Warrior
PT:3/3 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. 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. 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 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. 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.

2
forge-gui/res/cardsfolder/t/titanoth_rex.txt
View File

@@ -5,6 +5,6 @@ PT:11/11
K:Trample K:Trample
K:Cycling:1 G 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. 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 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. 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.

3
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -296,6 +296,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
for (final Entry<CardView, Integer> e : result.entrySet()) { for (final Entry<CardView, Integer> e : result.entrySet()) {
if (gameCacheBlockers.containsKey(e.getKey())) { if (gameCacheBlockers.containsKey(e.getKey())) {
map.put(gameCacheBlockers.get(e.getKey()), e.getValue()); 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 { } else {