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

added Fiendslayer Paladin

master
melvin 2013-08-19 22:00:08 +08:00
parent 6d1d6550f6
commit 297aaf1c49
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
release/Magarena/scripts/Fiendslayer_Paladin.txt Normal file
View File

@ -0,0 +1,11 @@
name=Fiendslayer Paladin
url=http://magiccards.info/m14/en/18.html
image=http://magiccards.info/scans/en/m14/18.jpg
value=3.717
rarity=R
type=Creature
subtype=Human,Knight
cost={1}{W}{W}
pt=2/2
ability=first strike,lifelink,can't be the target of black or red spells your opponents control
timing=main

3
src/magic/model/MagicAbility.java
View File

@ -103,7 +103,8 @@ public enum MagicAbility {
Hexproof("hexproof",80),
CannotBeTheTarget0("can't be the target of spells or abilities your opponents control",80),
CannotBeTheTarget1("can't be the target of spells or abilities your opponents control",80),
CannotBeTheTargetOfNonGreen("can't be the target of nongreen spells or abilities from nongreen sources",0),
CannotBeTheTargetOfNonGreen("can't be the target of nongreen spells or abilities from nongreen sources",10),
CannotBeTheTargetOfBlackOrRedOpponentSpell("can't be the target of black or red spells your opponents control",10),
Deathtouch("deathtouch",60),
Defender("defender",-100),
DoesNotUntap("doesn't untap during untap step",-30),

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

@ -1031,7 +1031,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
}
// Can't be the target of spells or abilities your opponents controls.
if (hasAbility(MagicAbility.Hexproof) && source.getController() != getController()) {
if (hasAbility(MagicAbility.Hexproof) && isEnemy(source)) {
return false;
}
@ -1046,7 +1046,14 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
}
// Can't be the target of nongreen spells or abilities from nongreen sources
if (hasAbility(MagicAbility.CannotBeTheTargetOfNonGreen) && source.hasColor(MagicColor.Green)) {
if (hasAbility(MagicAbility.CannotBeTheTargetOfNonGreen) && source.hasColor(MagicColor.Green) == false) {
return false;
}
// Can't be the target of black or red spell your opponent control
if (hasAbility(MagicAbility.CannotBeTheTargetOfBlackOrRedOpponentSpell) &&
(source.hasColor(MagicColor.Black) || source.hasColor(MagicColor.Red)) &&
source.isSpell() && isEnemy(source)) {
return false;
}