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

* Fixed some wrong rule text of Oubliette and Tawnos's Coffin.

Browse source
This commit is contained in:
LevelX2 2016-04-25 23:30:56 +02:00
parent 213107f835
commit e81f5cbb32
2 changed files with 83 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Mage.Sets/src/mage/sets/antiquities/TawnossCoffin.java
View file

@ -29,7 +29,6 @@ package mage.sets.antiquities;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SkipUntapOptionalAbility;
@ -64,7 +63,7 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class TawnossCoffin extends CardImpl {
public Counters godHelpMe=null;
public Counters godHelpMe = null;
public TawnossCoffin(UUID ownerId) {
super(ownerId, 33, "Tawnos's Coffin", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}");
@ -77,11 +76,8 @@ public class TawnossCoffin extends CardImpl {
ability.addCost(new ManaCostsImpl("{3}"));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
//When Tawnos's Coffin leaves the battlefield...
Ability ability2 = new LeavesBattlefieldTriggeredAbility(new TawnossCoffinReturnEffect(), false);
this.addAbility(ability2);
//or becomes untapped, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it, and if you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.
Ability ability3 = new BecomesUnTappedSourceTriggeredAbility(new TawnossCoffinReturnEffect(), false);
//When Tawnos's Coffin leaves the battlefield or becomes untapped, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it, and if you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.
Ability ability3 = new TawnossCoffinTriggeredAbility(new TawnossCoffinReturnEffect(), false);
this.addAbility(ability3);
}
@ -94,42 +90,42 @@ public class TawnossCoffin extends CardImpl {
return new TawnossCoffin(this);
}
}
class BecomesUnTappedSourceTriggeredAbility extends TriggeredAbilityImpl {
public BecomesUnTappedSourceTriggeredAbility(Effect effect, boolean isOptional) {
super(Zone.BATTLEFIELD, effect, isOptional);
class TawnossCoffinTriggeredAbility extends LeavesBattlefieldTriggeredAbility {
public TawnossCoffinTriggeredAbility(Effect effect, boolean isOptional) {
super(effect, isOptional);
}
public BecomesUnTappedSourceTriggeredAbility(Effect effect) {
super(Zone.BATTLEFIELD, effect);
}
public BecomesUnTappedSourceTriggeredAbility(final BecomesUnTappedSourceTriggeredAbility ability) {
public TawnossCoffinTriggeredAbility(final TawnossCoffinTriggeredAbility ability) {
super(ability);
}
@Override
public BecomesUnTappedSourceTriggeredAbility copy() {
return new BecomesUnTappedSourceTriggeredAbility(this);
public TawnossCoffinTriggeredAbility copy() {
return new TawnossCoffinTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.UNTAPPED;
return super.checkEventType(event, game) || event.getType().equals(GameEvent.EventType.UNTAPPED);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType().equals(GameEvent.EventType.UNTAPPED)) {
return event.getTargetId().equals(sourceId);
} else {
return super.checkTrigger(event, game);
}
}
@Override
public String getRule() {
return "When {this} becomes untapped, " + super.getRule();
return "When {this} leaves the battlefield or becomes untapped, " + super.getRule();
}
}
class TawnossCoffinEffect extends OneShotEffect {
private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent();
@ -140,7 +136,7 @@ class TawnossCoffinEffect extends OneShotEffect {
public TawnossCoffinEffect() {
super(Outcome.Detriment);
this.staticText = "Exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. When TawnossCoffin leaves the battlefield, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.";
this.staticText = "exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature";
}
public TawnossCoffinEffect(final TawnossCoffinEffect effect) {
@ -159,10 +155,11 @@ class TawnossCoffinEffect extends OneShotEffect {
if (enchantment == null) {
enchantment = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
}
UUID targetId=source.getFirstTarget();
if (targetId==null) return false; // if previous scan somehow failed, simply quit
UUID targetId = source.getFirstTarget();
if (targetId == null) {
return false; // if previous scan somehow failed, simply quit
}
if (enchantment != null) { //back to code (mostly) copied from Flickerform
Permanent enchantedCreature = game.getPermanent(targetId);
if (enchantedCreature != null) {
@ -176,7 +173,7 @@ class TawnossCoffinEffect extends OneShotEffect {
}
//((TawnossCoffin)enchantment.getMainCard()).godHelpMe = enchantedCreature.getCounters(game); //why doesn't work? should return the same card, no?
((TawnossCoffin)game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy();
((TawnossCoffin) game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy();
if (!(enchantedCreature instanceof Token)) {
@ -203,10 +200,9 @@ class TawnossCoffinReturnEffect extends OneShotEffect {
filterAura.add(new SubtypePredicate("Aura"));
}
public TawnossCoffinReturnEffect() {
super(Outcome.Benefit);
this.staticText = "return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.";
this.staticText = "return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent";
}
@ -226,8 +222,10 @@ class TawnossCoffinReturnEffect extends OneShotEffect {
FilterCard filter = new FilterCard();
filter.add(new CardTypePredicate(CardType.CREATURE));
//There should be only 1 there, but the for each loop seems the most practical to get to it
for (Card enchantedCard : exileZone.getCards(filter, game)){
if (enchantedCard == null) continue;
for (Card enchantedCard : exileZone.getCards(filter, game)) {
if (enchantedCard == null) {
continue;
}
enchantedCard.putOntoBattlefield(game, Zone.EXILED, source.getSourceId(), enchantedCard.getOwnerId());
Permanent newPermanent = game.getPermanent(enchantedCard.getId());
if (newPermanent != null) {
@ -255,9 +253,13 @@ class TawnossCoffinReturnEffect extends OneShotEffect {
}
}
Card oubliette = game.getCard(source.getSourceId());
if (oubliette == null) return false;//1st stab at getting those counters back
for(Counter c : ((TawnossCoffin)oubliette).godHelpMe.values()){ //would be nice if could just use that copy function to set the whole field
if(c!=null) newPermanent.getCounters(game).addCounter(c);
if (oubliette == null) {
return false;//1st stab at getting those counters back
}
for (Counter c : ((TawnossCoffin) oubliette).godHelpMe.values()) { //would be nice if could just use that copy function to set the whole field
if (c != null) {
newPermanent.getCounters(game).addCounter(c);
}
}
}

33
Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
View file

@ -58,7 +58,7 @@ import mage.target.TargetPermanent;
*/
public class Oubliette extends CardImpl {
public Counters godHelpMe=null;
public Counters godHelpMe = null;
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target creature");
@ -87,7 +87,6 @@ public class Oubliette extends CardImpl {
}
}
class OublietteEffect extends OneShotEffect {
private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent();
@ -98,7 +97,7 @@ class OublietteEffect extends OneShotEffect {
public OublietteEffect() {
super(Outcome.Detriment);
this.staticText = "Exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. When Oubliette leaves the battlefield, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.";
this.staticText = "exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature";
}
public OublietteEffect(final OublietteEffect effect) {
@ -117,10 +116,11 @@ class OublietteEffect extends OneShotEffect {
if (enchantment == null) {
enchantment = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
}
UUID targetId=source.getFirstTarget();
if (targetId==null) return false; // if previous scan somehow failed, simply quit
UUID targetId = source.getFirstTarget();
if (targetId == null) {
return false; // if previous scan somehow failed, simply quit
}
if (enchantment != null) { //back to code (mostly) copied from Flickerform
Permanent enchantedCreature = game.getPermanent(targetId);
if (enchantedCreature != null) {
@ -134,7 +134,7 @@ class OublietteEffect extends OneShotEffect {
}
//((Oubliette)enchantment.getMainCard()).godHelpMe = enchantedCreature.getCounters(game); //why doesn't work? should return the same card, no?
((Oubliette)game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy();
((Oubliette) game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy();
/*
if (!(enchantedCreature instanceof Token)) {
@ -164,10 +164,9 @@ class OublietteReturnEffect extends OneShotEffect {
filterAura.add(new SubtypePredicate("Aura"));
}
public OublietteReturnEffect() {
super(Outcome.Benefit);
this.staticText = "return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.";
this.staticText = "return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent";
}
@ -187,8 +186,10 @@ class OublietteReturnEffect extends OneShotEffect {
FilterCard filter = new FilterCard();
filter.add(new CardTypePredicate(CardType.CREATURE));
//There should be only 1 there, but the for each loop seems the most practical to get to it
for (Card enchantedCard : exileZone.getCards(filter, game)){
if (enchantedCard == null) continue;
for (Card enchantedCard : exileZone.getCards(filter, game)) {
if (enchantedCard == null) {
continue;
}
enchantedCard.putOntoBattlefield(game, Zone.EXILED, source.getSourceId(), enchantedCard.getOwnerId());
Permanent newPermanent = game.getPermanent(enchantedCard.getId());
if (newPermanent != null) {
@ -216,9 +217,13 @@ class OublietteReturnEffect extends OneShotEffect {
}
}
Card oubliette = game.getCard(source.getSourceId());
if (oubliette == null) return false;//1st stab at getting those counters back
for(Counter c : ((Oubliette)oubliette).godHelpMe.values()){ //would be nice if could just use that copy function to set the whole field
if(c!=null) newPermanent.getCounters(game).addCounter(c);
if (oubliette == null) {
return false;//1st stab at getting those counters back
}
for (Counter c : ((Oubliette) oubliette).godHelpMe.values()) { //would be nice if could just use that copy function to set the whole field
if (c != null) {
newPermanent.getCounters(game).addCounter(c);
}
}
}