github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 11:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source 
Conflicts:
	Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java
	Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java
This commit is contained in:
LevelX2 2016-11-05 11:55:24 +01:00
commit e4e76c159b
3 changed files with 75 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/o/OathOfNissa.java
View file

@ -143,7 +143,7 @@ class OathOfNissaEffect extends OneShotEffect {
class OathOfNissaSpendAnyManaEffect extends AsThoughEffectImpl implements AsThoughManaEffect { class OathOfNissaSpendAnyManaEffect extends AsThoughEffectImpl implements AsThoughManaEffect {
public OathOfNissaSpendAnyManaEffect() { 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"; staticText = "you may spend mana as though it were mana of any color to cast planeswalker spells";
} }

16
Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java
View file

@ -45,7 +45,7 @@ import mage.players.Player;
/** /**
* *
* @author LevelX2 * @author spjspj
*/ */
public class TanaTheBloodsower extends CardImpl { public class TanaTheBloodsower extends CardImpl {
@ -61,7 +61,8 @@ public class TanaTheBloodsower extends CardImpl {
// Trample // Trample
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// Whenever Tana, the Bloodsower deals combat damage to a player, create that many 1/1 green Saproling creature tokens. // 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 // Partner
this.addAbility(PartnerAbility.getInstance()); this.addAbility(PartnerAbility.getInstance());
} }
@ -94,12 +95,13 @@ class TanaTheBloodsowerEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (controller != null) { if (player != null) {
Integer damage = (Integer) getValue("damage"); int amount = (Integer)getValue("damage");
if (damage > 0) { if (amount > 0) {
return new CreateTokenEffect(new SaprolingToken(), damage).apply(game, source); return new CreateTokenEffect(new SaprolingToken(), amount).apply(game, source);
} }
return true;
} }
return false; return false;
} }

6
Utils/gen-simple-cards-by-set.pl
View file

@ -46,13 +46,15 @@ if(!exists $knownSets{$setName}) {
my $packageName = $knownSets{$setName}; my $packageName = $knownSets{$setName};
$setName =~ s/"/\\"/g; $setName =~ s/"/\\"/g;
system("./gen-existing-cards-by-set.pl \"$setName\""); system("gen-existing-cards-by-set.pl \"$setName\"");
# Generate missing simple cards # Generate missing simple cards
print "Simple cards generated: \n"; print "Simple cards generated: \n";
foreach my $cardName (@setCards) { foreach my $cardName (@setCards) {
print "CardName: ".${$cardName}[0]." \n";
my $fileName = "../Mage.Sets/src/mage/sets/" . $packageName . "/" . toCamelCase(${$cardName}[0]) . ".java"; my $fileName = "../Mage.Sets/src/mage/sets/" . $packageName . "/" . toCamelCase(${$cardName}[0]) . ".java";
if(!-e $fileName) { if(!-e $fileName) {
system("./gen-card.pl \"${$cardName}[0]\" true"); print "fileName: ".$fileName." \n";
system("gen-card.pl \"${$cardName}[0]\" true");
} }
} }