mirror of
https://github.com/magefree/mage.git
synced 2025-12-26 05:22:02 -08:00
[ARB] various text fixes
This commit is contained in:
parent
3833d7bab3
commit
1582321d26
35 changed files with 377 additions and 383 deletions
|
|
@ -0,0 +1,45 @@
|
|||
package mage.abilities.common;
|
||||
|
||||
import mage.abilities.effects.Effect;
|
||||
import mage.abilities.keyword.CyclingAbility;
|
||||
import mage.constants.Zone;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent;
|
||||
import mage.game.events.ZoneChangeEvent;
|
||||
import mage.game.stack.StackObject;
|
||||
|
||||
/**
|
||||
* @author TheElk801
|
||||
*/
|
||||
public class CycleOrDiesTriggeredAbility extends ZoneChangeTriggeredAbility {
|
||||
|
||||
public CycleOrDiesTriggeredAbility(Effect effect, boolean optional) {
|
||||
super(Zone.ALL, effect, "When you cycle {this} or it dies, ", optional);
|
||||
}
|
||||
|
||||
public CycleOrDiesTriggeredAbility(CycleOrDiesTriggeredAbility ability) {
|
||||
super(ability);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkEventType(GameEvent event, Game game) {
|
||||
return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkTrigger(GameEvent event, Game game) {
|
||||
if (!event.getSourceId().equals(this.getSourceId())) {
|
||||
return false;
|
||||
}
|
||||
if (((ZoneChangeEvent) event).isDiesEvent()) {
|
||||
return true;
|
||||
}
|
||||
StackObject object = game.getStack().getStackObject(event.getSourceId());
|
||||
return object != null && object.getStackAbility() instanceof CyclingAbility;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CycleOrDiesTriggeredAbility copy() {
|
||||
return new CycleOrDiesTriggeredAbility(this);
|
||||
}
|
||||
}
|
||||
|
|
@ -86,7 +86,11 @@ public class DealsDamageToAPlayerAttachedTriggeredAbility extends TriggeredAbili
|
|||
|
||||
@Override
|
||||
public String getTriggerPhrase() {
|
||||
StringBuilder sb = new StringBuilder("Whenever ").append(attachedDescription);
|
||||
StringBuilder sb = new StringBuilder("Whenever ");
|
||||
sb.append(attachedDescription);
|
||||
if (!attachedDescription.endsWith("creature")) {
|
||||
sb.append(" creature");
|
||||
}
|
||||
sb.append(" deals");
|
||||
if (onlyCombat) {
|
||||
sb.append(" combat");
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class PreventAllDamageToAllEffect extends PreventionEffectImpl {
|
|||
public PreventAllDamageToAllEffect(Duration duration, FilterPermanentOrPlayer filter, boolean onlyCombat) {
|
||||
super(duration, Integer.MAX_VALUE, onlyCombat, false);
|
||||
this.filter = filter;
|
||||
staticText = "Prevent all "
|
||||
staticText = "prevent all "
|
||||
+ (onlyCombat ? "combat " : "")
|
||||
+ "damage that would be dealt to "
|
||||
+ filter.getMessage()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public class MustBeBlockedByTargetSourceEffect extends RequirementEffect {
|
|||
|
||||
public MustBeBlockedByTargetSourceEffect(Duration duration) {
|
||||
super(duration);
|
||||
staticText = "Target creature blocks {this} this turn if able";
|
||||
staticText = "target creature blocks {this} this turn if able";
|
||||
}
|
||||
|
||||
public MustBeBlockedByTargetSourceEffect(final MustBeBlockedByTargetSourceEffect effect) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue