diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java index 19775b279..684529118 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java @@ -50,7 +50,7 @@ public class Card1_310 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java index b33ac651e..5c23833d0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java @@ -51,7 +51,7 @@ public class Card1_311 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_122.java index caf72ee42..05b638512 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_122.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_122.java @@ -43,7 +43,7 @@ public class Card10_122 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_114.java index fb70efeeb..b0488dec1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_114.java @@ -55,7 +55,7 @@ public class Card2_114 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_315.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_315.java index 6fb119c4c..5f5e2aeb6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_315.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_315.java @@ -48,7 +48,7 @@ public class Card4_315 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_316.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_316.java index d604ed12e..2fa6480e7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_316.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_316.java @@ -61,7 +61,7 @@ public class Card4_316 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_115.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_115.java index 0854e70fb..a17c32002 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_115.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_115.java @@ -55,7 +55,7 @@ public class Card5_115 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java index 32b99eee6..cb9f0fe19 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java @@ -52,7 +52,7 @@ public class Card7_326 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java index 76db5d75c..d4f06e4d2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_327.java @@ -53,7 +53,7 @@ public class Card7_327 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo)) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new MakeRingBearerEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 68052fcaa..fef2d8e5a 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,7 @@
+3 Feb. 2012
+- Any version of Sam that can become the ring-bearer if Frodo dies can only become the ring-bearer if Frodo was the ring bearer when he was killed.
+
 2 Feb. 2012
 - "Iron Fist of the Orc" now can be activated in Regroup phase, rather than in Shadow phase.
 - Fixed a problem, where "Horn of Helm" could be played in every phase from hand.