Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor MagicDrawAction -> DrawAction

master
ShawnieBoy 2015-04-14 11:39:30 +01:00
parent 9feddcc645
commit f17e0d48ef
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/magic/model/action/MagicDrawAction.java → src/magic/model/action/DrawAction.java
View File

@ -12,17 +12,17 @@ import magic.model.trigger.MagicTriggerType;
import java.util.ArrayList;
import java.util.List;
public class MagicDrawAction extends MagicAction {
public class DrawAction extends MagicAction {
private final MagicPlayer player;
private final int amount;
private List<MagicCard> drawnCards;
public MagicDrawAction(final MagicPlayer player) {
public DrawAction(final MagicPlayer player) {
this(player, 1);
}
public MagicDrawAction(final MagicPlayer player,final int amount) {
public DrawAction(final MagicPlayer player,final int amount) {
this.player=player;
this.amount=amount;
}

4
src/magic/model/event/MagicDrawEvent.java
View File

@ -3,7 +3,7 @@ package magic.model.event;
import magic.model.MagicGame;
import magic.model.MagicPlayer;
import magic.model.MagicSource;
import magic.model.action.MagicDrawAction;
import magic.model.action.DrawAction;
public class MagicDrawEvent extends MagicEvent {
public MagicDrawEvent(final MagicSource source,final MagicPlayer player,final int amount) {
@ -19,7 +19,7 @@ public class MagicDrawEvent extends MagicEvent {
private static final MagicEventAction EVENT_ACTION=new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicDrawAction(event.getPlayer(), event.getRefInt()));
game.doAction(new DrawAction(event.getPlayer(), event.getRefInt()));
}
};

4
src/magic/model/event/MagicMulliganEvent.java
View File

@ -6,7 +6,7 @@ import magic.model.MagicGame;
import magic.model.MagicSource;
import magic.model.MagicLocationType;
import magic.model.MagicPlayer;
import magic.model.action.MagicDrawAction;
import magic.model.action.DrawAction;
import magic.model.action.MagicMoveCardAction;
import magic.model.action.MagicRemoveCardAction;
import magic.model.choice.MagicMulliganChoice;
@ -42,7 +42,7 @@ public class MagicMulliganEvent extends MagicEvent {
}
final MagicCardList library = player.getLibrary();
library.shuffle();
game.doAction(new MagicDrawAction(player,size - 1));
game.doAction(new DrawAction(player,size - 1));
game.addEvent(new MagicMulliganEvent(player));
}
}

12
src/magic/model/event/MagicRuleEventAction.java
View File

@ -629,7 +629,7 @@ public enum MagicRuleEventAction {
return new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicDrawAction(event.getPlayer(), amount));
game.doAction(new DrawAction(event.getPlayer(), amount));
game.doAction(new ChangeLifeAction(event.getPlayer(), -amount2));
}
};
@ -646,7 +646,7 @@ public enum MagicRuleEventAction {
return new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicDrawAction(ARG.youPlayer(event, matcher), amount));
game.doAction(new DrawAction(ARG.youPlayer(event, matcher), amount));
}
};
}
@ -684,7 +684,7 @@ public enum MagicRuleEventAction {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
for (final MagicPlayer player : game.filterPlayers(event.getPlayer(), filter)) {
game.doAction(new MagicDrawAction(player, amount));
game.doAction(new DrawAction(player, amount));
}
}
};
@ -748,7 +748,7 @@ public enum MagicRuleEventAction {
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPlayer(game,new MagicPlayerAction() {
public void doAction(final MagicPlayer player) {
game.doAction(new MagicDrawAction(player,amount));
game.doAction(new DrawAction(player,amount));
}
});
}
@ -767,7 +767,7 @@ public enum MagicRuleEventAction {
return new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicDrawAction(ARG.youPlayer(event, matcher), amount1));
game.doAction(new DrawAction(ARG.youPlayer(event, matcher), amount1));
game.addEvent(new MagicDiscardEvent(event.getSource(), ARG.youPlayer(event, matcher), amount2));
}
};
@ -787,7 +787,7 @@ public enum MagicRuleEventAction {
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPlayer(game,new MagicPlayerAction() {
public void doAction(final MagicPlayer player) {
game.doAction(new MagicDrawAction(player, amount1));
game.doAction(new DrawAction(player, amount1));
game.addEvent(new MagicDiscardEvent(event.getSource(), player, amount2));
}
});

4
src/magic/model/phase/MagicDrawPhase.java
View File

@ -2,7 +2,7 @@ package magic.model.phase;
import magic.model.MagicGame;
import magic.model.MagicPlayer;
import magic.model.action.MagicDrawAction;
import magic.model.action.DrawAction;
import magic.model.event.MagicExcludeEvent;
import magic.model.trigger.MagicTriggerType;
@ -27,7 +27,7 @@ public class MagicDrawPhase extends MagicPhase {
}
final MagicPlayer player=game.getTurnPlayer();
game.doAction(new MagicDrawAction(player));
game.doAction(new DrawAction(player));
game.executeTrigger(MagicTriggerType.AtDraw,game.getTurnPlayer());

2
src/magic/model/trigger/MagicAtDrawTrigger.java
View File

@ -3,7 +3,7 @@ package magic.model.trigger;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPlayer;
import magic.model.action.MagicDrawAction;
import magic.model.action.DrawAction;
import magic.model.event.MagicEvent;
import magic.model.event.MagicSourceEvent;

4
src/magic/model/trigger/MagicAtUpkeepTrigger.java
View File

@ -4,7 +4,7 @@ import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPlayer;
import magic.model.MagicSource;
import magic.model.action.MagicDrawAction;
import magic.model.action.DrawAction;
import magic.model.action.MagicRemoveTriggerAction;
import magic.model.event.MagicEvent;
import magic.model.event.MagicSourceEvent;
@ -42,7 +42,7 @@ public abstract class MagicAtUpkeepTrigger extends MagicTrigger<MagicPlayer> {
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicDrawAction(event.getPlayer()));
game.doAction(new DrawAction(event.getPlayer()));
}
};
}