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

Renamed HasCounterCondition to SourceHasCounterCondition.

Browse source
This commit is contained in:
LevelX2 2014-02-26 12:31:21 +01:00
parent 2520644e2c
commit fe2ff3cc35
22 changed files with 47 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/mage/abilities/condition/common/HasCounterCondition.java → Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java
View file

@ -38,23 +38,23 @@ import mage.game.permanent.Permanent;
*
* @author nantuko
*/
public class HasCounterCondition implements Condition {
public class SourceHasCounterCondition implements Condition {
private final CounterType counterType;
private int amount = 1;
private int from = -1;
private int to;
public HasCounterCondition(CounterType type) {
public SourceHasCounterCondition(CounterType type) {
this.counterType = type;
}
public HasCounterCondition(CounterType type, int amount) {
public SourceHasCounterCondition(CounterType type, int amount) {
this.counterType = type;
this.amount = amount;
}
public HasCounterCondition(CounterType type, int from, int to) {
public SourceHasCounterCondition(CounterType type, int from, int to) {
this.counterType = type;
this.from = from;
this.to = to;

4
Mage/src/mage/abilities/keyword/LevelerCardBuilder.java
View file

@ -34,7 +34,7 @@ import mage.abilities.AbilitiesImpl;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.HasCounterCondition;
import mage.abilities.condition.common.SourceHasCounterCondition;
import mage.abilities.decorator.ConditionalContinousEffect;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
@ -73,7 +73,7 @@ public class LevelerCardBuilder {
public List<Ability> build() {
List<Ability> constructed = new ArrayList<Ability>();
Condition condition = new HasCounterCondition(CounterType.LEVEL, level1, level2);
Condition condition = new SourceHasCounterCondition(CounterType.LEVEL, level1, level2);
for (Ability ability : abilities) {
ContinuousEffect effect = new GainAbilitySourceEffect(ability);
ConditionalContinousEffect abEffect = new ConditionalContinousEffect(effect, condition, "");

3
Mage/src/mage/cards/decks/importer/TxtDeckImporter.java
View file

@ -65,6 +65,9 @@ public class TxtDeckImporter extends DeckImporter {
}
int delim = line.indexOf(' ');
if (delim < 0) {
return;
}
String lineNum = line.substring(0, delim).trim();
String lineName = line.substring(delim).replace("’","\'").trim();
if (IGNORE_NAMES.contains(lineName)) {