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

Renaming method to avoid confusion.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-19 01:54:53 +00:00
parent b607c093c6
commit 2e90ceaaef
35 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java
View File

@@ -46,7 +46,7 @@ public class Card1_014 extends AbstractAttachableFPPossession {
List<Modifier> modifiers = new LinkedList<Modifier>();
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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java
View File

@@ -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);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java
View File

@@ -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)));

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java
View File

@@ -50,7 +50,7 @@ public class Card1_075 extends AbstractAttachableFPPossession {
List<Modifier> modifiers = new LinkedList<Modifier>();
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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java
View File

@@ -50,7 +50,7 @@ public class Card1_095 extends AbstractAttachableFPPossession {
List<Modifier> modifiers = new LinkedList<Modifier>();
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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java
View File

@@ -41,6 +41,6 @@ public class Card1_166 extends AbstractAttachable {
List<Modifier> modifiers = new LinkedList<Modifier>();
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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_282.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_283.java
View File

@@ -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))

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java
View File

@@ -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);
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java
View File

@@ -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) {

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java
View File

@@ -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;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java
View File

@@ -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;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_218.java
View File

@@ -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;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java
View File

@@ -50,7 +50,7 @@ public class Card1_221 extends AbstractAttachable {
List<Modifier> modifiers = new LinkedList<Modifier>();
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

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java
View File

@@ -47,7 +47,7 @@ public class Card1_225 extends AbstractAttachable {
List<Modifier> modifiers = new LinkedList<Modifier>();
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(

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -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) {