external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup for Card class, removed unreferenced methods and variables, inlined once-referenced, moved ai-related closer to AI

Browse Source
This commit is contained in:
Maxmtg
2013-04-11 21:18:01 +00:00
parent 465a862070
commit 7e14d5ca58
12 changed files with 76 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

487
src/main/java/forge/Card.java
View File

@@ -30,6 +30,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import org.apache.commons.lang3.StringUtils;
import com.esotericsoftware.minlog.Log;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -47,7 +49,6 @@ import forge.card.mana.ManaCostBeingPaid;
import forge.card.replacement.ReplaceMoved;
import forge.card.replacement.ReplacementEffect;
import forge.card.replacement.ReplacementResult;
import forge.card.spellability.AbilityManaPart;
import forge.card.spellability.AbilityTriggered;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellPermanent;
@@ -135,11 +136,9 @@ public class Card extends GameEntity implements Comparable<Card> {
private boolean token = false;
private boolean copiedToken = false;
private boolean copiedSpell = false;
private boolean spellWithChoices = false;
private ArrayList<Card> mustBlockCards = null;
private boolean canMorph = false;
private boolean canCounter = true;
private boolean evoked = false;
@@ -212,10 +211,6 @@ public class Card extends GameEntity implements Comparable<Card> {
private final List<Command> gainControlReleaseCommands = new ArrayList<Command>();
private final List<AbilityTriggered> zcTriggers = new ArrayList<AbilityTriggered>();
private final List<Command> equipCommandList = new ArrayList<Command>();
private final List<Command> unEquipCommandList = new ArrayList<Command>();
private final List<Command> enchantCommandList = new ArrayList<Command>();
private final List<Command> unEnchantCommandList = new ArrayList<Command>();
private final List<Command> untapCommandList = new ArrayList<Command>();
private final List<Command> changeControllerCommandList = new ArrayList<Command>();
@@ -1176,20 +1171,17 @@ public class Card extends GameEntity implements Comparable<Card> {
}
public final int getTotalCountersToAdd(final CounterType counterType, final int baseAmount, final boolean applyMultiplier) {
if (!this.canReceiveCounters(counterType)) {
return 0;
}
if (this.canReceiveCounters(counterType)) {
final int multiplier = applyMultiplier ? this.getController().getCounterDoublersMagnitude(counterType) : 1;
return multiplier * baseAmount;
}
return 0;
}
public final void addCounter(final CounterType counterType, final int n, final boolean applyMultiplier) {
if (!this.canReceiveCounters(counterType)) {
final int addAmount = getTotalCountersToAdd(counterType, n, applyMultiplier);
if ( addAmount == 0 )
return;
}
final int multiplier = applyMultiplier ? this.getController().getCounterDoublersMagnitude(counterType) : 1;
final int addAmount = (multiplier * n);
Integer oldValue = this.counters.get(counterType);
int newValue = addAmount + (oldValue == null ? 0 : oldValue.intValue());
@@ -1330,19 +1322,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return !this.counters.isEmpty();
}
/**
*
* getNumberOfCounters.
*
* @return int
*/
public final int getNumberOfCounters() {
int number = 0;
for (final Integer i : this.counters.values()) {
number += i.intValue();
}
return number;
}
// get all counters from a card
@@ -1452,24 +1431,12 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final int sumAllCounters() {
int count = 0;
int num = 0;
for (final Object value2 : this.counters.values()) {
num = (Integer) value2;
count += num;
for (final Integer value2 : this.counters.values()) {
count += value2.intValue();
}
return count;
}
/**
* <p>
* getNetPTCounters.
* </p>
*
* @return a int.
*/
public final int getNetPTCounters() {
return this.getCounters(CounterType.P1P1) - this.getCounters(CounterType.M1M1);
}
/**
* <p>
@@ -2526,53 +2493,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return Collections.unmodifiableList(this.getCharacteristics().getManaAbility());
}
// Returns basic mana abilities plus "reflected mana" abilities
/**
* <p>
* getAIPlayableMana.
* </p>
*
* @return a {@link java.util.ArrayList} object.
*/
public final ArrayList<SpellAbility> getAIPlayableMana() {
final ArrayList<SpellAbility> res = new ArrayList<SpellAbility>();
for (final SpellAbility a : this.getManaAbility()) {
// if a mana ability has a mana cost the AI will miscalculate
// if there is a parent ability the AI can't use it
final Cost cost = a.getPayCosts();
if (!cost.hasNoManaCost()
|| (a.getApi() != ApiType.Mana && a.getApi() != ApiType.ManaReflected)) {
continue;
}
AbilityManaPart am = a.getManaPart();
if (am.isBasic() && !res.contains(a)) {
res.add(a);
}
}
return res;
}
/**
* <p>
* getBasicMana.
* </p>
*
* @return a {@link java.util.ArrayList} object.
*/
public final List<SpellAbility> getBasicMana() {
final List<SpellAbility> res = new ArrayList<SpellAbility>();
for (final SpellAbility a : this.getManaAbility()) {
if (a.getManaPart().isBasic() && !res.contains(a)) {
res.add(a);
}
}
return res;
}
/**
* <p>
@@ -2877,29 +2797,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return this.copiedSpell;
}
/**
* <p>
* setSpellWithChoices.
* </p>
*
* @param b
* a boolean.
*/
public final void setSpellWithChoices(final boolean b) {
this.spellWithChoices = b;
}
/**
* <p>
* hasChoices.
* </p>
*
* @return a boolean.
*/
public final boolean hasChoices() {
return this.spellWithChoices;
}
/**
* <p>
* isFaceDown.
@@ -2934,28 +2831,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return this.canCounter;
}
/**
* <p>
* setCanMorph.
* </p>
*
* @param b
* a boolean.
*/
public final void setCanMorph(final boolean b) {
this.canMorph = b;
}
/**
* <p>
* getCanMorph.
* </p>
*
* @return a boolean.
*/
public final boolean getCanMorph() {
return this.canMorph;
}
/**
* <p>
@@ -3022,26 +2897,7 @@ public class Card extends GameEntity implements Comparable<Card> {
this.addTrigger(c, ZCTrigger.ENTERFIELD);
}
/**
* <p>
* removeComesIntoPlayCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void removeComesIntoPlayCommand(final Command c) {
this.removeTrigger(c, ZCTrigger.ENTERFIELD);
}
/**
* <p>
* comesIntoPlay.
* </p>
*/
public final void comesIntoPlay() {
this.executeTrigger(ZCTrigger.ENTERFIELD);
}
/**
* <p>
@@ -3055,26 +2911,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.addTrigger(c, ZCTrigger.DESTROY);
}
/**
* <p>
* removeDestroyCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void removeDestroyCommand(final Command c) {
this.removeTrigger(c, ZCTrigger.DESTROY);
}
/**
* <p>
* destroy.
* </p>
*/
public final void destroy() {
this.executeTrigger(ZCTrigger.DESTROY);
}
/**
* <p>
@@ -3088,161 +2924,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.addTrigger(c, ZCTrigger.LEAVEFIELD);
}
/**
* <p>
* removeLeavesPlayCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void removeLeavesPlayCommand(final Command c) {
this.removeTrigger(c, ZCTrigger.LEAVEFIELD);
}
/**
* <p>
* leavesPlay.
* </p>
*/
public final void leavesPlay() {
this.executeTrigger(ZCTrigger.LEAVEFIELD);
}
/**
* <p>
* addEquipCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void addEquipCommand(final Command c) {
this.equipCommandList.add(c);
}
/**
* <p>
* removeEquipCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void removeEquipCommand(final Command c) {
this.equipCommandList.remove(c);
}
/**
* <p>
* equip.
* </p>
*/
public final void equip() {
for (final Command var : this.equipCommandList) {
var.execute();
}
}
/**
* <p>
* addUnEquipCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void addUnEquipCommand(final Command c) {
this.unEquipCommandList.add(c);
}
/**
* <p>
* removeUnEquipCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void removeUnEquipCommand(final Command c) {
this.unEquipCommandList.remove(c);
}
/**
* <p>
* unEquip.
* </p>
*/
public final void unEquip() {
for (final Command var : this.unEquipCommandList) {
var.execute();
}
}
/**
* <p>
* addEnchantCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void addEnchantCommand(final Command c) {
this.enchantCommandList.add(c);
}
/**
* <p>
* clearEnchantCommand.
* </p>
*/
public final void clearEnchantCommand() {
this.enchantCommandList.clear();
}
/**
* <p>
* enchant.
* </p>
*/
public final void enchant() {
for (final Command var : this.enchantCommandList) {
var.execute();
}
}
/**
* <p>
* addUnEnchantCommand.
* </p>
*
* @param c
* a {@link forge.Command} object.
*/
public final void addUnEnchantCommand(final Command c) {
this.unEnchantCommandList.add(c);
}
/**
* <p>
* clearUnEnchantCommand.
* </p>
*/
public final void clearUnEnchantCommand() {
this.unEnchantCommandList.clear();
}
/**
* <p>
* unEnchant.
* </p>
*/
public final void unEnchant() {
for (final Command var : this.unEnchantCommandList) {
var.execute();
}
}
/**
* <p>
* addUntapCommand.
@@ -3420,7 +3101,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return a {@link forge.Card} object.
*/
public final Card getEquippingCard() {
if (this.equipping.size() == 0) {
if (this.equipping.isEmpty()) {
return null;
}
return this.equipping.get(0);
@@ -3544,7 +3225,6 @@ public class Card extends GameEntity implements Comparable<Card> {
}
this.addEquipping(c);
c.addEquippedBy(this);
this.equip();
// Play the Equip sound
Singletons.getModel().getGame().getEvents().post(new CardEquippedEvent());
@@ -3565,7 +3245,6 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final void unEquipCard(final Card c) // equipment.unEquipCard(equippedCard);
{
this.unEquip();
this.equipping.remove(c);
c.removeEquippedBy(this);
@@ -3735,7 +3414,6 @@ public class Card extends GameEntity implements Comparable<Card> {
}
this.addEnchanting(entity);
entity.addEnchantedBy(this);
this.enchant();
// run trigger
final HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("AttachSource", this);
@@ -3753,7 +3431,6 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final void unEnchantEntity(final GameEntity gameEntity) {
if ((this.enchanting != null) && this.enchanting.equals(gameEntity)) {
this.unEnchant();
this.enchanting = null;
gameEntity.removeEnchantedBy(this);
}
@@ -3782,17 +3459,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.getCharacteristics().getType().add(a);
}
/**
* <p>
* removeType.
* </p>
*
* @param a
* a {@link java.lang.String} object.
*/
public final void removeType(final String a) {
this.getCharacteristics().getType().remove(a);
}
/**
* <p>
@@ -3846,27 +3512,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return new ArrayList<String>(this.getCharacteristics().getType());
}
/**
*
* TODO Write javadoc for this method.
*
* @param types
* a ArrayList<CardType>
*/
public final void setChangedCardTypes(final ArrayList<CardType> types) {
this.changedCardTypes = types;
}
/**
*
* TODO Write javadoc for this method.
*
* @return ArrayList<CardType>
*/
public final ArrayList<CardType> getChangedCardTypes() {
return this.changedCardTypes;
}
/**
*
* TODO Write javadoc for this method.
@@ -3946,20 +3591,6 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
/**
* <p>
* clearAllTypes.
* </p>
*
* @return a {@link java.util.ArrayList} object.
*/
public final ArrayList<String> clearAllTypes() {
final ArrayList<String> originalTypes = new ArrayList<String>();
originalTypes.addAll(this.getCharacteristics().getType());
this.getCharacteristics().getType().clear();
return originalTypes;
}
// values that are printed on card
/**
* <p>
@@ -4081,27 +3712,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.baseDefenseString = s;
}
/**
*
* TODO Write javadoc for this method.
*
* @param pt
* ArrayList<CardPowerToughness>
*/
public final void setNewPT(final ArrayList<CardPowerToughness> pt) {
this.newPT = pt;
}
/**
*
* TODO Write javadoc for this method.
*
* @return ArrayList<CardPowerToughness>
*/
public final ArrayList<CardPowerToughness> getNewPT() {
return this.newPT;
}
/**
*
* TODO Write javadoc for this method.
@@ -4728,15 +4338,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return this.getCharacteristics().getIntrinsicKeyword();
}
/**
* <p>
* clearIntrinsicKeyword.
* </p>
*/
public final void clearIntrinsicKeyword() {
this.getCharacteristics().getIntrinsicKeyword().clear();
}
/**
* <p>
* Setter for the field <code>intrinsicKeyword</code>.
@@ -4749,17 +4350,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.getCharacteristics().setIntrinsicKeyword(new ArrayList<String>(a));
}
/**
* <p>
* clearAllKeywords.
* </p>
*/
public final void clearAllKeywords() {
this.getCharacteristics().getIntrinsicKeyword().clear();
this.extrinsicKeyword.clear();
// Hidden keywords won't be displayed on the card
this.hiddenExtrinsicKeyword.clear();
}
/**
* <p>
@@ -4891,17 +4481,6 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
/**
* <p>
* getExtrinsicKeywordSize.
* </p>
*
* @return a int.
*/
public int getExtrinsicKeywordSize() {
return this.extrinsicKeyword.size();
}
// Hidden Keywords will be returned without the indicator HIDDEN
/**
@@ -4978,7 +4557,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link java.lang.String} object.
*/
public final void addStaticAbilityString(final String s) {
if (s.trim().length() != 0) {
if (StringUtils.isNotBlank(s)) {
this.getCharacteristics().getStaticAbilityStrings().add(s);
}
}
@@ -5016,27 +4595,6 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
/**
* Adds the static ability.
*
* @param s
* the s
*
* @param state
* a {@link forge.CardCharacteristicName} object.
*
* @return a {@link forge.card.staticability.StaticAbility} object.
*/
public final StaticAbility addStaticAbility(final String s, final CardCharacteristicName state) {
if (s.trim().length() == 0) {
return null;
}
final StaticAbility stAb = new StaticAbility(s, this);
CardCharacteristics stateCharacteristics = this.getState(state);
stateCharacteristics.getStaticAbilities().add(stAb);
return stAb;
}
public final boolean isPermanent() {
return !(this.isInstant() || this.isSorcery() || this.isImmutable());
@@ -5070,9 +4628,9 @@ public class Card extends GameEntity implements Comparable<Card> {
private boolean typeContains(final String s) {
final Iterator<?> it = this.getType().iterator();
final Iterator<String> it = this.getType().iterator();
while (it.hasNext()) {
if (it.next().toString().startsWith(s)) {
if (it.next().startsWith(s)) {
return true;
}
}
@@ -5539,25 +5097,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return false;
}
/**
* <p>
* hasAnyKeyword.
* </p>
*
* @param keywords
* a {@link java.util.ArrayList} object.
* @return a boolean.
*/
public final boolean hasAnyKeyword(final ArrayList<String> keywords) {
for (int i = 0; i < keywords.size(); i++) {
if (this.hasKeyword(keywords.get(i))) {
return true;
}
}
return false;
}
// This counts the number of instances of a keyword a card has
/**
* <p>

2
src/main/java/forge/card/ability/ai/ChangeZoneAi.java
View File

@@ -1277,8 +1277,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
// to unenchant it, then clear out the commands
final GameEntity oldEnchanted = c.getEnchanting();
c.removeEnchanting(oldEnchanted);
c.clearEnchantCommand();
c.clearUnEnchantCommand();
}
c.enchantEntity(attachedTo);
} else { // When it should enter the battlefield attached to an illegal permanent it fails

2
src/main/java/forge/card/ability/ai/RepeatEachAi.java
View File

@@ -48,7 +48,7 @@ public class RepeatEachAi extends SpellAbilityAi {
perms = CardLists.filter(CardLists.getTargetableCards(perms, sa), new Predicate<Card>() {
@Override
public boolean apply(final Card c) {
return (c.sumAllCounters() > 0);
return c.hasCounters();
}
});
if (perms.isEmpty()) {

2
src/main/java/forge/card/ability/effects/AttachEffect.java
View File

@@ -127,8 +127,6 @@ public class AttachEffect extends SpellAbilityEffect {
final GameEntity oldEnchanted = card.getEnchanting();
oldEnchanted.removeEnchantedBy(card);
card.removeEnchanting(oldEnchanted);
card.clearEnchantCommand();
card.clearUnEnchantCommand();
card.clearTriggers(); // not sure if cleartriggers is needed?
}

6
src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
View File

@@ -488,8 +488,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
// to unenchant it, then clear out the commands
final GameEntity oldEnchanted = tgtC.getEnchanting();
tgtC.removeEnchanting(oldEnchanted);
tgtC.clearEnchantCommand();
tgtC.clearUnEnchantCommand();
}
tgtC.enchantEntity(attachedTo);
} else { //Equipment
@@ -780,8 +778,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
// to unenchant it, then clear out the commands
final GameEntity oldEnchanted = c.getEnchanting();
c.removeEnchanting(oldEnchanted);
c.clearEnchantCommand();
c.clearUnEnchantCommand();
}
c.enchantEntity(attachedTo);
} else { //Equipment
@@ -819,8 +815,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
// to unenchant it, then clear out the commands
final GameEntity oldEnchanted = c.getEnchanting();
c.removeEnchanting(oldEnchanted);
c.clearEnchantCommand();
c.clearUnEnchantCommand();
}
c.enchantEntity(attachedTo);
}

2
src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
View File

@@ -359,7 +359,7 @@ public class CardFactoryCreatures {
@Override
public void resolve() {
int n = card.sumAllCounters();
for (int i = 0; i < card.sumAllCounters(); i++) {
for (int i = 0; i < n; i++) {
for(Card tok : this.makeToken()) {
Singletons.getModel().getGame().getAction().moveToPlay(tok);
}

1
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -3344,7 +3344,6 @@ public class CardFactoryUtil {
if (n != -1) {
final String parse = card.getKeyword().get(n).toString();
card.setCanMorph(true);
Map<String, String> sVars = card.getSVars();
final String[] k = parse.split(":");

3
src/main/java/forge/game/GameAction.java
View File

@@ -52,6 +52,7 @@ import forge.card.spellability.Target;
import forge.card.staticability.StaticAbility;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerType;
import forge.card.trigger.ZCTrigger;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilCost;
import forge.game.event.CardDestroyedEvent;
@@ -1345,7 +1346,7 @@ public class GameAction {
final Card newCard = this.moveToGraveyard(c);
// Destroy needs to be called with Last Known Information
c.destroy();
c.executeTrigger(ZCTrigger.DESTROY);
// System.out.println("Card " + c.getName() +
// " is getting sent to GY, and this turn it got damaged by: ");

2
src/main/java/forge/game/ai/ComputerUtilCard.java
View File

@@ -882,7 +882,7 @@ public class ComputerUtilCard {
List<Card> list = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() {
@Override
public boolean apply(final Card c) {
for (final SpellAbility am : c.getAIPlayableMana()) {
for (final SpellAbility am : ComputerUtilMana.getAIPlayableMana(c)) {
am.setActivatingPlayer(player);
if (am.canPlay()) {
return true;

35
src/main/java/forge/game/ai/ComputerUtilMana.java
View File

@@ -477,7 +477,7 @@ public class ComputerUtilMana {
@Override
public boolean apply(final Card c) {
if (checkPlayable) {
for (final SpellAbility am : c.getAIPlayableMana()) {
for (final SpellAbility am : getAIPlayableMana(c)) {
am.setActivatingPlayer(ai);
if (am.canPlay()) {
return true;
@@ -518,7 +518,7 @@ public class ComputerUtilMana {
int usableManaAbilities = 0;
boolean needsLimitedResources = false;
boolean producesAnyColor = false;
final ArrayList<SpellAbility> manaAbilities = card.getAIPlayableMana();
final ArrayList<SpellAbility> manaAbilities = getAIPlayableMana(card);
for (final SpellAbility m : manaAbilities) {
@@ -605,7 +605,7 @@ public class ComputerUtilMana {
// Loop over all mana sources
for (int i = 0; i < manaSources.size(); i++) {
final Card sourceCard = manaSources.get(i);
final ArrayList<SpellAbility> manaAbilities = sourceCard.getAIPlayableMana();
final ArrayList<SpellAbility> manaAbilities = getAIPlayableMana(sourceCard);
// Loop over all mana abilities for a source
for (final SpellAbility m : manaAbilities) {
@@ -781,4 +781,33 @@ public class ComputerUtilMana {
return choiceString.toString();
}
// Returns basic mana abilities plus "reflected mana" abilities
/**
* <p>
* getAIPlayableMana.
* </p>
*
* @return a {@link java.util.ArrayList} object.
*/
public static final ArrayList<SpellAbility> getAIPlayableMana(Card c) {
final ArrayList<SpellAbility> res = new ArrayList<SpellAbility>();
for (final SpellAbility a : c.getManaAbility()) {
// if a mana ability has a mana cost the AI will miscalculate
// if there is a parent ability the AI can't use it
final Cost cost = a.getPayCosts();
if (!cost.hasNoManaCost()
|| (a.getApi() != ApiType.Mana && a.getApi() != ApiType.ManaReflected)) {
continue;
}
AbilityManaPart am = a.getManaPart();
if (am.isBasic() && !res.contains(a)) {
res.add(a);
}
}
return res;
}
}

5
src/main/java/forge/game/zone/PlayerZoneBattlefield.java
View File

@@ -34,6 +34,7 @@ import forge.card.mana.ManaCost;
import forge.card.spellability.Ability;
import forge.card.spellability.SpellAbility;
import forge.card.staticability.StaticAbility;
import forge.card.trigger.ZCTrigger;
import forge.game.GameActionUtil;
import forge.game.player.Player;
@@ -116,7 +117,7 @@ public class PlayerZoneBattlefield extends PlayerZone {
if (this.trigger) {
c.setSickness(true); // summoning sickness
c.comesIntoPlay();
c.executeTrigger(ZCTrigger.ENTERFIELD);
if (c.isLand()) {
@@ -214,7 +215,7 @@ public class PlayerZoneBattlefield extends PlayerZone {
}*/
if (this.leavesTrigger) {
c.leavesPlay();
c.executeTrigger(ZCTrigger.LEAVEFIELD);
}
if (Singletons.getModel().getGame().getStaticEffects().getCardToEffectsList().containsKey(c.getName())) {

44
src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -391,39 +391,39 @@ public class CardPanel extends JPanel implements CardContainer {
return;
}
final int counters = this.getCard().getNumberOfCounters();
if (counters == 1) {
CardFaceSymbols.drawSymbol("counters1", g, this.cardXOffset - 15, (this.cardYOffset + this.cardHeight)
- (this.cardHeight / 3) - 40);
} else if (counters == 2) {
CardFaceSymbols.drawSymbol("counters2", g, this.cardXOffset - 15, (this.cardYOffset + this.cardHeight)
- (this.cardHeight / 3) - 40);
} else if (counters == 3) {
CardFaceSymbols.drawSymbol("counters3", g, this.cardXOffset - 15, (this.cardYOffset + this.cardHeight)
- (this.cardHeight / 3) - 40);
} else if (counters > 3) {
CardFaceSymbols.drawSymbol("countersMulti", g, this.cardXOffset - 15, (this.cardYOffset + this.cardHeight)
- (this.cardHeight / 3) - 40);
int number = 0;
for (final Integer i : this.getCard().getCounters().values()) {
number += i.intValue();
}
final int counters = number;
final int yCounters = (this.cardYOffset + this.cardHeight) - (this.cardHeight / 3) - 40;
if (counters == 1) {
CardFaceSymbols.drawSymbol("counters1", g, this.cardXOffset - 15, yCounters);
} else if (counters == 2) {
CardFaceSymbols.drawSymbol("counters2", g, this.cardXOffset - 15, yCounters);
} else if (counters == 3) {
CardFaceSymbols.drawSymbol("counters3", g, this.cardXOffset - 15, yCounters);
} else if (counters > 3) {
CardFaceSymbols.drawSymbol("countersMulti", g, this.cardXOffset - 15, yCounters);
}
final int xSymbols = (this.cardXOffset + (this.cardWidth / 4)) - 16;
final int ySymbols = (this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16;
// int yOff = (cardHeight/4) + 2;
if (this.getCard().isAttacking()) {
CardFaceSymbols.drawSymbol("attack", g, (this.cardXOffset + (this.cardWidth / 4)) - 16,
(this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16);
CardFaceSymbols.drawSymbol("attack", g, xSymbols, ySymbols);
} else if (this.getCard().isBlocking()) {
CardFaceSymbols.drawSymbol("defend", g, (this.cardXOffset + (this.cardWidth / 4)) - 16,
(this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16);
CardFaceSymbols.drawSymbol("defend", g, xSymbols, ySymbols);
}
if (this.getCard().isSick() && this.getCard().isInPlay()) {
CardFaceSymbols.drawSymbol("summonsick", g, (this.cardXOffset + (this.cardWidth / 2)) - 16,
(this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16);
CardFaceSymbols.drawSymbol("summonsick", g, xSymbols, ySymbols);
}
if (this.getCard().isPhasedOut()) {
CardFaceSymbols.drawSymbol("phasing", g, (this.cardXOffset + (this.cardWidth / 2)) - 16,
(this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16);
CardFaceSymbols.drawSymbol("phasing", g, xSymbols, ySymbols);
}
if (this.getCard().isUsedToPay()) {