From 7ecfe9d8dfb3f7630c188a86c79ec3b5584da933 Mon Sep 17 00:00:00 2001
From: melvin <melvinzhang@gmail.com>
Date: Sun, 28 Oct 2012 22:00:15 +0800
Subject: [PATCH] allow A or B as mana source

---
 grammar/mtg.peg      |  6 ++++++
 grammar/parsable.txt | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/grammar/mtg.peg b/grammar/mtg.peg
index 6876023833..82747d988a 100644
--- a/grammar/mtg.peg
+++ b/grammar/mtg.peg
@@ -210,6 +210,7 @@ CounterType
     / "-1/-1"
     / "+1/+0"
     / "charge"
+    / "depletion"
     / "spore"
     / "storage"
     ;
@@ -251,6 +252,11 @@ AddManaAction
 
 ManaSource
     = "{1}"
+    / "{B} or {R}"
+    / "{G} or {W}"
+    / "{R} or {G}"
+    / "{U} or {B}"
+    / "{W} or {U}"
     / "{G}"
     / "{B}"
     / "{U}"
diff --git a/grammar/parsable.txt b/grammar/parsable.txt
index cc3a414232..59454183e4 100644
--- a/grammar/parsable.txt
+++ b/grammar/parsable.txt
@@ -723,11 +723,21 @@ Soulbond
 Storm
 Swampwalk
 {T}: Add {1} to your mana pool.
+{T}: Add {B} or {R} to your mana pool.
+{T}: Add {B} or {R} to your mana pool. Put a depletion counter on @.
 {T}: Add {B} to your mana pool.
+{T}: Add {G} or {W} to your mana pool.
+{T}: Add {G} or {W} to your mana pool. Put a depletion counter on @.
 {T}: Add {G} to your mana pool.
 {T}: Add one mana of any color to your mana pool.
+{T}: Add {R} or {G} to your mana pool.
+{T}: Add {R} or {G} to your mana pool. Put a depletion counter on @.
 {T}: Add {R} to your mana pool.
+{T}: Add {U} or {B} to your mana pool.
+{T}: Add {U} or {B} to your mana pool. Put a depletion counter on @.
 {T}: Add {U} to your mana pool.
+{T}: Add {W} or {U} to your mana pool.
+{T}: Add {W} or {U} to your mana pool. Put a depletion counter on @.
 {T}: Add {W} to your mana pool.
 Tap all artifacts.
 Tap all creatures.
@@ -789,6 +799,7 @@ Target player loses 5 life and you gain 5 life.
 {T}: @ gets +0/+4 until end of turn.
 {T}: @ gets +3/+3 until end of turn.
 Totem armor
+{T}, Pay 1 life: Add {G} or {W} to your mana pool.
 {T}, Pay 1 life: Add {G} to your mana pool.
 {T}, Pay 1 life: Add one mana of any color to your mana pool.
 {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.