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

Removed the Smaug in Java form and fixed the card in JSON

Browse Source
This commit is contained in:
marcin.sciesinski
2020-01-21 01:11:02 -08:00
parent 25e63afa57
commit 9abcefded5
2 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
View File

@@ -954,14 +954,12 @@
"type": "trigger", "type": "trigger",
"optional": true, "optional": true,
"trigger": { "trigger": {
"type": "losesSkirmish", "type": "winsSkirmish",
"filter": "or(companion,ally)", "filter": "name(Smaug)"
"against": "name(Smaug)"
}, },
"effect": { "effect": {
"type": "addBurdens", "type": "addBurdens",
"amount": 1 "amount": 1
} }
}, },
{ {
@@ -971,10 +969,13 @@
"type": "killed", "type": "killed",
"filter": "companion,culture(dwarven)" "filter": "companion,culture(dwarven)"
}, },
"condition": {
"type": "canSpot",
"filter": "name(Smaug),inSkirmish"
},
"effect": { "effect": {
"type": "addBurdens", "type": "addBurdens",
"amount": 1 "amount": 1
} }
}, },
{ {
@@ -984,7 +985,7 @@
"filter": "name(Bilbo)", "filter": "name(Bilbo)",
"condition": [ "condition": [
{ {
"type": "ringIsOn", "type": "ringIsOn"
}, },
{ {
"type": "canSpot", "type": "canSpot",

50
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set32/smaug/Card32_059.java
View File

@@ -1,50 +0,0 @@
package com.gempukku.lotro.cards.set32.smaug;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
import com.gempukku.lotro.logic.cardtype.AbstractPermanent;
import com.gempukku.lotro.logic.effects.AddBurdenEffect;
import com.gempukku.lotro.logic.effects.IncrementPhaseLimitEffect;
import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.PlayConditions;
import com.gempukku.lotro.logic.timing.TriggerConditions;
import java.util.Collections;
import java.util.List;
/**
* Set: The Clouds Burst
* Side: Shadow
* Culture: Smaug
* Twilight Cost: 0
* Type: Condition • Support area
* Game Text: Each time Smaug wins a skirmish or kills a [Dwarven] companion in a skirmish, you may add a doubt.
* While Bilbo wears The One Ring, he cannot be wounded by Smaug.
*/
public class Card32_059 extends AbstractPermanent {
public Card32_059() {
super(Side.SHADOW, 0, CardType.CONDITION, Culture.GUNDABAD, "Dragon's Malice", null, true);
}
@Override
public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (TriggerConditions.forEachKilledBy(game, effectResult, Filters.name("Smaug"), Filters.and(CardType.COMPANION, Culture.DWARVEN))
|| TriggerConditions.losesSkirmishInvolving(game, effectResult, Filters.or(CardType.COMPANION, CardType.ALLY), Filters.name("Smaug"))) {
OptionalTriggerAction action = new OptionalTriggerAction(self);
if (TriggerConditions.forEachKilledBy(game, effectResult, Filters.name("Smaug"), Filters.and(CardType.COMPANION, Culture.DWARVEN))) {
action.appendEffect(
new AddBurdenEffect(game.getGameState().getCurrentPlayerId(), self, 1));
} else if (TriggerConditions.losesSkirmishInvolving(game, effectResult, Filters.or(CardType.COMPANION, CardType.ALLY), Filters.name("Smaug"))) {
action.appendEffect(
new AddBurdenEffect(game.getGameState().getCurrentPlayerId(), self, 1));
}
return Collections.singletonList(action);
}
return null;
}
}