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

Revert "Mana Class Overhaul"

Browse source
This commit is contained in:
LevelX2 2015-11-19 22:59:57 +01:00
parent 02c1b9f22f
commit c4ab5806e0
16 changed files with 192 additions and 1070 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java
View file

@ -141,15 +141,15 @@ class PlasmCaptureManaEffect extends ManaEffect {
}
if (choiceColor.getColor().isBlack()) {
mana.increaseBlack();
mana.addBlack();
} else if (choiceColor.getColor().isBlue()) {
mana.increaseBlue();
mana.addBlue();
} else if (choiceColor.getColor().isRed()) {
mana.increaseRed();
mana.addRed();
} else if (choiceColor.getColor().isGreen()) {
mana.increaseGreen();
mana.addGreen();
} else if (choiceColor.getColor().isWhite()) {
mana.increaseWhite();
mana.addWhite();
}
}

10
Mage.Sets/src/mage/sets/dragonsoftarkir/SarkhanUnbroken.java
View file

@ -132,19 +132,19 @@ class SarkhanUnbrokenAbility1 extends OneShotEffect {
switch (manaChoice.getChoice()) {
case "White":
mana.increaseWhite();
mana.addWhite();
break;
case "Blue":
mana.increaseBlue();
mana.addBlue();
break;
case "Black":
mana.increaseBlack();
mana.addBlack();
break;
case "Red":
mana.increaseRed();
mana.addRed();
break;
case "Green":
mana.increaseGreen();
mana.addGreen();
break;
}

10
Mage.Sets/src/mage/sets/eventide/BloomTender.java
View file

@ -107,19 +107,19 @@ class BloomTenderEffect extends ManaEffect {
Mana mana = new Mana();
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(controller.getId())) {
if (mana.getBlack() == 0 && permanent.getColor(game).isBlack()) {
mana.increaseBlack();
mana.addBlack();
}
if (mana.getBlue() == 0 && permanent.getColor(game).isBlue()) {
mana.increaseBlue();
mana.addBlue();
}
if (mana.getRed() == 0 && permanent.getColor(game).isRed()) {
mana.increaseRed();
mana.addRed();
}
if (mana.getGreen() == 0 && permanent.getColor(game).isGreen()) {
mana.increaseGreen();
mana.addGreen();
}
if (mana.getWhite() == 0 && permanent.getColor(game).isWhite()) {
mana.increaseWhite();
mana.addWhite();
}
}
return mana;

10
Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java
View file

@ -142,15 +142,15 @@ class DawnsReflectionManaEffect extends ManaEffect {
}
if (choiceColor.getColor().isBlack()) {
mana.increaseBlack();
mana.addBlack();
} else if (choiceColor.getColor().isBlue()) {
mana.increaseBlue();
mana.addBlue();
} else if (choiceColor.getColor().isRed()) {
mana.increaseRed();
mana.addRed();
} else if (choiceColor.getColor().isGreen()) {
mana.increaseGreen();
mana.addGreen();
} else if (choiceColor.getColor().isWhite()) {
mana.increaseWhite();
mana.addWhite();
}
}

10
Mage.Sets/src/mage/sets/futuresight/CoalitionRelic.java
View file

@ -109,15 +109,15 @@ class CoalitionRelicEffect extends OneShotEffect {
player.choose(outcome, choice, game);
}
if (choice.getColor().isBlack()) {
mana.increaseBlack();
mana.addBlack();
} else if (choice.getColor().isBlue()) {
mana.increaseBlue();
mana.addBlue();
} else if (choice.getColor().isRed()) {
mana.increaseRed();
mana.addRed();
} else if (choice.getColor().isGreen()) {
mana.increaseGreen();
mana.addGreen();
} else if (choice.getColor().isWhite()) {
mana.increaseWhite();
mana.addWhite();
}
choice.clearChoice();
}

4
Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java
View file

@ -123,10 +123,10 @@ class OrcishLumberjackManaEffect extends ManaEffect {
}
switch (manaChoice.getChoice()) {
case "Green":
mana.increaseGreen();
mana.addGreen();
break;
case "Red":
mana.increaseRed();
mana.addRed();
break;
}

10
Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java
View file

@ -154,15 +154,15 @@ class MarketFestivalManaEffect extends ManaEffect {
}
if (choiceColor.getColor().isBlack()) {
mana.increaseBlack();
mana.addBlack();
} else if (choiceColor.getColor().isBlue()) {
mana.increaseBlue();
mana.addBlue();
} else if (choiceColor.getColor().isRed()) {
mana.increaseRed();
mana.addRed();
} else if (choiceColor.getColor().isGreen()) {
mana.increaseGreen();
mana.addGreen();
} else if (choiceColor.getColor().isWhite()) {
mana.increaseWhite();
mana.addWhite();
}
}
checkToFirePossibleEvents(mana, game, source);

11
Mage.Sets/src/mage/sets/legions/GoblinClearcutter.java
View file

@ -32,11 +32,15 @@ import java.util.Set;
import java.util.UUID;
import mage.MageInt;
import mage.Mana;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.common.ManacostVariableValue;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.choices.Choice;
import mage.choices.ChoiceImpl;
@ -44,11 +48,14 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
import mage.target.common.TargetCreatureOrPlayer;
/**
* @author BursegSardaukar
@ -125,10 +132,10 @@ class GoblinClearCutterEffect extends OneShotEffect {
}
switch (manaChoice.getChoice()) {
case "Green":
mana.increaseGreen();
mana.addGreen();
break;
case "Red":
mana.increaseRed();
mana.addRed();
break;
}
player.getManaPool().addMana(mana, game, source);

12
Mage.Sets/src/mage/sets/saviorsofkamigawa/SasayaOrochiAscendant.java
View file

@ -202,22 +202,22 @@ class SasayasEssenceManaEffectEffect extends ManaEffect {
}
switch (choice.getChoice()) {
case "Black":
newMana.increaseBlack();
newMana.addBlack();
break;
case "Blue":
newMana.increaseBlue();
newMana.addBlue();
break;
case "Red":
newMana.increaseRed();
newMana.addRed();
break;
case "Green":
newMana.increaseGreen();
newMana.addGreen();
break;
case "White":
newMana.increaseWhite();
newMana.addWhite();
break;
case "Colorless":
newMana.increaseColorless();
newMana.addColorless();
break;
}
}

4
Mage.Sets/src/mage/sets/shadowmoor/ManaforgeCinder.java
View file

@ -114,10 +114,10 @@ class ManaforgeCinderManaEffect extends OneShotEffect {
}
switch (manaChoice.getChoice()) {
case "Black":
mana.increaseBlack();
mana.addBlack();
break;
case "Red":
mana.increaseRed();
mana.addRed();
break;
}
controller.getManaPool().addMana(mana, game, source);

4
Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java
View file

@ -130,10 +130,10 @@ class XenagosManaEffect extends OneShotEffect {
}
switch (manaChoice.getChoice()) {
case "Green":
mana.increaseGreen();
mana.addGreen();
break;
case "Red":
mana.increaseRed();
mana.addRed();
break;
}
player.getManaPool().addMana(mana, game, source);