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

merged new cards

master
melvin 2011-11-03 10:15:18 +08:00
parent 6f8c27f6f2 c90d8212b4
commit 94031791bd
10 changed files with 283 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
resources/magic/data/cards.txt
View File

@ -18609,3 +18609,80 @@ cost={2}{U}
pt=1/1
ability=flying
timing=main
>Join the Ranks
url=http://magiccards.info/wwk/en/9.html
image=http://magiccards.info/scans/en/wwk/9.jpg
value=3
rarity=C
type=Instant
color=w
converted=4
cost={3}{W}
timing=token
>Auriok Glaivemaster
url=http://magiccards.info/ds/en/1.html
image=http://magiccards.info/scans/en/ds/1.jpg
value=1
rarity=C
type=Creature
subtype=Human,Soldier
color=w
converted=1
cost={W}
pt=1/1
timing=main
>Leonin Den-Guard
url=http://magiccards.info/mi/en/9.html
image=http://magiccards.info/scans/en/mi/9.jpg
value=2
rarity=C
type=Creature
subtype=Cat,Soldier
color=w
converted=2
cost={1}{W}
pt=1/3
timing=main
>Skyhunter Cub
url=http://magiccards.info/mi/en/21.html
image=http://magiccards.info/scans/en/mi/21.jpg
value=2
rarity=C
type=Creature
subtype=Cat,Knight
color=w
converted=3
cost={2}{W}
pt=2/2
timing=main
>Sunspear Shikari
url=http://magiccards.info/som/en/23.html
image=http://magiccards.info/scans/en/som/23.jpg
value=2
rarity=C
type=Creature
subtype=Cat,Soldier
color=w
converted=2
cost={1}{W}
pt=2/2
timing=main
>Raksha Golden Cub
url=http://magiccards.info/5dn/en/12.html
image=http://magiccards.info/scans/en/5dn/12.jpg
value=4
rarity=R
type=Legendary,Creature
subtype=Cat,Soldier
color=w
converted=7
cost={5}{W}{W}
pt=3/4
ability=vigilance
timing=fmain

11
resources/magic/data/tokens.txt
View File

@ -359,6 +359,17 @@ converted=0
cost={0}
pt=1/1
>Soldier Ally
token=Soldier Ally
image=http://magiccards.info/extras/token/worldwake/soldier-ally.jpg
value=1
type=Creature
subtype=Soldier,Ally
color=w
converted=0
cost={0}
pt=1/1
>Spirit
token=Spirit1
image=http://magiccards.info/extras/token/player-rewards-2004/spirit.jpg

2
src/magic/card/Argentum_Armor.java
View File

@ -20,7 +20,7 @@ public class Argentum_Armor {
new MagicEvent(
permanent,
permanent.getController(),
MagicTargetChoice.NEG_TARGET_PERMANENT,
MagicTargetChoice.TARGET_PERMANENT,
new MagicDestroyTargetPicker(false),
MagicEvent.NO_DATA,
this,

29
src/magic/card/Auriok_Glaivemaster.java Normal file
View File

@ -0,0 +1,29 @@
package magic.card;
import magic.model.MagicAbility;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPowerToughness;
import magic.model.mstatic.MagicLayer;
import magic.model.mstatic.MagicStatic;
public class Auriok_Glaivemaster {
public static final MagicStatic S1 = new MagicStatic(MagicLayer.ModPT) {
@Override
public void getPowerToughness(final MagicGame game,final MagicPermanent permanent,final MagicPowerToughness pt) {
if (permanent.isEquipped()) {
pt.add(1,1);
}
}
};
public static final MagicStatic S2 = new MagicStatic(MagicLayer.Ability) {
@Override
public long getAbilityFlags(final MagicGame game,final MagicPermanent permanent,final long flags) {
return permanent.isEquipped() ?
flags|MagicAbility.FirstStrike.getMask():
flags;
}
};
}

37
src/magic/card/Join_the_Ranks.java Normal file
View File

@ -0,0 +1,37 @@
package magic.card;
import magic.data.TokenCardDefinitions;
import magic.model.MagicGame;
import magic.model.MagicPayedCost;
import magic.model.MagicPlayer;
import magic.model.action.MagicMoveCardAction;
import magic.model.action.MagicPlayTokenAction;
import magic.model.event.MagicEvent;
import magic.model.event.MagicSpellCardEvent;
import magic.model.stack.MagicCardOnStack;
public class Join_the_Ranks {
public static final MagicSpellCardEvent S = new MagicSpellCardEvent() {
@Override
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
final MagicPlayer player = cardOnStack.getController();
return new MagicEvent(
cardOnStack.getCard(),
player,
new Object[]{cardOnStack,player},
this,
player + " puts two 1/1 white Soldier Ally creature tokens onto the battlefield.");
}
@Override
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object[] data,
final Object[] choiceResults) {
game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0]));
final MagicPlayer player=(MagicPlayer)data[1];
game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.getInstance().getTokenDefinition("Soldier Ally")));
game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.getInstance().getTokenDefinition("Soldier Ally")));
}
};
}

