All sites 3 and 6 are now Sanctuaries, removed all the keywords from the sites.

This commit is contained in:
marcins78@gmail.com
2011-11-11 00:42:52 +00:00
parent b6954935d7
commit 4dca740c4a
35 changed files with 70 additions and 59 deletions

View File

@@ -3,7 +3,6 @@ package com.gempukku.lotro.cards.set1.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.effects.RemoveTwilightEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -22,7 +21,7 @@ import java.util.List;
public class Card1_337 extends AbstractSite {
public Card1_337() {
super("Council Courtyard", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -29,7 +29,7 @@ public class Card1_338 extends AbstractSite {
public Card1_338() {
super("Ford of Bruinen", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.RIVER);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromHandEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters;
@@ -27,7 +26,7 @@ import java.util.List;
public class Card1_339 extends AbstractSite {
public Card1_339() {
super("Frodo's Bedroom", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromHandEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters;
@@ -27,7 +26,7 @@ import java.util.List;
public class Card1_340 extends AbstractSite {
public Card1_340() {
super("Rivendell Terrace", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromHandEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters;
@@ -27,7 +26,7 @@ import java.util.List;
public class Card1_341 extends AbstractSite {
public Card1_341() {
super("Rivendell Valley", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -23,7 +23,7 @@ public class Card1_342 extends AbstractSite {
public Card1_342() {
super("Rivendell Waterfall", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.FOREST);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filter;
import com.gempukku.lotro.filters.Filters;
@@ -29,7 +28,7 @@ import java.util.List;
public class Card1_350 extends AbstractSite {
public Card1_350() {
super("Dimrill Dale", Block.FELLOWSHIP, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -6,7 +6,6 @@ import com.gempukku.lotro.cards.effects.LookAtOpponentsHandEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseOpponentEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters;
@@ -28,7 +27,7 @@ import java.util.List;
public class Card1_351 extends AbstractSite {
public Card1_351() {
super("Galadriel's Glade", Block.FELLOWSHIP, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -20,7 +20,7 @@ public class Card1_352 extends AbstractSite {
public Card1_352() {
super("Lothlorien Woods", Block.FELLOWSHIP, 6, 3, Direction.LEFT);
addKeyword(Keyword.FOREST);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -28,7 +28,7 @@ public class Card2_120 extends AbstractSite {
public Card2_120() {
super("Valley of the Silverlode", Block.FELLOWSHIP, 6, 3, Direction.LEFT);
addKeyword(Keyword.RIVER);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -29,7 +29,7 @@ public class Card3_115 extends AbstractSite {
public Card3_115() {
super("Caras Galadhon", Block.FELLOWSHIP, 6, 3, Direction.LEFT);
addKeyword(Keyword.FOREST);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -3,7 +3,6 @@ package com.gempukku.lotro.cards.set3.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.effects.RemoveBurdenEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card3_119 extends AbstractSite {
public Card3_119() {
super("House of Elrond", Block.FELLOWSHIP, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.PutCardFromHandOnBottomOfDeckEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card4_337 extends AbstractSite {
public Card4_337() {
super("Barrows of Edoras", Block.TWO_TOWERS, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,6 @@ package com.gempukku.lotro.cards.set4.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -24,7 +23,7 @@ import java.util.List;
public class Card4_338 extends AbstractSite {
public Card4_338() {
super("Golden Hall", Block.TWO_TOWERS, 3, 1, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -25,7 +25,7 @@ import java.util.List;
public class Card4_339 extends AbstractSite {
public Card4_339() {
super("Stables", Block.TWO_TOWERS, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -6,7 +6,6 @@ import com.gempukku.lotro.cards.modifiers.conditions.LocationCondition;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card4_340 extends AbstractSite {
public Card4_340() {
super("Streets of Edoras", Block.TWO_TOWERS, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDeckEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card4_341 extends AbstractSite {
public Card4_341() {
super("Throne Room", Block.TWO_TOWERS, 3, 1, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -23,7 +23,7 @@ public class Card4_342 extends AbstractSite {
public Card4_342() {
super("Westemnet Plains", Block.TWO_TOWERS, 3, 1, Direction.RIGHT);
addKeyword(Keyword.PLAINS);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -31,7 +31,7 @@ public class Card4_352 extends AbstractSite {
public Card4_352() {
super("Caves of Aglarond", Block.TWO_TOWERS, 6, 3, Direction.LEFT);
addKeyword(Keyword.UNDERGROUND);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -24,7 +24,7 @@ import java.util.List;
public class Card4_353 extends AbstractSite {
public Card4_353() {
super("Great Hall", Block.TWO_TOWERS, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
addKeyword(Keyword.BATTLEGROUND);
}

View File

@@ -5,7 +5,6 @@ import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromHandEffect;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -26,7 +25,7 @@ import java.util.List;
public class Card4_354 extends AbstractSite {
public Card4_354() {
super("Hornburg Armory", Block.TWO_TOWERS, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,10 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDeadPileEffect;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Signet;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -25,7 +28,7 @@ import java.util.List;
public class Card6_117 extends AbstractSite {
public Card6_117() {
super("Mudeseld", Block.TWO_TOWERS, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,10 @@ package com.gempukku.lotro.cards.set6.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Signet;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.ActivateCardAction;
@@ -25,7 +28,7 @@ import java.util.Set;
public class Card6_118 extends AbstractSite {
public Card6_118() {
super("Hornburg Hall", Block.TWO_TOWERS, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -26,7 +25,7 @@ import java.util.List;
public class Card7_338 extends AbstractSite {
public Card7_338() {
super("Beacon of Minas Tirith", Block.KING, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -3,7 +3,6 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card7_339 extends AbstractSite {
public Card7_339() {
super("Hall of the Kings", Block.KING, 3, 1, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -5,7 +5,6 @@ import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.AddUntilEndOfTurnModifierEffect;
import com.gempukku.lotro.cards.modifiers.MoveLimitModifier;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -27,7 +26,7 @@ import java.util.List;
public class Card7_340 extends AbstractSite {
public Card7_340() {
super("Tower of Ecthelion", Block.KING, 3, 0, Direction.RIGHT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -3,7 +3,6 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card7_346 extends AbstractSite {
public Card7_346() {
super("Minas Tirith Fifth Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
@@ -25,7 +24,7 @@ import java.util.List;
public class Card7_347 extends AbstractSite {
public Card7_347() {
super("Minas Tirith First Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,10 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -22,7 +25,7 @@ import java.util.List;
public class Card7_348 extends AbstractSite {
public Card7_348() {
super("Minas Tirith Fourth Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,10 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -22,7 +25,7 @@ import java.util.List;
public class Card7_349 extends AbstractSite {
public Card7_349() {
super("Minas Tirith Second Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,10 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -22,7 +25,7 @@ import java.util.List;
public class Card7_350 extends AbstractSite {
public Card7_350() {
super("Minas Tirith Seventh Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,10 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -22,7 +25,7 @@ import java.util.List;
public class Card7_351 extends AbstractSite {
public Card7_351() {
super("Minas Tirith Sixth Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -2,7 +2,10 @@ package com.gempukku.lotro.cards.set7.site;
import com.gempukku.lotro.cards.AbstractSite;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -22,7 +25,7 @@ import java.util.List;
public class Card7_352 extends AbstractSite {
public Card7_352() {
super("Minas Tirith Third Circle", Block.KING, 6, 3, Direction.LEFT);
addKeyword(Keyword.SANCTUARY);
}
@Override

View File

@@ -24,7 +24,7 @@ public class RuleSet {
new ResolveSkirmishRule(_game, _actionsEnvironment).applyRule();
new SanctuaryRule(_actionsEnvironment).applyRule();
new SanctuaryRule(_actionsEnvironment, _modifiersLogic).applyRule();
new WinConditionRule(_actionsEnvironment).applyRule();

View File

@@ -8,6 +8,8 @@ import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.game.state.actions.DefaultActionsEnvironment;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect;
import com.gempukku.lotro.logic.modifiers.KeywordModifier;
import com.gempukku.lotro.logic.modifiers.ModifiersLogic;
import com.gempukku.lotro.logic.timing.Action;
import com.gempukku.lotro.logic.timing.EffectResult;
@@ -16,12 +18,17 @@ import java.util.List;
public class SanctuaryRule {
private DefaultActionsEnvironment _actionsEnvironment;
private ModifiersLogic _modifiersLogic;
public SanctuaryRule(DefaultActionsEnvironment actionsEnvironment) {
public SanctuaryRule(DefaultActionsEnvironment actionsEnvironment, ModifiersLogic modifiersLogic) {
_actionsEnvironment = actionsEnvironment;
_modifiersLogic = modifiersLogic;
}
public void applyRule() {
_modifiersLogic.addAlwaysOnModifier(
new KeywordModifier(null, Filters.and(CardType.SITE, Filters.or(Filters.siteNumber(3), Filters.siteNumber(6))), Keyword.SANCTUARY));
_actionsEnvironment.addAlwaysOnActionProxy(
new AbstractActionProxy() {
@Override