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

- "Final Triumph" should now correctly allow the skirmish to resolve based on Vitality.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-03-30 14:43:57 +00:00
parent 98ef5c3734
commit f85ce5c51a
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,14 +70,14 @@ public class RuleUtils {
if (skirmish == null) if (skirmish == null)
return 0; return 0;
final Evaluator overrideEvaluator = skirmish.getFpStrengthOverrideEvaluator();
if (overrideEvaluator != null)
return overrideEvaluator.evaluateExpression(game.getGameState(), game.getModifiersQuerying(), null);
PhysicalCard fpChar = skirmish.getFellowshipCharacter(); PhysicalCard fpChar = skirmish.getFellowshipCharacter();
if (fpChar == null) if (fpChar == null)
return 0; return 0;
final Evaluator overrideEvaluator = skirmish.getFpStrengthOverrideEvaluator();
if (overrideEvaluator != null)
return overrideEvaluator.evaluateExpression(game.getGameState(), game.getModifiersQuerying(), fpChar);
return game.getModifiersQuerying().getStrength(game.getGameState(), fpChar); return game.getModifiersQuerying().getStrength(game.getGameState(), fpChar);
} }

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DeckDAO.java
View File

@@ -189,8 +189,10 @@ public class DeckDAO {
String ringBearer = cardsList.get(0); String ringBearer = cardsList.get(0);
String ring = cardsList.get(1); String ring = cardsList.get(1);
final LotroDeck lotroDeck = new LotroDeck(); final LotroDeck lotroDeck = new LotroDeck();
lotroDeck.setRingBearer(ringBearer); if (ringBearer.length() > 0)
lotroDeck.setRing(ring); lotroDeck.setRingBearer(ringBearer);
if (ring.length() > 0)
lotroDeck.setRing(ring);
for (String blueprintId : cardsList.subList(2, cardsList.size())) { for (String blueprintId : cardsList.subList(2, cardsList.size())) {
if (_library.getLotroCardBlueprint(blueprintId).getCardType() == CardType.SITE) if (_library.getLotroCardBlueprint(blueprintId).getCardType() == CardType.SITE)
lotroDeck.addSite(blueprintId); lotroDeck.addSite(blueprintId);

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

@@ -1,6 +1,7 @@
<pre style="font-size:80%"> <pre style="font-size:80%">
<b>30 Mar. 2012</b> <b>30 Mar. 2012</b>
- "What Are We Waiting For?" should now skip only one Shadow phase, if player moves more than once. - "What Are We Waiting For?" should now skip only one Shadow phase, if player moves more than once.
- "Final Triumph" should now correctly allow the skirmish to resolve based on Vitality.
<b>28 Mar. 2012</b> <b>28 Mar. 2012</b>
- "Galadriel, Lady of the Golden Wood" should play the next site correctly now in non-numbered formats. - "Galadriel, Lady of the Golden Wood" should play the next site correctly now in non-numbered formats.