This commit is contained in:
Oleg Agafonov 2019-06-06 16:55:17 +04:00
parent 12fc854777
commit b64a75aa4b
6 changed files with 11 additions and 11 deletions

View file

@ -1502,11 +1502,11 @@ public class ComputerPlayer extends PlayerImpl implements Player {
}
@Override
public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) {
public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) {
log.debug("announceXMana");
//TODO: improve this
int xMin = min * multilier;
int xMax = (max == Integer.MAX_VALUE ? max : max * multilier);
int xMin = min * multiplier;
int xMax = (max == Integer.MAX_VALUE ? max : max * multiplier);
int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost();
if (numAvailable < 0) {
numAvailable = 0;

View file

@ -1128,12 +1128,12 @@ public class HumanPlayer extends PlayerImpl {
/**
* Gets the amount of mana the player want to spent for a x spell
*
* @param multilier - X multiplier after replace events
* @param multiplier - X multiplier after replace events
*/
@Override
public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) {
public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) {
int xValue = 0;
String extraMessage = (multilier == 1 ? "" : ", X will be increased by " + multilier + " times");
String extraMessage = (multiplier == 1 ? "" : ", X will be increased by " + multiplier + " times");
updateGameStatePriority("announceXMana", game);
do {
prepareForResponse(game);

View file

@ -1994,7 +1994,7 @@ public class TestPlayer implements Player {
}
@Override
public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) {
public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) {
if (!choices.isEmpty()) {
for (String choice : choices) {
if (choice.startsWith("X=")) {
@ -2006,7 +2006,7 @@ public class TestPlayer implements Player {
}
this.chooseStrictModeFailed(game, getInfo(ability) + "; " + message);
return computerPlayer.announceXMana(min, max, multilier, message, game, ability);
return computerPlayer.announceXMana(min, max, multiplier, message, game, ability);
}
@Override

View file

@ -912,7 +912,7 @@ public class PlayerStub implements Player {
}
@Override
public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) {
public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) {
return min;
}

View file

@ -568,7 +568,7 @@ public interface Player extends MageItem, Copyable<Player> {
return announceXMana(min, max, 1, message, game, ability);
}
int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability);
int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability);
// set the value for non mana X costs
int announceXCost(int min, int max, String message, Game game, Ability ability, VariableCost variableCost);

View file

@ -149,7 +149,7 @@ public class StubPlayer extends PlayerImpl implements Player {
}
@Override
public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) {
public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) {
return 0;
}