From 4dca740c4a0cb262b4ca923313f4dfc604c4e36a Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 11 Nov 2011 00:42:52 +0000 Subject: [PATCH] All sites 3 and 6 are now Sanctuaries, removed all the keywords from the sites. --- .../com/gempukku/lotro/cards/set1/site/Card1_337.java | 3 +-- .../com/gempukku/lotro/cards/set1/site/Card1_338.java | 2 +- .../com/gempukku/lotro/cards/set1/site/Card1_339.java | 3 +-- .../com/gempukku/lotro/cards/set1/site/Card1_340.java | 3 +-- .../com/gempukku/lotro/cards/set1/site/Card1_341.java | 3 +-- .../com/gempukku/lotro/cards/set1/site/Card1_342.java | 2 +- .../com/gempukku/lotro/cards/set1/site/Card1_350.java | 3 +-- .../com/gempukku/lotro/cards/set1/site/Card1_351.java | 3 +-- .../com/gempukku/lotro/cards/set1/site/Card1_352.java | 2 +- .../com/gempukku/lotro/cards/set2/site/Card2_120.java | 2 +- .../com/gempukku/lotro/cards/set3/site/Card3_115.java | 2 +- .../com/gempukku/lotro/cards/set3/site/Card3_119.java | 3 +-- .../com/gempukku/lotro/cards/set4/site/Card4_337.java | 3 +-- .../com/gempukku/lotro/cards/set4/site/Card4_338.java | 3 +-- .../com/gempukku/lotro/cards/set4/site/Card4_339.java | 2 +- .../com/gempukku/lotro/cards/set4/site/Card4_340.java | 3 +-- .../com/gempukku/lotro/cards/set4/site/Card4_341.java | 3 +-- .../com/gempukku/lotro/cards/set4/site/Card4_342.java | 2 +- .../com/gempukku/lotro/cards/set4/site/Card4_352.java | 2 +- .../com/gempukku/lotro/cards/set4/site/Card4_353.java | 2 +- .../com/gempukku/lotro/cards/set4/site/Card4_354.java | 3 +-- .../com/gempukku/lotro/cards/set6/site/Card6_117.java | 7 +++++-- .../com/gempukku/lotro/cards/set6/site/Card6_118.java | 7 +++++-- .../com/gempukku/lotro/cards/set7/site/Card7_338.java | 3 +-- .../com/gempukku/lotro/cards/set7/site/Card7_339.java | 3 +-- .../com/gempukku/lotro/cards/set7/site/Card7_340.java | 3 +-- .../com/gempukku/lotro/cards/set7/site/Card7_346.java | 3 +-- .../com/gempukku/lotro/cards/set7/site/Card7_347.java | 3 +-- .../com/gempukku/lotro/cards/set7/site/Card7_348.java | 7 +++++-- .../com/gempukku/lotro/cards/set7/site/Card7_349.java | 7 +++++-- .../com/gempukku/lotro/cards/set7/site/Card7_350.java | 7 +++++-- .../com/gempukku/lotro/cards/set7/site/Card7_351.java | 7 +++++-- .../com/gempukku/lotro/cards/set7/site/Card7_352.java | 7 +++++-- .../java/com/gempukku/lotro/logic/timing/RuleSet.java | 2 +- .../gempukku/lotro/logic/timing/rules/SanctuaryRule.java | 9 ++++++++- 35 files changed, 70 insertions(+), 59 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java index d474111f2..ea18cf182 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_337.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java index fad122806..1c324b144 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_339.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_339.java index b4ca056b8..9f4261e9c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_339.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_339.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_340.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_340.java index 15bb7ca8e..de05601bb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_340.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_340.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_341.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_341.java index ae8b58a94..31102da74 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_341.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_341.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java index ad23a947a..066b06e1b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java index 146501e24..1758f2892 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java index f36a1cb9a..597ee09c7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java index a50e39e5e..3cab62c63 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_352.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java index d3b4d9453..6c1d11e28 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_115.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_115.java index 0a08fdfa5..3247af3c0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_115.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_115.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java index 22bc6aafb..baa7a05a6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_337.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_337.java index b8804de50..4fc272eac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_337.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_337.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_338.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_338.java index 848b7230b..e1c035c63 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_338.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_338.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_339.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_339.java index c4b5e43c9..ebb0b96c0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_339.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_339.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_340.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_340.java index f8f1d9f66..024373e68 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_340.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_340.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_341.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_341.java index 8537d214f..760c8d375 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_341.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_341.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_342.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_342.java index c0f81337a..8968b8745 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_342.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_342.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_352.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_352.java index 66000232c..f711aa70e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_352.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_352.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_353.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_353.java index 28621d7e6..428891142 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_353.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_353.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_354.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_354.java index 30473fe26..e0b6dee26 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_354.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_354.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_117.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_117.java index 0510bb37c..56dfcc68c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_117.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_117.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_118.java index 7ba52117c..79e4a8d56 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_118.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_338.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_338.java index 66447b2a8..5fa1a7317 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_338.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_338.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_339.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_339.java index fbd03b583..f68aed48f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_339.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_339.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_340.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_340.java index 08eaa8c88..9dc7ac70f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_340.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_340.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_346.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_346.java index 7baf33167..93b186f57 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_346.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_346.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_347.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_347.java index b439850ab..2fd1f073b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_347.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_347.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_348.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_348.java index 1a0ea082f..83e2ef80c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_348.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_348.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_349.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_349.java index fa78a0cc9..c69fca9a7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_349.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_349.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_350.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_350.java index 326a79aed..82793053e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_350.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_350.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_351.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_351.java index 6d0ffc034..c0773a49b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_351.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_351.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_352.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_352.java index 2a6d81e81..0bebdc3b9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_352.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_352.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java index 172336dda..e20452d40 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java @@ -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(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java index 77fc4e347..4a83ebcdd 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java @@ -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