diff --git a/.gitattributes b/.gitattributes index dd6a0e1d060..ae250c35958 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2250,6 +2250,7 @@ forge-gui/res/cardsfolder/b/bant_sureblade.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/bar_the_door.txt -text forge-gui/res/cardsfolder/b/barbarian_bully.txt -text forge-gui/res/cardsfolder/b/barbarian_general.txt svneol=native#text/plain +forge-gui/res/cardsfolder/b/barbarian_guides.txt -text forge-gui/res/cardsfolder/b/barbarian_horde.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/barbarian_lunatic.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/barbarian_outcast.txt svneol=native#text/plain diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java index 5ae63f8861a..cf5a78d6f53 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -548,7 +548,9 @@ public class CombatUtil { walkTypes.add("Land.Snow"); } else if (keyword.endsWith("walk")) { final String landtype = keyword.replace("walk", ""); - if (CardType.isALandType(landtype)) { + if (landtype.startsWith("Snow ")) { + walkTypes.add(landtype.substring(5) + ".Snow"); + } else if (CardType.isALandType(landtype)) { if (!walkTypes.contains(landtype)) { walkTypes.add(landtype); } diff --git a/forge-gui/res/cardsfolder/b/barbarian_guides.txt b/forge-gui/res/cardsfolder/b/barbarian_guides.txt new file mode 100644 index 00000000000..7e5ff9225fe --- /dev/null +++ b/forge-gui/res/cardsfolder/b/barbarian_guides.txt @@ -0,0 +1,12 @@ +Name:Barbarian Guides +ManaCost:2 R +Types:Creature Human Barbarian +PT:1/2 +A:AB$ ChooseType | Cost$ 2 R T | Defined$ You | Type$ Land | SubAbility$ DBPump | StackDescription$ SpellDescription | SpellDescription$ Choose a land type. Target creature you control gains snow landwalk of the chosen type until end of turn. Return that creature to its owner's hand at the beginning of the next end step. +SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Snow ChosenTypewalk | DefinedKW$ ChosenType | StackDescription$ None | SubAbility$ DBDelTrig +SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | RememberObjects$ ParentTarget | Execute$ TrigReturn | SpellDescription$ Return that creature to its owner's hand at the beginning of the next end step. +SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Hand +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/barbarian_guides.jpg +Oracle:{2}{R}, {T}: Choose a land type. Target creature you control gains snow landwalk of the chosen type until end of turn. Return that creature to its owner's hand at the beginning of the next end step.