mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 04:38:00 +00:00
Code cleanup
This commit is contained in:
@@ -127,19 +127,6 @@ public abstract class InputPayMana extends InputSyncronizedBase {
|
|||||||
showMessage();
|
showMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* activateManaAbility.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param sa
|
|
||||||
* a {@link forge.game.spellability.SpellAbility} object.
|
|
||||||
* @param card
|
|
||||||
* a {@link forge.game.card.Card} object.
|
|
||||||
* @param manaCost
|
|
||||||
* a {@link forge.game.mana.ManaCostBeingPaid} object.
|
|
||||||
* @return a {@link forge.game.mana.ManaCostBeingPaid} object.
|
|
||||||
*/
|
|
||||||
protected boolean activateManaAbility(final Card card, ManaCostBeingPaid manaCost) {
|
protected boolean activateManaAbility(final Card card, ManaCostBeingPaid manaCost) {
|
||||||
return activateManaAbility(card, manaCost, null);
|
return activateManaAbility(card, manaCost, null);
|
||||||
}
|
}
|
||||||
@@ -168,7 +155,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
|
|||||||
if (colorCanUse == 0) { // no mana cost or something
|
if (colorCanUse == 0) { // no mana cost or something
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<SpellAbility> abilities = new ArrayList<SpellAbility>();
|
List<SpellAbility> abilities = new ArrayList<SpellAbility>();
|
||||||
// you can't remove unneeded abilities inside a for (am:abilities) loop :(
|
// you can't remove unneeded abilities inside a for (am:abilities) loop :(
|
||||||
|
|
||||||
@@ -232,7 +219,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
|
|||||||
colorMatches.add(sa);
|
colorMatches.add(sa);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (colorMatches.isEmpty()) {
|
if (colorMatches.isEmpty()) {
|
||||||
// can only match colorless just grab the first and move on.
|
// can only match colorless just grab the first and move on.
|
||||||
// This is wrong. Sometimes all abilities aren't created equal
|
// This is wrong. Sometimes all abilities aren't created equal
|
||||||
@@ -256,32 +243,21 @@ public abstract class InputPayMana extends InputSyncronizedBase {
|
|||||||
chosen.getManaPartRecursive().setExpressChoice(colors);
|
chosen.getManaPartRecursive().setExpressChoice(colors);
|
||||||
|
|
||||||
// System.out.println("Chosen sa=" + chosen + " of " + chosen.getHostCard() + " to pay mana");
|
// System.out.println("Chosen sa=" + chosen + " of " + chosen.getHostCard() + " to pay mana");
|
||||||
Runnable proc = new Runnable() {
|
|
||||||
|
locked = true;
|
||||||
|
game.getAction().invoke(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
HumanPlay.playSpellAbility(getController(), chosen.getActivatingPlayer(), chosen);
|
HumanPlay.playSpellAbility(getController(), chosen.getActivatingPlayer(), chosen);
|
||||||
player.getManaPool().payManaFromAbility(saPaidFor, InputPayMana.this.manaCost, chosen);
|
player.getManaPool().payManaFromAbility(saPaidFor, InputPayMana.this.manaCost, chosen);
|
||||||
|
|
||||||
onManaAbilityPaid();
|
onManaAbilityPaid();
|
||||||
onStateChanged();
|
onStateChanged();
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
locked = true;
|
|
||||||
game.getAction().invoke(proc);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* canMake. color is like "G", returns "Green".
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param am
|
|
||||||
* a {@link forge.card.spellability.AbilityMana} object.
|
|
||||||
* @param mana
|
|
||||||
* a {@link java.lang.String} object.
|
|
||||||
* @return a boolean.
|
|
||||||
*/
|
|
||||||
private static boolean abilityProducesManaColor(final SpellAbility am, AbilityManaPart m, final byte neededColor) {
|
private static boolean abilityProducesManaColor(final SpellAbility am, AbilityManaPart m, final byte neededColor) {
|
||||||
if (0 != (neededColor & ManaAtom.COLORLESS)) {
|
if (0 != (neededColor & ManaAtom.COLORLESS)) {
|
||||||
return true;
|
return true;
|
||||||
@@ -349,7 +325,6 @@ public abstract class InputPayMana extends InputSyncronizedBase {
|
|||||||
player.runWithController(proc, new PlayerControllerAi(game, player, player.getOriginalLobbyPlayer()));
|
player.runWithController(proc, new PlayerControllerAi(game, player, player.getOriginalLobbyPlayer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** {@inheritDoc} */
|
|
||||||
@Override
|
@Override
|
||||||
protected void onOk() {
|
protected void onOk() {
|
||||||
if (supportAutoPay()) {
|
if (supportAutoPay()) {
|
||||||
@@ -401,7 +376,6 @@ public abstract class InputPayMana extends InputSyncronizedBase {
|
|||||||
showMessage(getMessage());
|
showMessage(getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
/** {@inheritDoc} */
|
|
||||||
@Override
|
@Override
|
||||||
public void showMessage() {
|
public void showMessage() {
|
||||||
if (isFinished()) { return; }
|
if (isFinished()) { return; }
|
||||||
|
|||||||
Reference in New Issue
Block a user