From 81ddeeadea9a740750ec5dd1e628600d8e7089a3 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 28 Sep 2011 13:14:56 +0000 Subject: [PATCH] Fixing project, added listing duplicates and fixing issue with "Swordsman of the Northern Kingdom" --- gemp-lotr/gemp-lotr-cards/pom.xml | 2 +- .../cards/LotroCardBlueprintLibraryTest.java | 31 +++++++++++++++++++ .../lotro/cards/set1/gondor/Card1_117.java | 9 ++++-- gemp-lotr/gemp-lotr-common/pom.xml | 2 +- gemp-lotr/gemp-lotr-logic/pom.xml | 2 +- gemp-lotr/gemp-lotr-server/pom.xml | 2 +- gemp-lotr/gemp-lotr-web/pom.xml | 2 +- 7 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibraryTest.java diff --git a/gemp-lotr/gemp-lotr-cards/pom.xml b/gemp-lotr/gemp-lotr-cards/pom.xml index e3bd6a3a4..ce3c2ff93 100644 --- a/gemp-lotr/gemp-lotr-cards/pom.xml +++ b/gemp-lotr/gemp-lotr-cards/pom.xml @@ -2,7 +2,7 @@ - lotro + gemp-lotr com.gempukku.lotro 1.0-SNAPSHOT diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibraryTest.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibraryTest.java new file mode 100644 index 000000000..5ecd69355 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/LotroCardBlueprintLibraryTest.java @@ -0,0 +1,31 @@ +package com.gempukku.lotro.cards; + +import com.gempukku.lotro.game.LotroCardBlueprint; +import com.gempukku.lotro.game.LotroCardBlueprintLibrary; + +import java.util.HashMap; +import java.util.Map; + +public class LotroCardBlueprintLibraryTest { + public static void main(String[] args) { + LotroCardBlueprintLibrary library = new LotroCardBlueprintLibrary(); + + Map cardNames = new HashMap(); + for (int i = 1; i <= 1; i++) { + for (int j = 1; j <= 365; j++) { + String blueprintId = i + "_" + j; + try { + LotroCardBlueprint cardBlueprint = library.getLotroCardBlueprint(blueprintId); + String cardName = cardBlueprint.getName(); + if (cardNames.containsKey(cardName)) + System.out.println("Multiple detected - " + cardName + ": " + cardNames.get(cardName) + " and " + blueprintId); + else + cardNames.put(cardName, blueprintId); + } catch (IllegalArgumentException exp) { + exp.printStackTrace(); + } + } + } + + } +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_117.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_117.java index 59ff0f84f..d32c69444 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_117.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_117.java @@ -5,7 +5,10 @@ import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.CardAffectsCardEffect; import com.gempukku.lotro.cards.modifiers.StrengthModifier; -import com.gempukku.lotro.common.*; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Keyword; +import com.gempukku.lotro.common.Phase; +import com.gempukku.lotro.common.Side; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; @@ -22,7 +25,7 @@ import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; */ public class Card1_117 extends AbstractEvent { public Card1_117() { - super(Side.FREE_PEOPLE, Culture.GONDOR, "Swordarm of the White Tower", Phase.SKIRMISH); + super(Side.FREE_PEOPLE, Culture.GONDOR, "Swordsman of the Northern Kingdom", Phase.SKIRMISH); } @Override @@ -30,7 +33,7 @@ public class Card1_117 extends AbstractEvent { final PlayEventAction action = new PlayEventAction(self, true); action.appendEffect( - new ChooseActiveCardEffect(playerId, "Choose a GONDOR companion", Filters.culture(Culture.GONDOR), Filters.type(CardType.COMPANION)) { + new ChooseActiveCardEffect(playerId, "Choose a Ranger", Filters.keyword(Keyword.RANGER)) { @Override protected void cardSelected(PhysicalCard gondorCompanion) { int bonus = 2; diff --git a/gemp-lotr/gemp-lotr-common/pom.xml b/gemp-lotr/gemp-lotr-common/pom.xml index 3e5b414ea..5804488dc 100644 --- a/gemp-lotr/gemp-lotr-common/pom.xml +++ b/gemp-lotr/gemp-lotr-common/pom.xml @@ -2,7 +2,7 @@ - lotro + gemp-lotr com.gempukku.lotro 1.0-SNAPSHOT diff --git a/gemp-lotr/gemp-lotr-logic/pom.xml b/gemp-lotr/gemp-lotr-logic/pom.xml index 6c57c063d..6ecc221f3 100644 --- a/gemp-lotr/gemp-lotr-logic/pom.xml +++ b/gemp-lotr/gemp-lotr-logic/pom.xml @@ -2,7 +2,7 @@ - lotro + gemp-lotr com.gempukku.lotro 1.0-SNAPSHOT diff --git a/gemp-lotr/gemp-lotr-server/pom.xml b/gemp-lotr/gemp-lotr-server/pom.xml index cc8058ef1..1812f1982 100644 --- a/gemp-lotr/gemp-lotr-server/pom.xml +++ b/gemp-lotr/gemp-lotr-server/pom.xml @@ -2,7 +2,7 @@ - lotro + gemp-lotr com.gempukku.lotro 1.0-SNAPSHOT diff --git a/gemp-lotr/gemp-lotr-web/pom.xml b/gemp-lotr/gemp-lotr-web/pom.xml index 14a5e7e53..af76c3393 100644 --- a/gemp-lotr/gemp-lotr-web/pom.xml +++ b/gemp-lotr/gemp-lotr-web/pom.xml @@ -2,7 +2,7 @@ - lotro + gemp-lotr com.gempukku.lotro 1.0-SNAPSHOT