github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed build problem with OptionalAdditionalCostImpl.

Browse source
This commit is contained in:
LevelX2 2015-07-23 19:53:34 +02:00
parent f77fd14b1e
commit 05e35bcae7
3 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/costs/OptionalAdditionalCost.java
View file

@ -30,7 +30,7 @@ package mage.abilities.costs;
/**
* @author LevelX2
*/
public interface OptionalAdditionalCost extends Costs {
public interface OptionalAdditionalCost extends Cost {
String getName();

44
Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.costs;
/**
@ -33,10 +32,7 @@ package mage.abilities.costs;
* @author LevelX2
* @param <T>
*/
public class OptionalAdditionalCostImpl <T extends OptionalAdditionalCostImpl> extends CostsImpl<Cost> implements OptionalAdditionalCost{
public class OptionalAdditionalCostImpl<T extends OptionalAdditionalCostImpl> extends CostsImpl<Cost> implements OptionalAdditionalCost {
protected String name;
protected String reminderText;
@ -104,26 +100,26 @@ public class OptionalAdditionalCostImpl <T extends OptionalAdditionalCostImpl> e
}
/**
* Returns a text suffix for the game log, that can be added to
* the cast message.
* Returns a text suffix for the game log, that can be added to the cast
* message.
*
* @param position - if there are multiple costs, it's the postion the cost is set (starting with 0)
* @param position - if there are multiple costs, it's the postion the cost
* is set (starting with 0)
* @return
*/
@Override
public String getCastSuffixMessage(int position) {
StringBuilder sb = new StringBuilder();
if (isActivated() && (!isRepeatable() || getActivateCount() > 0)) {
sb.append(position > 0 ? " and ":"").append(" with ");
sb.append(position > 0 ? " and " : "").append(" with ");
if (isRepeatable()) {
sb.append(getActivateCount()).append(getActivateCount() > 1? " times ":" time ");
sb.append(getActivateCount()).append(getActivateCount() > 1 ? " times " : " time ");
}
sb.append(name);
}
return sb.toString();
return sb.toString();
}
/**
* If the player intends to pay the cost, the cost will be activated
*
@ -132,7 +128,9 @@ public class OptionalAdditionalCostImpl <T extends OptionalAdditionalCostImpl> e
public void activate() {
activated = true;
++activatedCounter;
};
}
;
/**
* Reset the activate and count information
@ -152,7 +150,7 @@ public class OptionalAdditionalCostImpl <T extends OptionalAdditionalCostImpl> e
@Override
public void setRepeatable(boolean repeatable) {
this.repeatable = repeatable;
}
}
/**
* Can the cost be multiple times activated
@ -162,7 +160,9 @@ public class OptionalAdditionalCostImpl <T extends OptionalAdditionalCostImpl> e
@Override
public boolean isRepeatable() {
return repeatable;
};
}
;
/**
* Returns if the cost was activated
@ -170,20 +170,24 @@ public class OptionalAdditionalCostImpl <T extends OptionalAdditionalCostImpl> e
* @return
*/
@Override
public boolean isActivated(){
public boolean isActivated() {
return activated;
};
}
;
/**
* Returns the number of times the cost was activated
* @return
*/
@Override
public int getActivateCount(){
public int getActivateCount() {
return activatedCounter;
};
}
;
@Override
public OptionalAdditionalCostImpl copy() {
return new OptionalAdditionalCostImpl(this);

18
Mage/src/mage/abilities/keyword/KickerAbility.java
View file

@ -218,15 +218,19 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
if (kickerCost.canPay(ability, sourceId, controllerId, game)
&& player.chooseUse(Outcome.Benefit, "Pay " + times + kickerCost.getText(false) + " ?", ability, game)) {
this.activateKicker(kickerCost, ability, game);
for (Iterator itKickerCost = kickerCost.iterator(); itKickerCost.hasNext();) {
Object kickerCostObject = itKickerCost.next();
if ((kickerCostObject instanceof Costs) || (kickerCostObject instanceof CostsImpl)) {
for (@SuppressWarnings("unchecked") Iterator<Cost> itDetails = ((Costs) kickerCostObject).iterator(); itDetails.hasNext();) {
addKickerCostsToAbility(itDetails.next(), ability, game);
if (kickerCost instanceof Costs) {
for (Iterator itKickerCost = ((Costs) kickerCost).iterator(); itKickerCost.hasNext();) {
Object kickerCostObject = itKickerCost.next();
if ((kickerCostObject instanceof Costs) || (kickerCostObject instanceof CostsImpl)) {
for (@SuppressWarnings("unchecked") Iterator<Cost> itDetails = ((Costs) kickerCostObject).iterator(); itDetails.hasNext();) {
addKickerCostsToAbility(itDetails.next(), ability, game);
}
} else {
addKickerCostsToAbility((Cost) kickerCostObject, ability, game);
}
} else {
addKickerCostsToAbility((Cost) kickerCostObject, ability, game);
}
} else {
addKickerCostsToAbility((Cost) kickerCost, ability, game);
}
again = kickerCost.isRepeatable();
} else {