Merge origin/master

This commit is contained in:
LevelX2 2017-10-21 16:14:14 +02:00
commit 919ec2fade
62 changed files with 2504 additions and 253 deletions

View file

@ -81,7 +81,7 @@ public class AjaniTest extends CardTestPlayerBase {
assertPermanentCount(playerA, "Kor Ally", 2);
assertPermanentCount(playerA, "Oath of Gideon", 1);
assertPermanentCount(playerA, "Ajani Goldmane", 1);
assertCounterCount("Ajani Goldmane", CounterType.LOYALTY, 6); // 5 + 1 = 5
assertCounterCount("Ajani Goldmane", CounterType.LOYALTY, 6); // 4 + 1 + 1 = 6
assertLife(playerA, 22);
assertLife(playerB, 20);