From b607c093c6b14e6b041623bf5b5a9eeec259ae11 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 19 Sep 2011 01:52:22 +0000 Subject: [PATCH] Renaming method to avoid confusion. --- .../main/java/com/gempukku/lotro/cards/set1/Card1_001.java | 2 +- .../main/java/com/gempukku/lotro/cards/set1/Card1_002.java | 2 +- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java | 2 +- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java | 2 +- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_031.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_033.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_041.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_047.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_049.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_066.java | 2 +- .../java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java | 2 +- .../java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java | 2 +- .../java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java | 2 +- .../java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java | 2 +- .../java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java | 2 +- .../java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java | 2 +- .../com/gempukku/lotro/cards/set1/isengard/Card1_160.java | 2 +- .../java/com/gempukku/lotro/cards/set1/moria/Card1_166.java | 2 +- .../java/com/gempukku/lotro/cards/set1/moria/Card1_180.java | 2 +- .../java/com/gempukku/lotro/cards/set1/moria/Card1_182.java | 2 +- .../java/com/gempukku/lotro/cards/set1/moria/Card1_190.java | 2 +- .../java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java | 2 +- .../java/com/gempukku/lotro/cards/set1/sauron/Card1_282.java | 2 +- .../java/com/gempukku/lotro/cards/set1/sauron/Card1_283.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_299.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_313.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_314.java | 2 +- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java | 2 +- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java | 2 +- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java | 2 +- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_218.java | 2 +- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java | 2 +- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java | 4 ++-- .../src/main/java/com/gempukku/lotro/filters/Filters.java | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java index 983800b57..e5d56bf1c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java @@ -54,7 +54,7 @@ public class Card1_001 extends AbstractAttachable { modifiers.add(new KeywordModifier(null, null, Keyword.RING_BEARER)); modifiers.add(new KeywordModifier(null, null, Keyword.RING_BOUND)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java index d2a34d756..985d15d60 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java @@ -52,7 +52,7 @@ public class Card1_002 extends AbstractAttachable { modifiers.add(new KeywordModifier(null, null, Keyword.RING_BEARER)); modifiers.add(new KeywordModifier(null, null, Keyword.RING_BOUND)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java index 3109948b9..762f5b829 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java @@ -31,6 +31,6 @@ public class Card1_008 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new OverwhelmedByMultiplierModifier(self, Filters.attachedTo(self), 3); + return new OverwhelmedByMultiplierModifier(self, Filters.isAttachedTo(self), 3); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java index b94dc92ce..4dbb8d4c4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java @@ -43,7 +43,7 @@ public class Card1_009 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java index d1f36f75b..f9ed2303d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java @@ -46,7 +46,7 @@ public class Card1_014 extends AbstractAttachableFPPossession { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java index 5800bc69b..d03b16638 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java @@ -51,7 +51,7 @@ public class Card1_031 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "Strength +2, if at Plains another +2", Filters.attachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Strength +2, if at Plains another +2", Filters.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { @Override public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { return result + (modifiersQuerying.hasKeyword(gameState, gameState.getCurrentSite(), Keyword.PLAINS) ? 4 : 2); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java index 060b4fb84..984a7c43a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java @@ -40,7 +40,7 @@ public class Card1_033 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 1); + return new StrengthModifier(self, Filters.isAttachedTo(self), 1); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java index 251586a28..6a518f89f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java @@ -31,6 +31,6 @@ public class Card1_041 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new KeywordModifier(self, Filters.attachedTo(self), Keyword.ARCHER); + return new KeywordModifier(self, Filters.isAttachedTo(self), Keyword.ARCHER); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java index e89c08d3b..f2f6c6b90 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java @@ -76,6 +76,6 @@ public class Card1_047 extends AbstractAttachableFPPossession { modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java index 75183c49b..8866b5dca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java @@ -34,7 +34,7 @@ public class Card1_049 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "Streng +1 for each Elf you can spot (limit +3)", Filters.attachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Streng +1 for each Elf you can spot (limit +3)", Filters.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { @Override public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { int count = Math.min(3, Filters.countActive(gameState, modifiersQuerying, Filters.race(Race.ELF))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java index 1d76504f4..78303b7b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java @@ -54,6 +54,6 @@ public class Card1_066 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new VitalityModifier(self, Filters.attachedTo(self), 1); + return new VitalityModifier(self, Filters.isAttachedTo(self), 1); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java index 841c8af6e..e02fe3d6e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java @@ -50,7 +50,7 @@ public class Card1_075 extends AbstractAttachableFPPossession { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java index c22e05e30..e27d76071 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java @@ -44,7 +44,7 @@ public class Card1_090 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new KeywordModifier(self, Filters.attachedTo(self), Keyword.ARCHER); + return new KeywordModifier(self, Filters.isAttachedTo(self), Keyword.ARCHER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java index 3c8ec0cf8..2c607c9e5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java @@ -50,7 +50,7 @@ public class Card1_095 extends AbstractAttachableFPPossession { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java index b9c415594..0787557e6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java @@ -31,6 +31,6 @@ public class Card1_101 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new OverwhelmedByMultiplierModifier(self, Filters.attachedTo(self), 3); + return new OverwhelmedByMultiplierModifier(self, Filters.isAttachedTo(self), 3); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java index 511c3ca0c..f8b881da4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java @@ -40,6 +40,6 @@ public class Card1_112 extends AbstractAttachableFPPossession { modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java index d7f6306d5..0d8bb23b0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java @@ -54,6 +54,6 @@ public class Card1_114 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new VitalityModifier(self, Filters.attachedTo(self), 1); + return new VitalityModifier(self, Filters.isAttachedTo(self), 1); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java index 35212a6ea..7dfb6aabd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java @@ -38,7 +38,7 @@ public class Card1_160 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java index 7498c3861..33581d6ab 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java @@ -41,6 +41,6 @@ public class Card1_166 extends AbstractAttachable { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(null, null, 3)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java index ead0cfa35..390469a64 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java @@ -32,7 +32,7 @@ public class Card1_180 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java index d9f81355d..24f7d8a22 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java @@ -39,7 +39,7 @@ public class Card1_182 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java index 9a83c12c5..05a2855df 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java @@ -45,7 +45,7 @@ public class Card1_190 extends AbstractAttachable { modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java index c4d00d39e..b2339fbcb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java @@ -39,7 +39,7 @@ public class Card1_269 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_282.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_282.java index 523d65e7f..020517364 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_282.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_282.java @@ -49,6 +49,6 @@ public class Card1_282 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), -1); + return new StrengthModifier(self, Filters.isAttachedTo(self), -1); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_283.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_283.java index 0f8b0f7ba..8a26ead0f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_283.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_283.java @@ -39,7 +39,7 @@ public class Card1_283 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "While at a sanctuary, bearer cannot heal.", Filters.attachedTo(self), new ModifierEffect[]{ModifierEffect.WOUND_MODIFIER}) { + return new AbstractModifier(self, "While at a sanctuary, bearer cannot heal.", Filters.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.WOUND_MODIFIER}) { @Override public boolean canBeHealed(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard card, boolean result) { if (modifiersQuerying.hasKeyword(gameState, gameState.getCurrentSite(), Keyword.SANCTUARY)) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java index 3eb7f3292..ba8d7607f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java @@ -32,6 +32,6 @@ public class Card1_299 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java index 16a545805..bca926985 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java @@ -47,7 +47,7 @@ public class Card1_313 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 2); + return new StrengthModifier(self, Filters.isAttachedTo(self), 2); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java index 138775b45..b02777f61 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java @@ -42,7 +42,7 @@ public class Card1_314 extends AbstractAttachable { public Modifier getAlwaysOnEffect(final PhysicalCard self) { return new StrengthModifier(self, Filters.and( - Filters.attachedTo(self), + Filters.isAttachedTo(self), new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java index 9abf5ae9e..b3c4b02f8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java @@ -52,7 +52,7 @@ public class Card1_207 extends AbstractPermanent { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "Burdens and wounds may not be removed from bearer.", Filters.attachedTo(self), new ModifierEffect[]{ModifierEffect.WOUND_MODIFIER}) { + return new AbstractModifier(self, "Burdens and wounds may not be removed from bearer.", Filters.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.WOUND_MODIFIER}) { @Override public boolean canBeHealed(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard card, boolean result) { return false; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java index 7d441a553..797a95e67 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java @@ -40,7 +40,7 @@ public class Card1_208 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "Strength +2, While at a Plains site, bearer is Strength +2", Filters.attachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Strength +2, While at a Plains site, bearer is Strength +2", Filters.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { @Override public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { int bonus = (modifiersQuerying.hasKeyword(gameState, gameState.getCurrentSite(), Keyword.PLAINS)) ? 4 : 2; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java index a31491fb3..6a80802e2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java @@ -35,7 +35,7 @@ public class Card1_216 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new StrengthModifier(self, Filters.attachedTo(self), 1); + return new StrengthModifier(self, Filters.isAttachedTo(self), 1); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_218.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_218.java index 7cacc9215..f87e1af55 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_218.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_218.java @@ -33,7 +33,7 @@ public class Card1_218 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "Strength +2, While you can spot 3 burdens, bearer is damage +1", Filters.attachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER, ModifierEffect.KEYWORD_MODIFIER}) { + return new AbstractModifier(self, "Strength +2, While you can spot 3 burdens, bearer is damage +1", Filters.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER, ModifierEffect.KEYWORD_MODIFIER}) { @Override public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { return result + 2; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java index 23e4f6383..5be368af6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java @@ -50,7 +50,7 @@ public class Card1_221 extends AbstractAttachable { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(null, null, 3)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java index 114ee0ada..479e74a08 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java @@ -47,7 +47,7 @@ public class Card1_225 extends AbstractAttachable { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(null, null, 2)); modifiers.add(new KeywordModifier(null, null, Keyword.DAMAGE)); - return new CompositeModifier(self, Filters.attachedTo(self), modifiers); + return new CompositeModifier(self, Filters.isAttachedTo(self), modifiers); } @Override @@ -60,7 +60,7 @@ public class Card1_225 extends AbstractAttachable { if (skirmish != null && skirmish.getShadowCharacters().contains(self.getAttachedTo())) { action.addEffect( - new ChooseActiveCardEffect(playerId, "Choose possession borne by character he is skirmishing", Filters.type(CardType.POSSESSION), Filters.attachedTo(skirmish.getFellowshipCharacter())) { + new ChooseActiveCardEffect(playerId, "Choose possession borne by character he is skirmishing", Filters.type(CardType.POSSESSION), Filters.isAttachedTo(skirmish.getFellowshipCharacter())) { @Override protected void cardSelected(PhysicalCard possession) { action.addEffect( diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index 4d07be4d5..9ca6edc90 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -252,7 +252,7 @@ public class Filters { }; } - public static Filter attachedTo(final PhysicalCard attachment) { + public static Filter isAttachedTo(final PhysicalCard attachment) { return new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {