From 39f6867ab0221904833c419ce0ac91558bf6d8b6 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 30 Jun 2016 09:26:00 +0800
Subject: [PATCH] Fix Cascade

---
 projects/mtg/include/AllAbilities.h |  8 +++++---
 projects/mtg/src/AllAbilities.cpp   | 21 ++++++++++++---------
 projects/mtg/src/MTGAbility.cpp     |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 87ae29c9d..bbf3000ec 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -6099,12 +6099,14 @@ public:
 
 
 //AACascade
-class AACascade: public ActivatedAbilityTP
+class AACascade: public ActivatedAbility
 {
 public:
     string nbcardsStr;
-    AACascade(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL,
-    int who = TargetChooser::UNSET);
+    vector<MTGCardInstance*>selectedCards;
+    vector<MTGCardInstance *>oldOrder;
+    vector<MTGCardInstance *>newOrder;
+    AACascade(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string nbcardsStr, ManaCost * _cost = NULL);
     int resolve();
     void toCastCard(MTGCardInstance * card);
     const string getMenuText();
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 44c99b139..10a17d831 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -1137,13 +1137,16 @@ AADepleter * AADepleter::clone() const
 }
 
 //AACascade
-AACascade::AACascade(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost, int who) :
-    ActivatedAbilityTP(observer, _id, card, _target, _cost, who),nbcardsStr(nbcardsStr)
+AACascade::AACascade(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string nbcardsStr, ManaCost * _cost) :
+    ActivatedAbility(observer, _id, _source, _cost, 0),nbcardsStr(nbcardsStr)
 {
+    selectedCards.clear();
+    oldOrder.clear();
+    newOrder.clear();
 }
     int AACascade::resolve()
     {
-        Player * player = getPlayerFromTarget(getTarget());
+        Player * player = source->controller();
         if (player)
         {
             WParsedInt numCards(nbcardsStr, NULL, source);
@@ -1155,14 +1158,13 @@ AACascade::AACascade(GameObserver* observer, int _id, MTGCardInstance * card, Ta
             {
                 if (library->nb_cards)
                 {
-                    for(int z = library->nb_cards; z >= 0; z--)
+                    for(int z = library->nb_cards-1; z >= 0; z--)
                     {
                         if(!library->cards[z]->isLand() && (library->cards[z]->getManaCost()->getConvertedCost() < source->getManaCost()->getConvertedCost()))
                         {
                             viable = library->cards[z];
                             player->game->putInZone(viable, library, exile);
                             {
-                                vector<MTGCardInstance*>selectedCards;
                                 for(int j=0; j < library->nb_cards; j++)
                                 {
                                      if(library->cards[j]->isCascaded)
@@ -1176,8 +1178,7 @@ AACascade::AACascade(GameObserver* observer, int _id, MTGCardInstance * card, Ta
                                     std::random_shuffle ( selectedCards.begin(), selectedCards.end() );
                                     for(unsigned int i = 0; i < selectedCards.size();++i)
                                     {
-                                        vector<MTGCardInstance *>oldOrder = library->cards;
-                                        vector<MTGCardInstance *>newOrder;
+                                        oldOrder = library->cards;
                                         newOrder.push_back(selectedCards[i]);
                                         for(unsigned int k = 0;k < oldOrder.size();++k)
                                         {
@@ -1207,8 +1208,10 @@ AACascade::AACascade(GameObserver* observer, int _id, MTGCardInstance * card, Ta
 void AACascade::toCastCard(MTGCardInstance * thisCard)
 {
     MTGAbility *ac = NEW AACastCard(game, game->mLayers->actionLayer()->getMaxId(), thisCard, thisCard,false,false,true,"","",false,false);
-    MayAbility *ma1 = NEW MayAbility(game, game->mLayers->actionLayer()->getMaxId(), ac, thisCard->clone(),true);
-    MTGAbility *ga1 = NEW GenericAddToGame(game, game->mLayers->actionLayer()->getMaxId(), thisCard,NULL,ma1);
+    MayAbility *ma1 = NEW MayAbility(game, game->mLayers->actionLayer()->getMaxId(), ac->clone(), thisCard->clone(),true);
+    MTGAbility *ga1 = NEW GenericAddToGame(game, game->mLayers->actionLayer()->getMaxId(), thisCard,NULL,ma1->clone());
+    SAFE_DELETE(ac);
+    SAFE_DELETE(ma1);
     ga1->resolve();
     return;
 }
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 089921769..2650ea1b3 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -2803,7 +2803,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     if (splitCascade.size())
     {
         Targetable * t = spell ? spell->getNextTarget() : NULL;
-        MTGAbility * a = NEW AACascade(observer, id, card, t , splitCascade[1], NULL, who);
+        MTGAbility * a = NEW AACascade(observer, id, card, target, splitCascade[1], NULL);
         a->oneShot = 1;
         return a;
     }