Cost reduction effects - refactor, removed redundant custom effects, added card hints;

This commit is contained in:
Oleg Agafonov 2020-06-29 12:52:14 +04:00
parent e4ebf50d42
commit cf3feff76a
35 changed files with 506 additions and 643 deletions

View file

@ -1,38 +1,60 @@
package mage.abilities.dynamicvalue.common;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.combat.CombatGroup;
import mage.game.permanent.Permanent;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public class AttackingCreatureCount implements DynamicValue {
private String message;
private FilterCreaturePermanent filter;
public AttackingCreatureCount() {
this("attacking creature");
}
public AttackingCreatureCount(FilterCreaturePermanent filter) {
this(filter, "attacking " + filter.getMessage());
}
public AttackingCreatureCount(String message) {
this(null, message);
}
public AttackingCreatureCount(FilterCreaturePermanent filter, String message) {
this.message = message;
this.filter = filter;
}
public AttackingCreatureCount(final AttackingCreatureCount dynamicValue) {
super();
this.message = dynamicValue.message;
this.filter = dynamicValue.filter;
}
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
int count = 0;
for (CombatGroup combatGroup : game.getCombat().getGroups()) {
count += combatGroup.getAttackers().size();
for (UUID permId : combatGroup.getAttackers()) {
if (filter != null) {
Permanent attacker = game.getPermanent(permId);
if (attacker != null && filter.match(attacker, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game)) {
count++;
}
} else {
count++;
}
}
}
return count;
}

View file

@ -1,65 +0,0 @@
package mage.abilities.dynamicvalue.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.combat.CombatGroup;
import mage.game.permanent.Permanent;
/**
*
* @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
*/
public class AttackingFilterCreatureCount implements DynamicValue {
private FilterCreaturePermanent filter;
private String message;
public AttackingFilterCreatureCount(FilterCreaturePermanent filter) {
this(filter, "attacking creature");
}
public AttackingFilterCreatureCount(FilterCreaturePermanent filter, String message) {
this.filter = filter;
this.message = message;
}
public AttackingFilterCreatureCount(final AttackingFilterCreatureCount dynamicValue) {
super();
this.message = dynamicValue.message;
this.filter = dynamicValue.filter;
}
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
int count = 0;
for (CombatGroup combatGroup : game.getCombat().getGroups()) {
for (UUID permId : combatGroup.getAttackers()) {
Permanent attacker = game.getPermanent(permId);
if (filter.match(attacker, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game)) {
count++;
}
}
}
return count;
}
@Override
public AttackingFilterCreatureCount copy() {
return new AttackingFilterCreatureCount(this);
}
@Override
public String getMessage() {
return message;
}
@Override
public String toString() {
return "X";
}
}

View file

@ -32,11 +32,11 @@ public enum GateYouControlCount implements DynamicValue {
@Override
public String toString() {
return "X";
return "1"; // uses "for each" effects, so must be 1, not X
}
@Override
public String getMessage() {
return "gate you control";
return "Gate you control";
}
}