29
src/magic/card/Leonin_Den_Guard.java Normal file
View File

@ -0,0 +1,29 @@
package magic.card;
import magic.model.MagicAbility;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPowerToughness;
import magic.model.mstatic.MagicLayer;
import magic.model.mstatic.MagicStatic;
public class Leonin_Den_Guard {
public static final MagicStatic S1 = new MagicStatic(MagicLayer.ModPT) {
@Override
public void getPowerToughness(final MagicGame game,final MagicPermanent permanent,final MagicPowerToughness pt) {
if (permanent.isEquipped()) {
pt.add(1,1);
}
}
};
public static final MagicStatic S2 = new MagicStatic(MagicLayer.Ability) {
@Override
public long getAbilityFlags(final MagicGame game,final MagicPermanent permanent,final long flags) {
return permanent.isEquipped() ?
flags|MagicAbility.Vigilance.getMask():
flags;
}
};
}

37
src/magic/card/Raksha_Golden_Cub.java Normal file
View File

@ -0,0 +1,37 @@
package magic.card;
import magic.model.MagicAbility;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPowerToughness;
import magic.model.mstatic.MagicLayer;
import magic.model.mstatic.MagicStatic;
import magic.model.target.MagicTargetFilter;
public class Raksha_Golden_Cub {
public static final MagicStatic S = new MagicStatic(
MagicLayer.ModPT,
MagicTargetFilter.TARGET_CAT_YOU_CONTROL) {
@Override
public void getPowerToughness(final MagicGame game,final MagicPermanent permanent,final MagicPowerToughness pt) {
pt.add(2,2);
}
@Override
public boolean condition(final MagicGame game,final MagicPermanent source,final MagicPermanent target) {
return source.isEquipped();
}
};
public static final MagicStatic S2 = new MagicStatic(
MagicLayer.Ability,
MagicTargetFilter.TARGET_CAT_YOU_CONTROL) {
@Override
public long getAbilityFlags(final MagicGame game,final MagicPermanent permanent,final long flags) {
return flags | MagicAbility.DoubleStrike.getMask();
}
@Override
public boolean condition(final MagicGame game,final MagicPermanent source,final MagicPermanent target) {
return source.isEquipped();
}
};
}

29
src/magic/card/Skyhunter_Cub.java Normal file
View File

@ -0,0 +1,29 @@
package magic.card;
import magic.model.MagicAbility;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPowerToughness;
import magic.model.mstatic.MagicLayer;
import magic.model.mstatic.MagicStatic;
public class Skyhunter_Cub {
public static final MagicStatic S1 = new MagicStatic(MagicLayer.ModPT) {
@Override
public void getPowerToughness(final MagicGame game,final MagicPermanent permanent,final MagicPowerToughness pt) {
if (permanent.isEquipped()) {
pt.add(1,1);
}
}
};
public static final MagicStatic S2 = new MagicStatic(MagicLayer.Ability) {
@Override
public long getAbilityFlags(final MagicGame game,final MagicPermanent permanent,final long flags) {
return permanent.isEquipped() ?
flags|MagicAbility.Flying.getMask():
flags;
}
};
}

22
src/magic/card/Sunspear_Shikari.java Normal file
View File

@ -0,0 +1,22 @@
package magic.card;
import magic.model.MagicAbility;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.mstatic.MagicLayer;
import magic.model.mstatic.MagicStatic;
public class Sunspear_Shikari {
public static final MagicStatic S = new MagicStatic(MagicLayer.Ability) {
@Override
public long getAbilityFlags(final MagicGame game,final MagicPermanent permanent,final long flags) {
return permanent.isEquipped() ?
flags |
MagicAbility.FirstStrike.getMask() |
MagicAbility.LifeLink.getMask()
:
flags;
}
};
}

11
src/magic/model/target/MagicTargetFilter.java
View File

@ -840,6 +840,17 @@ public interface MagicTargetFilter {
}
};
MagicTargetFilter TARGET_CAT_YOU_CONTROL = new MagicTargetFilter() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
return target.getController() == player &&
((MagicPermanent)target).isCreature(game) &&
((MagicPermanent)target).hasSubType(MagicSubType.Cat,game);
}
public boolean acceptType(final MagicTargetType targetType) {
return targetType == MagicTargetType.Permanent;
}
};
MagicTargetFilter TARGET_KNIGHT_CREATURE = new MagicTargetFilter() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
return ((MagicPermanent)target).isCreature(game) &&