Addes some new primitives from BRO set, fixes BRO and BRC dat files, updated image list url for BRO and BRS sets, imrpoved an AI deck, improved meld ability with "and" option, added new ability to allow a planeswalker to activate its loyalty abilities twice in a turn, improved Android downloader.

2023-05-28 23:17:21 +02:00
parent 066b30b1b7
commit 99f08276c6
12 changed files with 560 additions and 16 deletions
@@ -5057,6 +5057,12 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
        }
        MTGAbility * a = NEW AAMeld(observer, id, card, target, splitMeldName);
        a->oneShot = true;
+        if(storedAndAbility.size())
+        {
+            string stored = storedAndAbility;
+            storedAndAbility.clear();
+            ((AAMeld*)a)->andAbility = parseMagicLine(stored, id, spell, card);
+        }
        return a;
    }

@@ -7050,8 +7056,12 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
            {
                ActivatedAbility * check = dynamic_cast<ActivatedAbility*>(card->getObserver()->mLayers->actionLayer()->mObjects[k]);
                turnSide = card->isFlipped > 0 && !card->isInPlay(card->getObserver());
-                if(!turnSide && check && check->source == card && check->counters)
-                    return 0;
+                if(!turnSide && check && check->source == card){
+                    if(check->counters && !card->has(Constants::CANLOYALTYTWICE))
+                        return 0;
+                    else if(check->counters > 1 && card->has(Constants::CANLOYALTYTWICE))
+                        return 0;
+                }
            }
            if (player != game->currentPlayer)
                return 0;