From 2f57a39fcc38c3b0641fcb0da0c29db704f11b74 Mon Sep 17 00:00:00 2001
From: swordshine <hjy1986@gmail.com>
Date: Sat, 10 Mar 2018 15:04:31 +0800
Subject: [PATCH] - DOM: added "Historic" and Jhoira, Weatherlight Captain

---
 forge-game/src/main/java/forge/game/card/Card.java        | 1 +
 .../src/main/java/forge/game/card/CardProperty.java       | 4 ++++
 forge-gui/res/cardsfolder/e/exotic_disease.txt            | 2 +-
 .../cardsfolder/upcoming/jhoira_weatherlight_captain.txt  | 8 ++++++++
 forge-gui/res/lists/TypeLists.txt                         | 2 ++
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/jhoira_weatherlight_captain.txt

diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index d217ac8c53c..f453cf12e6d 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -3661,6 +3661,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     public final boolean isPlaneswalker()   { return getType().isPlaneswalker(); }
     public final boolean isEnchantment()    { return getType().isEnchantment(); }
     public final boolean isAura()           { return getType().hasSubtype("Aura"); }
+    public final boolean isHistoric()   {return getType().isLegendary() || getType().isArtifact() || getType().hasSubtype("Saga");}
 
     public final boolean isScheme()     { return getType().isScheme(); }
     public final boolean isPhenomenon() { return getType().isPhenomenon(); }
diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 6bfeaef3895..3a95cccc72a 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -74,6 +74,10 @@ public class CardProperty {
             if (card.isInstant() || card.isSorcery()) {
                 return false;
             }
+        } else if (property.equals("Historic")) {
+            if (!card.isHistoric()) {
+                return false;
+            }
         } else if (property.startsWith("CardUID_")) {// Protection with "doesn't remove effect"
             if (card.getId() != Integer.parseInt(property.split("CardUID_")[1])) {
                 return false;
diff --git a/forge-gui/res/cardsfolder/e/exotic_disease.txt b/forge-gui/res/cardsfolder/e/exotic_disease.txt
index 3dcc91e5435..16c4589850d 100644
--- a/forge-gui/res/cardsfolder/e/exotic_disease.txt
+++ b/forge-gui/res/cardsfolder/e/exotic_disease.txt
@@ -1,7 +1,7 @@
 Name:Exotic Disease
 ManaCost:4 B
 Types:Sorcery
-A:SP$ LoseLife | Cost$ 4 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ X | SubAbility$ DBGainLife | SpellDescription$ Domain — Target player loses X life and you gain X life, where X is the number of basic land types among lands you control.
+A:SP$ LoseLife | Cost$ 4 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ X | References$ X | SubAbility$ DBGainLife | SpellDescription$ Domain — Target player loses X life and you gain X life, where X is the number of basic land types among lands you control.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:Count$Domain
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/upcoming/jhoira_weatherlight_captain.txt b/forge-gui/res/cardsfolder/upcoming/jhoira_weatherlight_captain.txt
new file mode 100644
index 00000000000..d72ab09fc5f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jhoira_weatherlight_captain.txt
@@ -0,0 +1,8 @@
+Name:Jhoira, Weatherlight Captain
+ManaCost:2 U R
+Types:Legendary Creature Human Artificer
+PT:3/3
+T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a historic spell, draw a card. (Artifacts, legendaries, and Sagas are historic.)
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jhoira_weatherlight_captain.jpg
+Oracle:Whenever you cast a historic spell, draw a card. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 7a78eb675e9..33857b9d908 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -259,6 +259,7 @@ Trap
 Aura
 Cartouche
 Curse
+Saga
 Shrine
 [ArtifactTypes]
 Clue
@@ -284,6 +285,7 @@ Garruk
 Gideon
 Huatli
 Jace
+Jaya
 Karn
 Kaya
 Kiora