From 036ab0703bf7841a9576dbbee53dd5aac82c8a58 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Tue, 1 Oct 2019 18:02:47 -0700 Subject: [PATCH] Introduced all types of Actions for clarity --- .../logic/actions/PlayerReconcilesAction.java | 2 +- .../actions/ResolveSkirmishDamageAction.java | 2 +- .../actions/TransferPermanentAction.java | 2 +- .../gempukku/lotro/logic/timing/Action.java | 66 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayerReconcilesAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayerReconcilesAction.java index d3edf6e14..54bcb0187 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayerReconcilesAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayerReconcilesAction.java @@ -32,7 +32,7 @@ public class PlayerReconcilesAction implements Action { @Override public Type getType() { - return Type.OTHER; + return Type.RECONCILE; } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ResolveSkirmishDamageAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ResolveSkirmishDamageAction.java index 4b2667200..90d2ba8f8 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ResolveSkirmishDamageAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ResolveSkirmishDamageAction.java @@ -26,7 +26,7 @@ public class ResolveSkirmishDamageAction extends RequiredTriggerAction { @Override public Type getType() { - return Type.OTHER; + return Type.RESOLVE_DAMAGE; } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/TransferPermanentAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/TransferPermanentAction.java index 44f760ef8..0dba138d6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/TransferPermanentAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/TransferPermanentAction.java @@ -41,6 +41,6 @@ public class TransferPermanentAction extends ActivateCardAction { @Override public Type getType() { - return Type.OTHER; + return Type.TRANSFER; } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java index ae2adf090..f3ca5d827 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java @@ -1,33 +1,33 @@ -package com.gempukku.lotro.logic.timing; - -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; - -public interface Action { - public enum Type { - PLAY_CARD, SPECIAL_ABILITY, TRIGGER, OTHER - } - - public Type getType(); - - public PhysicalCard getActionSource(); - - public void setActionTimeword(Phase phase); - - public PhysicalCard getActionAttachedToCard(); - - public void setVirtualCardAction(boolean virtualCardAction); - - public boolean isVirtualCardAction(); - - public void setPerformingPlayer(String playerId); - - public String getPerformingPlayer(); - - public Phase getActionTimeword(); - - public String getText(LotroGame game); - - public Effect nextEffect(LotroGame game); -} +package com.gempukku.lotro.logic.timing; + +import com.gempukku.lotro.common.Phase; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; + +public interface Action { + public enum Type { + PLAY_CARD, SPECIAL_ABILITY, TRIGGER, TRANSFER, RECONCILE, RESOLVE_DAMAGE, OTHER + } + + public Type getType(); + + public PhysicalCard getActionSource(); + + public void setActionTimeword(Phase phase); + + public PhysicalCard getActionAttachedToCard(); + + public void setVirtualCardAction(boolean virtualCardAction); + + public boolean isVirtualCardAction(); + + public void setPerformingPlayer(String playerId); + + public String getPerformingPlayer(); + + public Phase getActionTimeword(); + + public String getText(LotroGame game); + + public Effect nextEffect(LotroGame game); +}