From 0af00a313ebcd967e139359b564afa507b2a7f7b Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 14 Aug 2016 21:26:19 +0800 Subject: [PATCH 1/3] adjust p/t box when tapped only --- projects/mtg/src/CardGui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index e80e8212c..2ee2a1fa8 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -386,7 +386,7 @@ void CardGui::Render() char buffer[200]; sprintf(buffer, "%i/%i", card->power, card->life); //move up the p/t box by increasing ymody - float ymody = (card->isAttacker()||card->isDefenser())?-6.0f:0.0f; + 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(actA))/2),0,0,0)); renderer->DrawRect(actX - (13 * actZ), actY + ymody + 4 * actZ, 25.5f * actZ, 14 * actZ, From 568f3ae94fe8a94457a821cd37cae6bcbae59790 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 14 Aug 2016 21:26:33 +0800 Subject: [PATCH 2/3] fix copying man lands --- projects/mtg/src/MTGCardInstance.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 008734c53..ed002960d 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/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 From 861620cb6eab817082ed317e1ccfa50ff57eb554 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 14 Aug 2016 21:53:54 +0800 Subject: [PATCH 3/3] fix AI deck129 invalid mtgid --- projects/mtg/bin/Res/ai/baka/deck129.txt | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/projects/mtg/bin/Res/ai/baka/deck129.txt b/projects/mtg/bin/Res/ai/baka/deck129.txt index 5d10a5d55..51eeb64b6 100644 --- a/projects/mtg/bin/Res/ai/baka/deck129.txt +++ b/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 -999009 -999009 -999009 +253587 +253587 +253587 +253587 #2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; -999171 -999171 +270792 +270792 #4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, -999260 -999260 -999260 -999260 +253539 +253539 +253539 +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 -999039 +290542 +290542 #4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, -999106 -999106 -999106 -999106 +270957 +270957 +270957 +270957 @@ -84,26 +84,26 @@ 369018 #4 x Forest (RTR), Basic Land Forest, -999086 -999086 -999086 -999086 +289326 +289326 +289326 +289326 #4 x Plains (RTR), Basic Land Plains, -999168 -999168 -999168 -999168 +289310 +289310 +289310 +289310 #2 x Temple Garden (RTR), Land Forest Plains, -999238 -999238 +253681 +253681 #4 x Plains (RTR), Basic Land Plains, -999265 -999265 -999265 -999265 +289309 +289309 +289309 +289309