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

all ability can be granted by lord ability

master
melvin 2013-08-29 22:32:48 +08:00
parent 5ca8ea8353
commit 47a0776535
2 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -819,11 +819,11 @@ public enum MagicAbility {
card.add(MagicStatic.genPTStatic(filter, power, toughness));
}
} else {
final Set<MagicAbility> abilities = MagicAbility.getAbilities(tokens[1].split(", "));
final MagicAbilityList abilityList = MagicAbility.getAbilityList(tokens[1].split(", "));
if (other) {
card.add(MagicStatic.genABStaticOther(filter, abilities));
card.add(MagicStatic.genABStaticOther(filter, abilityList));
} else {
card.add(MagicStatic.genABStatic(filter, abilities));
card.add(MagicStatic.genABStatic(filter, abilityList));
}
}
}
@ -891,26 +891,12 @@ public enum MagicAbility {
}
}
public static Set<MagicAbility> getAbilities(final String[] names) {
Set<MagicAbility> flags = EnumSet.noneOf(MagicAbility.class);
for (final String name : names) {
final MagicAbility ability = getAbility(name);
flags.add(ability);
// given ability cannot have arguments
if (NO_IMPL.contains(ability) == false) {
throw new RuntimeException("Unable to convert " + name + " to a given ability");
}
}
return flags;
}
public static MagicAbilityList getAbilityList(final String[] names) {
final MagicAbilityList abList = new MagicAbilityList();
final MagicAbilityList abilityList = new MagicAbilityList();
for (final String name : names) {
final MagicAbility ability = getAbility(name);
ability.addAbility(abList, name);
getAbility(name).addAbility(abilityList, name);
}
return abList;
return abilityList;
}
public static Set<MagicAbility> of(final MagicAbility first, MagicAbility... rest) {

26
src/magic/model/mstatic/MagicStatic.java
View File

@ -134,7 +134,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
};
}
public static MagicStatic genABStatic(final MagicTargetFilter<MagicPermanent> filter, final Set<MagicAbility> givenAbilityFlags) {
public static MagicStatic genABStatic(final MagicTargetFilter<MagicPermanent> filter, final MagicAbilityList abilityList) {
return new MagicStatic(
MagicLayer.Ability,
filter
@ -144,12 +144,13 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
flags.addAll(givenAbilityFlags);
flags.addAll(abilityList.getAbilities());
abilityList.addAbility(permanent);
}
};
}
public static MagicStatic genABStaticOther(final MagicTargetFilter<MagicPermanent> filter, final Set<MagicAbility> givenAbilityFlags) {
public static MagicStatic genABStaticOther(final MagicTargetFilter<MagicPermanent> filter, final MagicAbilityList abilityList) {
return new MagicStatic(
MagicLayer.Ability,
filter
@ -159,7 +160,8 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
flags.addAll(givenAbilityFlags);
flags.addAll(abilityList.getAbilities());
abilityList.addAbility(permanent);
}
@Override
public boolean condition(final MagicGame game,final MagicPermanent source,final MagicPermanent target) {
@ -185,22 +187,6 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
};
}
public static MagicStatic genABStatic(final Set<MagicAbility> givenAbilityFlags) {
return new MagicStatic(MagicLayer.Ability) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
flags.addAll(givenAbilityFlags);
}
@Override
public boolean accept(final MagicGame game,final MagicPermanent source,final MagicPermanent target) {
return MagicStatic.acceptLinked(game, source, target);
}
};
}
public static MagicStatic genTypeStatic(final int givenTypeFlags) {
return new MagicStatic(MagicLayer.Type) {
@Override