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

move parameters onto the same line as the method definition

master
melvinzhang 2015-05-15 19:39:05 +08:00
parent 7aa86d74b2
commit 444b4b8bb2
4 changed files with 30 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/magic/model/action/ChangeTurnPTAction.java
View File

@ -20,17 +20,15 @@ public class ChangeTurnPTAction extends MagicAction {
@Override
public void doAction(final MagicGame game) {
game.doAction(new AddStaticAction(permanent, new MagicStatic(
MagicLayer.ModPT,
MagicStatic.UntilEOT) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
pt.add(power, toughness);
game.doAction(new AddStaticAction(
permanent,
new MagicStatic(MagicLayer.ModPT, MagicStatic.UntilEOT) {
@Override
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.add(power, toughness);
}
}
}));
));
}
@Override

5
src/magic/model/action/GainAbilityAction.java
View File

@ -52,10 +52,7 @@ public class GainAbilityAction extends MagicAction {
public void doAction(final MagicGame game) {
game.doAction(new AddStaticAction(permanent, new MagicStatic(MagicLayer.Ability, duration) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
}));

5
src/magic/model/action/LoseAbilityAction.java
View File

@ -52,10 +52,7 @@ public class LoseAbilityAction extends MagicAction {
public void doAction(final MagicGame game) {
game.doAction(new AddStaticAction(permanent, new MagicStatic(MagicLayer.Ability, duration) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.loseAbility(permanent, flags);
}
}));

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

@ -105,10 +105,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genPTStatic(final MagicTargetFilter<MagicPermanent> affected, final int givenPower, final int givenToughness) {
return new MagicStatic(MagicLayer.ModPT, affected) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.add(givenPower, givenToughness);
}
};
@ -117,10 +114,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genPTStatic(final MagicCondition condition, final int givenPower, final int givenToughness) {
return new MagicStatic(MagicLayer.Game) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.add(givenPower, givenToughness);
}
@Override
@ -133,10 +127,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genPTStatic(final MagicCondition condition, final MagicTargetFilter<MagicPermanent> filter, final int givenPower, final int givenToughness) {
return new MagicStatic(MagicLayer.Game, filter) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.add(givenPower, givenToughness);
}
@Override
@ -149,10 +140,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genPTStatic(final int givenPower, final int givenToughness) {
return new MagicStatic(MagicLayer.ModPT) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.add(givenPower, givenToughness);
}
@Override
@ -165,10 +153,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genPTSetStatic(final int givenPower, final int givenToughness) {
return new MagicStatic(MagicLayer.SetPT) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.set(givenPower, givenToughness);
}
@Override
@ -181,10 +166,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genABStatic(final MagicTargetFilter<MagicPermanent> filter, final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Ability, filter) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
};
@ -193,10 +175,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.Game, filter) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
@Override
@ -209,10 +188,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genABStatic(final MagicCondition condition, final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Game) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
@Override
@ -225,10 +201,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic linkedABStatic(final MagicCondition condition, final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Ability) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
@Override
@ -241,10 +214,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic linkedABStatic(final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Ability) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
@Override
@ -257,10 +227,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genABGameStatic(final MagicTargetFilter<MagicPermanent> filter, final MagicAbilityList abilityList) {
return new MagicStatic(MagicLayer.Game, filter) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
abilityList.giveAbility(permanent, flags);
}
};
@ -282,9 +249,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic genSTStatic(final Set<MagicSubType> givenSubTypeFlags) {
return new MagicStatic(MagicLayer.Type) {
@Override
public void modSubTypeFlags(
final MagicPermanent permanent,
final Set<MagicSubType> flags) {
public void modSubTypeFlags(final MagicPermanent permanent, final Set<MagicSubType> flags) {
flags.addAll(givenSubTypeFlags);
}
@Override
@ -297,9 +262,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic AddLinkedColor(final int givenColorFlags) {
return new MagicStatic(MagicLayer.Color) {
@Override
public int getColorFlags(
final MagicPermanent permanent,
final int flags) {
public int getColorFlags(final MagicPermanent permanent, final int flags) {
return flags | givenColorFlags;
}
@Override
@ -312,9 +275,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic SetLinkedColor(final int givenColorFlags) {
return new MagicStatic(MagicLayer.Color) {
@Override
public int getColorFlags(
final MagicPermanent permanent,
final int flags) {
public int getColorFlags(final MagicPermanent permanent, final int flags) {
return givenColorFlags;
}
@Override
@ -326,17 +287,11 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic ControlEnchanted = new MagicStatic(MagicLayer.Control) {
@Override
public MagicPlayer getController(
final MagicPermanent source,
final MagicPermanent target,
final MagicPlayer player) {
public MagicPlayer getController(final MagicPermanent source, final MagicPermanent target, final MagicPlayer player) {
return source.getController();
}
@Override
public boolean accept(
final MagicGame game,
final MagicPermanent source,
final MagicPermanent target) {
public boolean accept(final MagicGame game, final MagicPermanent source, final MagicPermanent target) {
return source.getEnchantedPermanent() == target;
}
};
@ -345,17 +300,11 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
final MagicTargetFilter<MagicPermanent> filter = new MagicPermanentTargetFilter(target);
return new MagicStatic(MagicLayer.Control,filter) {
@Override
public MagicPlayer getController(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPlayer player) {
public MagicPlayer getController(final MagicPermanent source, final MagicPermanent permanent, final MagicPlayer player) {
return source.getController();
}
@Override
public boolean condition(
final MagicGame game,
final MagicPermanent source,
final MagicPermanent target) {
public boolean condition(final MagicGame game, final MagicPermanent source, final MagicPermanent target) {
if (you.getIndex() != source.getController().getIndex()) {
//remove this static after the update
game.addDelayedAction(new RemoveStaticAction(source, this));
@ -369,10 +318,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic Unleash = new MagicStatic(MagicLayer.Ability) {
@Override
public void modAbilityFlags(
final MagicPermanent source,
final MagicPermanent permanent,
final Set<MagicAbility> flags) {
public void modAbilityFlags(final MagicPermanent source, final MagicPermanent permanent, final Set<MagicAbility> flags) {
flags.add(MagicAbility.CannotBlock);
}
@Override
@ -383,10 +329,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
public static MagicStatic SwitchPT = new MagicStatic(MagicLayer.SwitchPT, MagicStatic.UntilEOT) {
@Override
public void modPowerToughness(
final MagicPermanent source,
final MagicPermanent permanent,
final MagicPowerToughness pt) {
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
pt.set(pt.toughness(),pt.power());
}
};