ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from PhallenCassidy/Deckbuilder-Streamlining

Browse Source 
Deckbuilder streamlining
This commit is contained in:
Marcin Sciesinski
2017-11-10 10:30:25 -08:00
committed by GitHub
parent 6707c2a7b3 aa6fd74785
commit 125a04f705
26 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java
View File

@@ -30,6 +30,7 @@ public class Card30_033 extends AbstractMinion {
public Card30_033() {
super(3, 7, 2, 3, Race.ORC, Culture.GUNDABAD, "Fimbul", "Orkish Assassin", true);
addKeyword(Keyword.DAMAGE, 1);
addKeyword(Keyword.WARG_RIDER);
}
@Override

1
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java
View File

@@ -30,6 +30,7 @@ public class Card30_036 extends AbstractMinion {
public Card30_036() {
super(2, 6, 2, 3, Race.ORC, Culture.GUNDABAD, "Narzug", "Orkish Assassin", true);
addKeyword(Keyword.ARCHER);
addKeyword(Keyword.WARG_RIDER);
}
@Override

1
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java
View File

@@ -34,6 +34,7 @@ import java.util.List;
public class Card30_038 extends AbstractMinion {
public Card30_038() {
super(3, 8, 2, 3, Race.ORC, Culture.GUNDABAD, "Orkish Marauder");
addKeyword(Keyword.WARG_RIDER);
}
@Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java
View File

@@ -40,6 +40,7 @@ import java.util.List;
public class Card30_039 extends AbstractMinion {
public Card30_039() {
super(2, 6, 2, 3, Race.ORC, Culture.GUNDABAD, "Orkish Aggressor");
addKeyword(Keyword.WARG_RIDER);
}
@Override
@@ -66,4 +67,4 @@ public class Card30_039 extends AbstractMinion {
}
return null;
}
}
}

1
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java
View File

@@ -37,6 +37,7 @@ import java.util.List;
public class Card30_040 extends AbstractMinion {
public Card30_040() {
super(4, 8, 3, 3, Race.ORC, Culture.GUNDABAD, "Watchful Orc");
addKeyword(Keyword.WARG_RIDER);
}
@Override

1
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java
View File

@@ -29,6 +29,7 @@ import java.util.List;
public class Card30_041 extends AbstractMinion {
public Card30_041() {
super(1, 5, 2, 3, Race.ORC, Culture.GUNDABAD, "Yazneg", "Orkish Assassin", true);
addKeyword(Keyword.WARG_RIDER);
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
*/
public class Card30_058 extends AbstractMinion {
public Card30_058() {
super(16, 17, 5, 7, Race.DRAGON, Culture.SMAUG, "Smaug", "The Golden", true);
super(16, 17, 5, 7, Race.DRAGON, Culture.GUNDABAD, "Smaug", "The Golden", true);
addKeyword(Keyword.DAMAGE, 2);
addKeyword(Keyword.FIERCE);
}

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java
View File

@@ -29,7 +29,8 @@ import java.util.List;
public class Card31_023 extends AbstractMinion {
public Card31_023() {
super(4, 9, 3, 3, Race.ORC, Culture.GUNDABAD, "Azog", "The Defiler", true);
addKeyword(Keyword.DAMAGE, 1);
addKeyword(Keyword.DAMAGE, 1);
addKeyword(Keyword.WARG_RIDER);
}
@Override

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java
View File

@@ -30,8 +30,9 @@ import java.util.List;
*/
public class Card31_024 extends AbstractMinion {
public Card31_024() {
super(4, 9, 3, 3, null, Culture.GUNDABAD, "Bolg", "Son of Azog", true);
addKeyword(Keyword.DAMAGE, 1);
super(4, 9, 3, 3, Race.ORC, Culture.GUNDABAD, "Bolg", "Son of Azog", true);
addKeyword(Keyword.DAMAGE, 1);
addKeyword(Keyword.WARG_RIDER);
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java
View File

@@ -53,7 +53,7 @@ public class Card31_025 extends AbstractAttachable {
@Override
protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
return Filters.and(Culture.GUNDABAD,Race.ORC);
return Race.ORC;
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java
View File

@@ -57,7 +57,7 @@ public class Card31_026 extends AbstractAttachable {
@Override
protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
return Filters.and(Culture.GUNDABAD,Race.ORC);
return Keyword.WARG_RIDER;
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java
View File

@@ -53,7 +53,7 @@ public class Card31_027 extends AbstractAttachable {
@Override
protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
return Filters.and(Culture.GUNDABAD,Race.ORC);
return Keyword.WARG_RIDER;
}
@Override

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
*/
public class Card31_028 extends AbstractAttachable {
public Card31_028() {
super(Side.SHADOW, CardType.POSSESSION, 3, Culture.ISENGARD, PossessionClass.MOUNT, "War-warg");
super(Side.SHADOW, CardType.POSSESSION, 3, Culture.GUNDABAD, PossessionClass.MOUNT, "War-warg");
}
@Override
@@ -53,7 +53,7 @@ public class Card31_028 extends AbstractAttachable {
@Override
protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
return Filters.and(Culture.GUNDABAD,Race.ORC);
return Keyword.WARG_RIDER;
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
*/
public class Card31_057 extends AbstractMinion {
public Card31_057() {
super(3, 9, 3, 5, Race.SPIDER, Culture.SPIDER, "Crazy Cob", null, true);
super(3, 9, 3, 5, Race.SPIDER, Culture.GUNDABAD, "Crazy Cob", null, true);
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java
View File

@@ -33,7 +33,7 @@ import java.util.List;
*/
public class Card31_058 extends AbstractPermanent {
public Card31_058() {
super(Side.SHADOW, 2, CardType.CONDITION, Culture.SPIDER, Zone.SUPPORT, "Enchanted River", null, true);
super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Enchanted River", null, true);
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java
View File

@@ -32,7 +32,7 @@ import java.util.List;
*/
public class Card31_059 extends AbstractMinion {
public Card31_059() {
super(3, 8, 2, 5, Race.SPIDER, Culture.SPIDER, "Fat Spider");
super(3, 8, 2, 5, Race.SPIDER, Culture.GUNDABAD, "Fat Spider");
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java
View File

@@ -34,7 +34,7 @@ import java.util.List;
*/
public class Card31_060 extends AbstractMinion {
public Card31_060() {
super(4, 9, 2, 5, Race.SPIDER, Culture.SPIDER, "Lazy Lob", null, true);
super(4, 9, 2, 5, Race.SPIDER, Culture.GUNDABAD, "Lazy Lob", null, true);
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java
View File

@@ -29,7 +29,7 @@ import java.util.List;
*/
public class Card31_061 extends AbstractMinion {
public Card31_061() {
super(4, 8, 3, 5, Race.SPIDER, Culture.SPIDER, "Old Tomnoddy");
super(4, 8, 3, 5, Race.SPIDER, Culture.GUNDABAD, "Old Tomnoddy");
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java
View File

@@ -34,7 +34,7 @@ import java.util.List;
*/
public class Card31_062 extends AbstractPermanent {
public Card31_062() {
super(Side.SHADOW, 2, CardType.CONDITION, Culture.SPIDER, Zone.SUPPORT, "Spider Nest");
super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Spider Nest");
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java
View File

@@ -30,7 +30,7 @@ import java.util.List;
*/
public class Card31_063 extends AbstractMinion {
public Card31_063() {
super(2, 7, 2, 5, Race.SPIDER, Culture.SPIDER, "Wicked Spider");
super(2, 7, 2, 5, Race.SPIDER, Culture.GUNDABAD, "Wicked Spider");
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java
View File

@@ -33,7 +33,7 @@ import java.util.List;
*/
public class Card31_064 extends AbstractMinion {
public Card31_064() {
super(5, 11, 4, 2, Race.TROLL, Culture.TROLL, "Bert", "Troll of Ettenmoors", true);
super(5, 11, 4, 2, Race.TROLL, Culture.GUNDABAD, "Bert", "Troll of Ettenmoors", true);
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
*/
public class Card31_065 extends AbstractPermanent {
public Card31_065() {
super(Side.SHADOW, 0, CardType.CONDITION, Culture.TROLL, Zone.SUPPORT, "Caught in a Sack");
super(Side.SHADOW, 0, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Caught in a Sack");
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
*/
public class Card31_066 extends AbstractMinion {
public Card31_066() {
super(5, 11, 4, 2, Race.TROLL, Culture.TROLL, "Tom", "Troll of Ettenmoors", true);
super(5, 11, 4, 2, Race.TROLL, Culture.GUNDABAD, "Tom", "Troll of Ettenmoors", true);
addKeyword(Keyword.FIERCE);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
*/
public class Card31_067 extends AbstractPermanent {
public Card31_067() {
super(Side.SHADOW, 2, CardType.CONDITION, Culture.TROLL, Zone.SUPPORT, "Troll Campfire", null, true);
super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Troll Campfire", null, true);
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java
View File

@@ -24,7 +24,7 @@ import java.util.List;
*/
public class Card31_068 extends AbstractAttachable {
public Card31_068() {
super(Side.SHADOW, CardType.POSSESSION, 1, Culture.TROLL, PossessionClass.HAND_WEAPON, "Troll Knife");
super(Side.SHADOW, CardType.POSSESSION, 1, Culture.GUNDABAD, PossessionClass.HAND_WEAPON, "Troll Knife");
}
@Override

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java
View File

@@ -35,7 +35,7 @@ import java.util.List;
*/
public class Card31_069 extends AbstractMinion {
public Card31_069() {
super(5, 11, 4, 2, Race.TROLL, Culture.TROLL, "William", "Troll of Ettenmoors", true);
super(5, 11, 4, 2, Race.TROLL, Culture.GUNDABAD, "William", "Troll of Ettenmoors", true);
addKeyword(Keyword.FIERCE);
}