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

replace TARGET_NONE with NONE, getAllAbilityFlags with getAbilityFlags

master
melvin 2012-10-13 11:31:19 +08:00
parent aa270db22f
commit 35a65f4f47
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/model/choice/MagicBuybackChoice.java
View File

@ -37,7 +37,7 @@ public class MagicBuybackChoice extends MagicChoice {
public MagicTargetChoice getTargetChoice() {
return (otherChoice instanceof MagicTargetChoice) ?
(MagicTargetChoice)otherChoice :
MagicTargetChoice.TARGET_NONE;
MagicTargetChoice.NONE;
}
@Override

2
src/magic/model/choice/MagicChoice.java
View File

@ -53,7 +53,7 @@ public abstract class MagicChoice {
}
public MagicTargetChoice getTargetChoice() {
return MagicTargetChoice.TARGET_NONE;
return MagicTargetChoice.NONE;
}
public int getManaChoiceResultIndex() {

2
src/magic/model/choice/MagicCombatCreature.java
View File

@ -28,7 +28,7 @@ public class MagicCombatCreature {
this.score = permanent.getScore();
final MagicPowerToughness pt = permanent.getPowerToughness();
lethalDamage = permanent.getLethalDamage(pt.toughness());
flags = permanent.getAllAbilityFlags();
flags = permanent.getAbilityFlags();
power = MagicAbility.DoubleStrike.hasAbility(flags) ?
pt.getPositivePower() * 2 :
pt.getPositivePower();

2
src/magic/model/choice/MagicKickerChoice.java
View File

@ -48,7 +48,7 @@ public class MagicKickerChoice extends MagicChoice {
@Override
public MagicTargetChoice getTargetChoice() {
return (otherChoice instanceof MagicTargetChoice) ? (MagicTargetChoice)otherChoice : MagicTargetChoice.TARGET_NONE;
return (otherChoice instanceof MagicTargetChoice) ? (MagicTargetChoice)otherChoice : MagicTargetChoice.NONE;
}
@Override

2
src/magic/model/choice/MagicMayChoice.java
View File

@ -31,7 +31,7 @@ public class MagicMayChoice extends MagicChoice {
super(description);
this.choices=choices;
MagicTargetChoice localTargetChoice = MagicTargetChoice.TARGET_NONE;
MagicTargetChoice localTargetChoice = MagicTargetChoice.NONE;
int localManaChoiceResultIndex = -1;
for (int index=0;index<choices.length;index++) {
final MagicChoice choice=choices[index];

4
src/magic/model/choice/MagicTargetChoice.java
View File

@ -18,8 +18,8 @@ import java.util.Map;
import java.util.Set;
public class MagicTargetChoice extends MagicChoice {
public static final MagicTargetChoice TARGET_NONE =
new MagicTargetChoice(MagicTargetFilter.ALL,false,MagicTargetHint.None,"nothing") {
public static final MagicTargetChoice NONE =
new MagicTargetChoice(MagicTargetFilter.NONE,false,MagicTargetHint.None,"nothing") {
@Override
public boolean isValid() {
return false;