External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[RFR] Correction of the text of some cards (#6602)

Browse source 
* Fix some cards

* Fix Clot Sliver

* Fix WarrenScourgeElf

* Fix Olivia Voldaren

* Fix Domri Rade Emblem

* Fix Broken Ambitions Missing text

Co-authored-by: Thomas ARBLAY <thomas.arblay@smile.fr>
This commit is contained in:
Thomas ARBLAY 2020-06-17 16:58:35 +02:00 • committed by GitHub
parent 055458e9a8
commit 2f68db7086
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 53 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java
View file

@ -2,10 +2,10 @@
package mage.abilities.effects.common;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.abilities.Ability;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
@ -21,6 +21,11 @@ public class RegenerateSourceEffect extends ReplacementEffectImpl {
staticText = "Regenerate {this}";
}
public RegenerateSourceEffect(String targetName) {
super(Duration.EndOfTurn, Outcome.Regenerate);
staticText = "Regenerate " + targetName;
}
public RegenerateSourceEffect(final RegenerateSourceEffect effect) {
super(effect);
}

10
Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java
View file

@ -47,13 +47,21 @@ public class AddCardSubTypeTargetEffect extends ContinuousEffectImpl {
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();
if (!mode.getTargets().isEmpty()) {
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
} else {
sb.append("It ");
}
sb.append(" becomes ").append(addedSubType).append(" in addition to its other types ").append(duration.toString());
if (addedSubType.toString().matches("(?i)^[AEIOUYaeiouy].*$")) {
sb.append(" becomes an ");
} else {
sb.append(" becomes a ");
}
sb.append(addedSubType).append(" in addition to its other types ").append(duration.toString());
return sb.toString();
}
}

21
Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java
View file

@ -1,7 +1,7 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
import mage.abilities.CompoundAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
import mage.abilities.keyword.DoubleStrikeAbility;
@ -22,16 +22,15 @@ public final class DomriRadeEmblem extends Emblem {
// "Creatures you control have double strike, trample, hexproof and haste."
public DomriRadeEmblem() {
this.setName("Emblem Domri");
this.setName("Emblem Domri Rade");
FilterPermanent filter = new FilterControlledCreaturePermanent("Creatures");
GainAbilityControlledEffect effect = new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfGame, filter);
Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect);
effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfGame, filter);
ability.addEffect(effect);
effect = new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.EndOfGame, filter);
ability.addEffect(effect);
effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfGame, filter);
ability.addEffect(effect);
this.getAbilities().add(ability);
CompoundAbility compoundAbilities = new CompoundAbility(
DoubleStrikeAbility.getInstance(),
TrampleAbility.getInstance(),
HexproofAbility.getInstance(),
HasteAbility.getInstance()
);
this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new GainAbilityControlledEffect(compoundAbilities, Duration.EndOfGame, filter)));
}
}