From 1d2abeb20be69f16ff2ec5dd77b4369e7ed63933 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 29 Jul 2016 18:37:03 +0800 Subject: [PATCH] Minor Border changes Also added copier values if it has copied a token or not... --- projects/mtg/bin/Res/graphics/alphabeta.png | Bin 4678 -> 19522 bytes projects/mtg/include/CardGui.h | 6 +-- projects/mtg/include/MTGCardInstance.h | 1 + projects/mtg/src/AllAbilities.cpp | 11 +++-- projects/mtg/src/CardDisplay.cpp | 6 +-- projects/mtg/src/CardGui.cpp | 42 ++++++++++++-------- projects/mtg/src/DeckView.cpp | 15 +++++-- projects/mtg/src/MTGCardInstance.cpp | 1 + 8 files changed, 53 insertions(+), 29 deletions(-) diff --git a/projects/mtg/bin/Res/graphics/alphabeta.png b/projects/mtg/bin/Res/graphics/alphabeta.png index 6684258170d55a63b841f75389d398b6561b7864..bc2c38a027292e72c7817bcee6a86aa0962186e8 100644 GIT binary patch literal 19522 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 delta 4153 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 || _target->isACopier) + if(_target->isToken || (_target->isACopier && _target->hasCopiedToken)) + { clone = _target; + tokencopied = true; + } else clone = MTGCollection()->getCardById(_target->copiedID); MTGCardInstance * myClone = NEW MTGCardInstance(clone, source->controller()->game); source->copy(myClone); SAFE_DELETE(myClone); source->isACopier = true; + source->hasCopiedToken = tokencopied; source->copiedID = _target->copiedID; if(_target->isMorphed) { @@ -3880,8 +3885,8 @@ int AACloner::resolve() // Use id of the card to have the same image as the original MTGCard* clone = (_target->isToken ? _target: MTGCollection()->getCardById(_target->getId())); - // If its a copier then copy what it is - if(_target->isACopier) + // If its a copier and copied a token then copy what it is + if(_target->isACopier && _target->hasCopiedToken) clone = _target; Player * targetPlayer = who == 1 ? source->controller()->opponent() : source->controller(); diff --git a/projects/mtg/src/CardDisplay.cpp b/projects/mtg/src/CardDisplay.cpp index 13c9f2fcd..d9147acdf 100644 --- a/projects/mtg/src/CardDisplay.cpp +++ b/projects/mtg/src/CardDisplay.cpp @@ -263,11 +263,11 @@ 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); - int drawMode = DrawMode::kNormal; + Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 0.90f, 0.0, 220); + int drawMode = DrawMode::kNormal;//scale card display from 1.0f to 0.90f if (observer) { - 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(); } diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 63de518ab..d0021a34b 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -111,17 +111,17 @@ void CardGui::Update(float dt) PlayGuiObject::Update(dt); } -void CardGui::DrawCard(const Pos& inPosition, int inMode, bool thumb, bool noborder) +void CardGui::DrawCard(const Pos& inPosition, int inMode, bool thumb, bool noborder, bool smallerscale) { - DrawCard(card, inPosition, inMode, thumb, noborder); + DrawCard(card, inPosition, inMode, thumb, noborder, smallerscale); } -void CardGui::DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode, bool thumb, bool noborder) +void CardGui::DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode, bool thumb, bool noborder, bool smallerscale) { switch (inMode) { case DrawMode::kNormal: - RenderBig(inCard, inPosition, thumb, noborder); + RenderBig(inCard, inPosition, thumb, noborder, smallerscale); break; case DrawMode::kText: AlternateRender(inCard, inPosition); @@ -1114,7 +1114,7 @@ void CardGui::TinyCropRender(MTGCard * card, const Pos& pos, JQuad * quad) } //Renders a big card on screen. Defaults to the "alternate" rendering if no image is found -void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder) +void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder, bool smallerscale) { JRenderer * renderer = JRenderer::GetInstance(); //GameObserver * game = GameObserver::GetInstance(); @@ -1145,7 +1145,7 @@ 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 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->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)); } @@ -1153,27 +1153,35 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder { if(cardsetname == "LEA"||cardsetname == "LEB") { + //force smaller scale + smallerscale = true; + //Draw more rounder black border renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-10.5f,(pos.actY - (pos.actZ * 119.7f))-11.5f,pos.actZ * 168.f + 0.5f,pos.actZ * 239.4f + 4.f,10.f,ARGB(255,5,5,5)); renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-10.5f,(pos.actY - (pos.actZ * 119.7f))-11.5f,pos.actZ * 168.f + 0.5f,pos.actZ * 239.4f + 4.f,10.f,ARGB(50,240,240,240)); } else - { + {//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)); } } - if(cardsetname == "LEA"||cardsetname == "LEB") - { - if(alphabeta.get()) - renderer->RenderQuad(alphabeta.get(),(pos.actX - (pos.actZ * 100.f))+12.f,(pos.actY - (pos.actZ * 142.5f))+17.5f, pos.actT, 0.88f, 0.88f); - renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale-0.01f, scale-0.01f); - } - else - renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale); } + //draw inner border + if(cardsetname == "LEA"||cardsetname == "LEB") + { + if(alphabeta.get()) + { + alphabeta->SetHotSpot(static_cast (alphabeta->mWidth / 2), static_cast (alphabeta->mHeight / 2)); + float myscale = pos.actZ * 250 / alphabeta->mHeight; + alphabeta->SetColor(ARGB((int)pos.actA,255,255,255)); + renderer->RenderQuad(alphabeta.get(), x, pos.actY, pos.actT, myscale, myscale); + } + } + //Draw card + if(smallerscale) + renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale-0.01f, scale-0.01f); else - renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale); - + renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale); RenderCountersBig(card, pos); return; } diff --git a/projects/mtg/src/DeckView.cpp b/projects/mtg/src/DeckView.cpp index a18424a9a..18e6247b3 100644 --- a/projects/mtg/src/DeckView.cpp +++ b/projects/mtg/src/DeckView.cpp @@ -147,6 +147,7 @@ void DeckView::renderCard(int index, int alpha, bool asThumbnail, bool addWHbord {//NORMAL VIEW WITH IMAGES int mode = !options[Options::DISABLECARDS].number ? DrawMode::kNormal : DrawMode::kText; float modx = addWHborder ? 2.0f:0.0f; + bool smallerscale = modx > 0.0f ? true:false; //border for editor && others??? string cardsetname = setlist[cardPosition.card->setId].c_str(); if(cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR"||cardsetname == "DM") @@ -156,11 +157,19 @@ void DeckView::renderCard(int index, int alpha, bool asThumbnail, bool addWHbord } else { - JRenderer::GetInstance()->FillRoundRect((cardPosition.x - cardPosition.scale * 100.0f)-(5.f+modx),(cardPosition.y - cardPosition.scale * 142.5f)-(5.f+modx),cardPosition.scale * 200.0f,cardPosition.scale * 285.0f,5.f+modx,ARGB(255,10,10,10)); - JRenderer::GetInstance()->DrawRoundRect((cardPosition.x - cardPosition.scale * 100.0f)-(5.f+modx),(cardPosition.y - cardPosition.scale * 142.5f)-(5.f+modx),cardPosition.scale * 200.0f,cardPosition.scale * 285.0f,5.f+modx,ARGB(50,240,240,240)); + if (cardsetname == "LEA" || cardsetname == "LEB") + { + JRenderer::GetInstance()->FillRoundRect((cardPosition.x - cardPosition.scale * 96.75f)-(7.f+modx),(cardPosition.y - cardPosition.scale * 139.25f)-(7.f+modx),cardPosition.scale * 193.5f,cardPosition.scale * 278.5f,7.f+modx,ARGB(255,10,10,10)); + JRenderer::GetInstance()->DrawRoundRect((cardPosition.x - cardPosition.scale * 96.75f)-(7.f+modx),(cardPosition.y - cardPosition.scale * 139.25f)-(7.f+modx),cardPosition.scale * 193.5f,cardPosition.scale * 278.5f,7.f+modx,ARGB(50,240,240,240)); + } + else + { + JRenderer::GetInstance()->FillRoundRect((cardPosition.x - cardPosition.scale * 100.0f)-(5.f+modx),(cardPosition.y - cardPosition.scale * 142.5f)-(5.f+modx),cardPosition.scale * 200.0f,cardPosition.scale * 285.0f,5.f+modx,ARGB(255,10,10,10)); + JRenderer::GetInstance()->DrawRoundRect((cardPosition.x - cardPosition.scale * 100.0f)-(5.f+modx),(cardPosition.y - cardPosition.scale * 142.5f)-(5.f+modx),cardPosition.scale * 200.0f,cardPosition.scale * 285.0f,5.f+modx,ARGB(50,240,240,240)); + } } Pos pos = Pos(cardPosition.x, cardPosition.y, cardPosition.scale * 285 / 250, 0.0, 255); - CardGui::DrawCard(cardPosition.card, pos, mode, asThumbnail, true); + CardGui::DrawCard(cardPosition.card, pos, mode, asThumbnail, true, smallerscale); } int quadAlpha = alpha; if (!deck()->count(cardPosition.card)) quadAlpha /= 2; diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 91f5404fc..2c3775dc3 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -227,6 +227,7 @@ void MTGCardInstance::initMTGCI() myPair = NULL; shackled = NULL; miracle = false; + hasCopiedToken = false; countTrini = 0; imprintedCards.clear(); attackCost = 0;