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

replace MagicAbility.values with MagicAbility.CORE

master
melvin 2012-09-22 18:32:22 +08:00
parent ac3d5f984d
commit d853236bd3
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/magic/generator/Ability_Mono_DeckGenerator.java
View File

@ -48,19 +48,18 @@ public class Ability_Mono_DeckGenerator extends DefaultDeckGenerator {
}
private void getPossibleTribes() {
for(MagicAbility ab : MagicAbility.values()) {
for(MagicAbility ab : MagicAbility.CORE) {
HashMap<MagicColor, Integer> countColors = new HashMap<MagicColor, Integer>();
countColors.put(MagicColor.Black, new Integer(0));
countColors.put(MagicColor.White, new Integer(0));
countColors.put(MagicColor.Green, new Integer(0));
countColors.put(MagicColor.Red, new Integer(0));
countColors.put(MagicColor.Blue, new Integer(0));
countColors.put(MagicColor.Black, 0);
countColors.put(MagicColor.White, 0);
countColors.put(MagicColor.Green, 0);
countColors.put(MagicColor.Red, 0);
countColors.put(MagicColor.Blue, 0);
// count colors
for(MagicCardDefinition card : CardDefinitions.getCards()) {
if(card.hasAbility(ab)) {
if (card.hasAbility(ab)) {
int colorFlags = card.getColorFlags();
for(MagicColor c : countColors.keySet()) {
if (c.hasColor(colorFlags)) {
countColors.put(c, new Integer(countColors.get(c).intValue() + 1));

6
src/magic/model/MagicAbility.java
View File

@ -1,6 +1,8 @@
package magic.model;
import java.util.List;
import java.util.EnumSet;
import magic.model.MagicCardDefinition;
import magic.model.MagicManaCost;
import magic.model.MagicManaType;
@ -623,7 +625,7 @@ public enum MagicAbility {
public static int getScore(final long flags) {
int score=0;
for (final MagicAbility ability : values()) {
for (final MagicAbility ability : CORE) {
if (ability.hasAbility(flags)) {
score+=ability.getScore();
}
@ -652,4 +654,6 @@ public enum MagicAbility {
}
return flags;
}
public static final EnumSet<MagicAbility> CORE = EnumSet.range(AttacksEachTurnIfAble, Soulbond);
}

3
src/magic/model/MagicCardDefinition.java
View File

@ -719,8 +719,7 @@ public class MagicCardDefinition {
}
private boolean abilityHasText(final String s) {
final MagicAbility[] abilityValues = MagicAbility.values();
for (final MagicAbility ability : abilityValues) {
for (final MagicAbility ability : MagicAbility.CORE) {
if(hasAbility(ability) && ability.getName().toLowerCase().contains(s)) {
return true;
}

3
src/magic/ui/viewer/PermanentViewerInfo.java
View File

@ -221,8 +221,7 @@ public class PermanentViewerInfo {
}
// Abilities
for (final MagicAbility ability : MagicAbility.values()) {
for (final MagicAbility ability : MagicAbility.CORE) {
if (ability.hasAbility(abilityFlags)) {
if (first) {
first=false;