From 44a7594a60e42839448c3024e9e18058dd59637e Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Tue, 13 Aug 2019 23:00:19 -0700 Subject: [PATCH] Finished extracting stuff from cards --- .../lotro/logic/cardtype/AbstractAttachable.java | 15 ++++----------- .../lotro/logic/cardtype/AbstractEvent.java | 2 -- .../lotro/logic/cardtype/AbstractMinion.java | 1 + .../logic/cardtype/AbstractResponseEvent.java | 12 +++++------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java index c9560801f..30298e0b4 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java @@ -4,18 +4,12 @@ import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.PossessionClass; import com.gempukku.lotro.common.Side; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.timing.Action; -import com.gempukku.lotro.logic.timing.Effect; -import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; -import java.util.List; import java.util.Set; public abstract class AbstractAttachable extends AbstractLotroCardBlueprint { - private PossessionClass _possessionClass; + private Set _possessionClasses; public AbstractAttachable(Side side, CardType cardType, int twilight, Culture culture, PossessionClass possessionClass, String name) { this(side, cardType, twilight, culture, possessionClass, name, null, false); @@ -23,13 +17,12 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint { public AbstractAttachable(Side side, CardType cardType, int twilight, Culture culture, PossessionClass possessionClass, String name, String subTitle, boolean unique) { super(twilight, side, cardType, culture, name, subTitle, unique); - _possessionClass = possessionClass; + if (possessionClass != null) + _possessionClasses = Collections.singleton(possessionClass); } @Override public Set getPossessionClasses() { - if (_possessionClass != null) - return Collections.singleton(_possessionClass); - return null; + return _possessionClasses; } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractEvent.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractEvent.java index 0cb3d6c1e..61b558ff2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractEvent.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractEvent.java @@ -37,8 +37,6 @@ public abstract class AbstractEvent extends AbstractLotroCardBlueprint { addKeyword(Keyword.SKIRMISH); else if (phase == Phase.REGROUP) addKeyword(Keyword.REGROUP); - else - addKeyword(Keyword.RESPONSE); } public abstract PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractMinion.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractMinion.java index c45654f78..412b12b7c 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractMinion.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractMinion.java @@ -35,6 +35,7 @@ public class AbstractMinion extends AbstractPermanent { return _site; } + @Override public final Race getRace() { return _race; } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractResponseEvent.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractResponseEvent.java index 434c4a3f6..9260f3e9d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractResponseEvent.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractResponseEvent.java @@ -1,18 +1,16 @@ package com.gempukku.lotro.logic.cardtype; +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.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.PlayEventAction; -public class AbstractResponseEvent extends AbstractEvent { +public class AbstractResponseEvent extends AbstractLotroCardBlueprint { public AbstractResponseEvent(Side side, int twilightCost, Culture culture, String name) { - super(side, twilightCost, culture, name, null); - } - - @Override - public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { - return null; + super(twilightCost, side, CardType.EVENT, culture, name); + addKeyword(Keyword.RESPONSE); } }