From a5e38db7ff5a2f9ec26a416e28919ad9e7753d83 Mon Sep 17 00:00:00 2001 From: MarcinSc Date: Sun, 26 May 2024 17:10:35 +0700 Subject: [PATCH] Migrated Sauron cards in set 17 to hjson --- .../lotro/cards/set17/sauron/Card17_105.java | 61 ---------------- .../resources/card-stubs/set17-Sauron.hjson | 38 ---------- .../cards/official/set17/set17-Sauron.hjson | 71 +++++++++++++++++++ 3 files changed, 71 insertions(+), 99 deletions(-) delete mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/sauron/Card17_105.java delete mode 100644 gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set17-Sauron.hjson create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Sauron.hjson diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/sauron/Card17_105.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/sauron/Card17_105.java deleted file mode 100644 index 76b7792e7..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/sauron/Card17_105.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.gempukku.lotro.cards.set17.sauron; - -import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Keyword; -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.GameUtils; -import com.gempukku.lotro.logic.cardtype.AbstractPermanent; -import com.gempukku.lotro.logic.modifiers.*; -import com.gempukku.lotro.logic.timing.PlayConditions; - -import java.util.LinkedList; -import java.util.List; - -/** - * Set: Rise of Saruman - * Side: Shadow - * Culture: Sauron - * Twilight Cost: 2 - * Type: Artifact • Support Area - * Game Text: To play, spot 2 minions. While you can spot Sauron, each other minion is damage +1. While the fellowship - * is in the same region as Mount Doom, each companion is resistance -2. - */ -public class Card17_105 extends AbstractPermanent { - public Card17_105() { - super(Side.SHADOW, 2, CardType.ARTIFACT, Culture.SAURON, "Throne of the Dark Lord", null, true); - } - - @Override - public boolean checkPlayRequirements(LotroGame game, PhysicalCard self) { - return PlayConditions.canSpot(game, 2, CardType.MINION); - } - - @Override - public List getInPlayModifiers(LotroGame game, PhysicalCard self) { - List modifiers = new LinkedList<>(); - modifiers.add( - new KeywordModifier(self, Filters.and(CardType.MINION, Filters.not(Filters.name("Sauron"))), - new SpotCondition(Filters.name("Sauron")), Keyword.DAMAGE, 1)); - modifiers.add( - new ResistanceModifier(self, CardType.COMPANION, - new Condition() { - @Override - public boolean isFullfilled(LotroGame game) { - for (int siteNo = 1; siteNo <= 9; siteNo++) { - if (GameUtils.getRegion(siteNo) == GameUtils.getRegion(game)) { - PhysicalCard site = game.getGameState().getSite(siteNo); - if (site != null && site.getBlueprint().getTitle().equals("Mount Doom")) - return true; - - } - } - return false; - } - }, -2)); - return modifiers; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set17-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set17-Sauron.hjson deleted file mode 100644 index b3dde99f1..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set17-Sauron.hjson +++ /dev/null @@ -1,38 +0,0 @@ -{ - - 17_105: { - cardInfo: { - imagePath: decipher/LOTR17105.jpg - javaClass: true - //parentId: 17_105 - //One of: Variant, Errata, Reprint - //parentType: Variant - //parentPath: alts/promo - version: 0 - collInfo: 17R105 - rarity: R - setNum: "17" - cardNum: 105 - style: Standard - } - title: Throne of the Dark Lord - unique: true - side: Shadow - culture: Sauron - twilight: 2 - type: Artifact - #target: - keywords: Support Area - effects: [ - ] - gametext: To play, spot 2 minions.
While you can spot Sauron, each other minion is damage +1.
While the fellowship is in the same region as Mount Doom, each companion is resistance -2. - lore: One for the Dark Lord on his dark throne. - promotext: "" - alts: { - promos: { - } - errata: { - } - } - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Sauron.hjson new file mode 100644 index 000000000..57d9daf8c --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Sauron.hjson @@ -0,0 +1,71 @@ +{ + + 17_105: { + cardInfo: { + imagePath: decipher/LOTR17105.jpg + javaClass: true + //parentId: 17_105 + //One of: Variant, Errata, Reprint + //parentType: Variant + //parentPath: alts/promo + version: 0 + collInfo: 17R105 + rarity: R + setNum: "17" + cardNum: 105 + style: Standard + } + title: Throne of the Dark Lord + unique: true + side: Shadow + culture: Sauron + twilight: 2 + type: Artifact + #target: + keywords: Support Area + effects: [ + { + type: toPlay + requires: { + type: canSpot + filter: minion + count: 2 + } + } + { + type: modifier + modifier: { + type: addKeyword + requires: { + type: canSpot + filter: name(Sauron) + } + filter: minion,not(name(Sauron)) + keyword: damage + amount: 1 + } + } + { + type: modifier + modifier: { + type: modifyResistance + requires: { + type: canSpot + filter: siteInCurrentRegion,name(Mount Doom) + } + filter: companion + amount: -2 + } + } + ] + gametext: To play, spot 2 minions.
While you can spot Sauron, each other minion is damage +1.
While the fellowship is in the same region as Mount Doom, each companion is resistance -2. + lore: One for the Dark Lord on his dark throne. + promotext: "" + alts: { + promos: { + } + errata: { + } + } + } +}