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

Healing simplified.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-24 11:08:23 +00:00
parent ff4368ce91
commit ae0d17d72b
7 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,14 +6,12 @@ import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
import com.gempukku.lotro.logic.decisions.IntegerAwaitingDecision;
import com.gempukku.lotro.logic.effects.AddTwilightEffect;
import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
import com.gempukku.lotro.logic.effects.HealCharactersEffect;
import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect;
import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
/**
@@ -45,13 +43,7 @@ public class Card1_294 extends AbstractOldEvent {
final int twilight = getValidatedResult(result);
action.appendCost(new AddTwilightEffect(self, twilight));
action.appendEffect(
new ChooseActiveCardEffect(self, playerId, "Choose a Hobbit", Filters.race(Race.HOBBIT)) {
@Override
protected void cardSelected(LotroGame game, PhysicalCard hobbit) {
for (int i = 0; i < twilight; i++)
action.appendEffect(new HealCharactersEffect(playerId, hobbit));
}
});
new ChooseAndHealCharactersEffect(action, playerId, 1, 1, twilight, Race.HOBBIT));
}
}));
return action;

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

@@ -31,7 +31,7 @@ import java.util.List;
*/
public class Card2_079 extends AbstractOldEvent {
public Card2_079() {
super(Side.SHADOW, Culture.WRAITH, "Resistance Becomes Unbearable");
super(Side.SHADOW, Culture.WRAITH, "Resistance Becomes Unbearable", Phase.MANEUVER);
}
@Override

12
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_013.java
View File

@@ -9,9 +9,7 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.ActivateCardAction;
import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect;
import com.gempukku.lotro.logic.effects.HealCharactersEffect;
import com.gempukku.lotro.logic.timing.Action;
import com.gempukku.lotro.logic.timing.EffectResult;
@@ -40,15 +38,7 @@ public class Card3_013 extends AbstractAlly {
if (effectResult.getType() == EffectResult.Type.START_OF_TURN) {
final OptionalTriggerAction action = new OptionalTriggerAction(self);
action.appendEffect(
new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)) {
@Override
protected void cardSelected(LotroGame game, PhysicalCard ally) {
action.insertEffect(
new HealCharactersEffect(playerId, ally));
action.insertEffect(
new HealCharactersEffect(playerId, ally));
}
});
new ChooseAndHealCharactersEffect(action, playerId, 1, 1, 2, Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)));
return Collections.singletonList(action);
}
return null;

12
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_107.java
View File

@@ -11,8 +11,7 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.ActivateCardAction;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
import com.gempukku.lotro.logic.effects.HealCharactersEffect;
import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect;
import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
import com.gempukku.lotro.logic.timing.Action;
@@ -52,14 +51,7 @@ public class Card3_107 extends AbstractAttachableFPPossession {
public void decisionMade(String result) throws DecisionResultInvalidException {
final int spotCount = getValidatedResult(result);
action.appendEffect(
new ChooseActiveCardEffect(self, playerId, "Choose companion with Frodo signet", Filters.type(CardType.COMPANION), Filters.signet(Signet.FRODO)) {
@Override
protected void cardSelected(LotroGame game, PhysicalCard card) {
for (int i = 0; i < spotCount; i++)
action.insertEffect(
new HealCharactersEffect(playerId, card));
}
});
new ChooseAndHealCharactersEffect(action, playerId, 1, 1, spotCount, CardType.COMPANION, Signet.FRODO));
}
}));
return Collections.singletonList(action);

14
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndHealCharactersEffect.java
View File

@@ -34,12 +34,14 @@ public class ChooseAndHealCharactersEffect extends ChooseActiveCardsEffect {
@Override
protected Filter getExtraFilter() {
return Filters.and(Filters.wounded, new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return modifiersQuerying.canBeHealed(gameState, physicalCard);
}
});
return Filters.and(
Filters.wounded,
new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return modifiersQuerying.canBeHealed(gameState, physicalCard);
}
});
}
@Override

15
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java
View File

@@ -1,6 +1,7 @@
package com.gempukku.lotro.logic.effects;
import com.gempukku.lotro.filters.Filter;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.game.state.LotroGame;
@@ -27,12 +28,14 @@ public class HealCharactersEffect extends AbstractPreventableCardEffect {
@Override
protected Filter getExtraAffectableFilter() {
return new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return modifiersQuerying.canBeHealed(gameState, physicalCard);
}
};
return Filters.and(
Filters.wounded,
new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return modifiersQuerying.canBeHealed(gameState, physicalCard);
}
});
}
@Override

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

@@ -1,6 +1,7 @@
<pre style="font-size:80%">
<b>24 Oct. 2011</b>
- Frodo and Sam are always Ring-bound (according to rules).
- "Resistance Becomes Unbearable" can be now played in Maneuver phase, as it's supposed to.
<b>23 Oct. 2011</b>
- "Hornburg Causeway" now adds +2 to archery for each unbound companion over 3, instead of +1.