From 2d763d106dabc9245feca7cfdd2578f717a744e8 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2016 02:27:06 +0800
Subject: [PATCH] try to fix failed logic here

---
 projects/mtg/src/AllAbilities.cpp    | 4 ++--
 projects/mtg/src/GameObserver.cpp    | 4 ++--
 projects/mtg/src/MTGCardInstance.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index af883cebe..0369afc0c 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -1324,7 +1324,7 @@ int AACopier::resolve()
         source->copiedID = _target->getMTGId();
         source->modifiedbAbi = _target->modifiedbAbi;
         source->origbasicAbilities = _target->origbasicAbilities;
-        source->basicAbilities = _target->basicAbilities;
+        source->basicAbilities = _target->origbasicAbilities;
         if(_target->isMorphed)
         {
             source->power = 2;
@@ -3696,7 +3696,7 @@ int AACloner::resolve()
             spell->source->addType(*it);
         }
         spell->source->modifiedbAbi = _target->modifiedbAbi;
-        spell->source->origbasicAbilities = _target->origbasicAbilities;
+        spell->source->basicAbilities = _target->origbasicAbilities;
         delete spell;
     }
     return 1;
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 37736c980..faa869fdb 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -941,12 +941,12 @@ void GameObserver::gameStateBasedEffects()
                         p->game->putInExile(c);
 
                     }
-                }
+                }/*
                 if(c->modifiedbAbi > 0)
                 {
                     c->modifiedbAbi = 0;
                     c->basicAbilities = c->origbasicAbilities;
-                }
+                }*///disabled this failed logic I introduce... when copying/cloning a card copy orig basic abilities...
                 if(nbcards > z->nb_cards)
                 {
                     t = 0;
diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index e7fd92ceb..67783aa97 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -88,7 +88,7 @@ void MTGCardInstance::copy(MTGCardInstance * card)
     MTGCard * source = card->model;
     CardPrimitive * data = source->data;
 
-    basicAbilities = card->basicAbilities;
+    basicAbilities = card->origbasicAbilities;
     origbasicAbilities = card->origbasicAbilities;
     modifiedbAbi = card->modifiedbAbi;
     for (size_t i = 0; i < data->types.size(); i++)