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

First obvious fixes.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-03 15:34:02 +00:00
parent 1567ea9ec5
commit 11632a6098
6 changed files with 4 additions and 7 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/effects/PayTwilightCostEffect.java
View File

@@ -40,7 +40,7 @@ public class PayTwilightCostEffect implements Cost {
game.getGameState().sendMessage(_physicalCard.getOwner() + " adds " + twilightCost + " to twilight pool");
return new CostResolution(null, true);
} else {
boolean success = game.getGameState().getTwilightPool() <= twilightCost;
boolean success = game.getGameState().getTwilightPool() >= twilightCost;
twilightCost = Math.min(twilightCost, game.getGameState().getTwilightPool());
if (twilightCost > 0) {
game.getGameState().removeTwilight(twilightCost);

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java
View File

@@ -14,7 +14,7 @@ public class RemoveTwilightEffect extends UnrespondableEffect implements Choosea
@Override
public void doPlayEffect(LotroGame game) {
int toRemove = Math.max(game.getGameState().getTwilightPool(), _twilight);
int toRemove = Math.min(game.getGameState().getTwilightPool(), _twilight);
game.getGameState().sendMessage(toRemove + " twilight gets removed from twilight pool");
game.getGameState().removeTwilight(toRemove);
}
@@ -26,7 +26,7 @@ public class RemoveTwilightEffect extends UnrespondableEffect implements Choosea
@Override
public CostResolution playCost(LotroGame game) {
int toRemove = Math.max(game.getGameState().getTwilightPool(), _twilight);
int toRemove = Math.min(game.getGameState().getTwilightPool(), _twilight);
game.getGameState().sendMessage(toRemove + " twilight gets removed from twilight pool");
game.getGameState().removeTwilight(toRemove);

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java
View File

@@ -7,7 +7,6 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
import com.gempukku.lotro.logic.actions.WoundAction;
import com.gempukku.lotro.logic.decisions.CardsSelectionDecision;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
import com.gempukku.lotro.logic.effects.WoundCharacterEffect;

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java
View File

@@ -6,7 +6,6 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
import com.gempukku.lotro.logic.actions.WoundAction;
import com.gempukku.lotro.logic.decisions.CardsSelectionDecision;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
import com.gempukku.lotro.logic.effects.WoundCharacterEffect;

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java
View File

@@ -8,7 +8,6 @@ import com.gempukku.lotro.game.state.GameState;
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.actions.WoundAction;
import com.gempukku.lotro.logic.effects.KillEffect;
import com.gempukku.lotro.logic.effects.WoundCharacterEffect;
import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
View File

@@ -37,7 +37,7 @@ public class LotroServer extends AbstractServer {
_lotroCardBlueprintLibrary = library;
_chatServer = chatServer;
_defaultCollection = new DefaultCardCollection();
for (int i = 1; i <= 1; i++) {
for (int i = 1; i <= 3; i++) {
for (int j = 1; j <= 365; j++) {
String blueprintId = i + "_" + j;
try {