From 55cf47e61e80f116113031966427fc995121e13e Mon Sep 17 00:00:00 2001
From: RedDeckWins <reddeckwins@cardforge.org>
Date: Fri, 24 May 2013 23:53:03 +0000
Subject: [PATCH] Demonic hordes no longer hard coded

---
 res/cardsfolder/d/demonic_hordes.txt                        | 6 +++++-
 .../java/forge/card/ability/effects/ChoosePlayerEffect.java | 3 ++-
 src/main/java/forge/game/phase/Upkeep.java                  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/cardsfolder/d/demonic_hordes.txt b/res/cardsfolder/d/demonic_hordes.txt
index 24c6cc61613..e9593859c6a 100644
--- a/res/cardsfolder/d/demonic_hordes.txt
+++ b/res/cardsfolder/d/demonic_hordes.txt
@@ -1,9 +1,13 @@
 Name:Demonic Hordes
 ManaCost:3 B B B
 Types:Creature Demon
-Text:At the beginning of your upkeep, unless you pay BBB, tap Demonic Hordes and sacrifice a land of an opponent's choice.
 PT:5/5
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBTap | TriggerDescription$ At the beginning of your upkeep, unless you pay B B B, tap Demonic Hordes and sacrifice a land of an opponent's choice.
 A:AB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land. | Cost$ T | SpellDescription$ Destroy target land.
+SVar:DBTap:DB$ Tap | Defined$ Self | UnlessCost$ B B B | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBChooseOpponent
+SVar:DBChooseOpponent:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChooseLand
+SVar:DBChooseLand:DB$ ChooseCard | Defined$ ChosenPlayer | Choices$ Land.YouCtrl | ChoiceTitle$ Select a land for opponent to sacrifice | SubAbility$ DBSacLand
+SVar:DBSacLand:DB$ Destroy | Sacrifice$ True| Defined$ ChosenCard | SubAbility$ DBReset
 SVar:PlayMain1:FALSE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/demonic_hordes.jpg
 Oracle:{T}: Destroy target land.\nAt the beginning of your upkeep, unless you pay {B}{B}{B}, tap Demonic Hordes and sacrifice a land of an opponent's choice.
diff --git a/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java b/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java
index 5b1de90683b..6b95c55fb47 100644
--- a/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java
@@ -60,7 +60,8 @@ public class ChoosePlayerEffect extends SpellAbilityEffect {
                     } else if ("Pump".equals(sa.getParam("AILogic"))) {
                         chosen = choices.contains(p) ? p : choices.get(0);
                     } else {
-                        chosen = p;
+                        System.out.println("Default player choice logic.");
+                        chosen = choices.contains(p) ? p : choices.get(0);
                     }
                 }
 
diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java
index 7b893a61cdd..0d4c3ba7449 100644
--- a/src/main/java/forge/game/phase/Upkeep.java
+++ b/src/main/java/forge/game/phase/Upkeep.java
@@ -91,7 +91,7 @@ public class Upkeep extends Phase {
 
         Upkeep.upkeepTheAbyss(game);
         Upkeep.upkeepDropOfHoney(game);
-        Upkeep.upkeepDemonicHordes(game);
+        //Upkeep.upkeepDemonicHordes(game);
         Upkeep.upkeepTangleWire(game);
 
         Upkeep.upkeepOathOfDruids(game);