Merge pull request #43 from WagicProject/master

getting master

projects/mtg/bin/Res/ai/baka/deck129.txt

@@ -23,23 +23,23 @@
 369072
 
 #4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
-999009
+253587
-999009
+253587
-999009
+253587
-999009
+253587
 
 #2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
-999171
+270792
-999171
+270792
 
 #4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
-999260
+253539
-999260
+253539
-999260
+253539
-999260
+253539
 
 #1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
-999262
+253575
 
 
 
@@ -57,14 +57,14 @@
 369060
 
 #2 x Chromatic Lantern (RTR), {3}, Artifact, 
-999039
+290542
-999039
+290542
 
 #4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
-999106
+270957
-999106
+270957
-999106
+270957
-999106
+270957
 
 
 
@@ -84,26 +84,26 @@
 369018
 
 #4 x Forest (RTR), Basic Land Forest, 
-999086
+289326
-999086
+289326
-999086
+289326
-999086
+289326
 
 #4 x Plains (RTR), Basic Land Plains, 
-999168
+289310
-999168
+289310
-999168
+289310
-999168
+289310
 
 #2 x Temple Garden (RTR), Land Forest Plains, 
-999238
+253681
-999238
+253681
 
 #4 x Plains (RTR), Basic Land Plains, 
-999265
+289309
-999265
+289309
-999265
+289309
-999265
+289309
 
 
 

projects/mtg/bin/Res/sets/BVC/_cards.dat

@@ -0,0 +1,386 @@
+[meta]
+author=Wagic Team
+name=Duel Decks: Blessed vs. Cursed
+year=2016
+total=76
+[/meta]
+[card]
+primitive=Abattoir Ghoul
+id=409626
+rarity=U
+[/card]
+[card]
+primitive=Appetite for Brains
+id=409627
+rarity=U
+[/card]
+[card]
+primitive=Barter in Blood
+id=409628
+rarity=U
+[/card]
+[card]
+primitive=Bonds of Faith
+id=409578
+rarity=C
+[/card]
+[card]
+primitive=Butcher Ghoul
+id=409629
+rarity=C
+[/card]
+[card]
+primitive=Butcher's Cleaver
+id=409607
+rarity=U
+[/card]
+[card]
+primitive=Captain of the Mists
+id=409600
+rarity=R
+[/card]
+[card]
+primitive=Cathedral Sanctifier
+id=409579
+rarity=C
+[/card]
+[card]
+primitive=Champion of the Parish
+id=409580
+rarity=R
+[/card]
+[card]
+primitive=Chapel Geist
+id=409581
+rarity=C
+[/card]
+[card]
+primitive=Cobbled Wings
+id=409645
+rarity=C
+[/card]
+[card]
+primitive=Compelling Deterrence
+id=409618
+rarity=U
+[/card]
+[card]
+primitive=Dearly Departed
+id=409582
+rarity=R
+[/card]
+[card]
+primitive=Diregraf Captain
+id=409644
+rarity=U
+[/card]
+[card]
+primitive=Diregraf Ghoul
+id=409630
+rarity=U
+[/card]
+[card]
+primitive=Dismal Backwater
+id=409646
+rarity=C
+[/card]
+[card]
+primitive=Doomed Traveler
+id=409583
+rarity=C
+[/card]
+[card]
+primitive=Dread Return
+id=409631
+rarity=U
+[/card]
+[card]
+primitive=Driver of the Dead
+id=409632
+rarity=C
+[/card]
+[card]
+primitive=Eerie Interlude
+id=409584
+rarity=R
+[/card]
+[card]
+primitive=Elder Cathar
+id=409585
+rarity=C
+[/card]
+[card]
+primitive=Emancipation Angel
+id=409586
+rarity=U
+[/card]
+[card]
+primitive=Falkenrath Noble
+id=409633
+rarity=U
+[/card]
+[card]
+primitive=Fiend Hunter
+id=409587
+rarity=U
+[/card]
+[card]
+primitive=Forbidden Alchemy
+id=409619
+rarity=C
+[/card]
+[card]
+primitive=Gather the Townsfolk
+id=409588
+rarity=C
+[/card]
+[card]
+primitive=Geist of Saint Traft
+id=409577
+rarity=M
+[/card]
+[card]
+primitive=Ghoulraiser
+id=409634
+rarity=C
+[/card]
+[card]
+primitive=Goldnight Redeemer
+id=409589
+rarity=U
+[/card]
+[card]
+primitive=Gravecrawler
+id=409635
+rarity=R
+[/card]
+[card]
+primitive=Gryff Vanguard
+id=409601
+rarity=C
+[/card]
+[card]
+primitive=Harvester of Souls
+id=409636
+rarity=R
+[/card]
+[card]
+primitive=Havengul Runebinder
+id=409620
+rarity=R
+[/card]
+[card]
+primitive=Human Frailty
+id=409637
+rarity=U
+[/card]
+[card]
+primitive=Increasing Devotion
+id=409590
+rarity=R
+[/card]
+[card]
+primitive=Island
+id=409611
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=409612
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=409613
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=409647
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=409648
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=409649
+rarity=L
+[/card]
+[card]
+primitive=Makeshift Mauler
+id=409621
+rarity=C
+[/card]
+[card]
+primitive=Mindwrack Demon
+id=409617
+rarity=M
+[/card]
+[card]
+primitive=Mist Raven
+id=409602
+rarity=C
+[/card]
+[card]
+primitive=Moan of the Unhallowed
+id=409638
+rarity=U
+[/card]
+[card]
+primitive=Momentary Blink
+id=409591
+rarity=C
+[/card]
+[card]
+primitive=Moorland Inquisitor
+id=409592
+rarity=C
+[/card]
+[card]
+primitive=Nephalia Smuggler
+id=409603
+rarity=U
+[/card]
+[card]
+primitive=Plains
+id=409614
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=409615
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=409616
+rarity=L
+[/card]
+[card]
+primitive=Pore Over the Pages
+id=409604
+rarity=U
+[/card]
+[card]
+primitive=Rebuke
+id=409593
+rarity=C
+[/card]
+[card]
+primitive=Relentless Skaabs
+id=409622
+rarity=U
+[/card]
+[card]
+primitive=Scrapskin Drake
+id=409623
+rarity=C
+[/card]
+[card]
+primitive=Screeching Skaab
+id=409624
+rarity=C
+[/card]
+[card]
+primitive=Seraph Sanctuary
+id=409609
+rarity=C
+[/card]
+[card]
+primitive=Sever the Bloodline
+id=409639
+rarity=R
+[/card]
+[card]
+primitive=Sharpened Pitchfork
+id=409608
+rarity=U
+[/card]
+[card]
+primitive=Slayer of the Wicked
+id=409594
+rarity=U
+[/card]
+[card]
+primitive=Spectral Gateguards
+id=409595
+rarity=C
+[/card]
+[card]
+primitive=Stitched Drake
+id=409625
+rarity=C
+[/card]
+[card]
+primitive=Swamp
+id=409650
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=409651
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=409652
+rarity=L
+[/card]
+[card]
+primitive=Tandem Lookout
+id=409605
+rarity=U
+[/card]
+[card]
+primitive=Thraben Heretic
+id=409596
+rarity=U
+[/card]
+[card]
+primitive=Tooth Collector
+id=409640
+rarity=U
+[/card]
+[card]
+primitive=Topplegeist
+id=409597
+rarity=U
+[/card]
+[card]
+primitive=Tower Geist
+id=409606
+rarity=U
+[/card]
+[card]
+primitive=Tranquil Cove
+id=409610
+rarity=C
+[/card]
+[card]
+primitive=Tribute to Hunger
+id=409641
+rarity=U
+[/card]
+[card]
+primitive=Unbreathing Horde
+id=409642
+rarity=R
+[/card]
+[card]
+primitive=Victim of Night
+id=409643
+rarity=C
+[/card]
+[card]
+primitive=Village Bell-Ringer
+id=409598
+rarity=C
+[/card]
+[card]
+primitive=Voice of the Provinces
+id=409599
+rarity=C
+[/card]

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -6887,6 +6887,7 @@ toughness=2
 [/card]
 [card]
 name=Aven Fateshaper
+abilities=flying
 auto=name(Look at My top cards) reveal:4 optionone name(Look) target(*|reveal) doNothing optiononeend optiontwo target(<4>*|reveal) moveto(mylibrary) optiontwoend revealend
 auto={4}{u}:name(Look at My top cards) reveal:4 optionone name(Look) target(*|reveal) doNothing optiononeend optiontwo target(<4>*|reveal) moveto(mylibrary) optiontwoend revealend
 text=Flying -- When Aven Fateshaper enters the battlefield, look at the top four cards of your library, then put them back in any order. -- {4}{U}: Look at the top four cards of your library, then put them back in any order.

projects/mtg/src/ActionStack.cpp

@@ -130,7 +130,10 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
 
     if (bigQuad)
     {
-        Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220);
+        /*Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220);
+        CardGui::DrawCard(source, pos, observer->getCardSelector()->GetDrawMode());*/
+        Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 0.80f, 0.0, 220);
+        pos.actY = 142;//adjust y a little bit
         CardGui::DrawCard(source, pos, observer->getCardSelector()->GetDrawMode());
     }
 

projects/mtg/src/AllAbilities.cpp

@@ -1466,7 +1466,7 @@ int AACopier::resolve()
         if(_target->isToken || (_target->isACopier && _target->hasCopiedToken))
             tokencopied = true;
 
-        if(tokencopied)
+        if(tokencopied && !_target->isACopier)
             source->copy(_target->clone());
         else
         {

projects/mtg/src/CardDisplay.cpp

@@ -263,11 +263,13 @@ void CardDisplay::Render()
     {
         mObjects[mCurr]->Render();
         CardGui * cardg = ((CardGui *) mObjects[mCurr]);
-        Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220);
+        //Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220);
+        Pos pos = Pos((CardGui::BigWidth / 2), CardGui::BigHeight / 2 - 10, 0.80f, 0.0, 220);
         int drawMode = DrawMode::kNormal;
         if (observer)
         {
-            pos.actY = 145;
+            //pos.actY = 145;
+            pos.actY = 142;//reduce y a little
             if (x < (CardGui::BigWidth / 2)) pos.actX = SCREEN_WIDTH - 10 - CardGui::BigWidth / 2;
             drawMode = observer->getCardSelector()->GetDrawMode();
         }

projects/mtg/src/CardGui.cpp

@@ -153,7 +153,7 @@ void CardGui::Render()
     else
         quad = AlternateThumbQuad(card);
 
-    float cardScale = quad ? 40 / quad->mHeight : 1;
+    float cardScale = quad ? 38 / quad->mHeight : 1;
     //I want the below for melded cards but I dont know how to adjust everything else
     //to look neat and clean. leaving this here incase someone else wants to pretty up the p/t box
     //and line up the position.
@@ -385,9 +385,11 @@ void CardGui::Render()
         mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
         char buffer[200];
         sprintf(buffer, "%i/%i", card->power, card->life);
-        renderer->FillRect(actX - (13 * actZ), actY + 4 * actZ, 25.5f * actZ, 14 * actZ,
+         //move up the p/t box by increasing ymody
+         float ymody = ((card->isAttacker()||card->isDefenser())&&card->isTapped())?-6.0f:0.0f;
+        renderer->FillRect(actX - (13 * actZ), actY + ymody + 4 * actZ, 25.5f * actZ, 14 * actZ,
             ARGB(((static_cast<unsigned char>(actA))/2),0,0,0));
-        renderer->DrawRect(actX - (13 * actZ), actY + 4 * actZ, 25.5f * actZ, 14 * actZ,
+        renderer->DrawRect(actX - (13 * actZ), actY + ymody + 4 * actZ, 25.5f * actZ, 14 * actZ,
             ARGB(((static_cast<unsigned char>(actA))),20,20,20));
         //damaged or buffed or powered down        
         if(card->wasDealtDamage && card->life <= 2)
@@ -403,7 +405,7 @@ void CardGui::Render()
         mFont->SetScale(actZ);
         mFont->SetScale(actZ);
         float halfbufferW = (mFont->GetStringWidth(buffer))/2;
-        mFont->DrawString(buffer, actX - halfbufferW, actY + 7 * actZ);
+        mFont->DrawString(buffer, actX - halfbufferW, actY + ymody + 7 * actZ);
         mFont->SetScale(1);
     }
 
@@ -1123,7 +1125,7 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
     //    card = (MTGCard*)game->mLayers->actionLayer()->currentActionCard;
     //i want this but ai targets cards so quickly that it can crash the game.
     float x = pos.actX;
-
+    JQuadPtr alphabeta = WResourceManager::Instance()->RetrieveTempQuad("alphabeta.png");
     JQuadPtr quad = thumb ? WResourceManager::Instance()->RetrieveCard(card, RETRIEVE_THUMB)
                           : WResourceManager::Instance()->RetrieveCard(card);
     MTGCardInstance * kcard =  dynamic_cast<MTGCardInstance*>(card);
@@ -1145,24 +1147,39 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
         if(!noborder)
         {
             if(cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR"||cardsetname == "DM")
-            {
+            {//Draw white border
-                //like white border
+                renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(255,248,248,255));
-                renderer->FillRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(255,248,248,255));
+                renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(150,20,20,20));
-                //black thin line to simulate card edge
-                renderer->DrawRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(150,20,20,20));
             }
             else
             {
-                //like black border
+                if(cardsetname == "LEA")
-                renderer->FillRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(255,10,10,10));
+                {//BETA HAS REGULAR BORDER
-                //white thin line to simulate card edge
+                    //Draw more rounder black border
-                renderer->DrawRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(50,240,240,240));
+                    renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-10.f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f - 0.5f,pos.actZ * 239.4f + 8.f,10.f,ARGB(255,5,5,5));
-            }
+                    renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-10.f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f - 0.5f,pos.actZ * 239.4f + 8.f,10.f,ARGB(50,240,240,240));
-            //render card image
-            renderer->RenderQuad(quad.get(), x, pos.actY-2, pos.actT, scale-0.02f, scale-0.02f);
                 }
                 else
