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

- Fixed YouCtrl in isValidCard.

Browse Source 
- Some cleanup of stPump.
This commit is contained in:
jendave
2011-08-06 08:09:25 +00:00
parent 0b908a92dd
commit e3811fc4b9
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/cardsfolder/mindwrack_liege.txt
View File

@@ -3,8 +3,8 @@ ManaCost:3 UR UR UR
Types:Creature Horror Types:Creature Horror
Text:UR UR UR UR: You may put a blue or red creature card from your hand onto the battlefield. Text:UR UR UR UR: You may put a blue or red creature card from your hand onto the battlefield.
PT:4/4 PT:4/4
K:stPumpOther:Creature.Blue+:1/1:No Condition:Other blue creatures you control get +1/+1. K:stPumpOther:Creature.Blue+YouCtrl:1/1:No Condition:Other blue creatures you control get +1/+1.
K:stPumpOther:Creature.Red+:1/1:No Condition:Other red creatures you control get +1/+1. K:stPumpOther:Creature.Red+YouCtrl:1/1:No Condition:Other red creatures you control get +1/+1.
SVar:PlayMain1:TRUE SVar:PlayMain1:TRUE
SVar:Rarity:Rare SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/mindwrack_liege.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/mindwrack_liege.jpg

4
src/forge/Card.java
View File

@@ -2040,15 +2040,15 @@ public class Card extends MyObservable {
{ {
if (!getController().equals(Controller)) if (!getController().equals(Controller))
return false; return false;
Restrictions[i] = Restrictions[i].split("\\+YouCtrl")[0];
Restrictions[i].replaceAll(".YouCtrl", ""); Restrictions[i].replaceAll(".YouCtrl", "");
Restrictions[i].replaceAll("YouCtrl", "");
} }
else if (Restrictions[i].contains("YouDontCtrl")) else if (Restrictions[i].contains("YouDontCtrl"))
{ {
if (getController().equals(Controller)) if (getController().equals(Controller))
return false; return false;
Restrictions[i] = Restrictions[i].split("\\+YouDontCtrl")[0];
Restrictions[i].replaceAll(".YouDontCtrl", ""); Restrictions[i].replaceAll(".YouDontCtrl", "");
Restrictions[i].replaceAll("YouDontCtrl", "");
} }
} }
return isValidCard(Restrictions); return isValidCard(Restrictions);

26
src/forge/GameActionUtil.java
View File

