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

Fixing assigning chars to minions

Browse Source
This commit is contained in:
marcin.sciesinski
2019-09-02 15:46:46 -07:00
parent 9df7b4af32
commit 6dcad60e01
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignToSkirmishAgainstMinion.java
View File

@@ -16,6 +16,10 @@ import com.gempukku.lotro.logic.effects.AssignmentEffect;
import com.gempukku.lotro.logic.timing.Effect;
import org.json.simple.JSONObject;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class AssignToSkirmishAgainstMinion implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
@@ -41,12 +45,16 @@ public class AssignToSkirmishAgainstMinion implements EffectAppenderProducer {
result.addEffectAppender(
new DelayedAppender() {
@Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
protected List<? extends Effect> createEffects(boolean cost, CostToEffectAction action, ActionContext actionContext) {
final String assigningPlayer = playerSource.getPlayer(actionContext);
final Filterable filter = minionFilter.getFilterable(actionContext);
final PhysicalCard minion = Filters.findFirstActive(actionContext.getGame(), filter);
final PhysicalCard fpCharacter = actionContext.getCardFromMemory("_tempFpCharacter");
return new AssignmentEffect(assigningPlayer, fpCharacter, minion);
final Collection<? extends PhysicalCard> fpChar = actionContext.getCardsFromMemory("_tempFpCharacter");
if (fpChar.size() == 1) {
return Collections.singletonList(
new AssignmentEffect(assigningPlayer, fpChar.iterator().next(), minion));
}
return null;
}
});

14
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DelayedAppender.java
View File

@@ -29,12 +29,14 @@ public abstract class DelayedAppender implements EffectAppender {
protected void doPlayEffect(LotroGame game) {
// Need to insert them, but in the reverse order
final List<? extends Effect> effects = createEffects(cost, action, actionContext);
final Effect[] effectsArray = effects.toArray(new Effect[0]);
for (int i = effectsArray.length - 1; i >= 0; i--)
if (cost)
action.insertCost(effectsArray[i]);
else
action.insertEffect(effectsArray[i]);
if (effects != null) {
final Effect[] effectsArray = effects.toArray(new Effect[0]);
for (int i = effectsArray.length - 1; i >= 0; i--)
if (cost)
action.insertCost(effectsArray[i]);
else
action.insertEffect(effectsArray[i]);
}
}
@Override