- Skip the "Choose cards to activate from opening hand" step if I have no cards with these effects

- Added Odric, Master Tactician for test
This commit is contained in:
swordshine
2013-06-03 05:47:21 +00:00
parent 5b44514fd4
commit c3f999bc29
3 changed files with 17 additions and 1 deletions

1
.gitattributes vendored
View File

@@ -7546,6 +7546,7 @@ res/cardsfolder/o/ocular_halo.txt svneol=native#text/plain
res/cardsfolder/o/oculus.txt svneol=native#text/plain res/cardsfolder/o/oculus.txt svneol=native#text/plain
res/cardsfolder/o/odds_ends.txt -text res/cardsfolder/o/odds_ends.txt -text
res/cardsfolder/o/odious_trow.txt svneol=native#text/plain res/cardsfolder/o/odious_trow.txt svneol=native#text/plain
res/cardsfolder/o/odric_master_tactician.txt -text
res/cardsfolder/o/odylic_wraith.txt svneol=native#text/plain res/cardsfolder/o/odylic_wraith.txt svneol=native#text/plain
res/cardsfolder/o/off_balance.txt svneol=native#text/plain res/cardsfolder/o/off_balance.txt svneol=native#text/plain
res/cardsfolder/o/offalsnout.txt svneol=native#text/plain res/cardsfolder/o/offalsnout.txt svneol=native#text/plain

View File

@@ -0,0 +1,12 @@
Name:Odric, Master Tactician
ManaCost:2 W W
Types:Legendary Creature Human Soldier
PT:3/4
K:First Strike
T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ OdricTest | SVarCompare$ GE3 | Execute$ TrigOdricEffect | TriggerDescription$ Whenever CARDNAME and at least three other creatures attack, you choose which creatures block this combat and how those creatures block.
SVar:TrigOdricEffect:AB$ DeclareCombatants | Cost$ 0 | DeclareAttackers$ True | DeclareBlockers$ True
SVar:OdricTest:Count$Valid Creature.attacking+Other
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/odric_master_tactician.jpg
Oracle:First strike (This creature deals combat damage before creatures without first strike.)\nWhenever Odric, Master Tactician and at least three other creatures attack, you choose which creatures block this combat and how those creatures block.
SetInfo:M13 Rare

View File

@@ -550,8 +550,11 @@ public class PlayerControllerHuman extends PlayerController {
for(SpellAbility sa : usableFromOpeningHand) { for(SpellAbility sa : usableFromOpeningHand) {
srcCards.add(sa.getSourceCard()); srcCards.add(sa.getSourceCard());
} }
List<Card> chosen = GuiChoose.order("Choose cards to activate from opening hand", "Activate first", -1, srcCards, null, null);
List<SpellAbility> result = new ArrayList<SpellAbility>(); List<SpellAbility> result = new ArrayList<SpellAbility>();
if (srcCards.isEmpty()) {
return result;
}
List<Card> chosen = GuiChoose.order("Choose cards to activate from opening hand", "Activate first", -1, srcCards, null, null);
for(Card c : chosen) { for(Card c : chosen) {
for(SpellAbility sa : usableFromOpeningHand) { for(SpellAbility sa : usableFromOpeningHand) {
if ( sa.getSourceCard() == c ) { if ( sa.getSourceCard() == c ) {