@@ -11241,21 +11241,21 @@ public class GameActionUtil {
return false; return false;
} }
}); });
// For each card found, find the keywords which are the StatusEffect Keywords // For each card found, find the keywords which are the stPump Keywords
for(int i = 0; i < Cards_WithKeyword.size() ; i++) { for(int i = 0; i < Cards_WithKeyword.size() ; i++) {
Card card = Cards_WithKeyword.get(i); Card card = Cards_WithKeyword.get(i);
ArrayList<String> a = card.getKeyword(); ArrayList<String> a = card.getKeyword();
int StaticEffectKeywords = 0; int stPumpKeywords = 0;
int StaticEffectKeyword_Number[] = new int[a.size()]; int stPumpKeyword_Number[] = new int[a.size()];
for(int x = 0; x < a.size(); x++) for(int x = 0; x < a.size(); x++)
if(a.get(x).toString().startsWith("stPump")) { if(a.get(x).toString().startsWith("stPump")) {
StaticEffectKeyword_Number[StaticEffectKeywords] = x; stPumpKeyword_Number[stPumpKeywords] = x;
StaticEffectKeywords = StaticEffectKeywords + 1; stPumpKeywords = stPumpKeywords + 1;
} }
// For each keyword found, Record Data about the keyword and the source card // For each keyword found, Record Data about the keyword and the source card
// Record Data Start // Record Data Start
for(int CKeywords = 0; CKeywords < StaticEffectKeywords; CKeywords++) { for(int CKeywords = 0; CKeywords < stPumpKeywords; CKeywords++) {
String parse = card.getKeyword().get(StaticEffectKeyword_Number[CKeywords]).toString(); String parse = card.getKeyword().get(stPumpKeyword_Number[CKeywords]).toString();
String k[] = parse.split(":"); String k[] = parse.split(":");
int ANCount = 0; int ANCount = 0;
KeywordsActive = 0; KeywordsActive = 0;
@@ -11278,7 +11278,7 @@ public class GameActionUtil {
} }
} }
if(!ActivatedAlready) { if(!ActivatedAlready) {
InfoStorage[KeywordsActive] = String.valueOf(card.getUniqueNumber()) + ":" + StaticEffectKeyword_Number[CKeywords] + ":" + card.getController(); InfoStorage[KeywordsActive] = String.valueOf(card.getUniqueNumber()) + ":" + stPumpKeyword_Number[CKeywords] + ":" + card.getController();
ActivationNumber = KeywordsActive; ActivationNumber = KeywordsActive;
} }
CardList SourceCard_in_CardsWithKeyword = CardsWithKeyword.getName(card.getName()); CardList SourceCard_in_CardsWithKeyword = CardsWithKeyword.getName(card.getName());
@@ -11288,7 +11288,7 @@ public class GameActionUtil {
} }
// JOptionPane.showMessageDialog(null, ANCount + " " + SourceCard_in_CardsWithKeyword.size(), "", JOptionPane.INFORMATION_MESSAGE); // JOptionPane.showMessageDialog(null, ANCount + " " + SourceCard_in_CardsWithKeyword.size(), "", JOptionPane.INFORMATION_MESSAGE);
for(int i1 = 0; i1 < ANCount - SourceCard_in_CardsWithKeyword.size() + 1; i1++) { for(int i1 = 0; i1 < ANCount - SourceCard_in_CardsWithKeyword.size() + 1; i1++) {
if(CKeywords + 1 == StaticEffectKeywords) CardsWithKeyword.add(card); if(CKeywords + 1 == stPumpKeywords) CardsWithKeyword.add(card);
} }
// Record Data End // Record Data End
@@ -11305,12 +11305,7 @@ public class GameActionUtil {
next[ANumber].clear(); next[ANumber].clear();
CardList Cards_inZone = new CardList(); CardList Cards_inZone = new CardList();
// Where does the SourceCard have to be? if(AllZone.GameAction.isCardInPlay(SourceCard)) {
boolean CardInRightZone = false;
if(AllZone.GameAction.isCardInPlay(SourceCard)) CardInRightZone = true;
if(Keyword_Details[1].equals("Graveyard")&& AllZone.GameAction.isCardInGrave(SourceCard)) CardInRightZone = true;
if(CardInRightZone) {
// Who gets the Bonus? // Who gets the Bonus?
Cards_inZone.add(AffectedCards(SourceCard, Keyword_Details)); Cards_inZone.add(AffectedCards(SourceCard, Keyword_Details));
@@ -11351,7 +11346,6 @@ public class GameActionUtil {
// Is the Card in the right location // Is the Card in the right location
boolean SourceCardinRightZone = true; boolean SourceCardinRightZone = true;
if(!AllZone.GameAction.isCardInPlay(Source)) SourceCardinRightZone = false; if(!AllZone.GameAction.isCardInPlay(Source)) SourceCardinRightZone = false;
if(k[1].equals("Graveyard") && !AllZone.GameAction.isCardInGrave(Source)) SourceCardinRightZone = false;
if(!LastKnownController.equals(Source.getController())) SourceCardinRightZone = false; if(!LastKnownController.equals(Source.getController())) SourceCardinRightZone = false;
// If the Source Card is not in the right Location or the Special Conditions are no longer met - Then Remove Bonus // If the Source Card is not in the right Location or the Special Conditions are no longer met - Then Remove Bonus