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

create an artificial layer for ability changing that depends on condition, fixes #447

master
melvinzhang 2015-10-20 20:58:56 +08:00
parent 7ba64fda16
commit 86df942684
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/magic/model/MagicPermanent.java
View File

@ -498,6 +498,7 @@ public class MagicPermanent extends MagicObjectImpl implements MagicSource,Magic
cachedColorFlags = mstatic.getColorFlags(this, cachedColorFlags);
break;
case Ability:
case AbilityCond:
mstatic.modAbilityFlags(source, this, cachedAbilityFlags);
break;
case SetPT:

1
src/magic/model/mstatic/MagicLayer.java
View File

@ -10,6 +10,7 @@ public enum MagicLayer {
CDAColor, //5a. CDA color
Color, //5b. color changing
Ability, //6. ability adding/removing
AbilityCond, //6b. ability adding/removing that depends on condition
CDAPT, //7a. CDA p/t
SetPT, //7b. set p/t to specific value
ModPT, //7c. modify p/t

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

@ -174,7 +174,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
}
public static MagicStatic genABStatic(final MagicCondition condition, final MagicTargetFilter<MagicPermanent> filter, final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Ability, filter) {
return new MagicStatic(MagicLayer.AbilityCond, filter) {
@Override
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
@ -187,7 +187,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
}
public static MagicStatic genABStatic(final MagicCondition condition, final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Ability) {
return new MagicStatic(MagicLayer.AbilityCond) {
@Override
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);