- Added Catalyst Stone.

This commit is contained in:
Sloth
2012-11-30 21:18:04 +00:00
parent ed4fef0a25
commit 41d4e8bbf1
4 changed files with 42 additions and 14 deletions

1
.gitattributes vendored
View File

@@ -1446,6 +1446,7 @@ res/cardsfolder/c/cataclysm.txt -text
res/cardsfolder/c/catacomb_dragon.txt -text
res/cardsfolder/c/catacomb_slug.txt -text
res/cardsfolder/c/catalog.txt svneol=native#text/plain
res/cardsfolder/c/catalyst_stone.txt -text
res/cardsfolder/c/catapult_master.txt svneol=native#text/plain
res/cardsfolder/c/catapult_squad.txt svneol=native#text/plain
res/cardsfolder/c/catastrophe.txt svneol=native#text/plain

1
.gitignore vendored
View File

@@ -359,6 +359,7 @@ res/pics/TSP
res/pics/UDS
res/pics/ULG
res/pics/USG
res/pics/VAN
res/pics/VIS
res/pics/WTH
res/pics/WWK

View File

@@ -0,0 +1,12 @@
Name:Catalyst Stone
ManaCost:2
Types:Artifact
Text:no text
S:Mode$ ReduceCost | ValidCard$ Card | Type$ Flashback | Activator$ You | Amount$ 2 | Description$ Flashback costs you pay cost up to 2 less.
S:Mode$ RaiseCost | ValidCard$ Card | Type$ Flashback | Activator$ Opponent | Amount$ 2 | Description$ Flashback costs your opponents pay cost 2 more.
SVar:RemRandomDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/catalyst_stone.jpg
SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/297.jpg
Oracle:Flashback costs you pay cost up to {2} less.\nFlashback costs your opponents pay cost {2} more.
End

View File

@@ -73,9 +73,14 @@ public class StaticAbilityCostChange {
if (!(sa instanceof AbilityActivated)) {
return originalCost;
}
} else if (params.get("Type").equals("NonManaAbility")
&& (!(sa instanceof AbilityActivated) || null != sa.getManaPart())) {
return originalCost;
} else if (params.get("Type").equals("NonManaAbility")) {
if (!(sa instanceof AbilityActivated) || null != sa.getManaPart()) {
return originalCost;
}
} else if (params.get("Type").equals("Flashback")) {
if (!sa.isFlashBackAbility()) {
return originalCost;
}
}
}
if (params.containsKey("AffectedZone") && !card.isInZone(ZoneType.smartValueOf(params.get("AffectedZone")))) {
@@ -186,17 +191,26 @@ public class StaticAbilityCostChange {
return originalCost;
}
if (params.containsKey("Type")) {
if (params.get("Type").equals("Spell") && !sa.isSpell()) {
return originalCost;
}
if (params.get("Type").equals("Ability") && !(sa instanceof AbilityActivated)) {
return originalCost;
}
if (params.get("Type").equals("Cycling") && !sa.isCycling()) {
return originalCost;
} else if (params.get("Type").equals("Equip")
&& (!(sa instanceof AbilityActivated) || !sa.hasParam("Equip"))) {
return originalCost;
if (params.get("Type").equals("Spell")) {
if (!sa.isSpell()) {
return originalCost;
}
} else if (params.get("Type").equals("Ability")) {
if (!(sa instanceof AbilityActivated)) {
return originalCost;
}
} else if (params.get("Type").equals("Cycling")) {
if (!sa.isCycling()) {
return originalCost;
}
} else if (params.get("Type").equals("Equip")) {
if (!(sa instanceof AbilityActivated) || !sa.hasParam("Equip")) {
return originalCost;
}
} else if (params.get("Type").equals("Flashback")) {
if (!sa.isFlashBackAbility()) {
return originalCost;
}
}
}
if (params.containsKey("ValidTarget")) {