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

Fix Navigator's Compass not working while casting spells

Browse source
This commit is contained in:
Alex W. Jackson 2022-02-20 13:24:57 -05:00
parent 8243c19fdf
commit dd8d86ba95
6 changed files with 49 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java
View file

@ -6,10 +6,12 @@ import mage.abilities.mana.*;
import mage.constants.*;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
public class BecomesBasicLandEnchantedEffect extends ContinuousEffectImpl {
@ -18,7 +20,11 @@ public class BecomesBasicLandEnchantedEffect extends ContinuousEffectImpl {
public BecomesBasicLandEnchantedEffect(SubType... landNames) {
super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Detriment);
landTypes.addAll(Arrays.asList(landNames));
this.staticText = setText();
this.staticText = "enchanted land is " + CardUtil.addArticle(CardUtil.concatWithAnd(landTypes
.stream()
.map(SubType::getDescription)
.collect(Collectors.toList())
));
}
public BecomesBasicLandEnchantedEffect(final BecomesBasicLandEnchantedEffect effect) {
@ -76,21 +82,4 @@ public class BecomesBasicLandEnchantedEffect extends ContinuousEffectImpl {
}
return true;
}
private String setText() {
StringBuilder sb = new StringBuilder("Enchanted land is a ");
int i = 1;
for (SubType landType : landTypes) {
if (i > 1) {
if (i == landTypes.size()) {
sb.append(" and ");
} else {
sb.append(", ");
}
}
i++;
sb.append(landType);
}
return sb.toString();
}
}

70
Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
View file

@ -1,5 +1,6 @@
package mage.abilities.effects.common.continuous;
import mage.abilities.Abilities;
import mage.abilities.Ability;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.mana.*;
@ -9,11 +10,13 @@ import mage.constants.*;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* http://mtgsalvation.gamepedia.com/Land_changers
@ -24,7 +27,6 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
protected boolean chooseLandType;
protected List<SubType> landTypes = new ArrayList<>();
private final List<SubType> landTypesToAdd = new ArrayList<>();
private final boolean loseOther; // loses all other abilities, card types, and creature types
public BecomesBasicLandTargetEffect(Duration duration) {
@ -58,15 +60,13 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
dependencyTypes.add(DependencyType.BecomePlains);
}
this.chooseLandType = chooseLandType;
this.staticText = setText();
this.loseOther = loseOther;
this.staticText = setText();
}
public BecomesBasicLandTargetEffect(final BecomesBasicLandTargetEffect effect) {
super(effect);
this.landTypes.addAll(effect.landTypes);
this.landTypesToAdd.addAll(effect.landTypesToAdd);
this.chooseLandType = effect.chooseLandType;
this.loseOther = effect.loseOther;
}
@ -90,9 +90,6 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
return;
}
}
if (loseOther) {
landTypesToAdd.addAll(landTypes);
}
}
@Override
@ -112,33 +109,37 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
land.removeAllAbilities(source.getSourceId(), game);
// 305.7
land.removeAllSubTypes(game, SubTypeSet.NonBasicLandType);
land.addSubType(game, landTypes);
} else {
landTypesToAdd.clear();
for (SubType subtype : landTypes) {
if (!land.hasSubtype(subtype, game)) {
land.addSubType(game, subtype);
landTypesToAdd.add(subtype);
}
}
}
land.addSubType(game, landTypes);
// add intrinsic land abilities here not in layer 6
for (SubType landType : landTypesToAdd) {
Abilities<Ability> landAbilities = land.getAbilities(game);
for (SubType landType : landTypes) {
switch (landType) {
case PLAINS:
land.addAbility(new WhiteManaAbility(), source.getSourceId(), game);
if (!landAbilities.containsClass(WhiteManaAbility.class)) {
land.addAbility(new WhiteManaAbility(), source.getSourceId(), game);
}
break;
case ISLAND:
land.addAbility(new BlueManaAbility(), source.getSourceId(), game);
if (!landAbilities.containsClass(BlueManaAbility.class)) {
land.addAbility(new BlueManaAbility(), source.getSourceId(), game);
}
break;
case SWAMP:
land.addAbility(new BlackManaAbility(), source.getSourceId(), game);
if (!landAbilities.containsClass(BlackManaAbility.class)) {
land.addAbility(new BlackManaAbility(), source.getSourceId(), game);
}
break;
case MOUNTAIN:
land.addAbility(new RedManaAbility(), source.getSourceId(), game);
if (!landAbilities.containsClass(RedManaAbility.class)) {
land.addAbility(new RedManaAbility(), source.getSourceId(), game);
}
break;
case FOREST:
land.addAbility(new GreenManaAbility(), source.getSourceId(), game);
if (!landAbilities.containsClass(GreenManaAbility.class)) {
land.addAbility(new GreenManaAbility(), source.getSourceId(), game);
}
break;
}
}
@ -147,23 +148,18 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
}
private String setText() {
StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder("target land becomes ");
if (chooseLandType) {
sb.append("Target land becomes the basic land type of your choice");
sb.append("the basic land type of your choice");
} else {
sb.append("Target land becomes a ");
int i = 1;
for (SubType landType : landTypes) {
if (i > 1) {
if (i == landTypes.size()) {
sb.append(" and ");
} else {
sb.append(", ");
}
}
i++;
sb.append(landType);
}
sb.append(CardUtil.addArticle(CardUtil.concatWithAnd(landTypes
.stream()
.map(SubType::getDescription)
.collect(Collectors.toList())
)));
}
if (!loseOther) {
sb.append(" in addition to its other types");
}
if (!duration.toString().isEmpty() && duration != Duration.EndOfGame) {
sb.append(' ').append(duration.toString());