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 e5d56bf1c..3e96f4c60 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 985d15d60..eae6a033b 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 762f5b829..2549deab0 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.isAttachedTo(self), 3); + return new OverwhelmedByMultiplierModifier(self, Filters.hasAttached(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 4dbb8d4c4..bb2d0b1f4 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 f9ed2303d..b200068c3 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 d03b16638..bc28ab9e8 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.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Strength +2, if at Plains another +2", Filters.hasAttached(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 984a7c43a..a5f353e8e 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.isAttachedTo(self), 1); + return new StrengthModifier(self, Filters.hasAttached(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 6a518f89f..fae311a3f 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.isAttachedTo(self), Keyword.ARCHER); + return new KeywordModifier(self, Filters.hasAttached(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 f2f6c6b90..efbbd7b64 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 8866b5dca..0e54e37b7 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.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Streng +1 for each Elf you can spot (limit +3)", Filters.hasAttached(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 78303b7b2..9cea0a4f3 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.isAttachedTo(self), 1); + return new VitalityModifier(self, Filters.hasAttached(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 e02fe3d6e..d84bdc844 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 e27d76071..7e4894e6f 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.isAttachedTo(self), Keyword.ARCHER); + return new KeywordModifier(self, Filters.hasAttached(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 2c607c9e5..8e3e45520 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 0787557e6..db7d26573 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.isAttachedTo(self), 3); + return new OverwhelmedByMultiplierModifier(self, Filters.hasAttached(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 f8b881da4..2a6332107 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 0d8bb23b0..3022fef8f 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.isAttachedTo(self), 1); + return new VitalityModifier(self, Filters.hasAttached(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 7dfb6aabd..334839a91 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 33581d6ab..3044289b6 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 390469a64..c4f7cf711 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 24f7d8a22..fd5d3e6be 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 05a2855df..697da718a 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 b2339fbcb..2f74befa8 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 020517364..6c5a4274f 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.isAttachedTo(self), -1); + return new StrengthModifier(self, Filters.hasAttached(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 8a26ead0f..69099b74d 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.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.WOUND_MODIFIER}) { + return new AbstractModifier(self, "While at a sanctuary, bearer cannot heal.", Filters.hasAttached(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 ba8d7607f..039a948e6 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 bca926985..3a771f3aa 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.isAttachedTo(self), 2); + return new StrengthModifier(self, Filters.hasAttached(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 b02777f61..d67fe0aa8 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.isAttachedTo(self), + Filters.hasAttached(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 b3c4b02f8..422a1ca74 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.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.WOUND_MODIFIER}) { + return new AbstractModifier(self, "Burdens and wounds may not be removed from bearer.", Filters.hasAttached(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 797a95e67..7990e97e5 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.isAttachedTo(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Strength +2, While at a Plains site, bearer is Strength +2", Filters.hasAttached(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 6a80802e2..175cdb473 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.isAttachedTo(self), 1); + return new StrengthModifier(self, Filters.hasAttached(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 f87e1af55..2f8dd95f6 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.isAttachedTo(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.hasAttached(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 5be368af6..80d7a6040 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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 479e74a08..aa9d15169 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.isAttachedTo(self), modifiers); + return new CompositeModifier(self, Filters.hasAttached(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.isAttachedTo(skirmish.getFellowshipCharacter())) { + new ChooseActiveCardEffect(playerId, "Choose possession borne by character he is skirmishing", Filters.type(CardType.POSSESSION), Filters.hasAttached(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 9ca6edc90..3a1fd2f1e 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 isAttachedTo(final PhysicalCard attachment) { + public static Filter hasAttached(final PhysicalCard attachment) { return new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {