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

Removing distinction of successful vs carriedOut.

Browse Source
This commit is contained in:
marcins78
2012-12-11 18:03:23 +00:00
parent 0449d7a486
commit 0c2ce3db25
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/orc/Card13_121.java
View File

@@ -40,7 +40,7 @@ public class Card13_121 extends AbstractEvent {
@Override
protected FullEffectResult playEffectReturningResult(LotroGame game) {
final FullEffectResult fullEffectResult = super.playEffectReturningResult(game);
if (fullEffectResult.isSuccessful())
if (fullEffectResult.isCarriedOut())
bonus.set(6);
return fullEffectResult;
}

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java
View File

@@ -8,7 +8,6 @@ import java.util.Collection;
public abstract class AbstractEffect implements Effect {
private Boolean _carriedOut;
private Boolean _successful;
protected boolean _prevented;
protected abstract FullEffectResult playEffectReturningResult(LotroGame game);
@@ -17,7 +16,6 @@ public abstract class AbstractEffect implements Effect {
public final void playEffect(LotroGame game) {
FullEffectResult fullEffectResult = playEffectReturningResult(game);
_carriedOut = fullEffectResult.isCarriedOut();
_successful = fullEffectResult.isSuccessful();
}
@Override
@@ -36,18 +34,12 @@ public abstract class AbstractEffect implements Effect {
}
protected static class FullEffectResult {
private boolean _successful;
private boolean _carriedOut;
public FullEffectResult(boolean successful, boolean carriedOut) {
_successful = successful;
_carriedOut = carriedOut;
}
public boolean isSuccessful() {
return _successful;
}
public boolean isCarriedOut() {
return _carriedOut;
}