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

- Ambush is now correctly an optional trigger, rather than required.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-03 21:09:49 +00:00
parent c2e210d0e6
commit 408b4af653
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,14 +25,14 @@ public class AmbushRule {
_actionsEnvironment.addAlwaysOnActionProxy(
new AbstractActionProxy() {
@Override
public List<? extends Action> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult) {
public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult) {
if (effectResult.getType() == EffectResult.Type.ASSIGNMENT) {
AssignmentResult assignmentResult = (AssignmentResult) effectResult;
if (assignmentResult.getPlayerId().equals(game.getGameState().getCurrentPlayerId())) {
List<RequiredTriggerAction> actions = new LinkedList<RequiredTriggerAction>();
for (List<PhysicalCard> minions : assignmentResult.getAssignments().values()) {
for (PhysicalCard minion : minions) {
if (game.getModifiersQuerying().hasKeyword(game.getGameState(), minion, Keyword.AMBUSH)) {
if (game.getModifiersQuerying().hasKeyword(game.getGameState(), minion, Keyword.AMBUSH) && minion.getOwner().equals(playerId)) {
final int count = game.getModifiersQuerying().getKeywordCount(game.getGameState(), minion, Keyword.AMBUSH);
RequiredTriggerAction action = new RequiredTriggerAction(minion);
action.setText("Ambush - add " + count);

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

@@ -6,6 +6,7 @@
- Deck builder now allows to sort cards by name (default), twilight cost, strength and vitality.
- "Legolas, Elven Comrade" now gives the strength penalty correctly to the minion.
- "Company of Archers" now correctly tries to spot 2 ELVEN companions rather than conditions to be able to play it.
- Ambush is now correctly an optional trigger, rather than required.
<b>2 Nov. 2011</b>
- "O Elbereth! Gilthoniel!" should correctly give the option to cancel a skirmish with Nazgul when used in skirmish