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

remove casting of target, simplified logic

master
melvin 2012-10-27 09:36:39 +08:00
parent 705629aa95
commit 08355fa45a
2 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/magic/card/Falkenrath_Aristocrat.java
View File

@ -38,16 +38,10 @@ public class Falkenrath_Aristocrat {
public MagicEvent getPermanentEvent(
final MagicPermanent source,
final MagicPayedCost payedCost) {
String message = "SN is indestructible this turn.";
boolean isHuman = false;
final MagicTarget target = payedCost.getTarget();
if (target != MagicTargetNone.getInstance()) {
final MagicPermanent sacrificed = (MagicPermanent)payedCost.getTarget();
isHuman = sacrificed.getCardDefinition().hasSubType(MagicSubType.Human);
if (isHuman) {
message += " Put a +1/+1 counter on SN.";
}
}
final boolean isHuman = payedCost.getTarget().hasSubType(MagicSubType.Human);
final String message =
"SN is indestructible this turn." +
(isHuman ? " Put a +1/+1 counter on SN." : "");
return new MagicEvent(
source,
isHuman ? 1 : 0,
@ -64,14 +58,12 @@ public class Falkenrath_Aristocrat {
event.getPermanent(),
MagicAbility.Indestructible
));
if (event.getRefInt() == 1) {
game.doAction(new MagicChangeCountersAction(
event.getPermanent(),
MagicCounterType.PlusOne,
1,
true
));
}
game.doAction(new MagicChangeCountersAction(
event.getPermanent(),
MagicCounterType.PlusOne,
event.getRefInt(),
true
));
}
};
}

28
src/magic/card/Falkenrath_Torturer.java
View File

@ -38,16 +38,10 @@ public class Falkenrath_Torturer {
public MagicEvent getPermanentEvent(
final MagicPermanent source,
final MagicPayedCost payedCost) {
String message = "SN gains flying until end of turn.";
boolean isHuman = false;
final MagicTarget target = payedCost.getTarget();
if (target != MagicTargetNone.getInstance()) {
final MagicPermanent sacrificed = (MagicPermanent)payedCost.getTarget();
isHuman = sacrificed.getCardDefinition().hasSubType(MagicSubType.Human);
if (isHuman) {
message += " Put a +1/+1 counter on SN.";
}
}
final boolean isHuman = payedCost.getTarget().hasSubType(MagicSubType.Human);
final String message =
"SN gains flying until end of turn." +
(isHuman ? " Put a +1/+1 counter on SN." : "");
return new MagicEvent(
source,
isHuman ? 1 : 0,
@ -64,14 +58,12 @@ public class Falkenrath_Torturer {
event.getPermanent(),
MagicAbility.Flying
));
if (event.getRefInt() == 1) {
game.doAction(new MagicChangeCountersAction(
event.getPermanent(),
MagicCounterType.PlusOne,
1,
true
));
}
game.doAction(new MagicChangeCountersAction(
event.getPermanent(),
MagicCounterType.PlusOne,
event.getRefInt(),
true
));
}
};
}