External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2016-03-17 15:47:18 +01:00
commit e70ae2520a
3 changed files with 45 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/abilities/dynamicvalue/MultipliedValue.java
View file

@ -38,21 +38,21 @@ import mage.game.Game;
public class MultipliedValue implements DynamicValue {
private final DynamicValue value;
private final int multiplier;
private final int multplier; // should be renamed to multiplier but don't want to break your stuff
public MultipliedValue(DynamicValue value, int multiplier) {
this.value = value.copy();
this.multiplier = multiplier;
this.multplier = multiplier;
}
MultipliedValue(final MultipliedValue dynamicValue) {
this.value = dynamicValue.value.copy();
this.multiplier = dynamicValue.multiplier;
this.multplier = dynamicValue.multplier;
}
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
return multiplier * value.calculate(game, sourceAbility, effect);
return multplier * value.calculate(game, sourceAbility, effect);
}
@Override
@ -63,10 +63,10 @@ public class MultipliedValue implements DynamicValue {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if (multiplier == 2) {
if (multplier == 2) {
sb.append("twice ");
} else {
sb.append(multiplier).append(" * ");
sb.append(multplier).append(" * ");
}
return sb.append(value.toString()).toString();
}

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

@ -52,7 +52,7 @@ public class BlockedCreatureCount implements DynamicValue {
public BlockedCreatureCount(String message, boolean beyondTheFirst) {
this.message = message;
this.beyondTheFirst = beyondTheFirst;
//this.beyondTheFirst = beyondTheFirst; this was never set in the original, so not setting here just in case ??
}
public BlockedCreatureCount(final BlockedCreatureCount dynamicValue) {