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

Merge remote-tracking branch 'remotes/upstream/master'

Browse source
This commit is contained in:
ciaccona007 2017-07-10 11:44:54 -04:00
commit a1e7c00e21
11 changed files with 179 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Mage/src/main/java/mage/Mana.java
View file

@ -237,6 +237,38 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
any += mana.getAny();
}
/**
* Increases the given mana by one.
*
* @param manaType
*/
public void increase(ManaType manaType) {
switch (manaType) {
case BLACK:
black++;
break;
case BLUE:
blue++;
break;
case COLORLESS:
colorless++;
break;
case GENERIC:
generic++;
break;
case GREEN:
green++;
break;
case RED:
red++;
break;
case WHITE:
white++;
break;
}
}
/**
* Increases the Red mana by one.
*/
@ -815,11 +847,12 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
}
/**
* Returns if this objects mana contains any coloured mana the same as the passed in
* {@link Mana}'s mana.
* Returns if this objects mana contains any coloured mana the same as the
* passed in {@link Mana}'s mana.
*
* @param mana the mana to check for
* @return true if this contains any of the same type of coloured mana that this has
* @return true if this contains any of the same type of coloured mana that
* this has
*/
public boolean containsAny(final Mana mana) {
if (mana.black > 0 && this.black > 0) {
@ -832,7 +865,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
return true;
} else if (mana.green > 0 && this.green > 0) {
return true;
}
}
return false;
}

2
Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java
View file

@ -47,6 +47,8 @@ public interface ManaCost extends Cost {
Mana getPayment();
Mana getUsedManaToPay();
void assignPayment(Game game, Ability ability, ManaPool pool, Cost costsToPay);
void setPayment(Mana mana);

32
Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java
View file

@ -46,18 +46,21 @@ import mage.util.ManaUtil;
public abstract class ManaCostImpl extends CostImpl implements ManaCost {
protected Mana payment;
protected Mana usedManaToPay;
protected Mana cost;
protected ManaOptions options;
protected Filter sourceFilter;
public ManaCostImpl() {
payment = new Mana();
usedManaToPay = new Mana();
options = new ManaOptions();
}
public ManaCostImpl(final ManaCostImpl manaCost) {
super(manaCost);
this.payment = manaCost.payment.copy();
this.usedManaToPay = manaCost.usedManaToPay.copy();
this.cost = manaCost.cost.copy();
this.options = manaCost.options.copy();
if (manaCost.sourceFilter != null) {
@ -70,6 +73,11 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost {
return payment;
}
@Override
public Mana getUsedManaToPay() {
return usedManaToPay;
}
@Override
public Mana getMana() {
return cost;
@ -118,31 +126,31 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost {
// first check special mana
switch (mana) {
case B:
if (pool.pay(ManaType.BLACK, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.BLACK, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseBlack();
return true;
}
break;
case U:
if (pool.pay(ManaType.BLUE, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.BLUE, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseBlue();
return true;
}
break;
case W:
if (pool.pay(ManaType.WHITE, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.WHITE, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseWhite();
return true;
}
break;
case G:
if (pool.pay(ManaType.GREEN, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.GREEN, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseGreen();
return true;
}
break;
case R:
if (pool.pay(ManaType.RED, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.RED, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseRed();
return true;
}
@ -154,7 +162,7 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost {
protected void assignColorless(Ability ability, Game game, ManaPool pool, int mana, Cost costToPay) {
int conditionalCount = pool.getConditionalCount(ability, game, null, costToPay);
while (mana > payment.count() && (pool.count() > 0 || conditionalCount > 0)) {
if (pool.pay(ManaType.COLORLESS, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.COLORLESS, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseColorless();
}
break;
@ -164,27 +172,27 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost {
protected boolean assignGeneric(Ability ability, Game game, ManaPool pool, int mana, Cost costToPay) {
int conditionalCount = pool.getConditionalCount(ability, game, null, costToPay);
while (mana > payment.count() && (pool.count() > 0 || conditionalCount > 0)) {
if (pool.pay(ManaType.COLORLESS, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.COLORLESS, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseColorless();
continue;
}
if (pool.pay(ManaType.BLACK, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.BLACK, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseBlack();
continue;
}
if (pool.pay(ManaType.BLUE, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.BLUE, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseBlue();
continue;
}
if (pool.pay(ManaType.WHITE, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.WHITE, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseWhite();
continue;
}
if (pool.pay(ManaType.GREEN, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.GREEN, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseGreen();
continue;
}
if (pool.pay(ManaType.RED, ability, sourceFilter, game, costToPay)) {
if (pool.pay(ManaType.RED, ability, sourceFilter, game, costToPay, usedManaToPay)) {
this.payment.increaseRed();
continue;
}

9
Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
View file

@ -120,6 +120,15 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
return manaTotal;
}
@Override
public Mana getUsedManaToPay() {
Mana manaTotal = new Mana();
for (ManaCost cost : this) {
manaTotal.add(cost.getUsedManaToPay());
}
return manaTotal;
}
@Override
public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
return pay(ability, game, sourceId, controllerId, noMana, this);

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java
View file

@ -43,7 +43,7 @@ public class ColorsOfManaSpentToCastCount implements DynamicValue {
}
if (spell != null) {
// NOT the cmc of the spell on the stack
Mana mana = spell.getSpellAbility().getManaCostsToPay().getPayment();
Mana mana = spell.getSpellAbility().getManaCostsToPay().getUsedManaToPay();
if (mana.getBlack() > 0) {
count++;
}

1
Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
View file

@ -56,6 +56,7 @@ public class UntapTargetEffect extends OneShotEffect {
public UntapTargetEffect(final UntapTargetEffect effect) {
super(effect);
this.useOnlyTargetPointer = effect.useOnlyTargetPointer;
}
@Override

6
Mage/src/main/java/mage/players/ManaPool.java
View file

@ -110,9 +110,10 @@ public class ManaPool implements Serializable {
* @param filter
* @param game
* @param costToPay complete costs to pay (needed to check conditional mana)
* @param usedManaToPay the information about what mana was paid
* @return
*/
public boolean pay(ManaType manaType, Ability ability, Filter filter, Game game, Cost costToPay) {
public boolean pay(ManaType manaType, Ability ability, Filter filter, Game game, Cost costToPay, Mana usedManaToPay) {
if (!autoPayment && manaType != unlockedManaType) {
// if manual payment and the needed mana type was not unlocked, nothing will be paid
return false;
@ -149,6 +150,7 @@ public class ManaPool implements Serializable {
GameEvent event = new GameEvent(GameEvent.EventType.MANA_PAID, ability.getId(), mana.getSourceId(), ability.getControllerId(), 0, mana.getFlag());
event.setData(mana.getOriginalId().toString());
game.fireEvent(event);
usedManaToPay.increase(mana.getFirstAvailable());
mana.remove(usableManaType);
if (mana.count() == 0) { // so no items with count 0 stay in list
manaItems.remove(mana);
@ -479,7 +481,7 @@ public class ManaPool implements Serializable {
return false;
}
public boolean isEmpty(){
public boolean isEmpty() {
return count() == 0;
}
}