-            renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale);
+                {//draw black border
+                    renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(255,5,5,5));
+                    renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(50,240,240,240));
+                }
+            }
+        }
+        //draw inner border
+        if(cardsetname == "LEA"||cardsetname == "LEB")
+        {
+            if(alphabeta.get())
+            {
+                alphabeta->SetHotSpot(static_cast<float> (alphabeta->mWidth / 2), static_cast<float> (alphabeta->mHeight / 2));
+                float myscale = pos.actZ * 254 / alphabeta->mHeight;
+                alphabeta->SetColor(ARGB((int)pos.actA,255,255,255));
+                renderer->RenderQuad(alphabeta.get(), x, pos.actY+0.2f, pos.actT, myscale, myscale);
+            }
+        }
+        float modxscale = (cardsetname =="UNH")?0.02f:0.0f;
+        float modyscale = (cardsetname =="UNH")?0.015f:0.0f;
+        renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale+modxscale, scale+modyscale);
 
         RenderCountersBig(card, pos);
         return;

projects/mtg/src/CardSelector.cpp

@@ -339,8 +339,14 @@ void CardSelector::Render()
         active->Render();
         if (CardView* card = dynamic_cast<CardView*>(active) )
         {
+            //if(timer > 0)
+                //card->DrawCard(bigpos, mDrawMode);
             if(timer > 0)
-                card->DrawCard(bigpos, mDrawMode);
+             {
+                 float modx = 14.f;
+                 Pos npos = Pos(bigpos.x+modx,bigpos.y-4.f,bigpos.zoom-(bigpos.zoom/5),bigpos.t,bigpos.alpha);
+                 card->DrawCard(npos, mDrawMode);
+             }
         }
     }
 }

projects/mtg/src/MTGCardInstance.cpp

@@ -106,6 +106,7 @@ void MTGCardInstance::copy(MTGCardInstance * card)
 
     CardPrimitive * data = source->data;
     basicAbilities = data->basicAbilities;
+    types.clear();//reset types.. fix copying man lands... the copier becomes an unanimated land...
     for (size_t i = 0; i < data->types.size(); i++)
     {
         types.push_back(data->types[i]);
@@ -115,7 +116,7 @@ void MTGCardInstance::copy(MTGCardInstance * card)
 
     manaCost.copy(data->getManaCost());
 
-    setText(""); //The text is retrieved from the data anyways
+    setText(data->text); //The text is retrieved from the data anyways
     setName(data->name);
 
     power = data->power;//layer 7a