mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
- Added a isType function to cards.java that also checks for changelings.
- Changed the staticeffect keyword to now also pump changelings.
This commit is contained in:
4
.gitattributes
vendored
4
.gitattributes
vendored
@@ -374,7 +374,7 @@ src/forge/BoosterDraft.java svneol=native#text/plain
|
|||||||
src/forge/BoosterDraftAI.java svneol=native#text/plain
|
src/forge/BoosterDraftAI.java svneol=native#text/plain
|
||||||
src/forge/BoosterPack.java svneol=native#text/plain
|
src/forge/BoosterPack.java svneol=native#text/plain
|
||||||
src/forge/ButtonUtil.java svneol=native#text/plain
|
src/forge/ButtonUtil.java svneol=native#text/plain
|
||||||
src/forge/Card.java svneol=native#text/plain
|
src/forge/Card.java -text svneol=native#text/plain
|
||||||
src/forge/CardContainer.java svneol=native#text/plain
|
src/forge/CardContainer.java svneol=native#text/plain
|
||||||
src/forge/CardFactory.java -text svneol=native#text/plain
|
src/forge/CardFactory.java -text svneol=native#text/plain
|
||||||
src/forge/CardFactoryUtil.java -text svneol=native#text/plain
|
src/forge/CardFactoryUtil.java -text svneol=native#text/plain
|
||||||
@@ -430,7 +430,7 @@ src/forge/GUI_Filter.java -text svneol=native#text/plain
|
|||||||
src/forge/GUI_ImportPicture.java -text svneol=native#text/plain
|
src/forge/GUI_ImportPicture.java -text svneol=native#text/plain
|
||||||
src/forge/GUI_Quest_Filter.java -text svneol=native#text/plain
|
src/forge/GUI_Quest_Filter.java -text svneol=native#text/plain
|
||||||
src/forge/GameAction.java -text svneol=native#text/plain
|
src/forge/GameAction.java -text svneol=native#text/plain
|
||||||
src/forge/GameActionUtil.java svneol=native#text/plain
|
src/forge/GameActionUtil.java -text svneol=native#text/plain
|
||||||
src/forge/GameInfo.java -text svneol=native#text/plain
|
src/forge/GameInfo.java -text svneol=native#text/plain
|
||||||
src/forge/GenerateConstructedDeck.java -text svneol=native#text/plain
|
src/forge/GenerateConstructedDeck.java -text svneol=native#text/plain
|
||||||
src/forge/GenerateConstructedMultiColorDeck.java -text svneol=native#text/plain
|
src/forge/GenerateConstructedMultiColorDeck.java -text svneol=native#text/plain
|
||||||
|
|||||||
@@ -1886,4 +1886,21 @@ public class Card extends MyObservable {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//usable to check for changelings
|
||||||
|
public boolean isType(String cardType) {
|
||||||
|
if (type.contains(cardType)
|
||||||
|
|| ((isCreature() || (isTribal() && !cardType.equals("Creature")))
|
||||||
|
&& !cardType.equals("Legendary") && !cardType.equals("Planeswalker")
|
||||||
|
&& !cardType.equals("Basic") && !cardType.equals("Enchantment")
|
||||||
|
&& !cardType.equals("Land") && !cardType.equals("Sorcery")
|
||||||
|
&& !cardType.equals("Instant") && !cardType.equals("Artifact")
|
||||||
|
&& !cardType.equals("Snow") && !cardType.equals("Arcane")
|
||||||
|
&& !cardType.equals("Equipment") && !cardType.equals("Aura")
|
||||||
|
&& !cardType.equals("Plains") && !cardType.equals("Mountain")
|
||||||
|
&& !cardType.equals("Island") && !cardType.equals("Forest")
|
||||||
|
&& !cardType.equals("Swamp") && getKeyword().contains("Changeling"))) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10317,7 +10317,7 @@ public class GameActionUtil {
|
|||||||
if(Specific[i].contains("Type.") && !Specific[i].contains("NonType.")) {
|
if(Specific[i].contains("Type.") && !Specific[i].contains("NonType.")) {
|
||||||
Cards_inZone = Cards_inZone.filter(new CardListFilter() {
|
Cards_inZone = Cards_inZone.filter(new CardListFilter() {
|
||||||
public boolean addCard(Card c) {
|
public boolean addCard(Card c) {
|
||||||
if(c.getType().contains(Specific[Restriction_Count[0]].replaceFirst("Type.", ""))) return true;
|
if(c.isType(Specific[Restriction_Count[0]].replaceFirst("Type.", ""))) return true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user