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

Merge pull request #831 from FenrisulfrX/fixes

Browse source 
Fixes Phyrexian Totem
This commit is contained in:
LevelX2 2015-03-25 21:35:08 +01:00
commit 9b29e72e82
8 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/invasion/PhyrexianBattleflies.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class PhyrexianBattleflies extends mage.sets.phyrexiavsthecoalition.PhyrexianBattleflies {

2
Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianColossus.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class PhyrexianColossus extends mage.sets.eighthedition.PhyrexianColossus {

2
Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianProcessor.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class PhyrexianProcessor extends mage.sets.urzassaga.PhyrexianProcessor {

34
Mage.Sets/src/mage/sets/phyrexiavsthecoalition/PhyrexianTotem.java
View file

@ -37,7 +37,6 @@ import mage.abilities.effects.common.SacrificeEffect;
import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.mana.BlackManaAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
@ -46,8 +45,8 @@ import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.Token;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
/**
@ -80,7 +79,7 @@ public class PhyrexianTotem extends CardImpl {
private class PhyrexianTotemToken extends Token {
PhyrexianTotemToken() {
super("", "a 5/5 black Horror artifact creature with trample");
super("Horror", "a 5/5 black Horror artifact creature with trample");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlack(true);
@ -107,19 +106,26 @@ class PhyrexianTotemTriggeredAbility extends TriggeredAbilityImpl {
return new PhyrexianTotemTriggeredAbility(this);
}
@Override
public boolean checkInterveningIfClause(Game game) {
Permanent permanent = game.getPermanentOrLKIBattlefield(getSourceId());
if (permanent != null) {
return permanent.getCardType().contains(CardType.CREATURE);
}
return false;
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGED_CREATURE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if(event.getType() == GameEvent.EventType.DAMAGED_CREATURE && event.getTargetId().equals(this.sourceId)) {
UUID controller = game.getControllerId(event.getTargetId());
if(controller != null) {
Player player = game.getPlayer(controller);
Card card = game.getCard(event.getSourceId());
if(player != null && card.getCardType().contains(CardType.CREATURE)) {
getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
((SacrificeEffect) getEffects().get(0)).setAmount(new StaticValue(event.getAmount()));
return true;
}
}
if (event.getTargetId().equals(getSourceId())) {
getEffects().get(0).setTargetPointer(new FixedTarget(getControllerId()));
((SacrificeEffect) getEffects().get(0)).setAmount(new StaticValue(event.getAmount()));
return true;
}
return false;
}

2
Mage.Sets/src/mage/sets/seventhedition/PhyrexianColossus.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class PhyrexianColossus extends mage.sets.eighthedition.PhyrexianColossus {

2
Mage.Sets/src/mage/sets/stronghold/HornetCannon.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class HornetCannon extends mage.sets.phyrexiavsthecoalition.HornetCannon {

2
Mage.Sets/src/mage/sets/timespiral/PhyrexianTotem.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class PhyrexianTotem extends mage.sets.phyrexiavsthecoalition.PhyrexianTotem {

2
Mage.Sets/src/mage/sets/urzassaga/PhyrexianColossus.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author FenrisulfrX
*/
public class PhyrexianColossus extends mage.sets.eighthedition.PhyrexianColossus {