Fix Cloner and Copier abilities

2015-09-29 10:42:29 +08:00
parent 6458b46437
commit 0bab560e89
7 changed files with 40 additions and 2 deletions
@@ -2068,6 +2068,7 @@ public:

            assert(value < 2);
            _target->basicAbilities.set(ability, value > 0);
+            _target->modifiedbAbi += 1;
            return InstantAbility::addToGame();
        }

@@ -2080,7 +2081,10 @@ public:
    {
        MTGCardInstance * _target = (MTGCardInstance *) target;
        if (_target)
+        {
            _target->basicAbilities.set(ability, stateBeforeActivation);
+            _target->modifiedbAbi -= 1;
+        }
        return 1;
    }

@@ -58,6 +58,7 @@ public:
    uint8_t colors;
    typedef std::bitset<Constants::NB_BASIC_ABILITIES> BasicAbilitiesSet;
    BasicAbilitiesSet basicAbilities;
+    BasicAbilitiesSet origbasicAbilities;

    map<string,string> magicTexts;
    string magicText;
@@ -242,6 +242,8 @@ public:
    bool isACopier;
    bool bypassTC;
    bool discarded;
+    int copiedID;
+    int modifiedbAbi;

    void eventattacked();
    void eventattackedAlone();