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

- Cleanup.

Browse Source
This commit is contained in:
Sloth
2012-11-25 15:11:10 +00:00
parent f0216839d0
commit 0086f71816
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/c/concussive_bolt.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 R R
Types:Sorcery
Text:no text
A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 4 | SubAbility$ DBPump | SpellDescription$ CARDNAME deals 4 damage to target player. Metalcraft - If you control three or more artifacts, creatures that player controls can't block this turn.
SVar:DBPump:DB$PumpAll | Defined$ Targeted | ValidCards$ Creature | ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE3 | KW$ HIDDEN CARDNAME can't block.
SVar:DBPump:DB$ PumpAll | Defined$ Targeted | ValidCards$ Creature | ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE3 | KW$ HIDDEN CARDNAME can't block.
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/concussive_bolt.jpg
SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/60.jpg

2
res/cardsfolder/d/dispatch.txt
View File

@@ -3,7 +3,7 @@ ManaCost:W
Types:Instant
Text:no text
A:SP$ Tap | Cost$ W | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ DBExile | SpellDescription$ Tap target creature. Metalcraft - If you control three or more artifacts, exile that creature.
SVar:DBExile:DB$ChangeZone | Condition$ Metalcraft | Defined$ Targeted | Origin$ Battlefield | Destination$ Exile | ConditionDescription$ If you control three or more artifacts,
SVar:DBExile:DB$ ChangeZone | Condition$ Metalcraft | Defined$ Targeted | Origin$ Battlefield | Destination$ Exile | ConditionDescription$ If you control three or more artifacts,
SVar:RemAIDeck:True
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/dispatch.jpg

8
res/cardsfolder/m/molten_psyche.txt
View File

@@ -3,11 +3,11 @@ ManaCost:1 R R
Types:Sorcery
Text:no text
A:SP$ ChangeZoneAll | Cost$ 1 R R | Defined$ You | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | Shuffle$ True | SubAbility$ PsychoDraw | SpellDescription$ Each player shuffles the cards from his or her hand into his or her library, then draws that many cards. Metalcraft - If you control three or more artifacts, Molten Psyche deals damage to each opponent equal to the number of cards that player has drawn this turn.
SVar:PsychoDraw:DB$Draw | NumCards$ X | References$ X| Defined$ You | SubAbility$ PsychOpp
SVar:PsychoDraw:DB$ Draw | NumCards$ X | References$ X| Defined$ You | SubAbility$ PsychOpp
SVar:PsychOpp:DB$ ChangeZoneAll | Defined$ Opponent | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | ForgetOtherRemembered$ True | Shuffle$ True | SubAbility$ PsychoDrawOpp
SVar:PsychoDrawOpp:DB$Draw | NumCards$ X | References$ X| Defined$ Opponent | SubAbility$ DBCleanup
SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True | SubAbility$ MindFlame
SVar:MindFlame:DB$DealDamage | Defined$ Opponent | NumDmg$ Y | References$ Y| ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE3
SVar:PsychoDrawOpp:DB$ Draw | NumCards$ X | References$ X| Defined$ Opponent | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ MindFlame
SVar:MindFlame:DB$ DealDamage | Defined$ Opponent | NumDmg$ Y | References$ Y| ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE3
SVar:X:Remembered$Amount
SVar:Y:Count$OppDrewThisTurn
SVar:NeedsToPlayVar:Z LE2

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

@@ -6498,8 +6498,7 @@ public class Card extends GameEntity implements Comparable<Card> {
if (list.indexOf(source) >= list.indexOf(this)) {
return false;
}
} else if (property.startsWith("DirectlyAbove")) { // "Are Directly Above"
// Source
} else if (property.startsWith("DirectlyAbove")) { // "Are Directly Above" Source
final List<Card> list = this.getOwner().getCardsIn(ZoneType.Graveyard);
if (list.indexOf(this) - list.indexOf(source) != 1) {
return false;
@@ -6564,15 +6563,12 @@ public class Card extends GameEntity implements Comparable<Card> {
}
return false;
} else {
boolean shares = false;
for (final Card card : sourceController.getCardsIn(ZoneType.Battlefield)) {
if (card.isValid(restriction, sourceController, source) && this.sharesColorWith(card)) {
shares = true;
return true;
}
}
if (!shares) {
return false;
}
return false;
}
}
} else if (property.startsWith("sharesCreatureTypeWith")) {
@@ -6672,7 +6668,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return false;
}
}
} else if (property.startsWith("SecondSpellCastThisTurn")) {
final List<Card> list = CardUtil.getThisTurnCast("Card", source);
if (list.size() < 2) {
@@ -6681,7 +6676,6 @@ public class Card extends GameEntity implements Comparable<Card> {
else if (list.get(1) != this) {
return false;
}
} else if (property.startsWith("sharesTypeWith")) {
if (!this.sharesTypeWith(source)) {
return false;