Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add getRarityChar() to IRenderableCard

master
ShawnieBoy 2016-01-05 18:14:51 +00:00
parent 16a0f798d1
commit 0dc50c65b8
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/magic/model/MagicCard.java
View File

@ -597,4 +597,8 @@ public class MagicCard
@Override @Override
public boolean isHidden() {return cardDefinition.isHidden();} public boolean isHidden() {return cardDefinition.isHidden();}
@Override
public Character getRarityChar() {
return cardDefinition.getRarityChar();
}
} }

26
src/magic/model/MagicCardDefinition.java
View File

@ -1,33 +1,21 @@
package magic.model; package magic.model;
import java.util.*;
import magic.ai.ArtificialScoringSystem; import magic.ai.ArtificialScoringSystem;
import magic.data.CardDefinitions; import magic.data.CardDefinitions;
import magic.data.CardProperty; import magic.data.CardProperty;
import magic.data.MagicIcon; import magic.data.MagicIcon;
import magic.model.event.MagicActivation; import magic.model.event.*;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicHandCastActivation;
import magic.model.event.MagicCardEvent;
import magic.model.event.MagicEvent;
import magic.model.event.MagicEventSource;
import magic.model.event.MagicManaActivation;
import magic.model.event.MagicPayManaCostEvent;
import magic.model.event.MagicPermanentActivation;
import magic.model.event.MagicPlayCardEvent;
import magic.model.event.MagicTiming;
import magic.model.mstatic.MagicCDA; import magic.model.mstatic.MagicCDA;
import magic.model.mstatic.MagicStatic; import magic.model.mstatic.MagicStatic;
import magic.model.trigger.MagicTrigger;
import magic.model.trigger.MagicTriggerType;
import magic.model.trigger.EntersBattlefieldTrigger; import magic.model.trigger.EntersBattlefieldTrigger;
import magic.model.trigger.EntersWithCounterTrigger; import magic.model.trigger.EntersWithCounterTrigger;
import magic.model.trigger.MagicTrigger;
import magic.model.trigger.ThisCycleTrigger;
import magic.model.trigger.ThisDrawnTrigger; import magic.model.trigger.ThisDrawnTrigger;
import magic.model.trigger.ThisPutIntoGraveyardTrigger; import magic.model.trigger.ThisPutIntoGraveyardTrigger;
import magic.model.trigger.ThisSpellIsCastTrigger; import magic.model.trigger.ThisSpellIsCastTrigger;
import magic.model.trigger.ThisCycleTrigger;
import java.util.*;
import magic.ui.cardBuilder.IRenderableCard; import magic.ui.cardBuilder.IRenderableCard;
import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem;
@ -351,6 +339,10 @@ public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {
return (rarity == null ? "" : rarity.getName()); return (rarity == null ? "" : rarity.getName());
} }
public Character getRarityChar() {
return rarity.getChar();
}
public void setToken() { public void setToken() {
token=true; token=true;
} }

4
src/magic/model/MagicPermanent.java
View File

@ -1425,5 +1425,9 @@ public class MagicPermanent extends MagicObjectImpl implements MagicSource,Magic
@Override @Override
public boolean isHidden() {return cardDefinition.isHidden();} public boolean isHidden() {return cardDefinition.isHidden();}
@Override
public Character getRarityChar(){
return cardDefinition.getRarityChar();
}
} }

2
src/magic/ui/cardBuilder/IRenderableCard.java
View File

@ -1,7 +1,6 @@
package magic.ui.cardBuilder; package magic.ui.cardBuilder;
import java.util.Collection; import java.util.Collection;
import java.util.EnumSet;
import java.util.Set; import java.util.Set;
import magic.model.MagicAbility; import magic.model.MagicAbility;
@ -43,4 +42,5 @@ public interface IRenderableCard {
boolean isInstant(); boolean isInstant();
boolean isEnchantment(); boolean isEnchantment();
boolean isHidden(); boolean isHidden();
Character getRarityChar();
} }