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

- Modified GuiDisplayUtil.java and card border colors now include a test for zerker's color keyword and will now display rules consistent colors.

Browse Source 
- Fixed Disciple of Kangee and the target creature will now display a blue colored border until EOT.
- Added "Ghostfire is colorless." text to Ghostfire's cards.txt entry.
This commit is contained in:
jendave
2011-08-06 03:06:18 +00:00
parent af45f8a3c3
commit 0dc4540089
4 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cards.txt
View File

@@ -8667,7 +8667,7 @@ spDamageTgtCP:3
Ghostfire Ghostfire
2 R 2 R
Instant Instant
no text Ghostfire is colorless.
spDamageTgtCP:3 spDamageTgtCP:3
Ghostfire is colorless. Ghostfire is colorless.

2
res/main.properties
View File

@@ -1,6 +1,6 @@
program/mail=mtgerror@yahoo.com program/mail=mtgerror@yahoo.com
program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26 program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
program/version=Forge -- official beta: 09/12/14, SVN revision: 227 program/version=Forge -- official beta: 09/12/14, SVN revision: 228
tokens--file=AllTokens.txt tokens--file=AllTokens.txt

4
src/forge/CardFactory_Creatures.java
View File

@@ -6489,7 +6489,7 @@ public class CardFactory_Creatures {
if (AllZone.GameAction.isCardInPlay(creature[0])) if (AllZone.GameAction.isCardInPlay(creature[0]))
{ {
creature[0].removeExtrinsicKeyword("Flying"); creature[0].removeExtrinsicKeyword("Flying");
creature[0].removeExtrinsicKeyword(tgtName + " is blue."); creature[0].removeIntrinsicKeyword(tgtName + " is blue.");
creature[0].setManaCost(origManaCost); creature[0].setManaCost(origManaCost);
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
{ {
@@ -6510,7 +6510,7 @@ public class CardFactory_Creatures {
} }
} }
creature[0].addExtrinsicKeyword("Flying"); creature[0].addExtrinsicKeyword("Flying");
creature[0].addExtrinsicKeyword(tgtName + " is blue."); creature[0].addIntrinsicKeyword(tgtName + " is blue.");
AllZone.EndOfTurn.addUntil(EOT); AllZone.EndOfTurn.addUntil(EOT);
}//if (card is in play) }//if (card is in play)
}//resolve() }//resolve()

21
src/forge/GuiDisplayUtil.java
View File

@@ -92,6 +92,7 @@ public class GuiDisplayUtil implements NewConstants {
public static Border getBorder(Card card) { public static Border getBorder(Card card) {
Color color; Color color;
/*
if(card.isArtifact()) color = Color.gray; if(card.isArtifact()) color = Color.gray;
else if(CardUtil.getColor(card).equals(Constant.Color.Black) || card.getName().equals("Swamp") else if(CardUtil.getColor(card).equals(Constant.Color.Black) || card.getName().equals("Swamp")
|| card.getName().equals("Bog")) color = Color.black; || card.getName().equals("Bog")) color = Color.black;
@@ -108,8 +109,26 @@ public class GuiDisplayUtil implements NewConstants {
if(CardUtil.getColors(card).size() != 1) { if(CardUtil.getColors(card).size() != 1) {
color = Color.orange; color = Color.orange;
} }
*/
if(CardUtil.getColors(card).size() > 1)
color = Color.orange;
else if((CardUtil.getColor(card).equals(Constant.Color.Black) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
|| (card.getIntrinsicKeyword().contains(card.getName() + " is black."))) color = Color.black;
else if((CardUtil.getColor(card).equals(Constant.Color.Green) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
|| (card.getIntrinsicKeyword().contains(card.getName() + " is green."))) color = new Color(0, 220, 39);
else if((CardUtil.getColor(card).equals(Constant.Color.White) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
|| (card.getIntrinsicKeyword().contains(card.getName() + " is white."))) color = Color.white;
else if((CardUtil.getColor(card).equals(Constant.Color.Red) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
|| (card.getIntrinsicKeyword().contains(card.getName() + " is red."))) color = Color.red;
else if((CardUtil.getColor(card).equals(Constant.Color.Blue) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
|| (card.getIntrinsicKeyword().contains(card.getName() + " is blue."))) color = Color.blue;
else if(CardUtil.getColor(card).equals(Constant.Color.Colorless) || (card.getKeyword().contains(card.getName() + " is colorless.")))
color = Color.gray;
else color = new Color(200, 0, 230); // If your card has a violet border, something is wrong
if(!card.isArtifact()) { // if(!card.isArtifact()) {
if(!CardUtil.getColor(card).equals(Constant.Color.Colorless) || (!card.getKeyword().contains(card.getName() + " is colorless."))) {
int r = color.getRed(); int r = color.getRed();
int g = color.getGreen(); int g = color.getGreen();
int b = color.getBlue(); int b = color.getBlue();