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

- "The One Rings" should now correctly add burdens instead of wounds if The One Ring is on.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-01-29 23:33:18 +00:00
parent 3cc02b4ab2
commit 4060d0a491
5 changed files with 27 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,13 +79,10 @@ public class Card1_001 extends AbstractAttachable {
if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))
&& game.getGameState().isWearingRing()
&& !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) {
WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 2));
return Collections.singletonList(action);
}
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 2));
return Collections.singletonList(action);
}
return null;
}

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

@@ -59,18 +59,11 @@ public class Card1_002 extends AbstractAttachable {
if (game.getGameState().getCurrentPhase() == Phase.SKIRMISH
&& TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))
&& !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) {
WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) {
List<Action> actions = new LinkedList<Action>();
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
action.appendEffect(new PutOnTheOneRingEffect());
actions.add(action);
return actions;
}
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
action.appendEffect(new PutOnTheOneRingEffect());
return Collections.singletonList(action);
}
return null;
}
@@ -80,13 +73,10 @@ public class Card1_002 extends AbstractAttachable {
if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))
&& game.getGameState().isWearingRing()
&& !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) {
WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
return Collections.singletonList(action);
}
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
return Collections.singletonList(action);
}
return null;
}

28
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/Card11_001.java
View File

@@ -58,18 +58,12 @@ public class Card11_001 extends AbstractAttachable {
public List<? extends Action> getOptionalInPlayBeforeActions(final String playerId, LotroGame game, Effect effect, final PhysicalCard self) {
if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))
&& !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) {
WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) {
List<Action> actions = new LinkedList<Action>();
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
action.appendEffect(new PutOnTheOneRingEffect());
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
action.appendEffect(new PutOnTheOneRingEffect());
actions.add(action);
return actions;
}
return Collections.singletonList(action);
}
return null;
}
@@ -79,14 +73,10 @@ public class Card11_001 extends AbstractAttachable {
if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))
&& game.getGameState().isWearingRing()
&& !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) {
WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) {
List<RequiredTriggerAction> actions = new LinkedList<RequiredTriggerAction>();
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
return actions;
}
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
return Collections.singletonList(action);
}
return null;
}

11
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/Card9_001.java
View File

@@ -88,13 +88,10 @@ public class Card9_001 extends AbstractAttachable {
if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))
&& game.getGameState().isWearingRing()
&& !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) {
WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect;
if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
return Collections.singletonList(action);
}
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
action.appendEffect(new AddBurdenEffect(self, 1));
return Collections.singletonList(action);
}
return null;
}

1
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -1,6 +1,7 @@
<pre style="font-size:80%">
<b>29 Jan. 2012</b>
- "Whip of Many Thongs" now discards only Free People cards from hand.
- "The One Rings" should now correctly add burdens instead of wounds if The One Ring is on.
<b>28 Jan. 2012</b>
- "Watch-tower of Cirith Ungol" now allows to exert only YOUR minion.