Merge branch 'master' into fix_hints_equip

# Conflicts:
#	Mage.Sets/src/mage/cards/b/BehemothSledge.java
#	Mage.Sets/src/mage/cards/d/DivinersWand.java
#	Mage.Sets/src/mage/cards/u/UmbralMantle.java
#	Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java
#	Mage.Sets/src/mage/cards/w/WandOfOrcus.java
#	Mage/src/main/java/mage/abilities/keyword/EquipAbility.java
This commit is contained in:
Alex Vasile 2022-05-12 08:12:25 -06:00
commit b3bf42389b
5304 changed files with 66289 additions and 32481 deletions

View file

@ -3,7 +3,7 @@ package mage.abilities.keyword;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.EquipEffect;
import mage.abilities.effects.common.AttachEffect;
import mage.constants.Outcome;
import mage.constants.TimingRule;
import mage.constants.Zone;
@ -39,7 +39,7 @@ public class EquipAbility extends ActivatedAbilityImpl {
}
public EquipAbility(Outcome outcome, Cost cost, Target target, boolean showAbilityHint) {
super(Zone.BATTLEFIELD, new EquipEffect(outcome), cost);
super(Zone.BATTLEFIELD, new AttachEffect(outcome, "Equip"), cost);
this.addTarget(target);
this.timing = TimingRule.SORCERY;
this.showAbilityHint = showAbilityHint;