mirror of
https://github.com/correl/mage.git
synced 2024-11-14 19:19:32 +00:00
Merge origin/master
Conflicts: Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java
This commit is contained in:
commit
e4e76c159b
3 changed files with 75 additions and 71 deletions
|
@ -143,7 +143,7 @@ class OathOfNissaEffect extends OneShotEffect {
|
|||
class OathOfNissaSpendAnyManaEffect extends AsThoughEffectImpl implements AsThoughManaEffect {
|
||||
|
||||
public OathOfNissaSpendAnyManaEffect() {
|
||||
super(AsThoughEffectType.SPEND_OTHER_MANA, Duration.Custom, Outcome.Benefit);
|
||||
super(AsThoughEffectType.SPEND_OTHER_MANA, Duration.WhileOnBattlefield, Outcome.Benefit);
|
||||
staticText = "you may spend mana as though it were mana of any color to cast planeswalker spells";
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ import mage.players.Player;
|
|||
|
||||
/**
|
||||
*
|
||||
* @author LevelX2
|
||||
* @author spjspj
|
||||
*/
|
||||
public class TanaTheBloodsower extends CardImpl {
|
||||
|
||||
|
@ -61,7 +61,8 @@ public class TanaTheBloodsower extends CardImpl {
|
|||
// Trample
|
||||
this.addAbility(TrampleAbility.getInstance());
|
||||
// Whenever Tana, the Bloodsower deals combat damage to a player, create that many 1/1 green Saproling creature tokens.
|
||||
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new TanaTheBloodsowerEffect(), false));
|
||||
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new TanaTheBloodsowerEffect(), false, true));
|
||||
|
||||
// Partner
|
||||
this.addAbility(PartnerAbility.getInstance());
|
||||
}
|
||||
|
@ -94,12 +95,13 @@ class TanaTheBloodsowerEffect extends OneShotEffect {
|
|||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
Player controller = game.getPlayer(source.getControllerId());
|
||||
if (controller != null) {
|
||||
Integer damage = (Integer) getValue("damage");
|
||||
if (damage > 0) {
|
||||
return new CreateTokenEffect(new SaprolingToken(), damage).apply(game, source);
|
||||
Player player = game.getPlayer(targetPointer.getFirst(game, source));
|
||||
if (player != null) {
|
||||
int amount = (Integer)getValue("damage");
|
||||
if (amount > 0) {
|
||||
return new CreateTokenEffect(new SaprolingToken(), amount).apply(game, source);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -46,13 +46,15 @@ if(!exists $knownSets{$setName}) {
|
|||
my $packageName = $knownSets{$setName};
|
||||
|
||||
$setName =~ s/"/\\"/g;
|
||||
system("./gen-existing-cards-by-set.pl \"$setName\"");
|
||||
system("gen-existing-cards-by-set.pl \"$setName\"");
|
||||
|
||||
# Generate missing simple cards
|
||||
print "Simple cards generated: \n";
|
||||
foreach my $cardName (@setCards) {
|
||||
print "CardName: ".${$cardName}[0]." \n";
|
||||
my $fileName = "../Mage.Sets/src/mage/sets/" . $packageName . "/" . toCamelCase(${$cardName}[0]) . ".java";
|
||||
if(!-e $fileName) {
|
||||
system("./gen-card.pl \"${$cardName}[0]\" true");
|
||||
print "fileName: ".$fileName." \n";
|
||||
system("gen-card.pl \"${$cardName}[0]\" true");
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue