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

made conds static final

master
melvin 2013-06-15 16:37:02 +08:00
parent b249cc275d
commit 90557034ea
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/magic/model/event/MagicPermanentActivation.java
View File

@ -34,8 +34,7 @@ public abstract class MagicPermanentActivation extends MagicActivation<MagicPerm
super(MagicActivation.NO_COND,hints,txt); super(MagicActivation.NO_COND,hints,txt);
} }
public MagicPermanentActivation(final MagicCondition[] conditions, final MagicActivationHints hints, public MagicPermanentActivation(final MagicCondition[] conditions, final MagicActivationHints hints, final String txt) {
final String txt) {
super(conditions,hints,txt); super(conditions,hints,txt);
} }

19
src/magic/model/event/MagicRegenerationActivation.java
View File

@ -10,19 +10,22 @@ import magic.model.condition.MagicSingleActivationCondition;
public class MagicRegenerationActivation extends MagicPermanentActivation { public class MagicRegenerationActivation extends MagicPermanentActivation {
private static final MagicActivationHints ACTIVATION_HINTS = new MagicActivationHints(MagicTiming.Pump); private static final MagicActivationHints hint = new MagicActivationHints(MagicTiming.Pump);
private static final MagicCondition[] conds = new MagicCondition[]{
MagicCondition.CAN_REGENERATE_CONDITION,
new MagicSingleActivationCondition(),
};
private final MagicManaCost cost; private final MagicManaCost cost;
public MagicRegenerationActivation(final MagicManaCost cost) { public MagicRegenerationActivation(final MagicManaCost aCost) {
super( super(
new MagicCondition[]{ conds,
MagicCondition.CAN_REGENERATE_CONDITION, hint,
new MagicSingleActivationCondition(),
},
ACTIVATION_HINTS,
"Regen" "Regen"
); );
this.cost=cost; cost = aCost;
} }
@Override @Override