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

refactor MagicGainAbilityAction ->GainAbilityAction

master
ShawnieBoy 2015-04-14 11:53:13 +01:00
parent 6d2a007403
commit 80fd80940c
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/model/action/BecomesAction.java
View File

@ -126,7 +126,7 @@ public class BecomesAction extends MagicAction {
game.doAction(new AddStaticAction(permanent, ST));
}
if (ability != null) {
game.doAction(new MagicGainAbilityAction(permanent, ability, duration));
game.doAction(new GainAbilityAction(permanent, ability, duration));
}
}

16
src/magic/model/action/MagicGainAbilityAction.java → src/magic/model/action/GainAbilityAction.java
View File

@ -12,39 +12,39 @@ import java.util.List;
import java.util.Set;
// Set an ability until end of turn.
public class MagicGainAbilityAction extends MagicAction {
public class GainAbilityAction extends MagicAction {
private final MagicPermanent permanent;
private final MagicAbilityList abilityList;
private final boolean duration;
public MagicGainAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList, final boolean duration) {
public GainAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList, final boolean duration) {
this.permanent=permanent;
this.abilityList=abilityList;
this.duration=duration;
}
public MagicGainAbilityAction(final MagicPermanent permanent,final Set<MagicAbility> abilities, final boolean duration) {
public GainAbilityAction(final MagicPermanent permanent,final Set<MagicAbility> abilities, final boolean duration) {
this(permanent,MagicAbility.getAbilityList(abilities), duration);
}
public MagicGainAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList) {
public GainAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList) {
this(permanent,abilityList,MagicStatic.UntilEOT);
}
public MagicGainAbilityAction(final MagicPermanent permanent,final List<MagicAbility> abilities) {
public GainAbilityAction(final MagicPermanent permanent,final List<MagicAbility> abilities) {
this(permanent,EnumSet.copyOf(abilities),MagicStatic.UntilEOT);
}
public MagicGainAbilityAction(final MagicPermanent permanent,final MagicAbility first, final MagicAbility ... rest) {
public GainAbilityAction(final MagicPermanent permanent,final MagicAbility first, final MagicAbility ... rest) {
this(permanent,MagicAbility.of(first,rest),MagicStatic.UntilEOT);
}
public MagicGainAbilityAction(final MagicPermanent permanent,final MagicAbility ability,final boolean duration) {
public GainAbilityAction(final MagicPermanent permanent,final MagicAbility ability,final boolean duration) {
this(permanent,MagicAbility.of(ability),duration);
}
public MagicGainAbilityAction(final MagicPermanent permanent,final MagicAbility ability) {
public GainAbilityAction(final MagicPermanent permanent,final MagicAbility ability) {
this(permanent,MagicAbility.of(ability),MagicStatic.UntilEOT);
}

6
src/magic/model/action/MagicPlayMod.java
View File

@ -65,12 +65,12 @@ public enum MagicPlayMod implements MagicPermanentAction {
},
HASTE_UEOT("it gains haste until end of turn") {
protected void doAction(final MagicGame game, final MagicPermanent perm) {
game.doAction(new MagicGainAbilityAction(perm, MagicAbility.Haste));
game.doAction(new GainAbilityAction(perm, MagicAbility.Haste));
}
},
HASTE("it gains haste") {
protected void doAction(final MagicGame game, final MagicPermanent perm) {
game.doAction(new MagicGainAbilityAction(perm, MagicAbility.Haste, MagicStatic.Forever));
game.doAction(new GainAbilityAction(perm, MagicAbility.Haste, MagicStatic.Forever));
}
},
PERSIST() {
@ -118,7 +118,7 @@ public enum MagicPlayMod implements MagicPermanentAction {
}
});
morphAct.add(new MagicMorphActivation(cost));
game.doAction(new MagicGainAbilityAction(perm, morphAct, MagicStatic.Forever));
game.doAction(new GainAbilityAction(perm, morphAct, MagicStatic.Forever));
}
perm.setState(MagicPermanentState.FaceDown);
}

4
src/magic/model/event/MagicGainProtectionFromEvent.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.MagicGainAbilityAction;
import magic.model.action.GainAbilityAction;
import magic.model.choice.MagicColorChoice;
public class MagicGainProtectionFromEvent extends MagicEvent {
@ -23,7 +23,7 @@ public class MagicGainProtectionFromEvent extends MagicEvent {
private static final MagicEventAction EVENT_ACTION=new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicGainAbilityAction(
game.doAction(new GainAbilityAction(
event.getRefPermanent(),
event.getChosenColor().getProtectionAbility()
));

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

@ -1055,7 +1055,7 @@ public enum MagicRuleEventAction {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ChangeTurnPTAction(ARG.itPermanent(event, matcher),power,toughness));
game.doAction(new MagicGainAbilityAction(ARG.itPermanent(event, matcher),abilityList));
game.doAction(new GainAbilityAction(ARG.itPermanent(event, matcher),abilityList));
}
};
}
@ -1077,7 +1077,7 @@ public enum MagicRuleEventAction {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ChangeTurnPTAction(event.getPermanent(),power,toughness));
game.doAction(new MagicGainAbilityAction(event.getPermanent(),abilityList));
game.doAction(new GainAbilityAction(event.getPermanent(),abilityList));
}
};
}
@ -1101,7 +1101,7 @@ public enum MagicRuleEventAction {
event.processTargetPermanent(game,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new ChangeTurnPTAction(creature,power,toughness));
game.doAction(new MagicGainAbilityAction(creature,abilityList));
game.doAction(new GainAbilityAction(creature,abilityList));
}
});
}
@ -1183,7 +1183,7 @@ public enum MagicRuleEventAction {
);
for (final MagicPermanent creature : targets) {
game.doAction(new ChangeTurnPTAction(creature,power,toughness));
game.doAction(new MagicGainAbilityAction(creature,abilityList));
game.doAction(new GainAbilityAction(creature,abilityList));
}
}
};
@ -1292,7 +1292,7 @@ public enum MagicRuleEventAction {
event.processTargetPermanent(game,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new ChangeTurnPTAction(creature,power,toughness));
game.doAction(new MagicGainAbilityAction(creature,abilityList));
game.doAction(new GainAbilityAction(creature,abilityList));
}
});
}
@ -2912,7 +2912,7 @@ public enum MagicRuleEventAction {
return new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicGainAbilityAction(ARG.itPermanent(event, matcher),abilityList));
game.doAction(new GainAbilityAction(ARG.itPermanent(event, matcher),abilityList));
}
};
}
@ -2941,7 +2941,7 @@ public enum MagicRuleEventAction {
return new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new MagicGainAbilityAction(event.getPermanent(),abilityList));
game.doAction(new GainAbilityAction(event.getPermanent(),abilityList));
}
};
}
@ -2993,7 +2993,7 @@ public enum MagicRuleEventAction {
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPermanent(game,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new MagicGainAbilityAction(creature,abilityList));
game.doAction(new GainAbilityAction(creature,abilityList));
}
});
}
@ -3073,7 +3073,7 @@ public enum MagicRuleEventAction {
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPermanent(game,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new MagicGainAbilityAction(creature,abilityList));
game.doAction(new GainAbilityAction(creature,abilityList));
}
});
}
@ -3137,7 +3137,7 @@ public enum MagicRuleEventAction {
filter
);
for (final MagicPermanent creature : targets) {
game.doAction(new MagicGainAbilityAction(creature,abilityList));
game.doAction(new GainAbilityAction(creature,abilityList));
}
}
};