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

- "Uruk Warrior" now correctly can use it's ability in Maneuver phase, rather than in Shadow phase.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-01-07 01:09:42 +00:00
parent 3625a32ef2
commit 3391171267
3 changed files with 10 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/set1/isengard/Card1_156.java
View File

@@ -32,7 +32,7 @@ public class Card1_156 extends AbstractMinion {
@Override
protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SHADOW, self, 0)
if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.MANEUVER, self, 0)
&& PlayConditions.canSpot(game, 6, CardType.COMPANION)) {
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(

12
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
View File

@@ -18,22 +18,22 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
private Set<Modifier> _skipSet = new HashSet<Modifier>();
private Map<Phase, Map<PhysicalCard, LimitCounter>> _counters = new HashMap<Phase, Map<PhysicalCard, LimitCounter>>();
private Map<Phase, Map<Integer, LimitCounter>> _counters = new HashMap<Phase, Map<Integer, LimitCounter>>();
private int _drawnThisPhaseCount = 0;
private Map<Integer, Integer> _woundsPerPhaseMap = new HashMap<Integer, Integer>();
@Override
public LimitCounter getUntilEndOfPhaseLimitCounter(PhysicalCard card, Phase phase) {
Map<PhysicalCard, LimitCounter> limitCounterMap = _counters.get(phase);
Map<Integer, LimitCounter> limitCounterMap = _counters.get(phase);
if (limitCounterMap == null) {
limitCounterMap = new HashMap<PhysicalCard, LimitCounter>();
limitCounterMap = new HashMap<Integer, LimitCounter>();
_counters.put(phase, limitCounterMap);
}
LimitCounter limitCounter = limitCounterMap.get(card);
LimitCounter limitCounter = limitCounterMap.get(card.getCardId());
if (limitCounter == null) {
limitCounter = new DefaultLimitCounter();
limitCounterMap.put(card, limitCounter);
limitCounterMap.put(card.getCardId(), limitCounter);
}
return limitCounter;
}
@@ -117,7 +117,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
removeModifiers(list);
list.clear();
}
Map<PhysicalCard, LimitCounter> counterMap = _counters.get(phase);
Map<Integer, LimitCounter> counterMap = _counters.get(phase);
if (counterMap != null)
counterMap.clear();

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

@@ -1,4 +1,7 @@
<pre style="font-size:80%">
<b>6 Jan. 2012</b>
- "Uruk Warrior" now correctly can use it's ability in Maneuver phase, rather than in Shadow phase.
<b>4 Jan. 2012</b>
- "Ellesar's Edict" should now correctly discard the Wraith.