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 Cellar Door's stack description

Browse Source 
- Improved Coalition Relic so that you can choose a color for each counter removed
This commit is contained in:
moomarc
2012-09-13 10:17:40 +00:00
parent e7fb88ba8b
commit b06c506953
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/cardsfolder/c/coalition_relic.txt
View File

@@ -4,10 +4,14 @@ Types:Artifact
Text:no text
A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
A:AB$ PutCounter | Cost$ T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, remove all charge counters from CARDNAME. Add one mana of any color to your mana pool for each charge counter removed this way.
SVar:TrigGetMana:AB$ Mana | Cost$ 0 | Produced$ Any | Amount$ X | References$ X | SubAbility$ TrigRemove | SpellDescription$ Add one mana of any color to your mana pool for each charge counter removed this way.
SVar:TrigRemove:DB$ RemoveCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ X | References$ X
SVar:X:Count$CardCounters.CHARGE
T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRepeat | TriggerDescription$ At the beginning of your precombat main phase, remove all charge counters from CARDNAME. Add one mana of any color to your mana pool for each charge counter removed this way.
SVar:TrigRepeat:AB$ Repeat | Cost$ 0 | RepeatSubAbility$ Clear | References$ X,Y | RepeatCheckSVar$ X | RepeatSVarCompare$ GE1 | StackDescription$ None | SubAbility$ DBCleanup | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
SVar:Clear:DB$ Cleanup | ClearRemembered$ True | SubAbility$ TrigRemove
SVar:TrigRemove:DB$ RemoveCounter | CounterType$ CHARGE | CounterNum$ 1 | RememberRemoved$ True | SubAbility$ TrigGetMana | References$ Y | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
SVar:TrigGetMana:DB$ Mana | Produced$ Any | Amount$ 1 | References$ X | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$RememberedSize
SVar:Y:Count$CardCounters.CHARGE
SVar:RemAIDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/coalition_relic.jpg

5
src/main/java/forge/card/abilityfactory/AbilityFactoryRepeat.java
View File

@@ -332,7 +332,10 @@ public final class AbilityFactoryRepeat {
sb.append(" ");
if (params.containsKey("StackDescription")) {
sb.append(params.get("StackDescription"));
final String desc = params.get("StackDescription");
if (!desc.equals("None")) {
sb.append(params.get("StackDescription"));
}
} else {
sb.append("Repeat something. Somebody should really write a better StackDescription!");
}

5
src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
View File

@@ -832,7 +832,8 @@ public class AbilityFactoryZoneAffecting {
if (numCards != 1) {
sb.append("s");
}
sb.append(" from the top of his or her library.");
final String millPosition = params.containsKey("FromBottom") ? "bottom" : "top";
sb.append(" from the " + millPosition + " of his or her library.");
}
final AbilitySub abSub = sa.getSubAbility();
@@ -1622,7 +1623,7 @@ public class AbilityFactoryZoneAffecting {
}
// Don't use draw abilities before main 2 if possible
if (Singletons.getModel().getGameState().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)
if (Singletons.getModel().getGameState().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)
&& !params.containsKey("ActivationPhases")) {
return false;
}