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

- Add Support for ChosenColor in AF_Mana

Browse Source 
- Add My Grail (Sol Grail)
This commit is contained in:
Sol
2011-10-02 02:43:10 +00:00
parent 5580bc2cfc
commit d6e1a324fb
5 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -7263,6 +7263,7 @@ res/cardsfolder/s/soaring_hope.txt svneol=native#text/plain
res/cardsfolder/s/soaring_seacliff.txt svneol=native#text/plain res/cardsfolder/s/soaring_seacliff.txt svneol=native#text/plain
res/cardsfolder/s/soilshaper.txt svneol=native#text/plain res/cardsfolder/s/soilshaper.txt svneol=native#text/plain
res/cardsfolder/s/sokenzan_bruiser.txt svneol=native#text/plain res/cardsfolder/s/sokenzan_bruiser.txt svneol=native#text/plain
res/cardsfolder/s/sol_grail.txt -text
res/cardsfolder/s/sol_ring.txt svneol=native#text/plain res/cardsfolder/s/sol_ring.txt svneol=native#text/plain
res/cardsfolder/s/solar_blast.txt svneol=native#text/plain res/cardsfolder/s/solar_blast.txt svneol=native#text/plain
res/cardsfolder/s/solar_tide.txt svneol=native#text/plain res/cardsfolder/s/solar_tide.txt svneol=native#text/plain

2
res/cardsfolder/h/hunting_kavu.txt
View File

@@ -7,4 +7,6 @@ A:AB$ ChangeZone | Cost$ 1 R G T | ValidTgts$ Creature.withoutFlying+YouDontCtrl
SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
SVar:Rarity:Uncommon SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_kavu.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_kavu.jpg
SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/252.jpg
Oracle:{1}{R}{G}, {T}: Exile Hunting Kavu and target creature without flying that's attacking you.
End End

2
res/cardsfolder/r/riptide_replicator.txt
View File

@@ -12,4 +12,6 @@ SVar:Y:Count$CardCounters.CHARGE
SVar:RemAIDeck:True SVar:RemAIDeck:True
SVar:Rarity:Rare SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_replicator.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_replicator.jpg
SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/309.jpg
Oracle:As Riptide Replicator enters the battlefield, choose a color and a creature type.\nRiptide Replicator enters the battlefield with X charge counters on it.\n{4}, {T}: Put an X/X creature token of the chosen color and type onto the battlefield, where X is the number of charge counters on Riptide Replicator.
End End

13
res/cardsfolder/s/sol_grail.txt Normal file
View File

@@ -0,0 +1,13 @@
Name:Sol Grail
ManaCost:3
Types:Artifact
Text:no text
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
SVar:ChooseColor:DB$ ChooseColor | Defined$ You
A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color to your mana pool.
SVar:RemAIDeck:True
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/sol_grail.jpg
SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/173.jpg
Oracle:As Sol Grail enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color to your mana pool.
End

4
src/main/java/forge/card/abilityFactory/AbilityFactory_Mana.java
View File

@@ -237,9 +237,13 @@ public class AbilityFactory_Mana {
private static String generatedMana(Ability_Mana abMana, AbilityFactory af, SpellAbility sa) { private static String generatedMana(Ability_Mana abMana, AbilityFactory af, SpellAbility sa) {
// Calculate generated mana here for stack description and resolving // Calculate generated mana here for stack description and resolving
HashMap<String, String> params = af.getMapParams(); HashMap<String, String> params = af.getMapParams();
Card card = sa.getSourceCard();
int amount = params.containsKey("Amount") ? AbilityFactory.calculateAmount(af.getHostCard(), params.get("Amount"), sa) : 1; int amount = params.containsKey("Amount") ? AbilityFactory.calculateAmount(af.getHostCard(), params.get("Amount"), sa) : 1;
String baseMana = abMana.mana(); String baseMana = abMana.mana();
if (baseMana.equals("Chosen")){
baseMana = Input_PayManaCostUtil.getShortColorString(card.getChosenColor());
}
if (params.containsKey("Bonus")) { if (params.containsKey("Bonus")) {
// For mana abilities that get a bonus // For mana abilities that get a bonus