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

simplified controlsPermanentWith* to just controlsPermanent

master
melvin 2013-06-03 13:29:24 +08:00
parent 79246b2e41
commit 6c6e8e9090
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Magarena/scripts/Butcher_of_Malakir.groovy
View File

@ -1,7 +1,7 @@
def action = {
final MagicGame game, final MagicEvent event ->
final MagicPlayer opponent=event.getPlayer().getOpponent();
if (opponent.controlsPermanentWithType(MagicType.Creature)) {
if (opponent.controlsPermanent(MagicType.Creature)) {
game.addEvent(new MagicSacrificePermanentEvent(
event.getPermanent(),
opponent,

2
release/Magarena/scripts/Eldrazi_Monument.groovy
View File

@ -34,7 +34,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPermanent permanent=event.getPermanent();
final MagicPlayer player=event.getPlayer();
if (player.controlsPermanentWithType(MagicType.Creature)) {
if (player.controlsPermanent(MagicType.Creature)) {
game.addEvent(new MagicSacrificePermanentEvent(permanent,player,MagicTargetChoice.SACRIFICE_CREATURE));
} else {
game.doAction(new MagicSacrificeAction(permanent));

2
release/Magarena/scripts/Endless_Wurm.groovy
View File

@ -15,7 +15,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPermanent permanent = event.getPermanent();
final MagicPlayer player = event.getPlayer();
if (player.controlsPermanentWithType(MagicType.Enchantment)) {
if (player.controlsPermanent(MagicType.Enchantment)) {
game.addEvent(new MagicSacrificePermanentEvent(permanent,player,MagicTargetChoice.SACRIFICE_ENCHANTMENT));
} else {
game.doAction(new MagicSacrificeAction(permanent));

2
release/Magarena/scripts/Grave_Pact.groovy
View File

@ -15,7 +15,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPlayer opponent = event.getPlayer().getOpponent();
if (opponent.controlsPermanentWithType(MagicType.Creature)) {
if (opponent.controlsPermanent(MagicType.Creature)) {
game.addEvent(new MagicSacrificePermanentEvent(
event.getSource(),
opponent,

2
release/Magarena/scripts/Kederekt_Parasite.groovy
View File

@ -3,7 +3,7 @@
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCard card) {
return (permanent.isEnemy(card) &&
permanent.getController().controlsPermanentWithColor(MagicColor.Red)) ?
permanent.getController().controlsPermanent(MagicColor.Red)) ?
new MagicEvent(
permanent,
card.getController(),

2
release/Magarena/scripts/Scroll_of_Avacyn.groovy
View File

@ -25,7 +25,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPlayer player = event.getPlayer();
game.doAction(new MagicDrawAction(player,1));
if (player.controlsPermanentWithSubType(MagicSubType.Angel)) {
if (player.controlsPermanent(MagicSubType.Angel)) {
game.doAction(new MagicChangeLifeAction(player,5));
}
}

2
release/Magarena/scripts/Scroll_of_Griselbrand.groovy
View File

@ -32,7 +32,7 @@
1,
false
));
if (player.controlsPermanentWithSubType(MagicSubType.Demon)) {
if (player.controlsPermanent(MagicSubType.Demon)) {
game.doAction(new MagicChangeLifeAction(player,-3));
}
}

2
release/Magarena/scripts/Sheoldred__Whispering_One.groovy
View File

@ -38,7 +38,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPlayer opponent=event.getPlayer();
if (opponent.controlsPermanentWithType(MagicType.Creature)) {
if (opponent.controlsPermanent(MagicType.Creature)) {
game.addEvent(new MagicSacrificePermanentEvent(
event.getSource(),
opponent,

2
release/Magarena/scripts/Thresher_Beast.groovy
View File

@ -14,7 +14,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPlayer opponent = event.getPlayer();
if (opponent.controlsPermanentWithType(MagicType.Land)) {
if (opponent.controlsPermanent(MagicType.Land)) {
game.addEvent(new MagicSacrificePermanentEvent(
event.getPermanent(),
opponent,

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

@ -772,7 +772,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
// Landwalk
for (final MagicColor color : MagicColor.values()) {
if (hasAbility(color.getLandwalkAbility()) &&
defendingPlayer.controlsPermanentWithSubType(color.getLandSubType())) {
defendingPlayer.controlsPermanent(color.getLandSubType())) {
return false;
}
}

8
src/magic/model/MagicPlayer.java
View File

@ -444,7 +444,7 @@ public class MagicPlayer implements MagicTarget {
return count;
}
public boolean controlsPermanentWithColor(final MagicColor color) {
public boolean controlsPermanent(final MagicColor color) {
for (final MagicPermanent permanent : permanents) {
if (permanent.hasColor(color)) {
return true;
@ -453,7 +453,7 @@ public class MagicPlayer implements MagicTarget {
return false;
}
public boolean controlsPermanentWithType(final MagicType type) {
public boolean controlsPermanent(final MagicType type) {
for (final MagicPermanent permanent : permanents) {
if (permanent.hasType(type)) {
return true;
@ -462,7 +462,7 @@ public class MagicPlayer implements MagicTarget {
return false;
}
public boolean controlsPermanentWithSubType(final MagicSubType subType) {
public boolean controlsPermanent(final MagicSubType subType) {
for (final MagicPermanent permanent : permanents) {
if (permanent.hasSubType(subType)) {
return true;
@ -471,7 +471,7 @@ public class MagicPlayer implements MagicTarget {
return false;
}
public boolean controlsPermanentWithAbility(final MagicAbility ability) {
public boolean controlsPermanent(final MagicAbility ability) {
for (final MagicPermanent permanent : permanents) {
if (permanent.hasAbility(ability)) {
return true;

10
src/magic/model/condition/MagicCondition.java
View File

@ -180,31 +180,31 @@ public interface MagicCondition {
MagicCondition CONTROL_BAT_CONDITION=new MagicCondition() {
public boolean accept(final MagicSource source) {
return source.getController().controlsPermanentWithSubType(MagicSubType.Bat);
return source.getController().controlsPermanent(MagicSubType.Bat);
}
};
MagicCondition CONTROL_BEAST_CONDITION=new MagicCondition() {
public boolean accept(final MagicSource source) {
return source.getController().controlsPermanentWithSubType(MagicSubType.Beast);
return source.getController().controlsPermanent(MagicSubType.Beast);
}
};
MagicCondition CONTROL_GOBLIN_CONDITION=new MagicCondition() {
public boolean accept(final MagicSource source) {
return source.getController().controlsPermanentWithSubType(MagicSubType.Goblin);
return source.getController().controlsPermanent(MagicSubType.Goblin);
}
};
MagicCondition CONTROL_ARTIFACT_CONDITION = new MagicCondition() {
public boolean accept(final MagicSource source) {
return source.getController().controlsPermanentWithType(MagicType.Artifact);
return source.getController().controlsPermanent(MagicType.Artifact);
}
};
MagicCondition CONTROL_GOLEM_CONDITION = new MagicCondition() {
public boolean accept(final MagicSource source) {
return source.getController().controlsPermanentWithSubType(MagicSubType.Golem);
return source.getController().controlsPermanent(MagicSubType.Golem);
}
};

2
src/magic/model/target/MagicShadowTargetPicker.java
View File

@ -38,7 +38,7 @@ public class MagicShadowTargetPicker extends MagicTargetPicker<MagicPermanent> {
// no score for not being able to block
// or opponent has no shadow creatures
if (!permanent.canBlock() ||
!player.getOpponent().controlsPermanentWithAbility(MagicAbility.Shadow)) {
!player.getOpponent().controlsPermanent(MagicAbility.Shadow)) {
return 0;
}
}

4
src/magic/model/trigger/MagicTappedIntoPlayUnlessTrigger.java
View File

@ -19,8 +19,8 @@ public class MagicTappedIntoPlayUnlessTrigger extends MagicWhenComesIntoPlayTrig
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
return (!player.controlsPermanentWithSubType(subType1) &&
!player.controlsPermanentWithSubType(subType2)) ?
return (!player.controlsPermanent(subType1) &&
!player.controlsPermanent(subType2)) ?
new MagicEvent(
permanent,
this,