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

[refactor] removed BoostCounter implementations

Browse source
This commit is contained in:
North 2014-05-31 18:43:05 +03:00
parent 44785267ec
commit ca1af753eb
12 changed files with 31 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java
View file

@ -32,7 +32,7 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.counters.common.PlusOneCounter;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
@ -70,7 +70,7 @@ public class AddPlusOneCountersAttachedEffect extends OneShotEffect<AddPlusOneCo
if (enchantment != null && enchantment.getAttachedTo() != null) {
Permanent creature = game.getPermanent(enchantment.getAttachedTo());
if (creature != null) {
creature.addCounters(new PlusOneCounter(amount), game);
creature.addCounters(CounterType.P1P1.createInstance(amount), game);
}
}
return true;

12
Mage/src/mage/counters/BoostCounter.java
View file

@ -32,13 +32,17 @@ package mage.counters;
*
* @author BetaSteward_at_googlemail.com
*/
public abstract class BoostCounter extends Counter {
public class BoostCounter extends Counter {
protected int power;
protected int toughness;
public BoostCounter(int power, int toughness) {
super(String.format("%1$+d/%2$+d", power, toughness));
this(power, toughness, 1);
}
public BoostCounter(int power, int toughness, int count) {
super(String.format("%1$+d/%2$+d", power, toughness), count);
this.power = power;
this.toughness = toughness;
}
@ -57,4 +61,8 @@ public abstract class BoostCounter extends Counter {
return toughness;
}
@Override
public BoostCounter copy() {
return new BoostCounter(this);
}
}

11
Mage/src/mage/counters/CounterType.java
View file

@ -28,9 +28,6 @@
package mage.counters;
import mage.counters.common.MinusOneCounter;
import mage.counters.common.PlusOneCounter;
/**
* Enum for counters, names and instances.
*
@ -63,9 +60,9 @@ public enum CounterType {
LEVEL("Level"),
LORE("Lore"),
LOYALTY("Loyalty"),
M1M1(new MinusOneCounter().name),
M1M1(new BoostCounter(-1, -1).name),
MINING("Mining"),
P1P1(new PlusOneCounter().name),
P1P1(new BoostCounter(1, 1).name),
PAGE("Page"),
PAIN("Pain"),
PETRIFICATION("Petrification"),
@ -116,9 +113,9 @@ public enum CounterType {
public Counter createInstance(int amount) {
switch (this) {
case P1P1:
return new PlusOneCounter(amount);
return new BoostCounter(1, 1, amount);
case M1M1:
return new MinusOneCounter(amount);
return new BoostCounter(-1, -1, amount);
default:
return new Counter(name, amount);
}

56
Mage/src/mage/counters/common/MinusOneCounter.java
View file

@ -1,56 +0,0 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.counters.common;
import mage.counters.BoostCounter;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class MinusOneCounter extends BoostCounter {
public MinusOneCounter() {
super(-1, -1);
}
public MinusOneCounter(int amount) {
super(-1, -1);
this.count = amount;
}
public MinusOneCounter(final MinusOneCounter counter) {
super(counter);
}
@Override
public MinusOneCounter copy() {
return new MinusOneCounter(this);
}
}

56
Mage/src/mage/counters/common/PlusOneCounter.java
View file

@ -1,56 +0,0 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.counters.common;
import mage.counters.BoostCounter;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class PlusOneCounter extends BoostCounter {
public PlusOneCounter() {
this(1);
}
public PlusOneCounter(int amount) {
super(1, 1);
this.count = amount;
}
public PlusOneCounter(final PlusOneCounter counter) {
super(counter);
}
@Override
public PlusOneCounter copy() {
return new PlusOneCounter(this);
}
}